diff --git a/src/api/account/notificationRecord.ts b/src/api/account/notificationRecord.ts
index 58cb612f..2485069e 100644
--- a/src/api/account/notificationRecord.ts
+++ b/src/api/account/notificationRecord.ts
@@ -1,7 +1,9 @@
 import server from '@/utils/request'
 
 // 获取记录列表
-export const getList_api = (data:object): any =>server.post(`/notifications/_query`,data)
+export const getList_api = (data:object): any =>server.get(`/notifications/_query`,encodeParams(data))
+// 获取未读记录列表
+export const getListByUnRead_api = (data:object): any =>server.post(`/notifications/_query`,data)
 // 修改记录状态
 export const changeStatus_api = (type:'_read'|'_unread',data:string[]): any =>server.post(`/notifications/${type}`,data)
 
diff --git a/src/components/Layout/components/Notice.vue b/src/components/Layout/components/Notice.vue
index 42ada485..36e6bb38 100644
--- a/src/components/Layout/components/Notice.vue
+++ b/src/components/Layout/components/Notice.vue
@@ -19,7 +19,7 @@
 </template>
 
 <script setup lang="tsx">
-import { getList_api } from '@/api/account/notificationRecord';
+import { getListByUnRead_api } from '@/api/account/notificationRecord';
 import NoticeInfo from './NoticeInfo.vue';
 import { getWebSocket } from '@/utils/websocket';
 import { notification, Button } from 'ant-design-vue';
@@ -93,7 +93,7 @@ const getList = () => {
             },
         ],
     };
-    getList_api(params)
+    getListByUnRead_api(params)
         .then((resp: any) => {
             list.value = resp.result.data;
             total.value = resp.result.total;
diff --git a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
index 72f82b22..59aca823 100644
--- a/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/BindChildDevice/index.vue
@@ -1,6 +1,6 @@
 <!-- 绑定设备 -->
 <template>
-    <a-modal
+    <j-modal
         :maskClosable="false"
         width="1000px"
         :visible="true"
@@ -12,7 +12,7 @@
         :confirmLoading="btnLoading"
     >
         <div style="margin-top: 10px">
-            <Search
+            <pro-search
                 :columns="columns"
                 target="child-device-bind"
                 @search="handleSearch"
@@ -73,14 +73,14 @@
                     }}
                 </template>
                 <template #state="slotProps">
-                    <a-badge
+                    <j-badge
                         :text="slotProps.state.text"
                         :status="statusMap.get(slotProps.state.value)"
                     />
                 </template>
             </JProTable>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/MSelect.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/MSelect.vue
index 1b66df49..f465c18d 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/MSelect.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/MSelect.vue
@@ -1,14 +1,14 @@
 <template>
-    <a-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%">
-        <a-select-option
+    <j-select allowClear v-model:value="_value" @change="onChange" placeholder="请选择" style="width: 100%">
+        <j-select-option
             v-for="item in list"
             :key="item.id"
             :value="item.id"
             :label="item.name"
             :filter-option="filterOption"
-            >{{ item.name }}</a-select-option
+            >{{ item.name }}</j-select-option
         >
-    </a-select>
+    </j-select>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
index 6d2c80ab..c59e7443 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
@@ -1,5 +1,5 @@
 <template>
-    <a-modal
+    <j-modal
         width="900px"
         title="批量映射"
         visible
@@ -10,49 +10,49 @@
             <div class="map-tree-top">
                 采集器的点位名称与属性名称一致时将自动映射绑定；有多个采集器点位名称与属性名称一致时以第1个采集器的点位数据进行绑定
             </div>
-            <a-spin :spinning="loading">
+            <j-spin :spinning="loading">
                 <div class="map-tree-content">
-                    <a-card class="map-tree-content-card" title="源数据">
-                        <a-tree
+                    <j-card class="map-tree-content-card" title="源数据">
+                        <j-tree
                             checkable
                             :height="300"
                             :tree-data="dataSource"
                             :checkedKeys="checkedKeys"
                             @check="onCheck"
                         />
-                    </a-card>
+                    </j-card>
                     <div style="width: 100px">
-                        <a-button
+                        <j-button
                             :disabled="rightList.length >= leftList.length"
                             @click="onRight"
-                            >加入右侧</a-button
+                            >加入右侧</j-button
                         >
                     </div>
-                    <a-card class="map-tree-content-card" title="采集器">
-                        <a-list
+                    <j-card class="map-tree-content-card" title="采集器">
+                        <j-list
                             size="small"
                             :data-source="rightList"
                             class="map-tree-content-card-list"
                         >
                             <template #renderItem="{ item }">
-                                <a-list-item>
+                                <j-list-item>
                                     {{ item.title }}
                                     <template #actions>
-                                        <a-popconfirm
+                                        <j-popconfirm
                                             title="确定删除?"
                                             @confirm="_delete(item.key)"
                                         >
                                             <AIcon type="DeleteOutlined" />
-                                        </a-popconfirm>
+                                        </j-popconfirm>
                                     </template>
-                                </a-list-item>
+                                </j-list-item>
                             </template>
-                        </a-list>
-                    </a-card>
+                        </j-list>
+                    </j-card>
                 </div>
-            </a-spin>
+            </j-spin>
         </div>
-    </a-modal>
+    </j-modal>
 </template>
 
 <script lang="ts" setup>
@@ -119,6 +119,7 @@ const onCheck = (keys: string[], e: any) => {
 };
 
 const onRight = () => {
+    console.log(rightList.value,leftList.value);
     rightList.value = leftList.value;
 };
 
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
index 10d5fc07..39fa047e 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
@@ -1,49 +1,51 @@
 <template>
-    <a-spin :spinning="loading" v-if="_metadata.length">
-        <a-card :bordered="false">
+    <j-spin :spinning="loading" v-if="_metadata.length">
+        <j-card :bordered="false">
             <template #title>
                 <TitleComponent data="点位映射"></TitleComponent>
             </template>
             <template #extra>
-                <a-space>
-                    <a-button @click="showModal">批量映射</a-button>
-                    <a-button type="primary" @click="onSave">保存并应用</a-button>
-                </a-space>
+                <j-space>
+                    <j-button @click="showModal">批量映射</j-button>
+                    <j-button type="primary" @click="onSave"
+                        >保存并应用</j-button
+                    >
+                </j-space>
             </template>
-            <a-form ref="formRef" :model="modelRef">
-                <a-table :dataSource="modelRef.dataSource" :columns="columns">
+            <j-form ref="formRef" :model="modelRef">
+                <j-table :dataSource="modelRef.dataSource" :columns="columns">
                     <template #headerCell="{ column }">
                         <template v-if="column.key === 'collectorId'">
                             采集器
-                            <a-tooltip title="边缘网关代理的真实物理设备">
+                            <j-tooltip title="边缘网关代理的真实物理设备">
                                 <AIcon type="QuestionCircleOutlined" />
-                            </a-tooltip>
+                            </j-tooltip>
                         </template>
                     </template>
                     <template #bodyCell="{ column, record, index }">
                         <template v-if="column.dataIndex === 'channelId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'channelId']"
                             >
-                                <a-select
+                                <j-select
                                     style="width: 100%"
                                     v-model:value="record[column.dataIndex]"
                                     placeholder="请选择"
                                     allowClear
                                     :filter-option="filterOption"
                                 >
-                                    <a-select-option
+                                    <j-select-option
                                         v-for="item in channelList"
                                         :key="item.value"
                                         :value="item.value"
                                         :label="item.label"
-                                        >{{ item.label }}</a-select-option
+                                        >{{ item.label }}</j-select-option
                                     >
-                                </a-select>
-                            </a-form-item>
+                                </j-select>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'collectorId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'collectorId']"
                                 :rules="[
                                     {
@@ -58,10 +60,10 @@
                                     type="COLLECTOR"
                                     :edgeId="instanceStore.current.id"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'pointId'">
-                            <a-form-item
+                            <j-form-item
                                 :name="['dataSource', index, 'pointId']"
                                 :rules="[
                                     {
@@ -76,33 +78,33 @@
                                     type="POINT"
                                     :edgeId="instanceStore.current.id"
                                 />
-                            </a-form-item>
+                            </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'id'">
-                            <a-badge
+                            <j-badge
                                 v-if="record[column.dataIndex]"
                                 status="success"
                                 text="已绑定"
                             />
-                            <a-badge v-else status="error" text="未绑定" />
+                            <j-badge v-else status="error" text="未绑定" />
                         </template>
                         <template v-if="column.key === 'action'">
-                            <a-tooltip title="解绑">
-                                <a-popconfirm
+                            <j-tooltip title="解绑">
+                                <j-popconfirm
                                     title="确认解绑"
                                     :disabled="!record.id"
                                     @confirm="unbind(record.id)"
                                 >
-                                    <a-button type="link" :disabled="!record.id"
+                                    <j-button type="link" :disabled="!record.id"
                                         ><AIcon type="icon-jiebang"
-                                    /></a-button>
-                                </a-popconfirm>
-                            </a-tooltip>
+                                    /></j-button>
+                                </j-popconfirm>
+                            </j-tooltip>
                         </template>
                     </template>
-                </a-table>
-            </a-form>
-        </a-card>
+                </j-table>
+            </j-form>
+        </j-card>
         <PatchMapping
             :deviceId="instanceStore.current.parentId"
             v-if="visible"
@@ -112,10 +114,10 @@
             :edgeId="instanceStore.current.id"
             :deviceData="deviceData"
         />
-    </a-spin>
-    <a-card v-else>
-    <JEmpty description="暂无数据，请配置物模型" style="margin: 10% 0" />
-    </a-card>
+    </j-spin>
+    <j-card v-else>
+        <JEmpty description="暂无数据，请配置物模型" style="margin: 10% 0" />
+    </j-card>
 </template>
 
 <script lang="ts" setup>
@@ -175,7 +177,7 @@ const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
 const props = defineProps(['productList']);
-const _emit = defineEmits(['close']);
+const _emit = defineEmits(['close','getEdgeMap']);
 const instanceStore = useInstanceStore();
 let _metadata = ref();
 const loading = ref<boolean>(false);
@@ -187,7 +189,7 @@ const modelRef = reactive({
 const deviceData = ref();
 const formRef = ref();
 const visible = ref<boolean>(false);
-
+/**获取通道列表 */
 const getChannel = async () => {
     if (instanceStore.current?.id) {
         const resp: any = await edgeChannel(instanceStore.current.id);
@@ -200,51 +202,31 @@ const getChannel = async () => {
         }
     }
 };
-
+/**
+ * 初始化
+ */
 const handleSearch = async () => {
     loading.value = true;
     getChannel();
     modelRef.dataSource = _metadata.value;
-    console.log(modelRef.dataSource);
-    // if (_metadata.value && _metadata.value.length) {
-    //     console.log(1234);
-    //     const resp: any = await getEdgeMap(instanceStore.current?.orgId || '', {
-    //         deviceId: instanceStore.current.id,
-    //         query: {},
-    //     }).catch(() => {
-    //         modelRef.dataSource = _metadata;
-    //         loading.value = false;
-    //     });
-    //     if (resp.status === 200) {
-    //         const array = resp.result?.[0].reduce((x: any, y: any) => {
-    //             const metadataId = _metadata.find(
-    //                 (item: any) => item.metadataId === y.metadataId,
-    //             );
-    //             if (metadataId) {
-    //                 Object.assign(metadataId, y);
-    //             } else {
-    //                 x.push(y);
-    //             }
-    //             return x;
-    //         }, _metadata);
-    //         modelRef.dataSource = array;
-    //     }
-    // }
     loading.value = false;
 };
-
+/**
+ * 解绑映射
+ * @param id 选择解绑id
+ */
 const unbind = async (id: string) => {
     if (id) {
         const resp = await removeEdgeMap(
-            instanceStore.current?.parentId || '',
+            instanceStore.current?.id || '',
             {
-                deviceId: instanceStore.current.id,
+                deviceId: instanceStore.current.parentId,
                 idList: [id],
             },
         );
         if (resp.status === 200) {
             message.success('操作成功！');
-            handleSearch();
+            _emit('getEdgeMap');
         }
     }
 };
@@ -280,8 +262,8 @@ const onSave = async () => {
                     productName: props.productList.find(
                         (item: any) => item.id === form.value?.productId,
                     ).name,
-                    parentId: instanceStore.current.id,
-                    id: instanceStore.current.parentId
+                    parentId: instanceStore.current.id, // 网关设备id
+                    id: instanceStore.current.parentId // 设备id
                         ? instanceStore.current.parentId
                         : undefined,
                 };
@@ -329,7 +311,4 @@ const showModal = async () => {
 </script>
 
 <style lang="less" scoped>
-:deep(.ant-form-item) {
-    margin: 0 !important;
-}
 </style>
\ No newline at end of file
diff --git a/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue b/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue
index 8bebc5f3..6138d3f9 100644
--- a/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue
@@ -2,7 +2,7 @@
     <div>
         <TitleComponent data="基本信息">
             <template #extra>
-                <j-button @click="comeBack">返回</j-button>
+                <j-button @click="comeBack" style="margin-left: 10px;">返回</j-button>
             </template>
         </TitleComponent>
         <j-form layout="vertical" :model="form" ref="formRef">
@@ -39,7 +39,10 @@
             </j-row>
             <j-row :gutter="24" v-if="visible">
                 <j-col :span="24"
-                    ><EdgeMap :productList="productList" @close="comeBack"
+                    ><EdgeMap
+                        :productList="productList"
+                        @close="comeBack"
+                        @getEdgeMap="getEdgeMapData"
                 /></j-col>
             </j-row>
         </j-form>
@@ -64,67 +67,80 @@ const formRef = ref();
 const emit = defineEmits(['closeChildSave']);
 const productList = ref();
 const visible = ref(false);
+/**
+ * 获取产品列表
+ */
 const getProductList = async () => {
     const res = await getProductListNoPage({
         terms: [{ column: 'accessProvider', value: 'edge-child-device' }],
     });
     if (res.status === 200) {
         productList.value = res.result;
-        if (props.childData?.id) {
-            current.value.parentId = props.childData.id;
-            form.name = props.childData?.name;
-            form.productId = props.childData?.productId;
-            selectChange(form.productId);
-            if (current.value.metadata) {
-                const metadata = current.value.metadata;
-                if (metadata && metadata.length !== 0) {
-                    getEdgeMap(current.value.id, {
-                        deviceId: props.childData.id,
-                        query: {},
-                    }).then((res) => {
-                        if (res.status === 200) {
-                            // console.log(res.result)
-                            //合并物模型
-                            const array = res.result[0]?.reduce(
-                                (x: any, y: any) => {
-                                    const metadataId = metadata.find(
-                                        (item: any) =>
-                                            item.metadataId === y.metadataId,
-                                    );
-                                    if (metadataId) {
-                                        Object.assign(metadataId, y);
-                                    } else {
-                                        x.push(y);
-                                    }
-                                    return x;
-                                },
-                                metadata,
-                            );
-                            //删除物模型
-                            const items = array.filter(
-                                (item: any) => item.metadataName,
-                            );
-                            current.value.metadata = items;
-                            const delList = array
-                                .filter((a: any) => !a.metadataName)
-                                .map((b: any) => b.id);
-                            //删除后解绑
-                            if (delList && delList.length !== 0) {
-                                removeEdgeMap(current.value.id, {
-                                    deviceId: props.childData.id,
-                                    idList: [...delList],
-                                });
-                            }
-                        }
-                    });
-                }
-            }
-            visible.value = true;
-        } else {
-            current.value.parentId = '';
-        }
+        getEdgeMapData();
     }
 };
+/**
+ * 获取映射数据
+ */
+const getEdgeMapData = () => {
+    if (props.childData?.id) {
+        current.value.parentId = props.childData.id; 
+        form.name = props.childData?.name;
+        form.productId = props.childData?.productId;
+        selectChange(form.productId);
+        if (current.value.metadata) {
+            const metadata = current.value.metadata;
+            if (metadata && metadata.length !== 0) {
+                getEdgeMap(current.value.id, {
+                    deviceId: props.childData.id,
+                    query: {},
+                }).then((res) => {
+                    if (res.status === 200) {
+                        // console.log(res.result)
+                        //合并物模型
+                        const array = res.result[0]?.reduce(
+                            (x: any, y: any) => {
+                                const metadataId = metadata.find(
+                                    (item: any) =>
+                                        item.metadataId === y.metadataId,
+                                );
+                                if (metadataId) {
+                                    Object.assign(metadataId, y);
+                                } else {
+                                    x.push(y);
+                                }
+                                return x;
+                            },
+                            metadata,
+                        );
+                        //删除物模型
+                        const items = array.filter(
+                            (item: any) => item.metadataName,
+                        );
+                        current.value.metadata = items;
+                        const delList = array
+                            .filter((a: any) => !a.metadataName)
+                            .map((b: any) => b.id);
+                        //删除后解绑
+                        if (delList && delList.length !== 0) {
+                            removeEdgeMap(current.value.id, {
+                                deviceId: props.childData.id,
+                                idList: [...delList],
+                            });
+                        }
+                    }
+                });
+            }
+        }
+        visible.value = true;
+    } else {
+        current.value.parentId = '';
+    }
+};
+/**
+ * 根据产品id获取对应映射列表
+ * @param e 产品id
+ */
 const selectChange = (e: any) => {
     if (e) {
         visible.value = true;
diff --git a/src/views/device/Instance/Detail/ChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/index.vue
index e3e298f2..d723385f 100644
--- a/src/views/device/Instance/Detail/ChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/index.vue
@@ -1,12 +1,12 @@
 <template>
-    <a-card>
+    <j-card>
         <SaveChild
             v-if="childVisible"
             @close-child-save="closeChildSave"
             :childData="_current"
         />
         <div v-else>
-            <Search
+            <pro-search
                 :columns="columns"
                 target="child-device"
                 @search="handleSearch"
@@ -76,7 +76,7 @@
                     }}
                 </template>
                 <template #state="slotProps">
-                    <a-badge
+                    <j-badge
                         :text="slotProps.state.text"
                         :status="statusMap.get(slotProps.state.value)"
                     />
@@ -108,7 +108,7 @@
             </JProTable>
             <BindChildDevice v-if="visible" @change="closeBindDevice" />
         </div>
-    </a-card>
+    </j-card>
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index f53f2366..bae48b9c 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -714,7 +714,7 @@
                             placeholder="请选中角色"
                         ></j-select>
                         <PermissionButton
-                            :uhasPermission="`${rolePermission}:update`"
+                            :hasPermission="`${rolePermission}:update`"
                             type="link"
                             @click="
                                 clickAddItem(
@@ -755,7 +755,7 @@
                             </template>
                         </j-tree-select>
                         <PermissionButton
-                            :uhasPermission="`${deptPermission}:update`"
+                            :hasPermission="`${deptPermission}:update`"
                             type="link"
                             @click="
                                 clickAddItem(
@@ -1297,7 +1297,7 @@
                                 placeholder="请选中角色"
                             ></j-select>
                             <PermissionButton
-                                :uhasPermission="`${rolePermission}:update`"
+                                :hasPermission="`${rolePermission}:update`"
                                 type="link"
                                 @click="
                                     clickAddItem(
@@ -1332,7 +1332,7 @@
                                 </template>
                             </j-tree-select>
                             <PermissionButton
-                                :uhasPermission="`${deptPermission}:update`"
+                                :hasPermission="`${deptPermission}:update`"
                                 type="link"
                                 @click="
                                     clickAddItem(
diff --git a/src/views/system/Apply/index.vue b/src/views/system/Apply/index.vue
index 214ecf00..382985a5 100644
--- a/src/views/system/Apply/index.vue
+++ b/src/views/system/Apply/index.vue
@@ -20,7 +20,7 @@
                 <template #headerTitle>
                     <div style="display: flex; align-items: center">
                         <PermissionButton
-                            :uhasPermission="`${permission}:add`"
+                            :hasPermission="`${permission}:add`"
                             type="primary"
                             @click="() => table.toSave()"
                         >
@@ -110,7 +110,7 @@
                                 </j-dropdown>
                                 <PermissionButton
                                     v-else
-                                    :uhasPermission="item.permission"
+                                    :hasPermission="item.permission"
                                     :tooltip="item.tooltip"
                                     :pop-confirm="item.popConfirm"
                                     @click="item.onClick"
@@ -151,7 +151,7 @@
                     <j-space :size="16">
                         <PermissionButton
                             v-for="i in table.getActions(slotProps, 'table')"
-                            :uhasPermission="i.permission"
+                            :hasPermission="i.permission"
                             type="link"
                             :tooltip="i.tooltip"
                             :pop-confirm="i.popConfirm"
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index 13178048..b2ce39fe 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -97,7 +97,7 @@
                 </template>
                 <template #action="slotProps">
                     <PermissionButton
-                        :uhasPermission="`{permission}:delete`"
+                        :hasPermission="`{permission}:delete`"
                         type="link"
                         :tooltip="{ title: '删除' }"
                         :popConfirm="{
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index 9d5541f0..6e3c567e 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -20,7 +20,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="table.openDialog({})"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -47,7 +47,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
@@ -57,7 +57,7 @@
                             <AIcon type="EditOutlined" />
                         </PermissionButton>
                         <PermissionButton
-                            :uhasPermission="`${permission}:manage`"
+                            :hasPermission="`${permission}:manage`"
                             type="link"
                             :tooltip="{
                                 title:
@@ -81,7 +81,7 @@
                             <AIcon type="icon-ziyuankuguanli" />
                         </PermissionButton>
                         <PermissionButton
-                            :uhasPermission="`${permission}:action`"
+                            :hasPermission="`${permission}:action`"
                             type="link"
                             :popConfirm="{
                                 title: `确定要${
@@ -109,7 +109,7 @@
                         </PermissionButton>
 
                         <PermissionButton
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             type="link"
                             :tooltip="{
                                 title: table.getRowStatus(slotProps)
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index cc3ac299..061e90bc 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -20,7 +20,7 @@
             <template #headerTitle>
                 <j-space>
                     <PermissionButton
-                        :uhasPermission="`${permission}:assert`"
+                        :hasPermission="`${permission}:assert`"
                         type="primary"
                         @click="table.clickAdd"
                     >
@@ -32,7 +32,7 @@
                             <j-menu>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:bind`"
+                                        :hasPermission="`${permission}:bind`"
                                         :popConfirm="{
                                             title: `是否批量解除绑定`,
                                             onConfirm: () =>
@@ -46,7 +46,7 @@
                                 </j-menu-item>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:assert`"
+                                        :hasPermission="`${permission}:assert`"
                                         @click="table.clickEdit()"
                                     >
                                         <AIcon type="EditOutlined" />批量编辑
@@ -117,14 +117,14 @@
                     </template>
                     <template #actions>
                         <PermissionButton
-                            :uhasPermission="`${permission}:assert`"
+                            :hasPermission="`${permission}:assert`"
                             @click="table.clickEdit(slotProps)"
                         >
                             <AIcon type="EditOutlined" />
                         </PermissionButton>
 
                         <PermissionButton
-                            :uhasPermission="`${permission}:bind`"
+                            :hasPermission="`${permission}:bind`"
                             :popConfirm="{
                                 title: `是否解除绑定`,
                                 onConfirm: () => table.clickUnBind(slotProps),
@@ -157,7 +157,7 @@
                 <j-space :size="16">
                     <PermissionButton
                         v-for="i in table.getActions(slotProps, 'table')"
-                        :uhasPermission="i.permission"
+                        :hasPermission="i.permission"
                         type="link"
                         :tooltip="i?.tooltip"
                         :pop-confirm="i.popConfirm"
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 3d744e41..ee92f835 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -20,7 +20,7 @@
             <template #headerTitle>
                 <j-space>
                     <PermissionButton
-                        :uhasPermission="`${permission}:assert`"
+                        :hasPermission="`${permission}:assert`"
                         type="primary"
                         @click="dialogs.addShow = true"
                     >
@@ -32,7 +32,7 @@
                             <j-menu>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:bind`"
+                                        :hasPermission="`${permission}:bind`"
                                         :popConfirm="{
                                             title: `是否批量解除绑定`,
                                             onConfirm: () =>
@@ -46,7 +46,7 @@
                                 </j-menu-item>
                                 <j-menu-item>
                                     <PermissionButton
-                                        :uhasPermission="`${permission}:assert`"
+                                        :hasPermission="`${permission}:assert`"
                                         @click="() => table.clickEdit()"
                                     >
                                         <AIcon type="EditOutlined" />批量编辑
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 80bc3a00..1b2cc56d 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -203,7 +203,7 @@
 
             <PermissionButton
                 type="primary"
-                :uhasPermission="`${permission}:update`"
+                :hasPermission="`${permission}:update`"
                 @click="form.clickSave"
             >
                 保存
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index dc60930d..b7647e83 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -10,7 +10,7 @@
             <template #headerTitle>
                 <PermissionButton
                     type="primary"
-                    :uhasPermission="`${permission}:update`"
+                    :hasPermission="`${permission}:update`"
                     @click="openDialog('新增', {})"
                 >
                     <AIcon type="PlusOutlined" />新增
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index cbe3398f..1ce75f89 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -18,7 +18,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="table.toDetails({})"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -51,7 +51,7 @@
 
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:add`"
+                            :hasPermission="`${permission}:add`"
                             :tooltip="{ title: '新增子菜单' }"
                             @click="table.addChildren(slotProps)"
                         >
@@ -59,7 +59,7 @@
                         </PermissionButton>
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             :tooltip="{ title: '删除' }"
                             :popConfirm="{
                                 title: `是否删除该菜单`,
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 96de9348..a896627a 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -76,7 +76,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index a0a38062..ee0f413e 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -66,7 +66,7 @@
                                 <template v-else-if="column.key === 'action'">
                                     <PermissionButton
                                         type="link"
-                                        :uhasPermission="`{permission}:delete`"
+                                        :hasPermission="`{permission}:delete`"
                                         :popConfirm="{
                                             title: `确定删除`,
                                             onConfirm: () =>
diff --git a/src/views/system/Role/index.vue b/src/views/system/Role/index.vue
index 8dc5c852..0003310d 100644
--- a/src/views/system/Role/index.vue
+++ b/src/views/system/Role/index.vue
@@ -23,7 +23,7 @@
                 <template #headerTitle>
                     <PermissionButton
                         type="primary"
-                        :uhasPermission="`${permission}:add`"
+                        :hasPermission="`${permission}:add`"
                         @click="dialogVisible = true"
                     >
                         <AIcon type="PlusOutlined" />新增
@@ -33,7 +33,7 @@
                 <template #action="slotProps">
                     <j-space :size="16">
                         <PermissionButton
-                            :uhasPermission="`${permission}:update`"
+                            :hasPermission="`${permission}:update`"
                             type="link"
                             :tooltip="{
                                 title: '编辑',
@@ -44,7 +44,7 @@
                         </PermissionButton>
                         <PermissionButton
                             type="link"
-                            :uhasPermission="`${permission}:delete`"
+                            :hasPermission="`${permission}:delete`"
                             :tooltip="{ title: '删除' }"
                             :popConfirm="{
                                 title: `确定要删除吗`,