diff --git a/.commitlintrc.cjs b/.commitlintrc.cjs
index 9ead01b6..5897803b 100644
--- a/.commitlintrc.cjs
+++ b/.commitlintrc.cjs
@@ -15,6 +15,8 @@ module.exports = {
         'style', // 格式（不影响代码变动）
         'revert', // 撤销commit 回滚上一版本
         'perf', // 性能优化
+          'remove', //删除
+          'release', //
       ]
     ],
     'scope-case': [0],
@@ -24,11 +26,11 @@ module.exports = {
       rules: {
         "commit-rule": ({ raw }) => {
           return [
-            /^\[(build|feat|fix|update|refactor|docs|chore|style|revert|perf)].+/g.test(raw),
+            /^\[(build|feat|fix|update|refactor|docs|chore|style|revert|perf|remove|release)].+/g.test(raw),
             `commit备注信息格式错误，格式为 <[type] 修改内容>，type支持${types.join(",")}`
           ]
         }
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/.gitignore b/.gitignore
index 21c8f822..692918f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@ components.d.ts
 *.njsproj
 *.sln
 *.sw?
-.history
\ No newline at end of file
+.history
+du-i18n.config.json
diff --git a/build.sh b/build.sh
index 5bbf1f2e..473d0d4d 100644
--- a/build.sh
+++ b/build.sh
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
-docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT .
-docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.2.0-SNAPSHOT
+docker build -t registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.3.0-SNAPSHOT .
+docker push registry.cn-shenzhen.aliyuncs.com/jetlinks/jetlinks-ui-vue:2.3.0-SNAPSHOT
diff --git a/config/config.ts b/config/config.ts
index fc15fd10..830f005d 100644
--- a/config/config.ts
+++ b/config/config.ts
@@ -1,6 +1,6 @@
 export default {
   theme: {
-    'primary-color': '#1d39c4',
+    'primary-color': '#1677FF',
   },
   logo: '/favicon.ico', // 浏览器标签页logo
   title: 'Jetlinks', // 浏览器标签页title
@@ -10,4 +10,4 @@ export default {
     mode: 'inline',
     theme: 'light', // 'dark' 'light'
   }
-}
\ No newline at end of file
+}
diff --git a/du-i18n.config.json b/du-i18n.config.json
new file mode 100644
index 00000000..248bbdbe
--- /dev/null
+++ b/du-i18n.config.json
@@ -0,0 +1,25 @@
+{
+	"quoteKeys": [
+		"$t",
+		"$t",
+		"i18n.t"
+	],
+	"defaultLang": "zh",
+	"tempLangs": [
+		"zh",
+		"en"
+	],
+	"langPaths": "**/src/i18n/locale/**",
+	"transSourcePaths": "**/src/i18n/source/**",
+	"tempPaths": "**/src/i18n/temp/**",
+	"tempFileName": "",
+	"multiFolders": [
+		"src",
+		"views"
+	],
+	"uncheckMissKeys": [],
+	"isSingleQuote": true,
+	"isOnlineTrans": true,
+	"baiduAppid": "20240704002091621",
+	"baiduSecrectKey": "CQdjuZ1v8AaZtx1NQQsW"
+}
diff --git a/package.json b/package.json
index b3b967db..da0e34a9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "jetlinks-vue",
   "private": true,
-  "version": "0.0.0",
+  "version": "2.2.0",
   "scripts": {
     "dev": "vite --mode develop",
     "dev:force": "vite --force --mode develop",
@@ -14,19 +14,27 @@
   },
   "dependencies": {
     "@ant-design/icons-vue": "^7.0.1",
+    "@fullcalendar/core": "^6.1.13",
+    "@fullcalendar/daygrid": "^6.1.13",
+    "@fullcalendar/interaction": "^6.1.13",
+    "@fullcalendar/vue3": "^6.1.13",
     "@liveqing/liveplayer-v3": "^3.7.10",
+    "@types/axios": "^0.14.0",
     "@types/marked": "^4.0.8",
     "@vitejs/plugin-vue-jsx": "^3.0.0",
-    "@vuemap/vue-amap": "^1.1.20",
+    "@vuemap/vue-amap": "^2.1.2",
     "@vueuse/core": "^9.10.0",
     "ant-design-vue": "^3.2.15",
+    "async-validator": "^4.2.5",
     "axios": "^1.2.1",
+    "colorpicker-v3": "^2.10.2",
+    "cronstrue": "^2.50.0",
     "driver.js": "^0.9.8",
     "echarts": "^5.4.1",
     "event-source-polyfill": "^1.0.31",
     "global": "^4.4.0",
     "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.38",
+    "jetlinks-ui-components": "^1.0.47",
     "jsencrypt": "^3.3.2",
     "less": "^4.1.3",
     "less-loader": "^11.1.0",
@@ -46,9 +54,10 @@
     "markdown-it-toc-done-right": "^4.2.0",
     "marked": "^4.2.12",
     "moment": "^2.29.4",
-    "monaco-editor": "^0.36.0",
+    "monaco-editor": "^0.50.0",
     "nrm": "^1.2.5",
     "pinia": "^2.0.28",
+    "resize-observer-polyfill": "^1.5.1",
     "rollup-plugin-copy": "^3.4.0",
     "rxjs": "^7.8.1",
     "unplugin-auto-import": "^0.12.1",
@@ -57,10 +66,15 @@
     "vite-plugin-monaco-editor": "^1.1.0",
     "vue": "3.3.4",
     "vue-cropper": "^1.0.9",
+    "vue-i18n": "^9.13.1",
     "vue-json-viewer": "^3.0.4",
     "vue-router": "^4.1.6",
     "vue3-json-viewer": "^2.2.2",
-    "vue3-ts-jsoneditor": "^2.7.1"
+    "vue3-ts-jsoneditor": "^2.7.1",
+    "xgplayer": "^3.0.19",
+    "xgplayer-flv": "^3.0.20-beta.0",
+    "xgplayer-hls": "^3.0.19",
+    "xgplayer-hls.js": "2.2.2"
   },
   "devDependencies": {
     "@commitlint/cli": "^17.4.1",
diff --git a/plugin/jetlinks.ts b/plugin/jetlinks.ts
index 683da500..06f00800 100644
--- a/plugin/jetlinks.ts
+++ b/plugin/jetlinks.ts
@@ -295,7 +295,6 @@ function getSideEffects(compName: string, options: JetlinksVueResolverOptions, _
     return
   const lib = options.cjs ? 'lib' : 'es'
   const packageName = options?.packageName || 'jetlinks-ui-components'
-
   if (importStyle === 'less' || importLess) {
     const styleDir = getStyleDir(compName, _isAntd)
     return `${packageName}/${lib}/${styleDir}/style`
@@ -319,8 +318,25 @@ const primitiveNames = ['AIcon','Affix', 'Anchor', 'AnchorLink', 'message', 'Not
   'DataTableObject',
   'CheckButton',
 ]
+
 const prefix = 'J'
 
+const proComponents = [
+  'ProTable', 'Search', 'AdvancedSearch', 'Ellipsis', 'MonacoEditor', 'ProLayout', 'ScrollTable', 'TableCard', 'Scrollbar', 'CardSelect', 'PopconfirmModal', 'DataTable',
+  'DataTableArray',
+  'DataTableString',
+  'DataTableInteger',
+  'DataTableDouble',
+  'DataTableBoolean',
+  'DataTableEnum',
+  'DataTableFile',
+  'DataTableDate',
+  'DataTableTypeSelect',
+  'DataTableObject',
+  'CheckButton',
+    'ValueItem'
+]
+
 let jetlinksNames: Set<string>
 
 function genJetlinksNames(primitiveNames: string[]): void {
@@ -356,11 +372,20 @@ export function JetlinksVueResolver(options: JetlinksVueResolverOptions = {}): a
       }
       const _isJetlinks = isJetlinks(name)
       const _isAntd = isAntdv(name)
+
       if ((_isJetlinks || _isAntd) && !options?.exclude?.includes(name)) {
+        // const importName = filterName.includes(name) ? name : name.slice(1)
+        //
+        // options.packageName = proComponents.includes(importName) ? 'jetlinks-ui-components' : 'ant-design-vue'
+        //
+        // const path = `${options.packageName}/${options.cjs ? 'lib' : 'es'}`
+        // const stylePath = getSideEffects(importName, options, !proComponents.includes(importName))
+
         const importName = filterName.includes(name) ? name : name.slice(1)
         options.packageName = _isJetlinks ? 'jetlinks-ui-components' : 'ant-design-vue'
         const path = `${options.packageName}/${options.cjs ? 'lib' : 'es'}`
         const stylePath = getSideEffects(importName, options, _isAntd)
+
         return {
           name: importName,
           from: path,
@@ -369,4 +394,4 @@ export function JetlinksVueResolver(options: JetlinksVueResolverOptions = {}): a
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/public/images/access/media-plugin.png b/public/images/access/media-plugin.png
new file mode 100644
index 00000000..6eab68fb
Binary files /dev/null and b/public/images/access/media-plugin.png differ
diff --git a/public/images/access/onvif.png b/public/images/access/onvif.png
new file mode 100644
index 00000000..4eaa9ee4
Binary files /dev/null and b/public/images/access/onvif.png differ
diff --git a/public/images/calendar/hover.png b/public/images/calendar/hover.png
new file mode 100644
index 00000000..10756cad
Binary files /dev/null and b/public/images/calendar/hover.png differ
diff --git a/src/App.vue b/src/App.vue
index 376264e4..f9c589c6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,10 @@
 <template>
-  <ConfigProvider :locale='zhCN'>
+  <ConfigProvider
+    :locale='zhCN'
+    :IconConfig="{
+      scriptUrl: '//at.alicdn.com/t/c/font_4035907_i1jazcune3.js'
+    }"
+  >
     <router-view />
   </ConfigProvider>
 </template>
@@ -9,7 +14,6 @@ import { ConfigProvider } from 'jetlinks-ui-components'
 import zhCN from 'jetlinks-ui-components/es/locale/zh_CN';
 import { storeToRefs } from 'pinia';
 import { useSystem } from './store/system';
-import DefaultSetting from '../config/config'
 import {LocalStore} from "@/utils/comm";
 import {TOKEN_KEY} from "@/utils/variable";
 
diff --git a/src/api/comm.ts b/src/api/comm.ts
index 312d52ce..3f273af9 100644
--- a/src/api/comm.ts
+++ b/src/api/comm.ts
@@ -4,6 +4,8 @@ import { SearchHistoryList } from 'components/Search/types'
 
 export const FILE_UPLOAD = `${BASE_API_PATH}/file/static`;
 
+export const FileUpload = `${BASE_API_PATH}/file/upload`;
+
 /**
  * 保存查询记录
  * @param data
@@ -31,11 +33,11 @@ export const systemVersion = () => server.get<{edition?: string}>('/system/versi
 
 /**
  * 聚合查询
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const queryDashboard = (data: Record<string, any>) => server.post(`/dashboard/_multi`, data)
 
 export const fileUpload = (data: any) => server.post('/file/static', data)
 
-export const lowCodeUrl = () => server.get('/system/config/low-code')
\ No newline at end of file
+export const lowCodeUrl = () => server.get('/system/config/low-code')
diff --git a/src/api/data-collect/collector.ts b/src/api/data-collect/collector.ts
index df3d219d..64f7ffed 100644
--- a/src/api/data-collect/collector.ts
+++ b/src/api/data-collect/collector.ts
@@ -83,5 +83,15 @@ export const getBacnetObjectList = (channelId: string, instanceNumber: string) =
  */
 export const getBacnetPropertyIdNotUse = (data: any) => server.post(`/collect/bacnet/${data.collectorId}/unused/ids`, data)
 
+// /**
+//  * 查询所有属性id
+//  */
+// export const getBacnetAllPropertyId = () => server.get('/collect/bacnet/property/ids')
+
 /**查询bacnet值类型*/
-export const getBacnetValueType = () => server.get(`/collect/bacnet/value/types`)
\ No newline at end of file
+export const getBacnetValueType = () => server.get(`/collect/bacnet/value/types`)
+
+/**
+ * 导出点位数据
+ */
+export const exportPoint = (collectorId:string,provider:string) => server.get(`/data-collect/point/${collectorId}/${provider}/export.xlsx`, {}, {responseType: 'blob'})
\ No newline at end of file
diff --git a/src/api/device/firmware.ts b/src/api/device/firmware.ts
index 19e3c7b0..7a71a5a5 100644
--- a/src/api/device/firmware.ts
+++ b/src/api/device/firmware.ts
@@ -11,12 +11,16 @@ export const remove = (id: string) => server.remove(`/firmware/${id}`);
 
 export const query = (data: object) => server.post(`/firmware/_query/`, data);
 
+export const queryPaginateNot = (data: object) => server.post('/firmware/_query/no-paging',data)
+
 export const querySystemApi = (data?: object) =>
     server.post(`/system/config/scopes`, data);
 
 export const task = (data: Record<string, unknown>) =>
     server.post(`/firmware/upgrade/task/detail/_query`, data);
 
+export const queryTaskPaginateNot = (data:any)=> server.post('/firmware/upgrade/task/detail/_query/no-paging',data)
+
 export const taskById = (id: string) =>
     server.get(`/firmware/upgrade/task/${id}`);
 
@@ -29,6 +33,10 @@ export const deleteTask = (id: string) =>
 export const history = (data: Record<string, unknown>) =>
     server.post(`/firmware/upgrade/history/_query`, data);
 
+export const historyPaginateNot =(data:Record<string,unknown>) =>
+    server.post('/firmware/upgrade/history/_query/no-paging',data)
+
+
 export const historyCount = (data: Record<string, unknown>) =>
     server.post(`/firmware/upgrade/history/_count`, data);
 
@@ -41,6 +49,8 @@ export const stopTask = (id: string) =>
 export const startOneTask = (data: string[]) =>
     server.post(`/firmware/upgrade/task/_start`, data);
 
+export const stopOneTask = (data: string[]) => 
+    server.post('/firmware/upgrade/task/_stop',data)
 // export const queryProduct = (data?: any) =>
 //     server.post(`/device-product/_query/no-paging`, data);
 export const queryProduct = (data?: any) =>
diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts
index a4fad8de..3ca23491 100644
--- a/src/api/device/instance.ts
+++ b/src/api/device/instance.ts
@@ -14,7 +14,7 @@ export const resetRule = (productId:string,deviceId:string,data:any) => server.r
 /**
  * 删除设备物模型
  * @param deviceId 设备ID
- * @returns 
+ * @returns
  */
 export const deleteMetadata = (deviceId: string) => server.remove(`/device-instance/${deviceId}/metadata`)
 
@@ -22,7 +22,7 @@ export const deleteMetadata = (deviceId: string) => server.remove(`/device-insta
  * 保存设备物模型
  * @param id 设备ID
  * @param data 物模型
- * @returns 
+ * @returns
  */
 export const saveMetadata = (id: string, data: DeviceMetadata) => server.put(`/device/instance/${id}/metadata`, data)
 
@@ -36,58 +36,58 @@ export const detail = (id: string) => server.get<DeviceInstance>(`/device-instan
 /**
  * 查询数据
  * @param data 分页搜索数据
- * @returns 
+ * @returns
  */
 export const query = (data?: Record<string, any>) => server.post('/device-instance/_query', data)
 
 /**
  * 不分页查询设备
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const queryNoPagingPost = (data?: Record<string, any>) => server.post('/device-instance/_query/no-paging?paging=false', data)
 
 /**
  * 删除设备
  * @param id 设备ID
- * @returns 
+ * @returns
  */
 export const _delete = (id: string) => server.remove(`/device-instance/${id}`)
 
 /**
  * 启用设备
  * @param id 设备ID
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const _deploy = (id: string) => server.post(`/device-instance/${id}/deploy`)
 
 /**
  * 禁用设备
  * @param id 设备ID
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const _undeploy = (id: string) => server.post(`/device-instance/${id}/undeploy`)
 
 /**
  * 批量激活设备
  * @param data 设备id数组
- * @returns 
+ * @returns
  */
 export const batchDeployDevice = (data: string[]) => server.put(`/device-instance/batch/_deploy`, data)
 
 /**
  * 批量注销设备
  * @param data 设备id数组
- * @returns 
+ * @returns
  */
 export const batchUndeployDevice = (data: string[]) => server.put(`/device-instance/batch/_unDeploy`, data)
 
 /**
  * 批量删除
  * @param data 设备id数组
- * @returns 
+ * @returns
  */
 export const batchDeleteDevice = (data: string[]) => server.put(`/device-instance/batch/_delete`, data)
 
@@ -95,7 +95,7 @@ export const batchDeleteDevice = (data: string[]) => server.put(`/device-instanc
  * 下载设备模板
  * @param productId 产品id
  * @param type 文件类型
- * @returns 
+ * @returns
  */
 export const deviceTemplateDownload = (productId: string, type: string) => `${BASE_API_PATH}/device-instance/${productId}/template.${type}`
 
@@ -104,7 +104,7 @@ export const templateDownload = (productId: string, type: string) => server.get(
  * 设备导入
  * @param productId 产品id
  * @param type 文件类型
- * @returns 
+ * @returns
  */
 export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boolean) => `${BASE_API_PATH}/device-instance/${productId}/import/_withlog?fileUrl=${fileUrl}&autoDeploy=${autoDeploy}&:X_Access_Token=${LocalStore.get(TOKEN_KEY)}`
 
@@ -112,21 +112,21 @@ export const deviceImport = (productId: string, fileUrl: string, autoDeploy: boo
  * 设备导出
  * @param productId 产品id
  * @param type 文件类型
- * @returns 
+ * @returns
  */
 export const deviceExport = (productId: string, type: string, params?: any) => server.get(`/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`, params, {responseType: 'blob'})
 export const deviceExportPath = (productId: string, type: string) => (`${BASE_API_PATH}/device-instance${!!productId ? `/${productId}` : ''}/export.${type}`)
 /**
  * 验证设备ID是否重复
  * @param id 设备id
- * @returns 
+ * @returns
  */
 export const isExists = (id: string) => server.get(`/device-instance/${id}/exists`)
 
 /**
  * 修改设备信息
  * @param data 设备信息
- * @returns 
+ * @returns
  */
 export const update = (data: Partial<DeviceInstance>) => data.id ? server.patch(`/device-instance`, data) : server.post(`/device-instance`, data)
 
@@ -134,27 +134,27 @@ export const update = (data: Partial<DeviceInstance>) => data.id ? server.patch(
  * 修改设备信息
  * @param id 设备id
  * @param data 设备信息
- * @returns 
+ * @returns
  */
 export const modify = (id: string, data: Partial<DeviceInstance>) => server.put(`/device-instance/${id}`, data)
 
 /**
  * 获取配置信息
  * @param id 设备id
- * @returns 
+ * @returns
  */
 export const getConfigMetadata = (id: string) => server.get(`/device-instance/${id}/config-metadata`)
 
 /**
  * 断开连接
  * @param id 设备id
- * @returns 
+ * @returns
  */
 export const _disconnect = (id: string) => server.post(`/device-instance/${id}/disconnect`)
 
 /**
  * 查询用户列表
- * @returns 
+ * @returns
  */
 export const queryUserListNoPaging = () => server.post(`/user/_query/no-paging`, {
   paging: false,
@@ -164,16 +164,16 @@ export const queryUserListNoPaging = () => server.post(`/user/_query/no-paging`,
 /**
  * 保存设备关系
  * @param id 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const saveRelations = (id: string, data: Record<string, any>) => server.patch(`/device/instance/${id}/relations`, data)
 
 /**
  * 修改标签
  * @param id 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const saveTags = (id: string, data: Record<string, any>) => server.patch(`/device/instance/${id}/tag`, data)
 
@@ -181,14 +181,14 @@ export const saveTags = (id: string, data: Record<string, any>) => server.patch(
  * 删除标签
  * @param deviceId 设备id
  * @param id 标签id
- * @returns 
+ * @returns
  */
 export const delTags = (deviceId: string, id: string) => server.remove(`/device/instance/${deviceId}/tag/${id}`)
 
 /**
  * 恢复默认配置
  * @param deviceId 设备id
- * @returns 
+ * @returns
  */
 export const configurationReset = (deviceId: string) => server.put(`/device-instance/${deviceId}/configuration/_reset`)
 
@@ -196,16 +196,16 @@ export const configurationReset = (deviceId: string) => server.put(`/device-inst
  * 查询事件详情列表
  * @param deviceId 设备id
  * @param eventId 事件id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const getEventList = (deviceId: string, eventId: string, data: Record<string, any>) => server.post(`/device-instance/${deviceId}/event/${eventId}?format=true`, data)
 
 /**
  * 设置属性至设备
  * @param deviceId 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const setProperty = (deviceId: string, data: Record<string, any>) => server.put(`/device-instance/${deviceId}/property`, data)
 
@@ -213,7 +213,7 @@ export const setProperty = (deviceId: string, data: Record<string, any>) => serv
  * 获取最新属性值
  * @param deviceId 设备id
  * @param type 属性id
- * @returns 
+ * @returns
  */
 export const getProperty = (deviceId: string, type: string) => server.get(`/device/standard/${deviceId}/property/${type}`)
 
@@ -221,7 +221,7 @@ export const getProperty = (deviceId: string, type: string) => server.get(`/devi
  * 查询设备的物模型指标
  * @param deviceId 设备id
  * @param propertyId 属性id
- * @returns 
+ * @returns
  */
 export const queryMetric = (deviceId: string, propertyId: string) => server.get(`/device-instance/${deviceId}/metric/property/${propertyId}`)
 
@@ -229,8 +229,8 @@ export const queryMetric = (deviceId: string, propertyId: string) => server.get(
  * 保存设备的物模型指标
  * @param deviceId 设备id
  * @param propertyId 属性id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const saveMetric = (deviceId: string, propertyId: string, data: Record<string, any>) => server.patch(`/device-instance/${deviceId}/metric/property/${propertyId}`, data)
 
@@ -238,24 +238,24 @@ export const saveMetric = (deviceId: string, propertyId: string, data: Record<st
  * 解绑子设备
  * @param deviceId 设备id
  * @param childrenId 子设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const unbindDevice = (deviceId: string, childrenId: string, data: Record<string, any>) => server.post(`/device/gateway/${deviceId}/unbind/${childrenId}`, data)
 
 /**
  * 批量解绑子设备
  * @param deviceId 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const unbindBatchDevice = (deviceId: string, data: Record<string, any>) => server.post(`/device/gateway/${deviceId}/unbind`, data)
 
 /**
  * 子设备绑定
  * @param deviceId 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const bindDevice = (deviceId: string, data: Record<string, any>) => server.post(`/device/gateway/${deviceId}/bind`, data)
 
@@ -271,7 +271,7 @@ export const queryDeviceMapping = (deviceId: string, data?: any) => server.post(
 export const saveDeviceMapping = (deviceId: string, data: any) => server.post(`/edge/operations/${deviceId}/device-mapping-save-batch/invoke`, data)
 
 /**
- *批量删除云端映射设备 
+ *批量删除云端映射设备
  */
 export const deleteDeviceMapping = (deviceId: string, data:any) => server.post(`/edge/operations/${deviceId}/device-mapping-delete-by-deviceid/invoke`, data)
 
@@ -294,64 +294,64 @@ export const addDevice = (params: any) => server.post("/device-instance", params
 /**
  * 设备接入网关状态
  * @param id 设备接入网关id
- * @returns 
+ * @returns
  */
 export const queryGatewayState = (id: string) => server.get(`/gateway/device/${id}/detail`)
 
 /**
  * 网络组件状态
  * @param id 网络组件id
- * @returns 
+ * @returns
  */
 export const queryNetworkState = (id: string) => server.get(`/network/config/${id}`)
 
 /**
  * 产品状态
  * @param id 产品id
- * @returns 
+ * @returns
  */
 export const queryProductState = (id: string) => server.get(`/device/product/${id}`)
 
 /**
  * 产品配置
  * @param id 产品id
- * @returns 
+ * @returns
  */
 export const queryProductConfig = (id: string) => server.get(`/device/product/${id}/config-metadata`)
 
 /**
  * 设备配置
  * @param id 设备id
- * @returns 
+ * @returns
  */
 export const queryDeviceConfig = (id: string) => server.get(`/device-instance/${id}/config-metadata`)
 
 /**
  * 查询协议
- * @param type 
- * @param transport 
- * @returns 
+ * @param type
+ * @param transport
+ * @returns
  */
 export const queryProtocolDetail = (type: string, transport: string) => server.get(`/protocol/${type}/transport/${transport}`)
 
 /**
  * 网络组件启用
  * @param id 网络组件ID
- * @returns 
+ * @returns
  */
 export const startNetwork = (id: string) => server.post(`/network/config/${id}/_start`)
 
 /**
  * 启用网关
  * @param id 网关id
- * @returns 
+ * @returns
  */
 export const startGateway = (id: string) => server.post(`/gateway/device/${id}/_startup`)
 
 /**
  * 网关详情
  * @param id 网关id
- * @returns 
+ * @returns
  */
 export const getGatewayDetail = (id: string) => server.get(`/gateway/device/${id}`)
 
@@ -366,231 +366,231 @@ export const getUnit = () => server.get<UnitType[]>(`/protocol/units`)
  * 执行功能
  * @param deviceId 设备id
  * @param functionId 功能id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const executeFunctions = (deviceId: string, functionId: string, data: any) => server.post(`/device/invoked/${deviceId}/function/${functionId}`, data)
 
 /**
  * 读取属性
  * @param deviceId 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const readProperties = (deviceId: string, data: any) => server.post(`/device/instance/${deviceId}/properties/_read`, data)
 
 /**
  * 设置属性
  * @param deviceId 设备id
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const settingProperties = (deviceId: string, data: any) => server.put(`/device/instance/${deviceId}/property`, data)
 
 /**
  * 设备功能-执行
  * @param id 设备id
- * @param action 
- * @param data 
- * @returns 
+ * @param action
+ * @param data
+ * @returns
  */
 export const execute = (id: string, action: string, data: any) => server.post(`/device/invoked/${id}/function/${action}`, data)
 
 /**
  * 查询通道列表不分页
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const queryChannelNoPaging = (data: any) => server.post(`data-collect/channel/_query/no-paging`, data)
 
 /**
  * 查询采集器列表不分页
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const queryCollectorNoPaging = (data: any) => server.post(`/data-collect/collector/_query/no-paging`, data)
 
 /**
  * 查询点位列表不分页
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const queryPointNoPaging = (data: any) => server.post(`/data-collect/point/_query/no-paging`, data)
 
 /**
  * 查询映射列表
- * @param thingType 
- * @param thingId 
- * @param params 
- * @returns 
+ * @param thingType
+ * @param thingId
+ * @param params
+ * @returns
  */
 export const queryMapping = (thingType: string, thingId: any, params?: any) => server.get(`/things/collector/${thingType}/${thingId}/_query`, params)
 
 /**
  * 删除映射
- * @param thingType 
- * @param thingId 
- * @param data 
- * @returns 
+ * @param thingType
+ * @param thingId
+ * @param data
+ * @returns
  */
 export const removeMapping = (thingType: string, thingId: any, data?: any) => server.post(`/things/collector/${thingType}/${thingId}/_delete`, data)
 
 /**
  * 映射树
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const treeMapping = (data?: any) => server.post(`/data-collect/channel/_all/tree`, data)
 
 /**
  * 保存映射
- * @param thingId 
- * @param provider 
- * @param data 
- * @returns 
+ * @param thingId
+ * @param provider
+ * @param data
+ * @returns
  */
 export const saveMapping = (thingId: any, provider: string, data?: any) => server.patch(`/things/collector/device/${thingId}/${provider}`, data)
 
 /**
  * 查询边缘网关通道
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const edgeChannel = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/data-collector-channel-list/invoke`, data)
 
 /**
  * 查询边缘网关采集器
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const edgeCollector = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/data-collector-list/invoke`, data)
 
 /**
  * 查询边缘网关点位
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const edgePoint = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/data-collector-point-list/invoke`, data)
 
 /**
- * 
- * @param deviceId 
- * @param data 
- * @returns 
+ *
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const getEdgeMap = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/device-collector-list/invoke`, data)
 
 /**
- * 
- * @param deviceId 
- * @param data 
- * @returns 
+ *
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const removeEdgeMap = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/device-collector-delete/invoke`, data)
 
 /**
- * 
- * @param deviceId 
- * @param data 
- * @returns 
+ *
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const treeEdgeMap = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/data-collector-channel-tree/invoke`, data)
 
 /**
- * 
- * @param deviceId 
- * @param data 
- * @returns 
+ *
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const saveEdgeMap = (deviceId: string, data?: any) => server.post(`/edge/operations/${deviceId}/device-collector-save/invoke`, data)
 
 /**
  * 查询属性详情
- * @param deviceId 
- * @param params 
- * @returns 
+ * @param deviceId
+ * @param params
+ * @returns
  */
 export const getPropertyData = (deviceId: string, params: Record<string, unknown>) => server.get(`/device-instance/${deviceId}/properties/_query`, params)
 
 /**
  * 聚合查询设备属性
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const getPropertiesInfo = (deviceId: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/agg/_query`, data)
 
 /**
  * 聚合查询设备属性
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const getPropertiesList = (deviceId: string, property: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/property/${property}/_query/no-paging`, data)
 
 /**
  * 获取指定协议
- * @param id 
- * @param transport 
- * @returns 
+ * @param id
+ * @param transport
+ * @returns
  */
 export const getProtocal = (id: string, transport: string) => server.get(`/protocol/${id}/transport/${transport}`)
 
 /**
  * 获取产品解析规则
- * @param productId 
- * @returns 
+ * @param productId
+ * @returns
  */
 export const productCode = (productId: string) => server.get(`/device/transparent-codec/${productId}`)
 /**
  * 保存产品解析规则
- * @param productId 
- * @returns 
+ * @param productId
+ * @returns
  */
 export const saveProductCode = (productId: string, data: Record<string, unknown>) => server.post(`/device/transparent-codec/${productId}`, data)
 /**
  * 获取设备解析规则
- * @param productId 
- * @param deviceId 
- * @returns 
+ * @param productId
+ * @param deviceId
+ * @returns
  */
 export const deviceCode = (productId: string, deviceId: string) => server.get(`device/transparent-codec/${productId}/${deviceId}`)
 /**
  * 保存设备解析规则
- * @param productId 
+ * @param productId
  * 查询设备日志
- * @param deviceId 
- * @param data 
- * @returns 
+ * @param deviceId
+ * @param data
+ * @returns
  */
 export const saveDeviceCode = (productId: string, deviceId: string, data: Record<string, unknown>) => server.post(`/device/transparent-codec/${productId}/${deviceId}`, data)
 /**
  * 编码测试
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const testCode = (data: Record<string, unknown>) => server.post(`/device/transparent-codec/decode-test`, data)
 /**
  * 删除设备解析规则
- * @param productId 
- * @param deviceId 
- * @returns 
+ * @param productId
+ * @param deviceId
+ * @returns
  */
 export const delDeviceCode = (productId: string, deviceId: string) => server.remove(`/device/transparent-codec/${productId}/${deviceId}`)
 /**
  * 删除产品解析规则
- * @param productId 
- * @returns 
+ * @param productId
+ * @returns
  */
 export const delProductCode = (productId: string) => server.remove(`/device/transparent-codec/${productId}`)
 export const queryLog = (deviceId: string, data: Record<string, unknown>) => server.post(`/device-instance/${deviceId}/logs`, data)
 
 /**
  * 查询设备日志类型
- * @returns 
+ * @returns
  */
 export const queryLogsType = () => server.get(`/dictionary/device-log-type/items`)
 
@@ -626,13 +626,60 @@ export const queryProductCodeTips = (productId: string) => server.get(`/device/t
 /**
  * 获取设备物模型规则TS
  * @param deviceId 设备ID
- * @returns 
+ * @returns
  */
-export const queryTypescript = (deviceId:string) => server.get(`/device/${deviceId}/virtual-property.d.ts`) 
+export const queryTypescript = (deviceId:string) => server.get(`/device/${deviceId}/virtual-property.d.ts`)
 
 /**
  * 获取产品物模型规则TS
  * @param productId 产品ID
+ * @returns
+ */
+export const queryProductTs = (productId:string) => server.get(`/product/${productId}/virtual-property.d.ts`)
+
+/**
+ * 阈值限制-新增/修改-产品
+ * @param data
+ */
+export const updateProductThreshold = (productId:string,propertyId:string,data: any) => server.put(`/message/preprocessor/product/${productId}/property/${propertyId}`, data)
+
+/**
+ * 阈值限制-新增/修改-设备
+ * @param data
+ */
+export const updateDeviceThreshold = (productId:string,deviceId:string,propertyId:string,data: any) => server.put(`/message/preprocessor/device/${productId}/${deviceId}/property/${propertyId}`, data)
+
+/**
+ * 阈值限制-设备物模型阈值限制
+ * @param productId
+ * @param deviceId
+ * @param propertyId
+ */
+export const queryDeviceThreshold = (productId: string, deviceId: string,  propertyId: string) => server.get(`/message/preprocessor/device/${productId}/${deviceId}/property/${propertyId}`)
+
+/**
+ * 阈值限制-产品物模型阈值限制
+ * @param productId
+ * @param propertyId
+ */
+export const queryProductThreshold = (productId: string, propertyId: string) => server.get(`/message/preprocessor/product/${productId}/property/${propertyId}`)
+
+/**
+ * 阈值限制-删除产品物模型的阈值
+ * @param productId 
+ * @param propertyId 
  * @returns 
  */
-export const queryProductTs = (productId:string) => server.get(`/product/${productId}/virtual-property.d.ts`)
\ No newline at end of file
+export const deleteProductThreshold = (productId:string,propertyId:string,data:any) => server.remove(`/message/preprocessor/product/${productId}/property/${propertyId}`,data)
+
+/**
+ * 阈值限制-删除产品物模型的阈值
+ * @param productId 
+ * @param propertyId 
+ * @returns 
+ */
+export const deleteDeviceThreshold = (productId:string,deviceId:string,propertyId:string,data:any) => server.remove(`/message/preprocessor/device/${productId}/${deviceId}/property/${propertyId}`,data)
+
+export const getTemplate = (id: string, format: string) => `${BASE_API_PATH}/device/instance/${id}/property-metadata/template.${format}`
+
+export const uploadAnalyzeMetadata = (data: any) => server.post('/device/instance/property-metadata/file/analyze', data)
diff --git a/src/api/device/product.ts b/src/api/device/product.ts
index de7e0256..90de1d2a 100644
--- a/src/api/device/product.ts
+++ b/src/api/device/product.ts
@@ -1,11 +1,12 @@
 import { OperatorItem } from '@/components/FRuleEditor/Operator/typings'
 import server from '@/utils/request'
 import { DeviceMetadata, ProductItem, DepartmentItem, MetadataType  } from '@/views/device/Product/typings'
+import {BASE_API_PATH} from "@/utils/variable";
 
 /**
  * 根据条件查询产品（不带翻页）
  * @param data 查询条件
- * @returns 
+ * @returns
  */
 export const queryNoPagingPost = (data: any) => server.post(`/device-product/_query/no-paging?paging=false`, data)
 
@@ -14,7 +15,7 @@ export const queryNoPagingPost = (data: any) => server.post(`/device-product/_qu
  * @param direction from|to
  * @param type 物模型类型
  * @param data 物模型数据
- * @returns 
+ * @returns
  */
 export const convertMetadata = (direction: 'from' | 'to', type: string, data: any) => server.post<DeviceMetadata>(`/device/product/metadata/convert-${direction}/${type}`, data)
 
@@ -22,20 +23,20 @@ export const convertMetadata = (direction: 'from' | 'to', type: string, data: an
  * 修改产品
  * @param id 产品ID
  * @param data 产品数据
- * @returns 
+ * @returns
  */
 export const modify = (id: string, data: any) => server.put(`/device-product/${id}`, data)
 
 /**
- * 
- * @returns 
+ *
+ * @returns
  */
 export const getCodecs = () => server.get<{id: string, name: string}>('/device/product/metadata/codecs')
 
 /**
  * 根据产品ID获取产品详情
  * @param id 产品ID
- * @returns 
+ * @returns
  */
 export const detail = (id: string) => server.get<ProductItem>(`/device-product/${id}`)
 
@@ -80,31 +81,31 @@ export const category = (data: any) => server.get('/device/category/_tree?paging
  /**
  * 启用产品
  * @param productId 产品ID
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const _deploy = (productId: string) => server.post(`/device-product/${productId}/deploy`)
 
 /**
  * 禁用产品
  * @param productId 产品ID
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const _undeploy = (productId: string) => server.post(`/device-product/${productId}/undeploy`)
 
 /**
  * 新增产品
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const addProduct = (data:any) => server.post('/device-product',data)
 
 /**
  * 修改产品
  * @param id 产品ID
- * @param data 
- * @returns 
+ * @param data
+ * @returns
  */
 export const editProduct = (data: any) => server.put(`/device-product/${data.id}`, data)
 
@@ -122,7 +123,7 @@ export const deleteProduct = (id: string) => server.remove(`/device-product/${id
 /**
  * 保存产品
  * @param data 产品信息
- * @returns 
+ * @returns
  */
 export const saveProductMetadata = (data: Record<string, unknown>) => server.patch('/device-product', data)
 
@@ -219,5 +220,7 @@ export const saveProductVirtualProperty = (productId: string, data: any[]) => se
 
 export const queryProductVirtualProperty = (productId: string, propertyId: string) => server.get(`/virtual/property/product/${productId}/${propertyId}`)
 
+export const getTemplate = (id: string, format: string) => `${BASE_API_PATH}/device/product/${id}/property-metadata/template.${format}`
+
 
 
diff --git a/src/api/northbound/alicloud.ts b/src/api/northbound/alicloud.ts
index 669899ef..89d278db 100644
--- a/src/api/northbound/alicloud.ts
+++ b/src/api/northbound/alicloud.ts
@@ -7,6 +7,11 @@ import server from '@/utils/request'
  */
 export const query = (data: Record<string, any>) => server.post('/device/aliyun/bridge/_query', data)
 
+/**
+ * 查询数据不分页
+ */
+export const queryPaginateNot = (data: any) => server.post('/device/aliyun/bridge/_query/no-paging', data)
+
 /**
  * 查询产品列表
  * @param data 
diff --git a/src/api/northbound/dueros.ts b/src/api/northbound/dueros.ts
index 63562377..e7d95784 100644
--- a/src/api/northbound/dueros.ts
+++ b/src/api/northbound/dueros.ts
@@ -7,6 +7,11 @@ import server from '@/utils/request'
  */
 export const query = (data: Record<string, any>) => server.post('/dueros/product/_query', data)
 
+/**
+ * 查询数据不分页
+ */
+export const queryPaginateNot = (data:any) => server.post('/dueros/product/_query/no-paging',data)
+
 /**
  * 查询产品列表
  * @param id 
diff --git a/src/api/rule-engine/configuration.ts b/src/api/rule-engine/configuration.ts
index 5570a740..99548f49 100644
--- a/src/api/rule-engine/configuration.ts
+++ b/src/api/rule-engine/configuration.ts
@@ -46,7 +46,15 @@ export const detail = (id:string) => server.get(`/alarm/config/${id}`);
 
 export const unbindScene = (id:string,data:any) => server.post(`/alarm/rule/bind/${id}/_delete`,data);
 
+export const unBindAlarm = (id: string, alarmId: string, data: any) => server.post(`/alarm/rule/bind/${alarmId}/${id}/_delete`, data)
+export const unBindAlarmMultiple = (data: any) => server.post(`/alarm/rule/bind/_delete`, data)
 /**
  * 保存关联场景
  */
 export const bindScene = (data:any) => server.patch("/alarm/rule/bind",data)
+
+/**
+ * 查询关联的场景执行动作id
+ * @param data
+ */
+export const queryBindScene = (data:any) => server.post("/alarm/rule/bind/_query",data)
diff --git a/src/api/rule-engine/log.ts b/src/api/rule-engine/log.ts
index 1f88a9d5..27288831 100644
--- a/src/api/rule-engine/log.ts
+++ b/src/api/rule-engine/log.ts
@@ -25,6 +25,13 @@ export const getOrgList = (parmas?:any) => server.get('/organization/_query/no-p
  */
 export const query = (data:any) => server.post('/alarm/record/_query/',data);
 
+/**
+ * 设备产品专用查询
+ * @param data 
+ * @returns 
+ */
+export const queryByDevice = (data:any) => server.post(`/alarm/record/device/_query`,data)
+
 /**
  * 告警处理
  */
@@ -49,4 +56,14 @@ export const queryHistoryList = (data:any) => server.post('/alarm/history/_query
 /**
  * 获取告警处理结果
  */
-export const queryHandleHistory = (data:any) => server.post('/alarm/record/handle-history/_query',data);
\ No newline at end of file
+export const queryHandleHistory = (data:any) => server.post('/alarm/record/handle-history/_query',data);
+
+/**
+ * 获取告警日志（新）
+ */
+export const queryLogList = (alarmConfigId:any,data:any) => server.post(`/alarm/history/${alarmConfigId}/_query`,data)
+
+/**
+ * 查询无效数据
+ */
+export const queryInvalidData = (data:any) => server.post('/message/preprocessor/invalid/_query',data)
diff --git a/src/api/rule-engine/scene.ts b/src/api/rule-engine/scene.ts
index 2fe75528..9fbe6435 100644
--- a/src/api/rule-engine/scene.ts
+++ b/src/api/rule-engine/scene.ts
@@ -27,4 +27,7 @@ export const queryBuiltInParams = (data: any, params?: any) => server.post(`/sce
 
 export const getParseTerm = (data: Record<string, any>) => server.post(`/scene/parse-term-column`, data)
 
-export const queryAlarmList = (data: Record<string, any>) => server.post(`/alarm/config/_query/`, data)
+export const queryAlarmPage = (data: Record<string, any>) => server.post(`/alarm/config/_query`, data)
+
+export const queryAlarmList = (data: Record<string, any>) => server.post(`/alarm/config/_query/no-paging`, data)
+export const queryAlarmCount = (data: Record<string, any>) => server.post(`/alarm/config/_count`, data)
diff --git a/src/api/system/calendar.ts b/src/api/system/calendar.ts
new file mode 100644
index 00000000..2b3b2cdd
--- /dev/null
+++ b/src/api/system/calendar.ts
@@ -0,0 +1,17 @@
+import server from '@/utils/request';
+//编辑标签
+export const saveTag = (data:any) => server.patch('/calendar/tags',data)
+//查询标签列表
+export const queryTags = () => server.get('/calendar/tags')
+//删除标签
+export const deleteTags = (ids:any) => server.remove('/calendar/tags',{},{data:ids})
+//保存标签颜色
+export const saveTagsColor = (data:any) => server.post('/system/config/calendar-tag-color',data) 
+//查询标签颜色
+export const getTagsColor = () => server.get('/system/config/calendar-tag-color');
+//查询指定日期内的日历
+export const queryEvents = (dateFrom:any,dateTo:any) => server.get(`/calendar/${dateFrom}/${dateTo}`)
+//批量保存指定日期的日历
+export const saveEvents = (data:any) => server.patch('/calendar',data)
+//清空日历 
+export const clearAll = () => server.remove('/calendar/mine/_all')
\ No newline at end of file
diff --git a/src/components/AMapComponent/index.vue b/src/components/AMapComponent/AMap.vue
similarity index 100%
rename from src/components/AMapComponent/index.vue
rename to src/components/AMapComponent/AMap.vue
diff --git a/src/components/AMapComponent/DistrictSearch.vue b/src/components/AMapComponent/DistrictSearch.vue
new file mode 100644
index 00000000..d64d9654
--- /dev/null
+++ b/src/components/AMapComponent/DistrictSearch.vue
@@ -0,0 +1,116 @@
+<template>
+
+</template>
+
+<script setup>
+import { useMap } from './useMap'
+import {pick} from "lodash-es";
+
+defineOptions({
+  name: 'DistrictSearch'
+})
+
+const instance = useMap()
+
+const props = defineProps({
+  subdistrict: {
+    type: Number,
+    default: 0
+  },
+  extensions: {
+    type: String,
+    default: 'all'
+  },
+  level: {
+    type: String,
+    default: 'district'
+  },
+  view: {
+    type: Boolean,
+    default: true
+  },
+  styles: {
+    type: Object,
+    default: () => ({})
+  },
+  adcode: {
+    type: String,
+    default: undefined
+  }
+})
+
+let district
+let polygon
+
+const remove = () => {
+  if (polygon && instance.$amapComponent) {
+    if (instance.$amapComponent.getLayers().length) {
+      instance.$amapComponent.remove(polygon)
+    }
+    polygon = null
+  }
+}
+
+const drawBounds = (paths) => {
+  if (polygon && instance.$amapComponent?.remove) {
+    instance.$amapComponent.remove(polygon)
+    polygon = null
+  }
+  for (var i = 0; i < paths.length; i += 1) {//构造MultiPolygon的path
+    paths[i] = [paths[i]]
+  }
+
+  const _styles = Object.assign({
+    strokeWeight: 1,
+    path: paths,
+    fillOpacity: 0.25,
+    fillColor: '#80d8ff',
+    strokeColor: '#0091ea'
+  },props.styles)
+
+  polygon = new AMap.Polygon(_styles);
+
+  instance.$amapComponent.add(polygon)
+
+  if (props.view) {
+    instance.$amapComponent.setFitView(polygon)
+  }
+}
+
+const queryDistrict = (code) => {
+  const opts = {
+    subdistrict: 0,   //获取边界不需要返回下级行政区
+    extensions: 'all',  //返回行政区边界坐标组等具体信息
+    level: 'district'  //查询行政级别为 市
+  }
+
+  const options = Object.assign(opts, pick(props, ['subdistrict', 'extensions', 'level']))
+
+  if (!district) {
+    district = new AMap.DistrictSearch(options)
+  }
+
+  if (!code) return
+  district.search(code, (status, result) => {
+    if (!result || !result.districtList || !result.districtList[0]) {
+      console.warn('请正确填写名称或更新其他名称');
+      return
+    }
+    const bounds = result.districtList[0].boundaries;
+    drawBounds(bounds)
+  })
+}
+
+onBeforeUnmount(() => {
+  remove()
+})
+
+watch(() => props.adcode, () =>{
+  queryDistrict(props.adcode)
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/AMapComponent/GeoJson.vue b/src/components/AMapComponent/GeoJson.vue
new file mode 100644
index 00000000..9b61b97f
--- /dev/null
+++ b/src/components/AMapComponent/GeoJson.vue
@@ -0,0 +1,91 @@
+<template>
+
+</template>
+
+<script setup>
+import { useMap } from './useMap'
+import { max, min } from 'lodash-es'
+
+defineOptions({
+  name: 'GeoJson'
+})
+
+const props = defineProps({
+  geo: {
+    type: Object,
+    default: undefined
+  },
+  view: {
+    type: Boolean,
+    default: true
+  },
+})
+
+const instance = useMap()
+
+let geoJsonLayer
+
+const remove = () => {
+  if (geoJsonLayer && instance.$amapComponent) {
+      if (instance.$amapComponent.getLayers().length) {
+        instance.$amapComponent.remove(geoJsonLayer)
+      }
+    geoJsonLayer = null
+  }
+}
+const drawBounds = () => {
+  remove()
+
+  if (!props.geo) return
+
+  geoJsonLayer = new AMap.GeoJSON({
+    geoJSON: props.geo,
+    getPolygon: (geojson, lnglats) => {
+      return new AMap.Polygon({
+        path: lnglats,
+        fillOpacity: 0.25,// 面积越大透明度越高
+        strokeColor: '#0091ea',
+        fillColor: '#80d8ff'
+      });
+    }
+  })
+
+  instance.$amapComponent.add(geoJsonLayer)
+
+  if (props.view) {
+
+    const points = props.geo.features.reduce((prev, next) => {
+      const coordinates = next.geometry.coordinates
+      prev.push(...coordinates[0])
+      return prev
+    }, [])
+
+    if (points.length) {
+      const lngArr = points.map(lnglat => lnglat[0])
+      const latArr = points.map(lnglat => lnglat[1])
+
+      const maxLng = max(lngArr)
+      const maxLat = max(latArr)
+      const minLng = min(lngArr)
+      const minLat = min(latArr)
+      const southWest = new AMap.LngLat(maxLng, maxLat)
+      const northEast = new AMap.LngLat(minLng, minLat)
+      const bounds = new AMap.Bounds(southWest, northEast)
+      instance.$amapComponent.setBounds(bounds)
+    }
+  }
+}
+
+onBeforeUnmount(() => {
+  remove()
+})
+
+watch(() => JSON.stringify(props.geo), () =>{
+  drawBounds()
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/AMapComponent/index.ts b/src/components/AMapComponent/index.ts
new file mode 100644
index 00000000..d5ebf374
--- /dev/null
+++ b/src/components/AMapComponent/index.ts
@@ -0,0 +1,7 @@
+import AMap from './AMap.vue'
+
+export * from './useMap'
+export { default as DistrictSearch } from './DistrictSearch.vue'
+export { default as GeoJson } from './GeoJson.vue'
+
+export default AMap
diff --git a/src/components/AMapComponent/useMap.ts b/src/components/AMapComponent/useMap.ts
new file mode 100644
index 00000000..61a634c8
--- /dev/null
+++ b/src/components/AMapComponent/useMap.ts
@@ -0,0 +1,4 @@
+export const useMap = () => {
+    return inject('parentInstance')
+}
+
diff --git a/src/components/AlarmLeveIcon/index.vue b/src/components/AlarmLeveIcon/index.vue
new file mode 100644
index 00000000..c8b52ecd
--- /dev/null
+++ b/src/components/AlarmLeveIcon/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <img :src="src" />
+</template>
+
+<script setup>
+
+defineOptions({
+  name: 'LevelIcon'
+})
+
+const props = defineProps({
+  level: {
+    type: Number,
+    default: undefined
+  }
+})
+
+const src = computed(() => {
+  return `/images/alarm/alarm${props.level}.png`
+})
+
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/BadgeStatus/color.ts b/src/components/BadgeStatus/color.ts
index a6f8d8fa..d79c300a 100644
--- a/src/components/BadgeStatus/color.ts
+++ b/src/components/BadgeStatus/color.ts
@@ -5,12 +5,6 @@ const color = {
   'success': '36, 178, 118',
   'warning': '255, 144, 0',
   'default': '102, 102, 102',
-  //告警颜色
-  'level1': '229, 0,  18',
-  'level2': '255, 148,  87',
-  'level3': '250, 189,  71',
-  'level4': '153, 153, 153',
-  'level5': '196, 196,  196'
 }
 export const getHexColor = (code: string, pe: number = 0.1) => {
   const _color = color[code] || color.default
diff --git a/src/components/BatchDropdown/index.vue b/src/components/BatchDropdown/index.vue
index 928bed9a..f7b17f28 100644
--- a/src/components/BatchDropdown/index.vue
+++ b/src/components/BatchDropdown/index.vue
@@ -53,6 +53,7 @@
 <script lang="ts" setup>
 import { PropType } from 'vue';
 import { BatchActionsType } from './types';
+import { defineExpose } from 'vue';
 
 const props = defineProps({
     actions: {
@@ -90,14 +91,17 @@ const reload = () => {
 
 const onPopConfirm = (e: any, fun: any) => {
     if (fun) {
-        fun(e);
         onPopCancel();
+        return fun(e);
     }
 };
 
 const onPopCancel = () => {
     visible.value = false;
 };
+defineExpose({
+    reload
+})
 </script>
 
 <style lang="less" scoped>
diff --git a/src/components/CardBox/index.vue b/src/components/CardBox/index.vue
index f2c5dc3d..fa24788a 100644
--- a/src/components/CardBox/index.vue
+++ b/src/components/CardBox/index.vue
@@ -25,7 +25,7 @@
                         background: getBackgroundColor(statusNames[status]),
                     }"
                 ></div>
-                <div style="display: flex">
+                <div class="card-content-body">
                     <!-- 图片 -->
                     <div class="card-item-avatar">
                         <slot name="img"> </slot>
@@ -57,8 +57,8 @@
                             :text="statusText"
                             :statusNames="statusNames"
                         ></BadgeStatus>
-                        <CustomBadgeStatus 
-                            v-else 
+                        <CustomBadgeStatus
+                            v-else
                             :status="status"
                             :text="statusText"
                             :statusNames="statusNames">
@@ -176,7 +176,7 @@ const handleClick = () => {
 .card {
     width: 100%;
     background-color: #fff;
-    
+
     .checked-icon {
         position: absolute;
         right: -22px;
@@ -249,6 +249,12 @@ const handleClick = () => {
             padding: 30px 12px 30px 30px;
             overflow: hidden;
 
+            .card-content-body {
+              display: flex;
+              position: relative;
+              z-index: 99;
+            }
+
             .card-item-avatar {
                 margin-right: 16px;
               display: flex;
@@ -317,6 +323,7 @@ const handleClick = () => {
             }
         }
 
+
         .card-content-top-line {
             &::before {
                 position: absolute;
diff --git a/src/components/CardSelect/CardSelect.vue b/src/components/CardSelect/CardSelect.vue
new file mode 100644
index 00000000..8fbf5611
--- /dev/null
+++ b/src/components/CardSelect/CardSelect.vue
@@ -0,0 +1,282 @@
+<template>
+    <div :class="{ 'j-card-panel': true, 'no-column': noColumn }">
+        <j-row v-if="!noColumn" :gutter="[16, 16]">
+            <j-col
+                v-for="item in itemOptions"
+                :key="item.value"
+                :span="24 / column"
+            >
+                <div
+                    :class="{
+                        'j-card-item': true,
+                        active: activeKeys.includes(item.value),
+                        disabled: disabled || item.disabled,
+                        horizontal: type === 'horizontal',
+                        vertical: type === 'vertical',
+                        right: float === 'right',
+                        left: float === 'left',
+                    }"
+                    @click="() => handleSelect(item.value, item)"
+                >
+                    <div class="j-card-title-warp">
+                        <div class="title">
+                            <slot
+                                name="title"
+                                :title="item.label"
+                                :option="item"
+                            >
+                                <j-ellipsis>
+                                    {{ item.label }}
+                                </j-ellipsis>
+                            </slot>
+                        </div>
+                        <div
+                            v-if="item.subLabel && showSubLabel"
+                            class="sub-title"
+                        >
+                            <slot
+                                name="subLabel"
+                                :sub-label="item.subLabel"
+                                :option="item"
+                            >
+                                {{ item.subLabel }}
+                            </slot>
+                        </div>
+                    </div>
+                    <div v-if="showImage" class="j-card-image">
+                        <slot name="image" :image="item.iconUrl" :option="item">
+                            <j-avatar
+                                class="icon box-shadow"
+                                :src="item.iconUrl"
+                            />
+                        </slot>
+                    </div>
+                </div>
+            </j-col>
+        </j-row>
+        <template v-else>
+            <div
+                v-for="item in itemOptions"
+                :key="item.value"
+                :class="{
+                    'j-card-item': true,
+                    active: activeKeys.includes(item.value),
+                    disabled: disabled || item.disabled,
+                    horizontal: type === 'horizontal',
+                    vertical: type === 'vertical',
+                    right: float === 'right',
+                    left: float === 'left',
+                }"
+                @click="() => handleSelect(item.value, item)"
+            >
+                <div class="j-card-title-warp">
+                    <div class="title">
+                        <slot name="title" :title="item.label" :option="item">
+                            <j-ellipsis>
+                                {{ item.label }}
+                            </j-ellipsis>
+                        </slot>
+                    </div>
+                    <div v-if="item.subLabel && showSubLabel" class="sub-title">
+                        <slot
+                            name="subLabel"
+                            :sub-label="item.subLabel"
+                            :option="item"
+                        >
+                            {{ item.subLabel }}
+                        </slot>
+                    </div>
+                </div>
+                <div v-if="showImage" class="j-card-image">
+                    <slot name="image" :image="item.iconUrl" :option="item">
+                        <j-avatar class="icon box-shadow" :src="item.iconUrl" />
+                    </slot>
+                </div>
+            </div>
+        </template>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, PropType, ref, toRefs, watch } from 'vue';
+
+interface CardOption {
+    value: string | number;
+    label: string;
+    subLabel?: string;
+    iconUrl: string;
+    disabled?: boolean;
+}
+
+const props = defineProps({
+    type: {
+        type: String as PropType<'vertical' | 'horizontal'>,
+        default: 'horizontal',
+    },
+    float: {
+        type: String as PropType<'left' | 'right'>,
+        default: 'left',
+    },
+    options: {
+        type: Array as PropType<Array<CardOption>>,
+        default: () => [],
+    },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    multiple: {
+        type: Boolean,
+        default: false,
+    },
+    column: {
+        type: Number,
+        default: 3,
+    },
+    noColumn: {
+        type: Boolean,
+        default: false,
+    },
+    showImage: {
+        type: Boolean,
+        default: true,
+    },
+    showSubLabel: {
+        type: Boolean,
+        default: true,
+    },
+    value: {
+        type: [String, Array],
+        default: undefined,
+    },
+    allowClear: {
+        type: Boolean,
+        default: false,
+    },
+});
+const { multiple, type, disabled, float } = toRefs(props);
+
+const emits = defineEmits(['update:value', 'change', 'select']);
+const activeKeys = ref<Array<string | number>>([]);
+const itemOptions = computed(() => props.options);
+const isAllowClear = computed(() => {
+    return props.allowClear !== false;
+});
+const getOptions = (keys: Array<string | number>): CardOption[] => {
+    return itemOptions.value.filter((item) => {
+        return keys.includes(item.value);
+    });
+};
+
+const handleSelect = (key: string | number, item: CardOption) => {
+    if (disabled.value || item.disabled) return;
+    let cloneActiveKeys = new Set(activeKeys.value);
+
+    const isActive = cloneActiveKeys.has(key);
+
+    // 已选中，并且单选，allowClear为false，则return
+    if (isActive && !multiple.value && isAllowClear.value === false) return;
+
+    if (isActive) {
+        // 选中
+        cloneActiveKeys.delete(key);
+    } else {
+        // 添加
+        multiple.value
+            ? cloneActiveKeys.add(key)
+            : (cloneActiveKeys = new Set([key]));
+    }
+
+    activeKeys.value = [...cloneActiveKeys.keys()];
+    const options = multiple.value ? getOptions(activeKeys.value) : item;
+
+    const values = props.multiple ? activeKeys.value : activeKeys.value[0]
+
+    emits('update:value', values);
+    emits('change', values, options);
+    emits('select', values, key, !isActive)
+};
+
+watch(
+    () => props.value,
+    () => {
+        activeKeys.value = Array.isArray(props.value)
+            ? props.value
+            : [props.value];
+    },
+    { immediate: true },
+);
+</script>
+
+<style lang="less" scoped>
+@card-border: #e6e6e6;
+.j-card-panel {
+  .j-card-item {
+    border: 1px solid @card-border;
+    border-radius: 4px;
+    cursor: pointer;
+    color: @black;
+    display: flex;
+    width: 100%;
+    gap: 12px;
+
+    .j-card-title-warp {
+      flex: 1 1 auto;
+      max-width: 100%;
+
+      .title {
+        word-break: keep-all;
+        width: 100%;
+      }
+    }
+
+    &.vertical {
+      flex-direction: column-reverse;
+      padding: 22px 4px;
+      align-items: center;
+
+      .j-card-image {
+        margin-bottom: 4px;
+      }
+    }
+
+    &.horizontal {
+      padding: 20px;
+    }
+
+    .sub-title {
+      color: rgba(0, 0, 0, 0.24);
+    }
+
+    &.right {
+      flex-direction: row-reverse;
+    }
+  }
+
+  &.no-column {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 16px;
+
+    .j-card-item {
+      min-width: 36px;
+      width: unset;
+
+      &.vertical {
+        padding: 14px 16px;
+      }
+    }
+  }
+
+  .active {
+    border: 1px solid var(--ant-primary-color) !important;
+  }
+
+  .disabled {
+    cursor: not-allowed;
+    opacity: 0.75;
+  }
+}
+
+
+</style>
diff --git a/src/components/CardSelect/RadioButton.vue b/src/components/CardSelect/RadioButton.vue
new file mode 100644
index 00000000..48fb30fb
--- /dev/null
+++ b/src/components/CardSelect/RadioButton.vue
@@ -0,0 +1,72 @@
+<template>
+  <div class="radio-button" :style="styles">
+    <div v-for="item in options" @click="onClick(item)"  class="radio-button-item" :class="{'active': myValue === item.value }">
+      {{ item.label }}
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineOptions({
+  name: 'RadioButton',
+})
+
+const props = defineProps({
+  value: {
+    type: [String, Number],
+    default: undefined
+  },
+  options: {
+    type: Array,
+    default: () => []
+  },
+  columns: {
+    type: Number,
+    default: 3
+  }
+})
+
+const emit = defineEmits(['update:value'])
+
+const myValue = ref(props.value)
+
+const styles = computed(() => {
+  return {
+    'grid-template-columns': `repeat(${props.columns}, 1fr)`
+  }
+})
+
+const onClick = (record) => {
+  if (myValue.value !== record.value) {
+    myValue.value = record.value
+    emit('update:value', record.value)
+    emit('select', record.value)
+  }
+}
+
+watch(() => props.value, () => {
+ myValue.value = props.value
+})
+
+</script>
+
+<style scoped lang="less">
+.radio-button {
+  display: grid;
+  gap: 16px;
+
+  .radio-button-item {
+    padding: 6px 12px;
+    text-align: center;
+    height: 100%;
+    border-radius: 2px;
+    background-color: #f5f5f5;
+    cursor: pointer;
+
+    &.active {
+      color: #fff;
+      background-color: @primary-color;
+    }
+  }
+}
+</style>
diff --git a/src/components/CardSelect/index.ts b/src/components/CardSelect/index.ts
new file mode 100644
index 00000000..a3abafb4
--- /dev/null
+++ b/src/components/CardSelect/index.ts
@@ -0,0 +1,11 @@
+import CardSelect from './CardSelect.vue';
+import type { App } from 'vue';
+
+CardSelect.name = 'JCardSelect';
+
+CardSelect.install = function (app: App) {
+    app.component('JCardSelect', CardSelect);
+    return app;
+};
+
+export default CardSelect;
diff --git a/src/components/CheckButton/CheckButton.vue b/src/components/CheckButton/CheckButton.vue
new file mode 100644
index 00000000..3746f451
--- /dev/null
+++ b/src/components/CheckButton/CheckButton.vue
@@ -0,0 +1,163 @@
+<template>
+  <div :class="['j-check-button', props.class]" :style="styles">
+    <div
+      v-for="item in _options"
+      :key="item.value"
+      :class="{
+        'j-check-button-item': true,
+        'selected': myValue.includes(item.value),
+        'disabled': item.disabled
+      }"
+      @click="
+                () => {
+                    selected(item.value, item.disabled);
+                }
+            "
+    >
+      {{ item.label }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, CSSProperties, PropType, ref, watch } from 'vue';
+import { isArray } from 'lodash-es';
+import { Form } from 'ant-design-vue'
+
+defineOptions({
+  name: 'CheckButton'
+})
+
+const props = defineProps({
+  value: {
+    type: [String, Array],
+    default: undefined,
+  },
+  options: {
+    type: Array,
+    default: () => [],
+  },
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  class: {
+    type: String,
+    default: undefined,
+  },
+  style: {
+    type: Object as PropType<CSSProperties>,
+    default: () => ({}),
+  },
+  columns: {
+    type: Number,
+    default: 3
+  }
+});
+const emit = defineEmits(['update:value', 'change', 'select']);
+
+const formItemContext = Form.useInjectFormItemContext();
+const myValue = ref();
+const optionsMap = ref(new Map());
+
+const styles = computed(() => {
+  return {
+    'grid-template-columns': `repeat(${props.columns}, 1fr)`,
+    ...props.style
+  }
+})
+
+const _options = computed(() => {
+  props.options.forEach((item: any) => {
+    if (props.disabled) {
+      item.disabled = props.disabled
+    }
+    optionsMap.value.set(item.value, item);
+  });
+  return props.options;
+});
+
+const selected = (key: string | number, disabeld: boolean) => {
+  if (disabeld || props.disabled) return;
+
+  const values = new Set(myValue.value);
+
+  if (values.has(key)) {
+    values.delete(key);
+  } else {
+    if (!props.multiple) {
+      values.clear();
+    }
+    values.add(key);
+  }
+
+  myValue.value = [...values.values()];
+
+  const optionsItems = myValue.value.map((_key) => {
+    return optionsMap.value.get(_key);
+  });
+
+  const _value = props.multiple ? myValue.value : myValue.value[0];
+
+  emit('update:value', _value);
+  emit('change', _value, props.multiple ? optionsItems : optionsItems[0]);
+  emit('select', _value, props.multiple ? optionsItems : optionsItems[0]);
+  formItemContext.onFieldChange()
+};
+
+watch(
+  () => props.value,
+  () => {
+    if (props.value) {
+      myValue.value = isArray(props.value) ? props.value : [props.value];
+    } else {
+      myValue.value = [];
+    }
+  },
+  { immediate: true, deep: true },
+);
+
+</script>
+
+<style scoped lang="less">
+.j-check-button {
+  display: grid;
+  gap: 16px;
+  width: 100%;
+
+  .j-check-button-item {
+    flex: 1;
+    min-width: 0;
+    padding: 8px;
+    border-radius: @border-radius-base;
+    background-color: #f2f3f5;
+    transition: all 0.3s;
+    color: #333;
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      background-color: @primary-color;
+      opacity: 0.85;
+      color: #fff;
+    }
+
+    &.selected {
+      background-color: @primary-color;
+      color: #fff;
+    }
+
+    &.disabled {
+      cursor: not-allowed;
+      color: #00000040;
+      background-color: #e6e6e6;
+      opacity: 1
+    }
+  }
+}
+
+</style>
diff --git a/src/components/CheckButton/index.ts b/src/components/CheckButton/index.ts
new file mode 100644
index 00000000..ea647f55
--- /dev/null
+++ b/src/components/CheckButton/index.ts
@@ -0,0 +1,3 @@
+import CheckButton from "./CheckButton.vue";
+
+export default CheckButton
diff --git a/src/components/ConfirmModal/index.vue b/src/components/ConfirmModal/index.vue
new file mode 100644
index 00000000..7d58d944
--- /dev/null
+++ b/src/components/ConfirmModal/index.vue
@@ -0,0 +1,76 @@
+<template>
+    <!-- <a-tooltip v-if="toolTip" v-bind="toolTip">
+        <span @click="showConfirm" :class="props.className" v-show="show">
+            {{ props.class }}
+            <slot></slot>
+        </span>
+    </a-tooltip> -->
+    <span @click="showConfirm" :class="props.className" v-show="show">
+        {{ props.class }}
+        <slot></slot>
+    </span>
+</template>
+
+<script setup>
+import { Modal } from 'ant-design-vue';
+const props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    onConfirm: {
+        type: Object,
+        default: {},
+    },
+    className: {
+        type: String,
+    },
+    show: {
+        type: Boolean,
+        default: true,
+    },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    toolTip: {
+        type: Object
+    },
+});
+// const confirmLoading = ref(false);
+// const modalVisible = ref(false);
+// const modalConfirm = async() => {
+//     if (typeof props.onConfirm === 'function') {
+//         confirmLoading.value = true;
+//         const res = await props.onConfirm()?.finally(()=>{
+//             confirmLoading.value = false;
+//             modalVisible.value = false;
+//             return
+//         });
+//         if(!res?.finally){
+//             confirmLoading.value = false;
+//             modalVisible.value = false;
+//         }
+//     } else {
+//         modalVisible.value = false;
+//     }
+// };
+const showConfirm = () => {
+    if (props.disabled) {
+        return;
+    }
+    Modal.confirm({
+        title: props.title,
+        content: props?.content,
+        onOk() {
+            return props?.onConfirm();
+        },
+        onCancel() {},
+    });
+};
+</script>
+<style lang="less" scoped>
+.modalContent {
+    text-align: center;
+}
+</style>
diff --git a/src/components/FRuleEditor-copy/Operator/index.vue b/src/components/FRuleEditor-copy/Operator/index.vue
deleted file mode 100644
index 2fdce988..00000000
--- a/src/components/FRuleEditor-copy/Operator/index.vue
+++ /dev/null
@@ -1,163 +0,0 @@
-<template>
-  <div class="operator-box">
-    <j-input-search @search="search" allow-clear placeholder="搜索关键字" />
-    <div class="tree">
-      <j-tree @select="selectTree" :field-names="{ title: 'name', key: 'id', }" auto-expand-parent
-        :tree-data="data"
-        :showLine="{ showLeafIcon: false }"
-        :show-icon="true">
-        <template #title="node">
-          <div class="node">
-            <div style="max-width: 180px"><Ellipsis>{{ node.name }}</Ellipsis></div>
-            <div :class="node.children?.length > 0 ? 'parent' : 'add'">
-              <j-popover v-if="node.type === 'property'" placement="right" title="请选择使用值">
-                <template #content>
-                  <j-space direction="vertical">
-                    <j-tooltip placement="right" title="实时值为空时获取上一有效值补齐，实时值不为空则使用实时值">
-                      <j-button type="text" @click="recentClick(node)">
-                        $recent实时值
-                      </j-button>
-                    </j-tooltip>
-                    <j-tooltip placement="right" title="实时值的上一有效值">
-                      <j-button @click="lastClick(node)" type="text">
-                        上一值
-                      </j-button>
-                    </j-tooltip>
-                  </j-space>
-                </template>
-                <a>添加</a>
-              </j-popover>
-
-              <a v-else @click="addClick(node)">
-                添加
-              </a>
-            </div>
-          </div>
-        </template>
-      </j-tree>
-    </div>
-    <div class="explain">
-      <Markdown :source="item?.description || ''"></Markdown>
-    </div>
-  </div>
-</template>
-<script setup lang="ts" name="Operator">
-import { useProductStore } from '@/store/product';
-import type { OperatorItem } from './typings';
-import { treeFilter } from '@/utils/tree'
-import { PropertyMetadata } from '@/views/device/Product/typings';
-import { getOperator } from '@/api/device/product'
-import Markdown from '@/components/Markdown'
-
-const props = defineProps({
-  id: String
-})
-
-interface Emits {
-  (e: 'addOperatorValue', data: string): void;
-}
-const emit = defineEmits<Emits>();
-
-const item = ref<Partial<OperatorItem>>()
-const data = ref<OperatorItem[]>([])
-const dataRef = ref<OperatorItem[]>([])
-
-const search = (value: string) => {
-  if (value) {
-    const nodes = treeFilter(dataRef.value, value, 'name') as OperatorItem[];
-    data.value = nodes;
-  } else {
-    data.value = dataRef.value;
-  }
-};
-
-const selectTree = (k: any, info: any) => {
-  item.value = info.node as unknown as OperatorItem;
-}
-
-const recentClick = (node: OperatorItem) => {
-  emit('addOperatorValue', `$recent("${node.id}")`)
-}
-const lastClick = (node: OperatorItem) => {
-  emit('addOperatorValue', `$lastState("${node.id}")`)
-}
-const addClick = (node: OperatorItem) => {
-  emit('addOperatorValue', node.code)
-}
-
-const productStore = useProductStore()
-
-const getData = async (id?: string) => {
-  const metadata = productStore.current.metadata || '{}';
-  const _properties = JSON.parse(metadata).properties || [] as PropertyMetadata[]
-  const properties = {
-    id: 'property',
-    name: '属性',
-    description: '',
-    code: '',
-    children: _properties
-      .filter((p: PropertyMetadata) => p.id !== id)
-      .map((p: PropertyMetadata) => ({
-        id: p.id,
-        name: p.name,
-        description: `### ${p.name}
-        \n 数据类型: ${p.valueType?.type}
-        \n 是否只读: ${p.expands?.readOnly || 'false'}
-        \n 可写数值范围: `,
-        type: 'property',
-      })),
-  };
-  const response = await getOperator();
-  if (response.status === 200) {
-    data.value = [properties as OperatorItem, ...response.result];
-    dataRef.value = [properties as OperatorItem, ...response.result];
-  }
-};
-
-watch(() => props.id,
-  (val) => {
-    getData(val)
-  },
-  { immediate: true }
-)
-</script>
-<style lang="less" scoped>
-.border {
-  margin-top: 10px;
-  padding: 10px;
-  border-top: 1px solid lightgray;
-}
-
-.operator-box {
-  width: 100%;
-
-  .explain {
-    .border;
-  }
-
-  .tree {
-    .border;
-
-    height: 350px;
-    overflow-y: auto;
-
-    .node {
-      display: flex;
-      justify-content: space-between;
-      width: 220px;
-
-      //.add {
-      //  display: none;
-      //}
-      //
-      //&:hover .add {
-      //  display: block;
-      //}
-
-      .parent {
-        display: none;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/components/FRuleEditor/Debug/index.vue b/src/components/FRuleEditor/Debug/index.vue
index 672da007..d21df3f9 100644
--- a/src/components/FRuleEditor/Debug/index.vue
+++ b/src/components/FRuleEditor/Debug/index.vue
@@ -3,6 +3,11 @@
         <div class="top">
             <div class="header">
                 <j-tabs v-model:activeKey="headerType">
+                  <template #rightExtra>
+                    <a v-if="virtualRule?.script && isBeginning" @click="beginAction">
+                      开始运行
+                    </a>
+                  </template>
                     <j-tab-pane key="property">
                         <template #tab>
                             <span class="title">
@@ -18,44 +23,6 @@
                         </template>
                     </j-tab-pane>
                 </j-tabs>
-                <!-- <div>
-                    <j-dropdown>
-                        <div class="title" @click.prevent>
-                            {{
-                                headerType === 'property'
-                                    ? '属性赋值'
-                                    : '标签赋值'
-                            }}
-                            <div class="description">
-                                {{
-                                    `请对上方规则使用的${
-                                        headerType === 'property'
-                                            ? '属性'
-                                            : '标签'
-                                    }进行赋值`
-                                }}
-                            </div>
-                        </div>
-                        <template #overlay>
-                            <j-menu>
-                                <j-menu-item>
-                                    <a
-                                        href="javascript:;"
-                                        @click="headerType = 'property'"
-                                        >属性赋值</a
-                                    >
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <a
-                                        href="javascript:;"
-                                        @click="headerType = 'tag'"
-                                        >标签赋值</a
-                                    >
-                                </j-menu-item>
-                            </j-menu>
-                        </template>
-                    </j-dropdown>
-                </div> -->
             </div>
             <div class="description">
                 {{
@@ -71,7 +38,7 @@
                     :pagination="false"
                     bordered
                     size="small"
-                    :scroll="{ y: 200 }"
+                    :scroll="{ y: 180 }"
                 >
                     <template #bodyCell="{ column, record, index }">
                         <template v-if="column.key === 'id'">
@@ -79,8 +46,13 @@
                                 showSearch
                                 :options="options"
                                 v-model:value="record.id"
+                                :getPopupContainer="(node) => tableWrapperRef || node"
                                 size="small"
-                                style="width: 100%; z-index: 1400 !important"
+                                style="width: 100%;"
+                                :virtual="true"
+                                :dropdownStyle="{
+                                  zIndex: 1072
+                                }"
                             />
                         </template>
                         <template v-if="column.key === 'current'">
@@ -131,7 +103,12 @@
                                 :options="tagOptions"
                                 v-model:value="record.id"
                                 size="small"
-                                style="width: 100%; z-index: 1400 !important"
+                                style="width: 100%;"
+                                :virtual="true"
+                                :getPopupContainer="(node) => tableWrapperRef || node"
+                                :dropdownStyle="{
+                                  zIndex: 1072
+                                }"
                             />
                         </template>
                         <template v-if="column.key === 'current'">
@@ -175,13 +152,13 @@
                         class="action"
                         @click="runScriptAgain"
                     >
-                        <a style="margin-left: 75px">发送数据</a>
+                        <a>发送数据</a>
                     </div>
-                    <div v-if="virtualRule?.script">
-                        <a v-if="isBeginning" @click="beginAction">
-                            开始运行
-                        </a>
-                        <a v-else @click="stopAction"> 停止运行 </a>
+                    <div v-if="virtualRule?.script && !isBeginning">
+<!--                        <a v-if="isBeginning" @click="beginAction">-->
+<!--                            开始运行-->
+<!--                        </a>-->
+                        <a v-if="!isBeginning" @click="stopAction"> 停止运行 </a>
                     </div>
                     <div>
                         <a @click="clearAction"> 清空 </a>
@@ -219,16 +196,17 @@
 </template>
 <script setup lang="ts" name="Debug">
 import { PropType, Ref } from 'vue';
-import { useProductStore } from '@/store/product';
 import { useRuleEditorStore } from '@/store/ruleEditor';
 import moment from 'moment';
 import { getWebSocket } from '@/utils/websocket';
-import { PropertyMetadata } from '@/views/device/Product/typings';
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 import { onlyMessage } from '@/utils/comm';
+import {message} from "ant-design-vue";
 
 const props = defineProps({
     virtualRule: Object as PropType<Record<any, any>>,
     id: String,
+    propertiesOptions: Array,
 });
 const emits = defineEmits(['success']);
 
@@ -238,21 +216,13 @@ type propertyType = {
     id?: string;
     current?: string;
     last?: string;
+
+    type?: string
 };
 const property = ref<propertyType[]>([]);
 const tag = ref<Array<any>>([]);
-const headerOptions = [
-    {
-        key: 'property',
-        label: '属性赋值',
-        title: '属性赋值',
-    },
-    {
-        key: 'tag',
-        label: '标签赋值',
-        title: '标签赋值',
-    },
-];
+const tableWrapperRef = useTableWrapper()
+
 const columns = [
     {
         title: '属性名称',
@@ -310,21 +280,20 @@ const deleteTagItem = (index: number) => {
 const ws = ref();
 
 const virtualIdRef = ref(new Date().getTime());
-const medataSource = inject<Ref<any[]>>('_dataSource');
+const medataSource = inject<Ref<any[]>>('metadataSource');
 const tagsSource = inject<Ref<any[]>>('_tagsDataSource');
-const productStore = useProductStore();
 const ruleEditorStore = useRuleEditorStore();
 
 const time = ref<number>(0);
 const timer = ref<any>(null);
 
 const runScript = () => {
-    const metadata = productStore.current.metadata || '{}';
-    const propertiesList = JSON.parse(metadata).properties || [];
+    const propertiesList = medataSource?.value || []
     const _properties = property.value.map((item: any) => {
         const _item = propertiesList.find((i: any) => i.id === item.id);
         return { ...item, type: _item?.valueType?.type };
     });
+    console.log('runScript', _properties, propertiesList)
     let _tags = {};
     tag.value.forEach((item) => {
         _tags[item.id] = item.current;
@@ -334,6 +303,11 @@ const runScript = () => {
     }
     if (!props.virtualRule?.script) {
         isBeginning.value = true;
+      message.config({
+        getContainer() {
+          return tableWrapperRef.value || document.body
+        }
+      })
         onlyMessage('请编辑规则', 'warning');
         return;
     }
@@ -385,12 +359,12 @@ const runScriptAgain = async () => {
     if (wsAgain.value) {
         wsAgain.value.unsubscribe?.();
     }
-    const metadata = productStore.current.metadata || '{}';
-    const propertiesList = JSON.parse(metadata).properties || [];
+    const propertiesList = medataSource?.value || []
     const _properties = property.value.map((item: any) => {
         const _item = propertiesList.find((i: any) => i.id === item.id);
         return { ...item, type: _item?.valueType?.type };
     });
+    console.log('runScriptAgain', _properties, propertiesList)
 
     wsAgain.value = getWebSocket(
         `virtual-property-debug-${props.id}-${new Date().getTime()}`,
@@ -414,6 +388,14 @@ const getTime = () => {
 };
 
 const beginAction = () => {
+  if (!property.value.length || property.value.some(item => !item.id || !(item.current || item.last) )) {
+    message.config({
+      getContainer() {
+        return tableWrapperRef.value || document.body
+      },
+    })
+    return onlyMessage('请填写属性值', 'warning')
+  }
     isBeginning.value = false;
     runScript();
     getTime();
@@ -435,13 +417,18 @@ onUnmounted(() => {
         ws.value.unsubscribe?.();
     }
     clearAction();
+
+    message.config({
+      getContainer() {
+        return document.body
+      },
+    })
     window.clearInterval(timer.value);
     timer.value = null;
 });
 
 const options = computed(() => {
-    return (medataSource.value || [])
-        .filter((p) => p.id !== props.id)
+    return (props.propertiesOptions || [])
         .map((item) => ({
             label: item.name,
             value: item.id,
@@ -455,6 +442,9 @@ const tagOptions = computed(() => {
     }));
 });
 
+defineExpose({
+  beginAction
+})
 // const getProperty = () => {
 //     // const metadata = productStore.current.metadata || '{}';
 //     // const _p: PropertyMetadata[] = JSON.parse(metadata).properties || [];
@@ -465,10 +455,11 @@ const tagOptions = computed(() => {
 </script>
 <style lang="less" scoped>
 .debug-container {
-    // display: flex;
+     display: flex;
     // width: 100%;
     // height: 340px;
     // margin-top: 20px;
+  gap: 12px;
 
     .top {
         // min-width: 0;
@@ -476,35 +467,36 @@ const tagOptions = computed(() => {
         // overflow-y: auto;
         height: 350px;
         border: 1px solid lightgray;
-        margin-bottom: 10px;
+        //margin-bottom: 10px;
 
         .header {
-            display: flex;
-            align-items: center;
+            //display: flex;
+            //align-items: center;
             width: 100%;
-            height: 40px;
+            height: 46px;
             border-bottom: 1px solid lightgray;
+            padding: 0 12px;
             //justify-content: space-around;
 
-            div {
-                display: flex;
-                //width: 100%;
-                align-items: center;
-                justify-content: flex-start;
-                height: 100%;
-
-                .title {
-                    margin: 0 10px;
-                    font-weight: 600;
-                    font-size: 16px;
-                }
-
-                .description {
-                    margin-left: 10px;
-                    color: lightgray;
-                    font-size: 12px;
-                }
-            }
+            //div {
+            //    display: flex;
+            //    //width: 100%;
+            //    align-items: center;
+            //    justify-content: flex-start;
+            //    height: 100%;
+            //
+            //    .title {
+            //        margin: 0 10px;
+            //        font-weight: 600;
+            //        font-size: 16px;
+            //    }
+            //
+            //    .description {
+            //        margin-left: 10px;
+            //        color: lightgray;
+            //        font-size: 12px;
+            //    }
+            //}
 
             .action {
                 width: 150px;
@@ -512,6 +504,11 @@ const tagOptions = computed(() => {
             }
         }
 
+          .description {
+              margin-left: 10px;
+              font-size: 12px;
+          }
+
         .top-bottom {
             padding: 10px;
         }
diff --git a/src/components/FRuleEditor/Operator/index.vue b/src/components/FRuleEditor/Operator/index.vue
index 19ed406f..e9d9b8f5 100644
--- a/src/components/FRuleEditor/Operator/index.vue
+++ b/src/components/FRuleEditor/Operator/index.vue
@@ -23,7 +23,7 @@
                                 </div>
                                 <div
                                     :class="
-                                        node.children?.length > 0
+                                        !node.isLeaf
                                             ? 'parent'
                                             : 'add'
                                     "
@@ -35,6 +35,7 @@
                                         }"
                                         placement="right"
                                         title="请选择使用值"
+                                        :getPopupContainer="getPopupContainer"
                                     >
                                         <template #content>
                                             <j-space direction="vertical">
@@ -73,6 +74,7 @@
                                         }"
                                         placement="right"
                                         title="请选择使用值"
+                                        :getPopupContainer="getPopupContainer"
                                     >
                                         <template #content>
                                             <j-space direction="vertical">
@@ -119,7 +121,7 @@ import { treeFilter } from '@/utils/tree';
 import { PropertyMetadata } from '@/views/device/Product/typings';
 import { getOperator } from '@/api/device/product';
 import { inject } from 'vue';
-import { Descriptions } from 'ant-design-vue';
+import {useTableWrapper, useTableFullScreen} from "@/components/Metadata/Table/context";
 import Markdown from '@/components/Markdown'
 
 const props = defineProps({
@@ -136,6 +138,8 @@ const item = ref<Partial<OperatorItem>>();
 const data = ref<OperatorItem[]>([]);
 const dataRef = ref<OperatorItem[]>([]);
 const tagsMetadata: any = inject('_tagsDataSource');
+const tableWrapperRef = useTableWrapper()
+const fullScreen = useTableFullScreen()
 const search = (value: string) => {
     if (value) {
         const nodes = treeFilter(
@@ -176,30 +180,39 @@ const getData = async (id?: string) => {
         name: '属性',
         description: '',
         code: '',
+        isLeaf: false,
         children: _properties
             .filter((p: PropertyMetadata) => p.id !== id)
-            .map((p: PropertyMetadata) => ({
+            .map((p: PropertyMetadata) => {
+              const readOnly = p.expands.type.length === 1 && p.expands.type[0] === 'read' ? '是' : '否'
+
+              return {
                 id: p.id,
                 name: p.name,
+                isLeaf: true,
                 description: `### ${p.name}
-        \n 数据类型: ${p.valueType?.type}
-        \n 是否只读: ${p.expands?.readOnly || 'false'}
-        \n 可写数值范围: `,
+                \n 标识: ${p.id}
+                \n 数据类型: ${p.valueType?.type}
+                \n 是否只读: ${readOnly}
+                \n 可写数值范围: `,
                 type: 'property',
-            })),
+              }
+            }),
     };
     const tags = {
         id: 'tags',
         name: '标签',
         Description: '',
         code: '',
+        isLeaf: false,
         children: tagsMetadata.value.map((i: any) => ({
             id: i.id,
             name: i.name,
+          isLeaf: true,
             description: `### ${i.name}
-        \n 数据类型: ${i.valueType?.type}
-        \n 是否只读: ${i.expands?.readOnly || 'false'}
-        \n 可写数值范围: `,
+            \n 标识: ${i.id}
+            \n 数据类型: ${i.valueType?.type}
+            \n 可写数值范围: `,
             type: 'tags',
         })),
     };
@@ -218,6 +231,14 @@ const getData = async (id?: string) => {
     }
 };
 
+const getPopupContainer = (node: any) => {
+  if (fullScreen.value) {
+    return tableWrapperRef.value || node
+  }
+
+  return document.body
+}
+
 watch(
     () => props.id,
     (val) => {
@@ -236,17 +257,21 @@ watch(
 .operator-box {
     width: 100%;
     display: flex;
+    flex-direction: column;
+    gap: 12px;
+    height: 100%;
 
     .left,
     .right {
-        width: 50%;
-        height: 350px;
+        //width: 50%;
+        //height: 350px;
+      height: calc(50% - 7px);
         border: 1px solid lightgray;
     }
 
     .left {
         padding: 10px;
-        margin-right: 10px;
+        //margin-right: 10px;
         .tree {
             height: 300px;
             //overflow-y: auto;
diff --git a/src/components/FRuleEditor/index.vue b/src/components/FRuleEditor/index.vue
index 82e9fc08..29a444a2 100644
--- a/src/components/FRuleEditor/index.vue
+++ b/src/components/FRuleEditor/index.vue
@@ -1,13 +1,16 @@
 <template>
     <j-modal
-        :zIndex="1030"
+        :zIndex="1072"
         :mask-closable="false"
         visible
-        width="70vw"
+        width="1300px"
         title="编辑规则"
-        :getContainer="(node) => fullRef || node"
-        @cancel="handleCancel"
         :destroyOnClose="true"
+        :dialogStyle="{
+          zIndex: 1072
+        }"
+        :getContainer="(node) => tableWrapperRef || node"
+        @cancel="handleCancel"
     >
         <div class="header" v-if="virtualRule?.windowType && virtualRule?.windowType !== 'undefined'">
             <div class="header-item">
@@ -24,27 +27,27 @@
         <div class="box">
             <div class="left">
                 <div>
-                    <Operator :id="id" :propertiesOptions="propertiesOptions" @add-operator-value="addOperatorValue" />
+                  <Editor
+                    ref="editor"
+                    mode="advance"
+                    key="advance"
+                    v-model:value="_value"
+                    :tips="tips"
+                  />
                 </div>
                 <div style="margin-top: 10px;">
-                    <Editor
-                        ref="editor"
-                        mode="advance"
-                        key="advance"
-                        v-model:value="_value"
-                        :tips="tips"
-                    />
-                </div>
-            </div>
-            <div class="right">
-                <Debug
+                  <Debug
                     :virtualRule="{
                         ...virtualRule,
                         script: _value,
                     }"
+                    :propertiesOptions="propertiesOptions"
                     :id="id"
-                    @success="onSuccess"
-                />
+                  />
+                </div>
+            </div>
+            <div class="right">
+              <Operator :id="id" :propertiesOptions="propertiesOptions" @add-operator-value="addOperatorValue" />
             </div>
         </div>
         <template #footer>
@@ -59,9 +62,8 @@
 import Editor from './Editor/index.vue';
 import Debug from './Debug/index.vue';
 import Operator from './Operator/index.vue';
-import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
 import { cloneDeep } from 'lodash-es';
-import { PropertyMetadata } from '@/views/device/Product/typings';
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 interface Emits {
     (e: 'save', data: string | undefined): void;
     (e: 'close'): void;
@@ -77,8 +79,7 @@ const props = defineProps({
 });
 
 const _value = ref<string | undefined>(props.value);
-const _disabled = ref<boolean>(true);
-const fullRef = inject(FULL_CODE);
+const tableWrapperRef = useTableWrapper()
 const tips = ref<any[]>([])
 const handleCancel = () => {
     emit('close');
@@ -110,7 +111,7 @@ const getAllCrud = () => {
     console.log(item)
     const config = item
     tips.value.push({
-      label: `${config.name}$recent实时值`, 
+      label: `${config.name}$recent实时值`,
       insertText:`$recent ("${config.id}")`,
       kind: 18,
     })
@@ -151,14 +152,14 @@ getAllCrud()
     width: 100%;
 
     .left {
-        width: 60%;
+        width: 75%;
     }
 
     .right {
-        width: 40%;
+        flex: 1 1 0;
         margin-left: 10px;
         padding-left: 10px;
         border-left: 1px solid lightgray;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/GeoComponent/index.vue b/src/components/GeoComponent/index.vue
index ceb4f8b8..9ed714f3 100644
--- a/src/components/GeoComponent/index.vue
+++ b/src/components/GeoComponent/index.vue
@@ -3,7 +3,7 @@
     <div class="page-container">
         <j-input allowClear v-model:value="inputPoint">
             <template #addonAfter>
-                <environment-outlined @click="modalVis = true" />
+                <environment-outlined @click="showMap" />
             </template>
         </j-input>
         <j-modal
@@ -101,6 +101,11 @@ const clickMap = (e: any) => {
     position.value = [e.lnglat.lng, e.lnglat.lat];
 };
 
+const showMap = () => {
+  mapPoint.value = props.point
+  modalVis.value = true;
+}
+
 /**
  * 选择搜索结果
  * @param e
@@ -110,6 +115,8 @@ const selectPoi = (e: any) => {
     mapPoint.value = selectPoint.join(',');
     map.setCenter(selectPoint);
 };
+
+
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/components/Metadata/Table/Table.vue b/src/components/Metadata/Table/Table.vue
new file mode 100644
index 00000000..792f4067
--- /dev/null
+++ b/src/components/Metadata/Table/Table.vue
@@ -0,0 +1,468 @@
+<template>
+  <div :class="{
+    'metadata-edit-table-wrapper': true,
+    'table-full-screen': isFullscreen
+  }" ref="tableWrapper">
+    <div class="metadata-edit-table-extra">
+      <slot name="extra" :isFullscreen="isFullscreen" :fullScreenToggle="toggle"/>
+    </div>
+    <div class="metadata-edit-table">
+      <div class="metadata-edit-table-header" style="height: 50px" :style="{paddingRight: scrollWidth + 'px'}">
+        <Header
+          :columns="myColumns"
+          :style="{width: tableStyle.width}"
+        />
+      </div>
+      <div class="metadata-edit-table-body" :style="{width: tableStyle.width, height: `${height}px`}">
+        <Body
+          ref="tableBody"
+          :dataSource="bodyDataSource"
+          :columns="myColumns"
+          :cellHeight="cellHeight"
+          :height="height"
+          :disableMenu="disableMenu"
+          :rowKey="rowKey"
+          :groupKey="groupActive.value"
+          :openGroup="openGroup"
+          :rowSelection="rowSelection"
+          @scrollDown="onScrollDown"
+        >
+        <template v-for="(_, name) in slots" #[name]="slotData">
+          <slot :name="name" v-bind="slotData || {}"/>
+        </template>
+        </Body>
+        <slot name="bodyExtra"></slot>
+      </div>
+      <Group
+        v-if="dataSource.length && openGroup"
+        v-model:activeKey="groupActive.value"
+        :options="groupOptions"
+        @add="addGroup"
+        @delete="groupDelete"
+        @edit="groupEdit"
+        @change="updateGroupActive"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup name="MetadataBaseTable">
+import {
+  FULL_SCREEN,
+  RIGHT_MENU,
+  TABLE_DATA_SOURCE,
+  TABLE_ERROR,
+  TABLE_GROUP_ACTIVE,
+  TABLE_GROUP_ERROR,
+  TABLE_GROUP_OPTIONS,
+  TABLE_OPEN_GROUP,
+  TABLE_TOOL,
+  TABLE_WRAPPER
+} from './consts'
+import {handleColumnsWidth} from './utils'
+import {useGroup, useResizeObserver, useValidate} from './hooks'
+import {tableProps} from 'ant-design-vue/lib/table'
+import {useFormContext} from './context'
+import Header from './header.vue'
+import Body from './body.vue'
+import {useFullscreen} from '@vueuse/core';
+import {provide, useAttrs, useSlots} from 'vue'
+import Group from './group.vue'
+import {bodyProps} from "./props";
+import {findIndex, get, sortBy} from 'lodash-es'
+
+const emit = defineEmits(['scrollDown', 'rightMenuClick', 'editChange', 'groupDelete', 'groupEdit'])
+
+const props = defineProps({
+  ...tableProps(),
+  ...bodyProps(),
+  serial: {
+    type: [Object, Boolean],
+    default: () => ({
+      width: 66,
+      title: '序号'
+    })
+  },
+  validateRowKey: {
+    type: Boolean,
+    default: false
+  },
+})
+
+const slots = useSlots()
+const attrs = useAttrs()
+
+const myColumns = ref([])
+const tableWrapper = ref()
+const tableBody = ref()
+const tableStyle = reactive({
+  width: '100%',
+  height: props.height
+})
+
+const fields = {}
+const defaultGroupId = 'group_1'
+
+const fieldsErrMap = ref({})
+const fieldsGroupError = ref({})
+
+const sortData = reactive({
+  key: undefined,
+  order: undefined,
+  orderKeys: [],
+  dataIndex: undefined
+})
+
+const {
+  groupActive,
+  groupOptions,
+  addGroup,
+  removeGroup,
+  updateGroupActive,
+  updateGroupOptions
+} = useGroup(props.openGroup)
+
+const _dataSource = computed(() => {
+  const _options = new Map()
+
+  const sortDataSource = sortData.key ?
+    sortBy(props.dataSource, (val) => {
+      if (!val.id) return 99999999
+
+      const index = findIndex(sortData.orderKeys, val2 => get(val, sortData.key) === val2)
+      return sortData.order === 'desc' ? index : ~index + 1
+    }) : props.dataSource
+
+  sortDataSource.forEach((item, index) => {
+    item.__dataIndex = index
+    if (props.openGroup) {
+      const _groupId = item.expands?.groupId
+      if (!_groupId) {
+        item.expands.groupId = groupActive.value || defaultGroupId
+        item.expands.groupName = groupActive.label || '分组_1'
+      }
+
+      const _optionsItem = _options.get(item.expands.groupId)
+
+      if (!_optionsItem) {
+        _options.set(item.expands.groupId, {
+          value: item.expands?.groupId,
+          label: item.expands?.groupName,
+          effective: item.id ? 1 : 0, // 有效数据长度
+          len: 1 // 分组数据总长度
+        })
+      } else {
+        if (item.id) {
+          _optionsItem.effective += 1
+        }
+        _optionsItem.len += 1
+        _options.set(item.expands.groupId, _optionsItem)
+      }
+
+      item.__serial = _optionsItem?.len || 1
+    } else {
+      item.__serial = index + 1
+    }
+  })
+
+  if (props.openGroup) {
+    updateGroupOptions([..._options.values()])
+  }
+
+  return sortDataSource
+})
+
+const bodyDataSource = computed(() => {
+  if (props.openGroup) {
+    return _dataSource.value.filter(item => {
+      return item.expands.groupId === groupActive.value
+    })
+  }
+  return _dataSource.value
+})
+
+useResizeObserver(tableWrapper, onResize)
+
+const {isFullscreen, toggle} = useFullscreen(tableWrapper);
+
+const {rules, validateItem, validate, errorMap} = useValidate(
+  _dataSource,
+  props.columns,
+  props.rowKey,
+  {
+    onError: (err) => {
+      fieldsErrMap.value = {}
+      fieldsGroupError.value = {}
+      const errMap = {}
+
+      // 显示全部err红标
+      err.forEach((item, errIndex) => {
+        item.forEach((e, eIndex) => {
+          const field = findField(e.__dataIndex, e.field)
+
+          const _eventKey = field ? field.eventKey : `${e.__dataIndex}-${e.field}`
+          if (field) {
+            field.showErrorTip(e.message)
+          }
+          errMap[_eventKey] = e.message
+
+          if (errIndex === 0 && eIndex === 0) {
+
+            if (props.openGroup) {
+              const expands = _dataSource.value[e.__dataIndex].expands
+              updateGroupActive(expands.groupId, expands.groupName)
+            }
+
+            setTimeout(() => {
+              tableBody.value.scrollTo(e.__serial - 1)
+            }, 10)
+          }
+        })
+      })
+
+      fieldsErrMap.value = errMap
+
+    },
+    onSuccess: () => {
+      fieldsErrMap.value = {}
+    },
+    onEdit: () => {
+      emit('editChange', true)
+    },
+    validateRowKey: props.validateRowKey
+  }
+)
+
+provide(TABLE_WRAPPER, tableWrapper)
+provide(FULL_SCREEN, isFullscreen)
+provide(RIGHT_MENU, {click: rightMenu, getPopupContainer: () => tableWrapper.value})
+provide(TABLE_ERROR, fieldsErrMap)
+provide(TABLE_GROUP_ERROR, fieldsGroupError)
+provide(TABLE_DATA_SOURCE, _dataSource)
+provide(TABLE_OPEN_GROUP, props.openGroup)
+provide(TABLE_TOOL, {
+  scrollTo: (record) => {
+    if (props.openGroup) {
+      const expands = record.expands
+      updateGroupActive(expands.groupId, expands.groupName)
+    }
+
+    setTimeout(() => {
+      tableBody.value.scrollTo(record.__serial)
+    }, 10)
+  },
+  selected: (keys) => {
+    tableBody.value.updateSelectedKeys(keys)
+  },
+  order: (type, key, orderKeys, dataIndex) => {
+    sortData.key = key
+    sortData.order = type
+    sortData.orderKeys = orderKeys
+    sortData.dataIndex = dataIndex
+  },
+  cleanOrder: () => {
+    sortData.key = undefined
+    sortData.order = undefined
+    sortData.orderKeys = []
+    sortData.dataIndex = undefined
+  },
+  sortData
+})
+provide(TABLE_GROUP_OPTIONS, groupOptions)
+provide(TABLE_GROUP_ACTIVE, groupActive)
+
+const addField = (key, field) => {
+  fields[key] = field
+}
+
+const removeField = (key) => {
+  delete fields[key]
+}
+
+function findField(index, name) {
+  const fieldId = Object.keys(fields).find(key => {
+    const {names} = fields[key]
+    return names[0] === index && names[1] === name
+  })
+  return fields[fieldId]
+}
+
+function removeFieldError(key) {
+  delete fieldsErrMap.value[key]
+}
+
+function addFieldError(key, message) {
+  fieldsErrMap.value[key] = message
+}
+
+const scrollWidth = computed(() => {
+  return (props.dataSource.length * props.cellHeight) > props.height ? 17 : 0
+})
+
+function onResize({width = 0, height}) {
+
+  const _width = width - scrollWidth.value
+
+  tableStyle.width = width || '100%'
+
+  // tableStyle.height = height - 146
+
+  let newColumns = [...props.columns]
+
+  if (props.serial) {
+    const serial = {
+      dataIndex: '__serial',
+      title: props.serial.title || '序号',
+      customRender: (customData) => {
+        if (props.serial?.customRender) {
+          return props.serial?.customRender(customData)
+        }
+        return customData.index + 1
+      },
+      width: props.serial?.width
+    }
+    newColumns = [serial, ...props.columns]
+  }
+
+  myColumns.value = handleColumnsWidth(newColumns, _width)
+}
+
+const onScrollDown = (len) => {
+  emit('scrollDown', len)
+}
+
+function rightMenu(menuType, record, copyValue) {
+  emit('rightMenuClick', menuType, record, copyValue)
+}
+
+const scrollToById = (key) => {
+  const _index = _dataSource.value.findIndex(item => item[props.rowKey] === key)
+  tableBody.value.scrollTo(_index)
+}
+
+const scrollToByIndex = (index) => {
+  tableBody.value.scrollTo(index)
+}
+
+const getTableWrapperRef = () => {
+  return tableWrapper.value
+}
+
+const groupDelete = (id, index) => {
+  removeGroup(index)
+  Object.keys(fieldsErrMap.value).forEach(errorKey => {
+    const [index] = errorKey.split('-')
+    const dataSourceItem = _dataSource.value[index]
+    const groupId = dataSourceItem.expands?.groupId
+    if (groupId === id) {
+      removeFieldError(errorKey)
+      removeField(errorKey)
+    }
+  })
+  emit('groupDelete', id)
+}
+
+const groupEdit = (record) => {
+  emit('groupEdit', record)
+}
+
+const getGroupActive = () => {
+  return groupActive.value
+}
+
+watch(() => fieldsErrMap.value, (errorMap) => {
+  fieldsGroupError.value = {}
+
+  if (props.openGroup) {
+    const _errorObj = errorMap
+    const groupErrorMap = {}
+
+    Object.keys(_errorObj).forEach(errorKey => {
+      const [index] = errorKey.split('-')
+      const dataSourceItem = _dataSource.value[index]
+      const groupId = dataSourceItem.expands?.groupId
+
+      const groupError = groupErrorMap[groupId]
+
+      const groupErrorItem = {
+        [errorKey]: {
+          message: _errorObj[errorKey],
+          index,
+          serial: dataSourceItem.__serial
+        }
+      }
+
+      if (groupError) {
+        groupError.push(groupErrorItem)
+      } else {
+        groupErrorMap[groupId] = [groupErrorItem]
+      }
+    })
+    console.log(groupErrorMap)
+
+    fieldsGroupError.value = groupErrorMap
+  }
+}, {deep: true})
+
+watch(() => scrollWidth.value, () => {
+  onResize({width: tableStyle.width})
+})
+
+useFormContext({
+  dataSource: computed(() => {
+    return props.dataSource
+  }),
+  errorMap,
+  rules,
+  addField,
+  removeField,
+  removeFieldError,
+  addFieldError,
+  validateItem
+})
+
+defineExpose({
+  validate,
+  tableWrapper,
+  scrollToById,
+  scrollToByIndex,
+  getTableWrapperRef,
+  getGroupActive
+})
+</script>
+
+<style scoped lang="less">
+.metadata-edit-table-wrapper {
+  background: #fff;
+  height: 100%;
+  position: relative;
+
+  &.table-full-screen {
+    padding: 24px;
+  }
+
+  .metadata-edit-table {
+    display: flex;
+    flex-direction: column;
+    flex-grow: 0;
+    flex-shrink: 0;
+    background: #fafafa;
+    transition: background-color .3s ease;
+
+    .metadata-edit-table-header {
+      overflow: hidden;
+      width: 100%;
+    }
+
+    .metadata-edit-table-body {
+      background-color: #fff;
+      overflow-y: hidden;
+      position: relative;
+      height: 100%;
+      width: 100%;
+      flex: 1 1 auto;
+      flex-direction: row;
+    }
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/TableFormItem.vue b/src/components/Metadata/Table/TableFormItem.vue
new file mode 100644
index 00000000..83f5e27f
--- /dev/null
+++ b/src/components/Metadata/Table/TableFormItem.vue
@@ -0,0 +1,201 @@
+<template>
+  <a-tooltip
+    color="#ffffff"
+    :get-popup-container="popContainer"
+    :arrowPointAtCenter="true"
+  >
+    <template #title>
+      <span style="color: #1d2129">{{errorMap.message}}</span>
+    </template>
+    <div v-if="errorMap.visible" class="table-form-error-target" ></div>
+  </a-tooltip>
+  <div :id="eventKey" style="position: relative" :class="{'edit-table-form-has-error': errorMap.message }">
+    <slot />
+  </div>
+</template>
+
+<script setup name="TableFormItem">
+import {useInjectError, useInjectForm, useTableWrapper} from "./context";
+import {get, isArray } from 'lodash-es'
+import {onBeforeUnmount, computed} from "vue";
+import { useProvideFormItemContext } from 'ant-design-vue/es/form/FormItemContext'
+import {TABLE_FORM_ITEM_ERROR} from "@/components/Metadata/Table/consts";
+
+const props = defineProps({
+  name: {
+    type: [String, Array],
+    default: undefined
+  },
+  required: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['change'])
+
+const tableWrapperRef = useTableWrapper()
+const context = useInjectForm()
+const globalErrorMessage = useInjectError()
+
+let hideTimer
+
+const eventKey = computed(() => {
+  const names = isArray(props.name) ? props.name : [props.name]
+  return names.join('-')
+})
+
+const errorMap = reactive({
+  message: '',
+  visible: false
+})
+
+const filedId = computed(() => {
+  const names = isArray(props.name) ? props.name : [props.name]
+  return names.join('_')
+})
+
+const filedName = computed(() => {
+  const names = isArray(props.name) ? props.name : [props.name]
+  const _rules = context.rules.value
+  let tempKey = undefined
+
+  for (const key of names) {
+    if (key in _rules) {
+      tempKey = key
+    }
+  }
+
+  return tempKey
+})
+
+const filedValue = computed(() => {
+  return get(context.dataSource.value, props.name)
+})
+
+provide(TABLE_FORM_ITEM_ERROR, errorMap)
+
+const popContainer = (e) => {
+  return e
+}
+
+const removeTimer = () => {
+  if (hideTimer) {
+    window.clearTimeout(hideTimer)
+    hideTimer = null
+  }
+}
+const showErrorTip = (msg) => {
+  removeTimer()
+  errorMap.message = msg
+  errorMap.visible = true
+}
+
+const hideErrorTip = () => {
+  errorMap.visible = false
+  removeTimer()
+  hideTimer = setTimeout(() => {
+    errorMap.message = ''
+  }, 300)
+}
+const validateRules = () => {
+  let index = 0
+  if (isArray(props.name)) {
+    index = props.name[0]
+  }
+
+  const promise = context.validateItem({ [filedName.value]: get(context.dataSource.value, props.name) }, index)
+  promise.catch(res => {
+    const error = res?.filter(item => item.field === filedName.value) || []
+    if (error.length === 0) {
+      hideErrorTip()
+      context.removeFieldError(eventKey.value)
+    } else {
+      removeTimer()
+      errorMap.message = error[0]?.message || errorMap.message
+      errorMap.visible = !!error.length
+      context.addFieldError(eventKey.value, errorMap.message)
+    }
+    return errorMap.message
+  })
+
+  return promise
+}
+
+const onFieldBlur = () => {
+  // validateRules()
+}
+
+const onFieldChange = () => {
+  validateRules()
+  emit('change')
+}
+
+watch(() => globalErrorMessage.value, (val) => {
+  if (val[eventKey.value]) {
+    showErrorTip(val[eventKey.value])
+  } else {
+    hideErrorTip()
+  }
+}, { immediate: true, deep: true})
+
+useProvideFormItemContext({
+  id: filedId,
+  onFieldChange,
+  onFieldBlur,
+}, computed(() => get(context.dataSource.value, props.name)))
+
+onBeforeUnmount(() => {
+  hideErrorTip()
+  // context.removeField(eventKey.value)
+})
+
+watch(() => [filedName.value, props.name], () => {
+  context.addField(eventKey.value, {
+    filedName: filedName.value,
+    eventKey: eventKey.value,
+    names: props.name,
+    validateRules,
+    showErrorTip
+  })
+}, { immediate: true })
+
+</script>
+
+<style scoped lang="less">
+.table-form-error-target {
+  position: absolute;
+  right: 2px;
+  top: -9px;
+  border: 16px solid transparent;
+  border-top-color: @error-color;
+  border-right-width: 0;
+  border-bottom-width: 0;
+}
+</style>
+
+<style lang="less">
+.edit-table-form-has-error {
+
+  .select-no-value {
+    .ant-select-selector {
+      border-color: @error-color !important;
+      &:focus {
+        box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
+      }
+    }
+  }
+
+  > input {
+    border-color: @error-color !important;
+
+    &:focus {
+      box-shadow: 0 0 0 2px var(--ant-error-color-outline) !important;
+    }
+  }
+
+  .table-form-required-aicon {
+    color: @error-color;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/body.vue b/src/components/Metadata/Table/body.vue
new file mode 100644
index 00000000..e8fea0c4
--- /dev/null
+++ b/src/components/Metadata/Table/body.vue
@@ -0,0 +1,282 @@
+<template>
+  <div
+    v-if="dataSource.length"
+    class="metadata-edit-table-body-viewport" :style="{ ...style, height: height + 'px'}" ref="viewScrollRef" @scroll="onScroll">
+    <div :style="{position: 'relative'}">
+      <div class="metadata-edit-scrollbar" :style="containerStyle"> </div>
+      <div class="metadata-edit-table-center" ref="tableCenterRef" >
+        <div
+            v-if="virtualData.length"
+            v-for="(item, index) in virtualData"
+            :class="{
+              'metadata-edit-table-row': true,
+              'metadata-edit-table-row-selected': selectedRowKeys?.includes(item[rowKey] || virtualRang.start + index + 1)
+            }"
+            :key="`record_${item.__key}`"
+            :style="{height: `${cellHeight}px`,}"
+            :data-row-key="item[rowKey] || virtualRang.start + index + 1"
+            @click.right.native="(e) => showContextMenu(e,item, virtualRang.start + index)"
+            @click.stop="() => rowClick(item)"
+        >
+          <div
+              v-for="column in columns"
+              class="metadata-edit-table-cell"
+              :style="{
+                width: `${column.width}px`,
+                left: `${column.left}px`,
+              }"
+          >
+            <div v-if="column.dataIndex === '__serial'" class="body-cell-box">
+              <slot name="serial" :record="item" :index="item.__dataIndex" :column="column" >
+                {{ virtualRang.start + index + 1 }}
+              </slot>
+            </div>
+            <div v-else class="body-cell-box">
+              <slot :name="column.dataIndex" :record="item" :index="item.__dataIndex" :column="column" >
+                {{ item[column.dataIndex] }}
+              </slot>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <template v-else>
+    <slot name="empty">
+      <div class="metadata-edit-table-body-empty">
+        <j-empty />
+      </div>
+    </slot>
+  </template>
+</template>
+
+<script setup name="MetadataBaseTableBody">
+import ContextMenu from './components/ContextMenu'
+import {useRightMenuContext} from "@/components/Metadata/Table/context";
+import {randomString} from "@/utils/utils";
+import {bodyProps} from "./props";
+
+const props = defineProps({
+  ...bodyProps(),
+  groupKey: {
+    type: [String, Number],
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['update:dataSource', 'scrollDown'])
+
+const viewScrollRef = ref()
+const tableCenterRef = ref()
+// const virtualData = ref([])
+const virtualRang = reactive({
+  start: 0,
+  end: 15
+})
+const containerStyle = ref(0)
+const context = useRightMenuContext()
+
+let scrollLock = ref(false)
+let menuInstance
+
+const maxLen = computed(() => {
+  return Math.trunc(props.height / props.cellHeight)
+})
+
+const selectedRowKeys = ref([])
+
+const virtualData = computed(()=> {
+
+  const array = props.dataSource.slice(virtualRang.start, virtualRang.end)
+  if (tableCenterRef.value) {
+    tableCenterRef.value.style.webkitTransform  =  `translate3d(0, ${virtualRang.start * props.cellHeight}px, 0)`
+  }
+  return array
+})
+// const updateVirtualData = (start, end) => {
+//   debugger
+//   virtualData.value = props.dataSource.slice(start, end)
+//   if (tableCenterRef.value) {
+//     tableCenterRef.value.style.webkitTransform  =  `translate3d(0, ${start * props.cellHeight}px, 0)`
+//   }
+// }
+
+const onScroll = () => {
+  const height = viewScrollRef.value.scrollTop
+  const clientHeight = viewScrollRef.value.clientHeight
+  const scrollHeight = viewScrollRef.value.scrollHeight
+
+  const _index = Math.round(height / props.cellHeight) - 1
+
+
+  const start = _index < 0 ? 0 : _index
+  const end = start + maxLen.value + 4
+
+  if (height + clientHeight >= props.dataSource.length * props.cellHeight && !scrollLock.value) { // 滚动到底
+    emit('scrollDown')
+    scrollLock.value = true
+  }
+
+  virtualRang.start = start
+  virtualRang.end = end
+  // updateVirtualData(start, end)
+}
+
+const scrollTo = (index) => {
+  if (viewScrollRef.value) {
+    let top = index * props.cellHeight
+    viewScrollRef.value.scrollTop = top
+  }
+}
+
+const showContextMenu = (e, record, _index) => {
+  e.preventDefault()
+  if (props.disableMenu) {
+    record = {
+      ...record,
+      __index: _index
+    }
+    menuInstance = ContextMenu(e, record, context)
+  }
+}
+
+// const updateView = () => {
+//   updateVirtualData(virtualRang.start, virtualRang.start + maxLen.value)
+// }
+
+const rowClick = (record) => {
+  if (props.rowSelection?.selectedRowKeys) {
+    const rowSet = new Set(selectedRowKeys.value)
+    const key = record[props.rowKey]
+    const selected = !rowSet.has(key)
+
+    if (selected) {
+      rowSet.delete(key)
+    } else {
+      rowSet.add(key)
+    }
+
+    props.rowSelection.onSelect?.(record, selected )
+
+    selectedRowKeys.value = [...rowSet.values()]
+  }
+}
+
+const updateSelectedKeys = (keys) => {
+  selectedRowKeys.value = keys
+}
+
+onMounted(() => {
+  nextTick(() => {
+    onScroll()
+  })
+})
+
+onBeforeUnmount(() => {
+  menuInstance?.destroy()
+  menuInstance?.cleanCopy()
+})
+
+watch(() => JSON.stringify(props.rowSelection?.selectedRowKeys), (val) => {
+  selectedRowKeys.value = JSON.parse(val || '[]')
+}, { immediate: true })
+
+watch(() => props.dataSource, (val, oldVal) => {
+
+  props.dataSource.forEach((item, index) => {
+    if (!item.__key) {
+      item.__key = randomString()
+    }
+  })
+
+  // updateView()
+
+}, {
+  immediate: true,
+  deep: true
+})
+
+watch(() => props.dataSource.length, () => {
+  scrollLock.value = false
+  containerStyle.value = {
+    height: props.dataSource.length * props.cellHeight + 'px'
+  }
+
+  if (props.dataSource.length <= maxLen.value || props.dataSource.length === 0) {
+    emit('scrollDown', maxLen.value - props.dataSource.length + 3)
+  }
+}, { immediate: true})
+
+// watch(() => props.height, () => {
+//   updateView()
+// })
+
+watch(() => props.groupKey, () => {
+  if (props.openGroup) {
+    scrollTo(0)
+  }
+})
+
+defineExpose({
+  scrollTo,
+  updateSelectedKeys
+})
+
+</script>
+
+<style scoped lang="less">
+.metadata-edit-table-body-viewport {
+  max-height: 100%;
+  width: 100%;
+  overflow: hidden auto;
+  position: relative;
+
+  .metadata-edit-scrollbar {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    z-index: -1;
+  }
+
+  .metadata-edit-table-body-container {
+    overflow: hidden;
+    height: 100%;
+  }
+
+  .metadata-edit-table-center {
+    position: relative;
+    flex: 1 1 auto;
+    min-width: 0;
+    height: 100%;
+
+    .metadata-edit-table-row {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      //position: absolute;
+      transition: top .2s, height .2s, background-color .1s;
+      border-bottom: 1px solid #ebebeb;
+
+      &:hover {
+        background-color: rgb(248, 248, 248);
+      }
+
+      &.metadata-edit-table-row-selected {
+        background-color: var(--ant-primary-1);
+      }
+
+      .body-cell-box {
+        padding: 0 12px;
+        position: relative;
+      }
+    }
+  }
+}
+.metadata-edit-table-body-empty {
+  display: flex;
+  width: 100%;
+  justify-content: center;
+  padding-top: 24px;
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Array/index.vue b/src/components/Metadata/Table/components/Array/index.vue
new file mode 100644
index 00000000..4247555e
--- /dev/null
+++ b/src/components/Metadata/Table/components/Array/index.vue
@@ -0,0 +1,216 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 450px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <a-form-item label="元素类型" required name="type" :rules="rules" :validate-first="true">
+            <TypeSelect v-model:value="formData.type"/>
+          </a-form-item>
+          <ScaleItem v-if="showDouble" v-model:value="formData.scale" />
+          <StringItem v-else-if="showString" v-model:value="formData.expands.maxLength" />
+          <BooleanItem v-else-if="showBoolean" v-model:value="formData.boolean" name="boolean"/>
+          <DateItem v-else-if="showDate" v-model:value="formData.format"/>
+          <EnumItem ref="enumTableRef" v-else-if="showEnum" v-model:value="formData.enum.elements"/>
+          <a-form-item v-else-if="showArray" label="子元素类型" required :name="['elementType','type']" :rules="[{ required: true, message: '请选择子元素类型'}]">
+            <TypeSelect  v-model:value="formData.elementType.type" :filter="['array', 'object']" />
+          </a-form-item>
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value.type}"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataArray">
+import { PopoverModal, TypeSelect } from '../index'
+import ScaleItem from '../Double/ScaleItem.vue'
+import StringItem from '../String/Item.vue'
+import BooleanItem from '../Boolean/Item.vue'
+import DateItem from '../Date/Item.vue'
+import EnumItem from '../Enum/Item.vue'
+import {cloneDeep, pick} from 'lodash-es'
+import {Form} from "ant-design-vue";
+
+const emit = defineEmits(['update:value', 'cancel', 'confirm']);
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({}),
+  },
+  unitOptions: {
+    type: [Array, Function],
+    default: () => []
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const formRef = ref()
+const enumTableRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  type: props.value?.type,
+  scale: props.value?.scale,
+  expands: {
+    maxLength: props.value?.maxLength || props.value?.expands?.maxLength,
+  },
+  boolean: {
+    trueText: props.value?.trueText || '是',
+    trueValue: props.value?.trueValue || 'true',
+    falseText: props.value?.falseText || '否',
+    falseValue: props.value?.falseValue || 'false',
+  },
+  format: props.value?.format,
+  enum: {
+    multiple: props.value?.multiple,
+    elements: cloneDeep(props.value?.elements) || [],
+  },
+  elementType: props.value?.type === 'array' ? props.value.elementType : {
+    type: undefined
+  }
+});
+
+const showDouble = computed(() => {
+  return ['float', 'double'].includes(formData.type)
+})
+
+const showString = computed(() => {
+  return ['string', 'password'].includes(formData.type)
+})
+
+const showBoolean = computed(() => {
+  return formData.type === 'boolean'
+})
+
+const showDate = computed(() => {
+  return formData.type === 'date'
+})
+
+const showEnum = computed(() => {
+  return formData.type === 'enum'
+})
+
+const showArray = computed(() => {
+  return formData.type === 'array'
+})
+
+const rules = [
+  {
+    validator(_, value) {
+      if (!value) {
+        return Promise.reject('请选择元素类型');
+      }
+      return Promise.resolve();
+    },
+    trigger: 'change',
+  },
+];
+
+const typeChange = (e) => {
+  if (['float', 'double'].includes(e)) {
+    formData.scale = 2;
+  }
+};
+
+const initValue = () => {
+  formData.type = props.value?.type;
+  formData.scale = props.value?.scale;
+  formData.expands.maxLength = props.value?.maxLength || props.value?.expands?.maxLength;
+  formData.boolean = {
+    trueText: props.value?.trueText || '是',
+    trueValue: props.value?.trueValue || 'true',
+    falseText: props.value?.falseText || '否',
+    falseValue: props.value?.falseValue || 'false',
+  };
+  formData.format = props.value?.format;
+  formData.enum = {
+    multiple: props.value?.multiple,
+    elements: cloneDeep(props.value?.elements || []),
+  };
+
+  formData.elementType = props.value?.type === 'array' ? props.value.elementType : {
+    type: undefined
+  }
+};
+
+const handleValue = (type, data) => {
+  let newObject = {};
+  switch (type) {
+    case 'float':
+    case 'double':
+      newObject = pick(data, 'scale');
+      break;
+    case 'boolean':
+      newObject = { ...data.boolean };
+      break;
+    case 'enum':
+      newObject.elements = data.enum.elements;
+      break;
+    case 'string':
+    case 'password':
+      newObject = pick(data, 'expands');
+      break;
+    case 'date':
+      newObject = pick(data, 'format');
+      break;
+    case 'array':
+      newObject = pick(data, 'elementType')
+  }
+
+  return {
+    type: type,
+    ...newObject,
+  };
+};
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  let enumTable = true
+  if (enumTableRef.value) {
+    enumTable = !!(await enumTableRef.value.validate())
+  }
+  if (data && enumTable) {
+
+    visible.value = false
+    const _value = handleValue(formData.type, formData)
+    emit('update:value', _value);
+    emit('confirm', _value);
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  initValue();
+  emit('cancel');
+}
+
+watch(() => JSON.stringify(props.value), () => {
+  initValue()
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Boolean/Item.vue b/src/components/Metadata/Table/components/Boolean/Item.vue
new file mode 100644
index 00000000..1af7a496
--- /dev/null
+++ b/src/components/Metadata/Table/components/Boolean/Item.vue
@@ -0,0 +1,67 @@
+<template>
+  <a-form-item
+    label="布尔值"
+    required
+    :name="name"
+    :rules="rules"
+    :validate-first="true"
+  >
+    <Content
+      v-model:value="myValue"
+      @change="change"
+    />
+  </a-form-item>
+</template>
+
+<script setup name="MetadataBooleanItem">
+import Content from './ItemContext.vue'
+
+const emits = defineEmits([
+  'update:value',
+  'change'
+])
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({}),
+  },
+  name: {
+    type: String,
+    default: 'value',
+  },
+});
+
+const myValue = ref(props.value)
+
+const rules = [{
+  validator(_, v) {
+    const isMax = Object.values(v).some(
+      (item) => item.length > 64,
+    );
+    const isNull = Object.values(v).some((item) => !item);
+    if (isMax) {
+      return Promise.reject('最多可输入64个字符');
+    }
+
+    if (isNull) {
+      return Promise.reject('请输入布尔值');
+    }
+
+    return Promise.resolve();
+  }
+}]
+
+const change = () => {
+  emits(`update:value`, myValue.value)
+  emits(`change`, myValue.value)
+}
+
+watch(() => JSON.stringify(props.value), () => {
+  myValue.value = props.value
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Boolean/ItemContext.vue b/src/components/Metadata/Table/components/Boolean/ItemContext.vue
new file mode 100644
index 00000000..958eb41e
--- /dev/null
+++ b/src/components/Metadata/Table/components/Boolean/ItemContext.vue
@@ -0,0 +1,76 @@
+<template>
+  <div class="boolean-items">
+    <div class="boolean-item boolean-true">
+      <div class="boolean-true-text">
+        <a-input v-model:value="formData.trueText" @change="valueChange"/>
+      </div>
+      <span>-</span>
+      <div class="boolean-true-value">
+        <a-input v-model:value="formData.trueValue" @change="valueChange"/>
+      </div>
+    </div>
+    <div class="boolean-item boolean-false">
+      <div class="boolean-false-text">
+        <a-input v-model:value="formData.falseText" @change="valueChange"/>
+      </div>
+      <span>-</span>
+      <div class="boolean-false-value">
+        <a-input v-model:value="formData.falseValue" @change="valueChange"/>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="BooleanItemContext">
+
+const emits = defineEmits([
+  'update:value',
+  'change'
+])
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: {}
+  }
+})
+
+const formData = reactive({
+  trueText: props.value?.trueText || '是',
+  trueValue: props.value?.trueValue || 'true',
+  falseText: props.value?.falseText || '否',
+  falseValue: props.value?.falseValue || 'false',
+});
+
+const valueChange = () => {
+  emits(`update:value`, formData)
+  emits(`change`, formData)
+}
+
+watch(() => JSON.stringify(props.value), () => {
+  formData.trueText = props.value?.trueText;
+  formData.trueValue = props.value?.trueValue;
+  formData.falseText = props.value?.falseText;
+  formData.falseValue = props.value?.falseValue;
+})
+
+</script>
+
+<style scoped lang="less">
+.boolean-items {
+  .boolean-item {
+    display: flex;
+    gap: 4px;
+    align-items: center;
+
+    > div {
+      flex: 1;
+      min-width: 0;
+    }
+  }
+
+  .boolean-true {
+    margin-bottom: 8px;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Boolean/index.vue b/src/components/Metadata/Table/components/Boolean/index.vue
new file mode 100644
index 00000000..1437e961
--- /dev/null
+++ b/src/components/Metadata/Table/components/Boolean/index.vue
@@ -0,0 +1,117 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 250px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <Item v-model:value="formData.value" />
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" />
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataBoolean">
+import { PopoverModal } from '../index'
+import Item from './Item.vue'
+import {Form} from "ant-design-vue";
+
+const emit = defineEmits([
+  'update:trueText',
+  'update:trueValue',
+  'update:falseText',
+  'update:falseValue',
+  'confirm',
+  'cancel'
+]);
+
+const props = defineProps({
+  trueText: {
+    type: String,
+    default: undefined
+  },
+  trueValue: {
+    type: String,
+    default: undefined
+  },
+  falseText: {
+    type: String,
+    default: undefined
+  },
+  falseValue: {
+    type: String,
+    default: undefined
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const formRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  value: {
+    trueText: props.trueText || '是',
+    trueValue: props.trueValue || 'true',
+    falseText: props.falseText || '否',
+    falseValue: props.falseValue || 'false',
+  }
+})
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  if (data) {
+    visible.value = false
+    emit('update:trueText', formData.value.trueText);
+    emit('update:trueValue', formData.value.trueValue);
+    emit('update:falseText', formData.value.falseText);
+    emit('update:falseValue', formData.value.falseValue);
+    emit('confirm', formData.value);
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.value.trueText = props.trueText || '是'
+  formData.value.trueValue = props.trueValue || 'true'
+  formData.value.falseText = props.falseText || '否'
+  formData.value.falseValue = props.falseValue || 'false'
+  emit('cancel');
+}
+
+watch(() => [
+  props.trueText,
+  props.trueValue,
+  props.falseText,
+  props.falseValue,
+], () => {
+  formData.value.trueText = props.trueText || '是'
+  formData.value.trueValue = props.trueValue || 'true'
+  formData.value.falseText = props.falseText || '否'
+  formData.value.falseValue = props.falseValue || 'false'
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/BooleanSelect/index.vue b/src/components/Metadata/Table/components/BooleanSelect/index.vue
new file mode 100644
index 00000000..1b24b643
--- /dev/null
+++ b/src/components/Metadata/Table/components/BooleanSelect/index.vue
@@ -0,0 +1,80 @@
+<template>
+  <j-select
+    v-model:value="myValue"
+    style="width: 100%;"
+    :options="options"
+    :getPopupContainer="(node) => tableWrapperRef || node"
+    @change="change"
+  >
+
+  </j-select>
+</template>
+
+<script setup name="BooleanSelect">
+import {useTableWrapper} from "@/components/Metadata/Table/context";
+import {isBoolean} from "lodash-es";
+import { selectProps } from 'ant-design-vue/lib/select'
+
+const props = defineProps({
+  ...selectProps(),
+  value: {
+    type: [Boolean, Number, String],
+    default: true
+  },
+  trueLabel: {
+    type: String,
+    default: '必填',
+  },
+  falseLabel: {
+    type: String,
+    default: '不必填',
+  },
+  trueValue: {
+    type: [Boolean, Number, String],
+    default: true,
+  },
+  falseValue: {
+    type: [Boolean, Number, String],
+    default: false
+  }
+})
+
+const emit = defineEmits(['update:value', 'change'])
+const tableWrapperRef = useTableWrapper()
+
+const myValue = ref()
+
+const options = computed(() => {
+
+  const _trueValue = isBoolean(props.trueValue) ? String(props.trueValue) : props.trueValue
+  const _falseValue = isBoolean(props.falseValue) ? String(props.falseValue) : props.falseValue
+  return [
+    {
+      label: props.trueLabel,
+      value: _trueValue,
+      baseValue: props.trueValue
+    },
+    {
+      label: props.falseLabel,
+      value: _falseValue,
+      baseValue: props.falseValue
+    }
+    ]
+})
+const change = (e) => {
+  const item = options.value.find(item => item.value === myValue.value)
+  emit('update:value', item.baseValue)
+  emit('change', item.baseValue)
+}
+
+watch(() => [props.value, options.value], () => {
+  const item = options.value.find(item => item.baseValue === props.value)
+  myValue.value = item ? item.value : options.value[0].value
+
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/ContextMenu/index.ts b/src/components/Metadata/Table/components/ContextMenu/index.ts
new file mode 100644
index 00000000..042c5cfd
--- /dev/null
+++ b/src/components/Metadata/Table/components/ContextMenu/index.ts
@@ -0,0 +1,90 @@
+import MenuContext from './menu.vue'
+import { h, render } from 'vue'
+import {handlePureRecord} from "@/components/Metadata/Table/utils";
+import {omit} from "lodash-es";
+
+let curInstance: Record<string, any> | null = null
+let seed = 1
+let copyValue: any
+const contextMenu = (e: Event, data: any, context: any) => {
+    if (curInstance) {
+        curInstance.destroy()
+    }
+    curInstance = null
+
+    let id = seed++
+    // 创建一个临时的div，用于挂载我们的菜单
+    const container = document.createElement('div') as HTMLElement
+    // 获取body标签，用于挂载整个菜单
+    const appendTo = context.getPopupContainer() || document.body
+    // 传给menu组件的props
+    const props = {
+        data: data,
+        onClose: () => {
+            if(curInstance){
+                curInstance.destroy()
+            }
+        },
+        onClick: (type: string) => {
+            const copyRecord = handlePureRecord(copyValue)
+            if (copyRecord.expands) {
+                copyRecord.expands = omit(copyRecord.expands, ['isProduct'])
+            }
+            context.click(type, data, handlePureRecord(copyRecord))
+        },
+        onCopy: (data: any) => {
+            copyValue = data
+            context.click('copy', data)
+        },
+        paste: !!copyValue
+    }
+
+    // 渲染虚拟节点
+    const vnode = h(
+        MenuContext,
+        props
+    )
+    // vnode为需要渲染的虚拟节点，container为渲染的容器
+    render(vnode, container)
+    // 首先需要先把菜单真正渲染到页面，才能拿到它的宽度和高度
+    appendTo.appendChild(container.firstElementChild as Node)
+    // 当前真正的菜单节点，上面输出的vnode中可以看到，el就是我们的菜单节点
+    const curMenu = vnode.el!
+    // 获取curMenu的高度和宽度，用于临界的计算
+    const { offsetWidth, offsetHeight } = curMenu!
+    // 获取body的可视区域的宽度
+    const { clientWidth } = appendTo
+    // 取出右键点击时的坐标，clientX是距离左侧的位置，clientY是距离顶部的位置
+    const { clientX, clientY } = e
+
+    // 当前可视区域的宽度 - 当前鼠标距离浏览器左边的距离
+    // 如果 大于菜单的宽度，说明正常设置菜单距离左边界的距离,即设置style.left
+    // 否则菜单需要在鼠标左侧展示，即需要设置style.right组件距离可视区域右侧的距离
+    const leftOrRight = clientWidth - clientX > offsetWidth ? "left" : "right"
+
+    // 当前浏览器的高度(不包含滚动条) - 当前鼠标距离浏览器上边的距离
+    // 如果 大于菜单的高度，说明可以正常设置菜单距离上边界的距离,即设置style.top
+    // 否则需要设置菜单距离底部边界的位置，即style.bottom
+    const topOrBottom = window.innerHeight - clientY > offsetHeight ? "top" : "bottom"
+    const offsetLeft = Math.abs(clientWidth - clientX)
+    // 设置left或者right的style
+    curMenu.style[leftOrRight] = leftOrRight === "left" ? `${clientX + 20}px` : `${offsetLeft}px`
+    // 设置top或者bottom的style
+    curMenu.style[topOrBottom] = topOrBottom === 'bottom' ? '2px' : `${clientY}px`
+
+    const instance = {
+        id,
+        destroy: () => {
+            curInstance = null
+            render(null, container)
+        },
+        cleanCopy: () => {
+            copyValue = null
+        }
+    }
+    curInstance = instance
+
+    return instance
+}
+
+export default contextMenu
diff --git a/src/components/Metadata/Table/components/ContextMenu/menu.vue b/src/components/Metadata/Table/components/ContextMenu/menu.vue
new file mode 100644
index 00000000..22840792
--- /dev/null
+++ b/src/components/Metadata/Table/components/ContextMenu/menu.vue
@@ -0,0 +1,117 @@
+<template>
+  <div
+    class="metadata-context-menu"
+    ref="contextMenu"
+    tabindex="-1"
+    @blur="close"
+  >
+    <a-menu @click="clickFunc">
+      <a-menu-item key="add">
+        <template #icon>
+          <AIcon type="PlusSquareOutlined" />
+        </template>
+        新增行
+      </a-menu-item>
+      <a-menu-item key="copy">
+        <template #icon>
+          <AIcon type="icon-copy" />
+        </template>
+         复制行
+      </a-menu-item>
+      <a-menu-item key="paste" :disabled="showPaste">
+        <template #icon>
+          <AIcon type="icon-paste" />
+        </template>
+        粘贴行
+      </a-menu-item>
+      <a-menu-item key="detail" :disabled="showDetail">
+        <template #icon>
+          <AIcon type="icon-chakan" />
+        </template>
+        查看详情
+      </a-menu-item>
+      <a-menu-item key="delete" class="danger" :disabled="showDelete">
+        <template #icon>
+          <AIcon type="DeleteOutlined" />
+        </template>
+        删除
+      </a-menu-item>
+    </a-menu>
+  </div>
+</template>
+
+<script setup name="MetadataContextMenu">
+import { onMounted, ref, nextTick } from "vue";
+import { AIcon } from 'jetlinks-ui-components'
+
+const props = defineProps({
+  data: {type: Object, default: () => ({})},
+  onClose: { type: Function, default: () => {} },
+  onClick: { type: Function, default: () => {} },
+  onCopy: { type: Function, default: () => {} },
+  paste: { type: Object, default: () => ({}) }
+});
+
+const contextMenu = ref(null);
+
+const showDetail = computed(() => {
+  return !props.data.id
+})
+
+const showPaste = computed(() => {
+  return !props.paste
+})
+
+const showDelete = computed(() => {
+  return props.data.expands?.isProduct
+})
+
+const clickFunc = ({ key }) => {
+  if (key === 'copy') {
+    props.onCopy(props.data)
+  }
+  props.onClick(key)
+};
+
+const close = (e) => {
+  setTimeout(() => {
+    props.onClose()
+  }, 300)
+}
+
+onMounted(async () => {
+// 确保组件已经渲染
+  await nextTick();
+// 触发组件focus
+  contextMenu.value.focus();
+});
+
+</script>
+
+<style scoped lang="less">
+.metadata-context-menu{
+  position: fixed;
+  box-shadow: 0 0 12px rgba(0, 0, 0 ,.2);
+  border-radius: 4px;
+  overflow: hidden;
+  width: 192px;
+  padding: 4px;
+  background-color: #fff;
+  :deep(.ant-menu) {
+    border-right: none;
+
+    .ant-menu-item {
+      margin: 0;
+      height: 32px;
+
+      &.danger {
+        color: @error-color;
+      }
+    }
+  }
+
+  :deep(.ant-menu-item-active) {
+    background-color: var(--ant-primary-1);;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Date/Item.vue b/src/components/Metadata/Table/components/Date/Item.vue
new file mode 100644
index 00000000..0d12bc1a
--- /dev/null
+++ b/src/components/Metadata/Table/components/Date/Item.vue
@@ -0,0 +1,66 @@
+<template>
+  <a-form-item
+    label="时间格式"
+    required
+    :name="name"
+    :rules="[
+            {
+                required: true,
+                message: '请选择时间格式',
+            },
+      ]"
+  >
+    <AutoComplete
+      v-model:value="date"
+      :options="options"
+      mode="tags"
+      placeholder="请选择时间格式"
+      :dropdownStyle="{ zIndex: 1072}"
+      :getPopupContainer="(node) => tableWrapperRef || node"
+      @change="change"
+    />
+  </a-form-item>
+</template>
+
+<script setup name="MetadataDateItem">
+import { AutoComplete } from 'jetlinks-ui-components'
+import {useTableWrapper} from "components/Metadata/Table/context";
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined,
+  },
+  name: {
+    type: String,
+    default: 'format',
+  },
+});
+
+const emit = defineEmits(['update:value']);
+
+const options = [
+  { label: 'yyyy-MM-dd HH:mm:ss', value: 'yyyy-MM-dd HH:mm:ss' },
+  { label: 'yyyy-MM-dd', value: 'yyyy-MM-dd' },
+  { label: 'hh:mm:ss', value: 'hh:mm:ss' },
+];
+
+const date = ref(props.value);
+
+const tableWrapperRef = useTableWrapper()
+const change = () => {
+  emit('update:value', date.value);
+};
+
+watch(
+  () => props.value,
+  () => {
+    date.value = props.value;
+  }
+);
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Date/index.vue b/src/components/Metadata/Table/components/Date/index.vue
new file mode 100644
index 00000000..da1f4fff
--- /dev/null
+++ b/src/components/Metadata/Table/components/Date/index.vue
@@ -0,0 +1,78 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 200px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <Item v-model:value="formData.format" />
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value}"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataDate">
+import { PopoverModal } from '../index'
+import Item from './Item.vue'
+import { Form } from 'ant-design-vue'
+
+const emit = defineEmits(['update:value', 'confirm', 'cancel']);
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined,
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+const formRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  format: props.value,
+})
+const onOk = async () => {
+  const data = await formRef.value.validate()
+
+  if (data) {
+    visible.value = false
+    emit('update:value', formData.format);
+    emit('confirm', formData.format);
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.format = props.value;
+  emit('cancel');
+}
+
+watch(() => props.value, (newValue) => {
+  formData.format = newValue
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Double/ScaleItem.vue b/src/components/Metadata/Table/components/Double/ScaleItem.vue
new file mode 100644
index 00000000..3b06beab
--- /dev/null
+++ b/src/components/Metadata/Table/components/Double/ScaleItem.vue
@@ -0,0 +1,48 @@
+<template>
+  <a-form-item
+    label="精度"
+    :name="name"
+  >
+    <a-input-number
+      v-model:value="scale"
+      style="width: 100%"
+      :precision="0"
+      :min="0"
+      :max="99"
+      placeholder="请输入0-99以内的整数"
+      @change="change"
+    />
+  </a-form-item>
+</template>
+
+<script setup name="MetadataScaleItem">
+const emit = defineEmits(['update:value']);
+
+const props = defineProps({
+  value: {
+    type: Number,
+    default: 0,
+  },
+  name: {
+    type: String,
+    default: 'scale',
+  },
+});
+
+const scale = ref(props.value);
+
+const change = () => {
+  emit('update:value', scale.value);
+};
+
+watch(
+  () => props.value,
+  () => {
+    scale.value = props.value;
+  });
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Double/index.vue b/src/components/Metadata/Table/components/Double/index.vue
new file mode 100644
index 00000000..3955819c
--- /dev/null
+++ b/src/components/Metadata/Table/components/Double/index.vue
@@ -0,0 +1,90 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 200px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <a-form-item label="单位" name="unit" :rules="[{ max: 64, message: '最多可输入64个字符' }]">
+            <UnitSelect v-model:value="formData.unit"/>
+          </a-form-item>
+          <ScaleItem v-model:value="formData.scale" />
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataDouble">
+import { UnitSelect, PopoverModal } from '../index'
+import ScaleItem from './ScaleItem.vue'
+import {Form} from "ant-design-vue";
+
+const emit = defineEmits(['update:value', 'cancel', 'confirm']);
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({}),
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const formRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  unit: props.value?.unit,
+  scale: props.value?.scale || 0, // 精度
+});
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  if (data) {
+    visible.value = false
+    emit('update:value', {
+      ...props.value,
+      ...formData
+    });
+    emit('confirm', {
+      ...props.value,
+      ...formData
+    });
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.unit = props.value?.unit;
+  formData.scale = props.value?.scale || 0;
+  emit('cancel');
+}
+
+watch(() => props.value, (newValue) => {
+  formData.unit = props.value?.unit;
+  formData.scale = props.value?.scale || 0;
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Enum/Item.vue b/src/components/Metadata/Table/components/Enum/Item.vue
new file mode 100644
index 00000000..0a421e53
--- /dev/null
+++ b/src/components/Metadata/Table/components/Enum/Item.vue
@@ -0,0 +1,74 @@
+<template>
+  <a-form-item :name="name" :rules="rules" :validate-first="true">
+    <template #label>
+      <span style="color: #ff4d4f; padding-right: 4px; padding-top: 2px">*</span>
+      枚举项
+    </template>
+    <Content ref="tableRef" v-model:value="dataSource" @change="change" />
+  </a-form-item>
+</template>
+
+<script setup name="MetadataEnumItem">
+import Content from './ItemContent.vue'
+
+const emit = defineEmits(['update:value'])
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => [],
+  },
+  type: {
+    type: Boolean,
+    default: false,
+  },
+  name: {
+    type: String,
+    default: 'elements',
+  },
+});
+
+
+const dataSource = ref(props.value || [])
+const tableRef = ref()
+
+const rules = [
+  {
+    validator: async (_, value) =>{
+      console.log(value, dataSource.value)
+      if (!dataSource.value?.length) {
+        return Promise.reject('请添加枚举项');
+      }
+      // console.log(tableRef, tableRef.value)
+      // const data = await tableRef.value?.validate?.()
+      // if (!data) {
+      //   return Promise.reject('');
+      // }
+      return Promise.resolve();
+    },
+  },
+];
+
+const change = () => {
+  emit('update:value', dataSource.value)
+}
+
+const validate = async () => {
+  const res = await tableRef.value?.validate()
+  return res
+}
+
+defineExpose({
+  validate
+})
+
+watch(
+  () => JSON.stringify(props.value),
+  (val) => {
+    dataSource.value = val ? JSON.parse(val) : [];
+  },
+);
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Enum/ItemContent.vue b/src/components/Metadata/Table/components/Enum/ItemContent.vue
new file mode 100644
index 00000000..df3d7c64
--- /dev/null
+++ b/src/components/Metadata/Table/components/Enum/ItemContent.vue
@@ -0,0 +1,150 @@
+<template>
+  <div>
+    <EditTable
+      ref="tableRef"
+      rowKey="value"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="false"
+      :height="200"
+      :disableMenu="false"
+      :validateRowKey="true"
+    >
+      <template #value="{ record, index }">
+        <EditTableFormItem
+          :name="[index, 'value']"
+        >
+          <a-input v-model:value="record.value" @change="valueChange"/>
+        </EditTableFormItem>
+      </template>
+      <template #text="{ record, index }">
+        <EditTableFormItem
+          :name="[index, 'text']"
+        >
+          <a-input v-model:value="record.text" @change="valueChange"/>
+        </EditTableFormItem>
+      </template>
+      <template #action="{ index }">
+        <a-button danger type="link"  @click="() => deleteItem(index)">
+          <template #icon>
+            <AIcon type="DeleteOutlined" />
+          </template>
+        </a-button>
+      </template>
+    </EditTable>
+    <a-button class="enum-table-add" @click="addItem">
+      <template #icon><AIcon type="PlusOutlined" /></template>
+      新增枚举项
+    </a-button>
+  </div>
+</template>
+
+<script setup name="EnumItemContent">
+import EditTable from '../../Table.vue'
+import EditTableFormItem from '../../TableFormItem.vue'
+import { Form } from "ant-design-vue";
+
+const emit = defineEmits(['update:value', 'change'])
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => [],
+  },
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const dataSource = ref(props.value || [])
+const tableRef = ref()
+
+const columns = [{
+  title: 'Value',
+  dataIndex: 'value',
+  form: {
+    rules: [
+      { max: 64, message: '最多可输入64个字符' },
+      {
+        asyncValidator: (rule, value, ...setting) => {
+          const option = setting[2]
+
+          if (!value) {
+            return Promise.reject('请输入Value值')
+          }
+
+          const isSome = dataSource.value.some((item) => {
+            return item.__dataIndex !== option.index && item.value === value
+          })
+
+          if (isSome) {
+            return Promise.reject('该Value值已存在')
+          }
+          return Promise.resolve();
+        }
+      }
+    ]
+  },
+},
+  {
+    title: 'Text',
+    dataIndex: 'text',
+    width: 150,
+    form: {
+      rules: [
+        { required: true, message: '请输入Text' },
+        { max: 64, message: '最多可输入64个字符' },
+      ]
+    }
+  },
+  {
+    title: '操作',
+    dataIndex: 'action',
+    width: 60,
+  },
+]
+
+const deleteItem = (index) => {
+  dataSource.value.splice(index, 1)
+  emit('update:value', dataSource.value)
+  emit('change', dataSource.value)
+  formItemContext.onFieldChange()
+}
+
+const addItem = () => {
+  dataSource.value.push({
+    value: undefined,
+    text: undefined
+  })
+  emit('update:value', dataSource.value)
+  emit('change', dataSource.value)
+  formItemContext.onFieldChange()
+}
+
+const valueChange = () => {
+  emit('update:value', dataSource.value)
+  emit('change', dataSource.value)
+  formItemContext.onFieldChange()
+}
+
+const validate = async () => {
+  const res = await tableRef.value?.validate()
+  return res
+}
+
+defineExpose({
+  validate
+})
+
+watch(
+  () => JSON.stringify(props.value),
+  () => {
+    dataSource.value = props.value || [];
+  },
+);
+</script>
+
+<style scoped>
+.enum-table-add {
+  width: 100%;
+  margin-top: 4px;
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Enum/index.vue b/src/components/Metadata/Table/components/Enum/index.vue
new file mode 100644
index 00000000..539c1528
--- /dev/null
+++ b/src/components/Metadata/Table/components/Enum/index.vue
@@ -0,0 +1,87 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 450px" v-if="visible">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <Item ref="tableRef" :value="formData.elements"/>
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value.length}"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataEnum">
+import { PopoverModal } from '../index'
+import { cloneDeep } from 'lodash-es'
+import Item from './Item.vue'
+import {Form} from "ant-design-vue";
+
+const emit = defineEmits(['update:value', 'confirm', 'cancel']);
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => ([]),
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const formRef = ref();
+const tableRef = ref();
+const visible = ref(false)
+const formData = reactive({
+  elements: cloneDeep(props.value) || [],
+});
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.elements = cloneDeep(props.value) || [];
+  emit('cancel');
+};
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  const tableData = await tableRef.value.validate()
+  console.log(data, tableData)
+  if (data && tableData) {
+    visible.value = false
+    formData.elements = tableData
+    emit('update:value', formData.elements)
+    emit('confirm', formData.elements);
+    formItemContext.onFieldChange()
+  }
+}
+
+watch(
+  () => JSON.stringify(props.value),
+  () => {
+    formData.elements = cloneDeep(props.value) || [];
+  }
+);
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/File/Type.vue b/src/components/Metadata/Table/components/File/Type.vue
new file mode 100644
index 00000000..a1e0f6d8
--- /dev/null
+++ b/src/components/Metadata/Table/components/File/Type.vue
@@ -0,0 +1,54 @@
+<template>
+  <a-form-item
+    label="文件类型"
+    required
+    :name="name"
+    :rules="[{ required: true, message: '请选择文件类型' }]"
+  >
+    <j-check-button
+      v-model:value="myValue"
+      :options="[
+                { label: 'URL', value: 'url' },
+                { label: 'Base64', value: 'base64' },
+                { label: 'binary', value: 'binary' },
+            ]"
+      @change="change"
+    />
+
+  </a-form-item>
+</template>
+
+<script setup name="MetadataFileType">
+import { ref, watch } from 'vue';
+
+
+const props = defineProps({
+  name: {
+    type: [String, Array],
+    default: 'bodyType',
+  },
+  value: {
+    type: String,
+    default: undefined,
+  },
+});
+
+const emit = defineEmits(['update:value']);
+
+const myValue = ref(props.value);
+
+const change = () => {
+  emit('update:value', myValue.value);
+};
+
+watch(
+  () => props.value,
+  () => {
+    myValue.value = props.value;
+  }
+);
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/File/index.vue b/src/components/Metadata/Table/components/File/index.vue
new file mode 100644
index 00000000..c45db672
--- /dev/null
+++ b/src/components/Metadata/Table/components/File/index.vue
@@ -0,0 +1,81 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 250px">
+        <a-form ref="formRef" :model="formData" layout="vertical">
+          <Type v-model:value="formData.bodyType" name="bodyType" />
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value}"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataFile">
+import Type from './Type.vue'
+import { PopoverModal } from '../index'
+import {Form} from "ant-design-vue";
+
+const emit = defineEmits(['update:value', 'confirm', 'cancel']);
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined,
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const formRef = ref();
+const formData = reactive({
+  bodyType: props.value,
+});
+
+const visible = ref(false)
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  if (data) {
+    visible.value = false
+    emit('update:value', formData.bodyType)
+    emit('onOk', formData.bodyType)
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.bodyType = props.value;
+  emit('cancel');
+}
+
+watch(
+  () => props.value,
+  () => {
+    formData.bodyType = props.value;
+  },
+);
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Group/index.vue b/src/components/Metadata/Table/components/Group/index.vue
new file mode 100644
index 00000000..8935151b
--- /dev/null
+++ b/src/components/Metadata/Table/components/Group/index.vue
@@ -0,0 +1,68 @@
+<template>
+  <a-auto-complete
+    v-model:value="myValue"
+    :options="options"
+    placeholder="请选择分组"
+    style="width: 100%;"
+    :getPopupContainer="(node) => tableWrapperRef || node"
+    @search="onSearch"
+    @select="onSelect"
+  />
+</template>
+
+<script setup name="MetadataGroup">
+
+import {METADATA_GROUP_OPTIONS} from "../../consts";
+import {useTableWrapper} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['update:value', 'change'])
+const myValue = ref(props.value)
+const searchValue = ref()
+
+const groupSetting = inject(METADATA_GROUP_OPTIONS, {})
+const tableWrapperRef = useTableWrapper()
+
+const options = computed(() => {
+  if (searchValue.value) {
+    let _options = (groupSetting.options.value || []).filter(item => {
+      return item.value.includes(searchValue.value)
+    })
+
+    if (!_options.length) {
+      _options.unshift({
+        label: searchValue.value,
+        value: searchValue.value
+      })
+    }
+    return _options
+
+  }
+
+  return groupSetting.options.value || []
+})
+
+const onSearch = (value) => {
+  searchValue.value = value
+}
+
+const onSelect = (value) => {
+  groupSetting.addOptions({ label: value, value })
+  emit('update:value', value)
+  emit('change', value)
+}
+
+watch(() => props.value, () => {
+  myValue.value = props.value
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Integer/index.vue b/src/components/Metadata/Table/components/Integer/index.vue
new file mode 100644
index 00000000..17fc18ec
--- /dev/null
+++ b/src/components/Metadata/Table/components/Integer/index.vue
@@ -0,0 +1,75 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 200px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <a-form-item label="单位" name="unit" :rules="[{ max: 64, message: '最多可输入64个字符' }]">
+            <UnitSelect v-model:value="formData.unit" />
+          </a-form-item>
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataInteger">
+import { UnitSelect, PopoverModal } from '../index'
+
+const emit = defineEmits(['update:value', 'cancel', 'confirm']);
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined,
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  unit: props.value,
+});
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+  if (data) {
+    visible.value = false
+    emit('update:value', formData.unit);
+    emit('confirm', formData.unit);
+  }
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.unit = props.value;
+  emit('cancel');
+}
+
+watch(() => props.value, (newValue) => {
+  formData.unit = newValue
+})
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Object/index.vue b/src/components/Metadata/Table/components/Object/index.vue
new file mode 100644
index 00000000..d4e7eab0
--- /dev/null
+++ b/src/components/Metadata/Table/components/Object/index.vue
@@ -0,0 +1,232 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 750px">
+        <EditTable
+          ref="tableRef"
+          :columns="myColumns"
+          :dataSource="dataSource"
+          :pagination="false"
+          :height="200"
+        >
+<!--          <template v-for="(_, key) in slots" :key="key" #[key]="slotData">-->
+<!--            <slot :name="key" v-bind="slotData"/>-->
+<!--          </template>-->
+          <template #id="{ record, index }">
+            <EditTableFormItem :name="[index, 'id']">
+              <a-input v-model:value="record.id" placeholder="请输入标识"/>
+            </EditTableFormItem>
+          </template>
+          <template #name="{ record, index }">
+            <EditTableFormItem :name="[index, 'name']">
+              <a-input v-model:value="record.name" placeholder="请输入名称"/>
+            </EditTableFormItem>
+          </template>
+          <template #expands="{ record }">
+            <BooleanSelect v-model:value="record.expands.required"/>
+          </template>
+          <template #valueType="{ record, index }">
+            <EditTableFormItem :name="[index, 'valueType']">
+              <div style="display: flex; gap: 12px; align-items: center">
+                <TypeSelect  v-model:value="record.valueType.type" style="flex: 1 1 0;min-width: 0" />
+                <DoubleParams v-if="['float', 'double'].includes(record.valueType.type)" v-model:value="record.valueType" placement="topRight"/>
+                <StringParams v-else-if="record.valueType.type === 'string'" v-model:value="record.valueType" placement="topRight"/>
+                <DateParams v-else-if="record.valueType.type === 'date'" v-model:value="record.valueType.format" placement="topRight"/>
+                <FileParams v-else-if="record.valueType.type === 'file'" v-model:value="record.valueType.bodyType" placement="topRight"/>
+                <EnumParams v-else-if="record.valueType.type === 'enum'" v-model:value="record.valueType.elements" placement="topRight"/>
+                <BooleanParams
+                  v-else-if="record.valueType.type === 'boolean'"
+                  v-model:falseText="record.valueType.falseText"
+                  v-model:falseValue="record.valueType.falseValue"
+                  v-model:trueText="record.valueType.trueText"
+                  v-model:trueValue="record.valueType.trueValue"
+                  placement="topRight"
+                />
+                <ArrayParams v-else-if="record.valueType.type === 'array'" v-model:value="record.valueType.elementType" placement="topRight"/>
+              </div>
+            </EditTableFormItem>
+          </template>
+          <template #action="{ index }">
+            <a-button danger type="link" style="padding: 0 5px" @click="() => deleteItem(index)">
+              <template #icon>
+                <AIcon type="DeleteOutlined" />
+              </template>
+            </a-button>
+          </template>
+        </EditTable>
+        <a-button style="width: 100%;margin-top: 4px" @click="addItem">
+          <template #icon><AIcon type="PlusOutlined" /></template>
+          新增
+        </a-button>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value.length}"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataObject">
+import { PopoverModal } from '../index'
+import BooleanSelect from "../BooleanSelect/index.vue";
+import { EditTable, TypeSelect, EditTableFormItem, StringParams, DateParams, FileParams, EnumParams, BooleanParams, ObjectParams, ArrayParams, DoubleParams } from '@/components/Metadata/Table'
+import {Form} from "ant-design-vue";
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => [],
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  type: {
+    type: String,
+    default: 'properties'
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const emit = defineEmits(['update:value', 'confirm', 'cancel']);
+const formItemContext = Form.useInjectFormItemContext();
+
+const slots = useSlots()
+
+const tableRef = ref()
+const dataSource = ref([])
+const visible = ref(false)
+
+const defaultColumns = [
+  {
+    title: '参数标识',
+    dataIndex: 'id',
+    form: {
+      rules: [
+        {
+          asyncValidator(_, value, ...setting) {
+            if (value) {
+              const option = setting[2]
+
+              const isSome = dataSource.value.some((item) => {
+                return item.__dataIndex !== option.index && item.id === value
+              })
+
+              if (isSome) {
+                return Promise.reject('该标识已存在')
+              }
+              return Promise.resolve()
+            }
+            return Promise.reject('请输入标识')
+          }
+        },
+        { max: 64, message: '最多可输入64个字符' },
+        {
+          pattern: /^[a-zA-Z0-9_]+$/,
+          message: '标识只能由数字、字母、下划线组成',
+        },
+      ]
+    }
+  },
+  {
+    title: '参数名称',
+    dataIndex: 'name',
+    form: {
+      rules: [
+        {
+          required: true,
+          message: '请输入名称'
+        },
+        { max: 64, message: '最多可输入64个字符' },
+      ]
+    }
+  },
+  props.type === 'functions' ? {
+    title: '填写约束',
+    dataIndex: 'expands',
+    width: 120,
+  } : null,
+  {
+    title: '数据类型',
+    dataIndex: 'valueType',
+    width: 240,
+    form: {
+      required: true,
+      rules: [{
+        validator(_, value) {
+          if (!value?.type) {
+            return Promise.reject('请选择数据类型')
+          }
+          return Promise.resolve()
+        }
+      }]
+    },
+  }
+]
+
+const myColumns = computed(() => {
+
+  return [
+    ...defaultColumns.filter(item => !!item),
+    {
+      dataIndex: 'action',
+      title: '操作',
+      width: 60,
+    }
+  ]
+})
+
+const onOk = async () => {
+  const data = await tableRef.value.validate()
+  if (data) {
+    visible.value = false
+    emit('update:value', data)
+    emit('confirm', data)
+    formItemContext.onFieldChange()
+  }
+}
+
+const onCancel = () => {
+  emit('cancel');
+};
+
+const deleteItem = (index) => {
+  dataSource.value.splice(index, 1)
+}
+
+const addItem = () => {
+  dataSource.value.push({
+    id: undefined,
+    name: undefined,
+    expands: {
+      required: false
+    },
+    valueType: {
+      expands: {}
+    }
+  })
+}
+
+watch(() => [JSON.stringify(props.value), visible.value], (val) => {
+  if (visible.value) {
+    dataSource.value = JSON.parse(val[0] || '[]')
+  }
+}, { immediate: true })
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Popover/index.vue b/src/components/Metadata/Table/components/Popover/index.vue
new file mode 100644
index 00000000..03ad744d
--- /dev/null
+++ b/src/components/Metadata/Table/components/Popover/index.vue
@@ -0,0 +1,111 @@
+<template>
+  <a-popover
+    trigger="click"
+    :visible="visible"
+    :overlay-class-name="{
+      [warpClassNames]: true,
+      'metadata-table-popover-warp': true
+    }"
+    :overlayStyle="{
+      'zIndex': 1070
+    }"
+    :getPopupContainer="(node) => tableWrapperRef || node"
+    @visibleChange="null"
+  >
+    <template #content>
+      <div v-if="visible">
+        <div :style="bodyStyle">
+          <slot name="content"/>
+        </div>
+        <div class="footer">
+          <a-space>
+            <a-button v-if="showCancel" size="small" @click="cancel">取消</a-button>
+            <a-button v-if="showOk" type="primary" size="small" @click="submit" :loading="confirmLoading">确认</a-button>
+          </a-space>
+        </div>
+      </div>
+    </template>
+    <span @click="() => visibleChange(true)">
+      <slot />
+    </span>
+  </a-popover>
+</template>
+
+<script setup name="MetadataPopover">
+import { useMask } from '../utils'
+import {useTableWrapper, useTableFullScreen} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  placement: {
+    type: String,
+    default: 'top'
+  },
+  confirmLoading: {
+    type: Boolean,
+    default: false
+  },
+  showCancel: {
+    type: Boolean,
+    default: true
+  },
+  showOk: {
+    type: Boolean,
+    default: true
+  },
+  bodyStyle: {
+    type: [String, Object],
+    default: undefined
+  },
+  visible: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['ok', 'cancel', 'update:visible'])
+
+const tableWrapperRef = useTableWrapper()
+const fullScreen = useTableFullScreen()
+
+const { warpClassNames, visibleChange, visible } = useMask(props.visible, {
+  visibleChange(v) {
+    emit('update:visible', v)
+  }
+})
+
+const cancel = () => {
+  emit('cancel')
+  visibleChange(false)
+}
+
+const submit = async () => {
+  emit('ok')
+}
+
+watch(() => props.visible, (newValue) => {
+  visibleChange(newValue)
+})
+
+watch(() => fullScreen.value, (val) => {
+  if (!val) {
+    cancel()
+  }
+})
+
+</script>
+
+<style scoped lang="less">
+.footer {
+  display: flex;
+  flex-direction: row-reverse;
+  margin-top: 8px;
+}
+</style>
+
+<style lang="less">
+.metadata-table-popover-warp {
+  .ant-popover-arrow {
+    display: none;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Search/Sort.vue b/src/components/Metadata/Table/components/Search/Sort.vue
new file mode 100644
index 00000000..872f8ed3
--- /dev/null
+++ b/src/components/Metadata/Table/components/Search/Sort.vue
@@ -0,0 +1,153 @@
+<template>
+  <a-popover
+    trigger="click"
+    placement="bottom"
+    :overlayStyle="{
+      'zIndex': 1050
+    }"
+    :getPopupContainer="(node) => tableWrapperRef || node"
+    @visibleChange="visibleChange"
+  >
+    <template #content>
+      <div class="table-sort-content">
+        <div class="table-sort-title">
+          排序
+        </div>
+        <div class="table-sort-body">
+          <a-table
+            v-if="visible"
+            size="small"
+            :columns="columns"
+            :dataSource="dataSource"
+            :row-selection="{ selectedRowKeys: mySelectedRowKeys, onChange: onSelectChange }"
+            :pagination="false"
+            :scroll="dataSource.length > 5 ? { y: 200 } : undefined"
+          >
+
+          </a-table>
+        </div>
+        <div class="table-sort-footer">
+          <j-space :size="16">
+            <a-button type="primary" @click="cleanParams" :disabled="!mySelectedRowKeys.length">清空条件</a-button>
+            <a-button type="primary" ghost @click="onAsc">升序</a-button>
+            <a-button type="primary" ghost @click="onDesc">降序</a-button>
+          </j-space>
+        </div>
+      </div>
+    </template>
+    <AIcon type="icon-paixu" :class="{ 'table-sort-icon': true, 'active': props.active }" />
+  </a-popover>
+</template>
+
+<script setup name="MetadataTableSort">
+import {useTableTool, useTableWrapper} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  dataSource: {
+    type: [Function, Array],
+    default: () => []
+  },
+  sortKey: {
+    type: [String, Array],
+    default: undefined
+  },
+  dataIndex: {
+    type: [Number, String],
+    default: undefined
+  },
+  selectedRowKeys: {
+    type: Array,
+    default: () => []
+  },
+  active: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['click'])
+
+const tableWrapperRef = useTableWrapper()
+const tableTool = useTableTool()
+
+const visible = ref(false)
+const dataSource = ref([])
+const mySelectedRowKeys = ref([])
+
+const columns = [
+  {
+    dataIndex: 'name',
+    title: '名称'
+  },
+  {
+    dataIndex: 'total',
+    title: '计数',
+    width: 70
+  }
+]
+
+const visibleChange = (e) => {
+  if (e) {
+    mySelectedRowKeys.value = props.selectedRowKeys
+    dataSource.value = (props.dataSource?.() || []).map((item, index) => Object.assign(item, { __index: index + 1}))
+  }
+
+  if (!e) {
+    setTimeout(() => {
+      visible.value = e
+    }, 300)
+  } else {
+    visible.value = e
+  }
+}
+
+const onSelectChange = (keys) => {
+  mySelectedRowKeys.value = keys
+}
+
+const cleanParams = () => {
+  mySelectedRowKeys.value = []
+  tableTool.cleanOrder()
+}
+
+const handleSortRowKeys = () => {
+  return dataSource.value
+    .filter(item => mySelectedRowKeys.value.includes(item.key))
+    .sort((a, b) => b.__index - a.__index)
+    .map(item => item.key)
+}
+
+const onAsc = () => {
+  tableTool.order('asc', props.sortKey, handleSortRowKeys(), props.dataIndex)
+  emit('click')
+}
+
+const onDesc = () => {
+  tableTool.order('desc', props.sortKey, handleSortRowKeys(), props.dataIndex)
+  emit('click')
+}
+
+</script>
+
+<style scoped lang="less">
+.table-sort-content {
+  width: 300px;
+
+  .table-sort-title {
+
+  }
+
+  .table-sort-body {
+    margin: 12px 0;
+  }
+}
+
+.table-sort-icon {
+  color: rgba(0,0,0, 0.25);
+  font-size: 16px;
+
+  &.active {
+    color: @primary-color;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/components/Search/index.ts b/src/components/Metadata/Table/components/Search/index.ts
new file mode 100644
index 00000000..faa1ccf1
--- /dev/null
+++ b/src/components/Metadata/Table/components/Search/index.ts
@@ -0,0 +1,2 @@
+export { default as SearchModal } from './search.vue'
+export { default as Sort } from './Sort.vue'
diff --git a/src/components/Metadata/Table/components/Search/search.vue b/src/components/Metadata/Table/components/Search/search.vue
new file mode 100644
index 00000000..565a2ab2
--- /dev/null
+++ b/src/components/Metadata/Table/components/Search/search.vue
@@ -0,0 +1,205 @@
+<template>
+  <DragModal
+    :width="800"
+    :height="modalHeight"
+    :title="false"
+    :dragRang="[600, 200]"
+    :bodyStyle="{
+      overflow: 'hidden'
+    }"
+    @heightChange="heightChange"
+  >
+    <div class="table-search">
+      <div class="table-search-header">
+        <div>
+          <a-space>
+            <span>查找</span>
+            <a-input v-model:value="searchValue" :maxlength="64" placeholder="请输入查找内容" />
+            <a-button type="primary" ghost @click="() => search('all')">查找全部</a-button>
+            <a-button type="primary" ghost @click="() => search('prev')">上一个</a-button>
+            <a-button type="primary" ghost @click="() => search('next')">下一个</a-button>
+          </a-space>
+        </div>
+        <div>
+          <a-button type="primary" @click.stop="onClose">关闭</a-button>
+        </div>
+      </div>
+      <div v-if="visible" style="margin: 12px 0">
+        <Table
+          ref="tableRef"
+          :data-source="filterArray"
+          :columns="columns"
+          :height="tableHeight"
+          :disableMenu="false"
+          :cellHeight="36"
+          :rowSelection="{
+            onSelect: onSelect,
+            selectedRowKeys: selectedRowKeys
+          }"
+          :serial="{
+            width: openGroup ? 150 : 66,
+            title: '行数'
+          }"
+        >
+          <template #serial="{ record }">
+            <span v-if="openGroup">
+              <Ellipsis>
+                {{ record.expands.groupName }} 第 {{ record.__oldSerial }} 行
+              </Ellipsis>
+            </span>
+            <span v-else>
+              {{ record.__serial }}
+            </span>
+          </template>
+          <template #id="{ record }">
+            <Ellipsis>
+              {{ record.id }}
+            </Ellipsis>
+          </template>
+          <template #name="{ record }">
+            <Ellipsis>
+              {{ record.name }}
+            </Ellipsis>
+          </template>
+        </Table>
+      </div>
+      <div v-if="visible">
+        查找到 <span class="table-search-result-total">{{filterArray.length}}</span> 条相关属性
+      </div>
+    </div>
+  </DragModal>
+</template>
+
+<script setup name="MetadataTableSearch">
+import { DragModal } from '@/components/Modal'
+import Table from '../../Table.vue'
+import {useTableDataSource, useTableOpenGroup, useTableTool, useGroupOptions} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  searchKey: {
+    type: String,
+    default: 'id'
+  }
+})
+
+const emit = defineEmits(['close'])
+
+
+const dataSource = useTableDataSource()
+const openGroup = useTableOpenGroup()
+const tableTool = useTableTool()
+const groupOptions = useGroupOptions()
+
+const searchValue = ref()
+const filterArray = ref([])
+const visible = ref(false)
+const searchIndex = ref(-1)
+const modalHeight = ref(100)
+const tableHeight = ref(230)
+const selectedRowKeys = ref([])
+const tableRef = ref()
+
+const columns = [
+  {
+    title: '标识',
+    dataIndex: 'id',
+  },
+  {
+    title: '名称',
+    dataIndex: 'name',
+  }
+]
+
+const selectedTableRow = (record) => {
+  tableTool.scrollTo({
+    ...record,
+    __serial: record.__serial - 1
+  })
+  tableTool.selected([record.id])
+}
+
+const handleFilterArray = () => {
+  const cloneDataSource = JSON.parse(JSON.stringify(dataSource.value || '[]')).map(item => Object.assign(item, { __oldSerial: item.__serial}))
+  const _filterArray = cloneDataSource.filter(item => {
+    if (item[props.searchKey]) {
+      return item[props.searchKey].includes(searchValue.value)
+    }
+    return false
+  })
+
+  if (openGroup) {
+    const handleGroup = []
+
+    groupOptions.value.forEach(group => {
+      handleGroup.push(..._filterArray.filter(item => item.expands.groupId === group.value))
+    })
+
+    return handleGroup
+  }
+
+  return _filterArray
+}
+
+const search = (key) => {
+  filterArray.value = handleFilterArray()
+
+  if (key === 'all') {
+    visible.value = true
+    modalHeight.value = 400
+    searchIndex.value = 0
+  } else if (key === 'next') {
+    searchIndex.value += 1
+  } else {
+    searchIndex.value -= 1
+  }
+
+  if (searchIndex.value < 0) {
+    searchIndex.value = filterArray.value.length - 1
+  } else if (searchIndex.value > filterArray.value.length - 1){
+    searchIndex.value = 0
+  }
+
+  const searchItem = filterArray.value[searchIndex.value]
+
+  if (key !== 'all' && visible.value) {
+    tableRef.value?.scrollToByIndex(searchIndex.value - 1)
+  }
+
+  if (filterArray.value.length > 1) {
+    selectedRowKeys.value = [searchItem.id]
+    selectedTableRow(searchItem)
+  } else {
+    selectedRowKeys.value = []
+    tableTool.selected([])
+  }
+}
+
+const heightChange = (h) => {
+  if (h > 340) {
+    tableHeight.value = h - 160
+  }
+}
+
+const onClose = () => {
+  console.log('close')
+  emit('close')
+}
+
+const onSelect = (record) => {
+  searchIndex.value = filterArray.value.findIndex(item => item.id === record.id)
+  selectedRowKeys.value = [record.id]
+  selectedTableRow(record)
+}
+
+</script>
+
+<style scoped lang="less">
+.table-search-header {
+  display: flex;
+  justify-content: space-between;
+}
+
+.table-search-result-total {
+  color: @primary-color;
+}
+</style>
diff --git a/src/components/Metadata/Table/components/String/Item.vue b/src/components/Metadata/Table/components/String/Item.vue
new file mode 100644
index 00000000..9c8de8f8
--- /dev/null
+++ b/src/components/Metadata/Table/components/String/Item.vue
@@ -0,0 +1,48 @@
+<template>
+  <a-form-item label="最大长度" :name="name">
+    <a-input-number
+      v-model:value="myValue"
+      style="width: 100%"
+      placeholder="请输入0-9999以内的整数"
+      :precision="0"
+      :min="0"
+      :max="9999"
+      @change="change"
+    />
+  </a-form-item>
+</template>
+
+<script setup name="MetadataStringItem">
+
+const props = defineProps({
+  value: {
+    type: Number,
+    default: 0
+  },
+  name: {
+    type: String,
+    default: 'maxLength'
+  },
+})
+
+const myValue = ref(props.value)
+
+const emit = defineEmits(['update:value']);
+
+const change = () => {
+  emit('update:value', myValue.value);
+};
+
+watch(
+  () => props.value,
+  (newValue) => {
+    myValue.value = newValue
+  },
+  { immediate: true },
+);
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/String/index.vue b/src/components/Metadata/Table/components/String/index.vue
new file mode 100644
index 00000000..63819da3
--- /dev/null
+++ b/src/components/Metadata/Table/components/String/index.vue
@@ -0,0 +1,79 @@
+<template>
+  <PopoverModal
+    v-model:visible="visible"
+    :placement="placement"
+    @ok="onOk"
+    @cancel="onCancel"
+  >
+    <template #content>
+      <div style="width: 200px">
+        <a-form ref="formRef" layout="vertical" :model="formData">
+          <Item v-model:value="formData.maxLength"/>
+        </a-form>
+      </div>
+    </template>
+    <slot>
+      <a-button type="link" :disabled="disabled" style="padding: 0">
+        <template #icon>
+          <AIcon type="EditOutlined"/>
+        </template>
+      </a-button>
+    </slot>
+  </PopoverModal>
+</template>
+
+<script setup name="MetadataString">
+import { PopoverModal } from '../index'
+import Item from './Item.vue'
+
+const emit = defineEmits(['update:value', 'confirm', 'cancel']);
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({}),
+  },
+  placement: {
+    type: String,
+    default: 'top',
+  },
+  disabled: {
+    type: Boolean,
+    default:false
+  }
+});
+
+const formRef = ref()
+const visible = ref(false)
+const formData = reactive({
+  maxLength: props.value.maxLength || props.value.expands?.maxLength,
+})
+
+const onOk = () => {
+  visible.value = false
+  const obj = {
+    ...props.value,
+    expands: {
+      maxLength: formData.maxLength
+    }
+  }
+
+  emit('update:value', obj);
+  emit('confirm', obj);
+}
+
+const onCancel = () => {
+  formRef.value?.resetFields();
+  formData.maxLength = props.value.maxLength || props.value.expands?.maxLength,
+  emit('cancel');
+}
+
+watch(() => props.value, (newValue) => {
+  formData.maxLength = newValue.maxLength || newValue.expands?.maxLength
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/Type/data.ts b/src/components/Metadata/Table/components/Type/data.ts
new file mode 100644
index 00000000..d67b09b2
--- /dev/null
+++ b/src/components/Metadata/Table/components/Type/data.ts
@@ -0,0 +1,67 @@
+const type = [
+    {
+        value: 'int',
+        label: 'int(整数型)',
+    },
+    {
+        value: 'long',
+        label: 'long(长整数型)',
+    },
+    {
+        value: 'float',
+        label: 'float(单精度浮点型)',
+    },
+    {
+        value: 'double',
+        label: 'double(双精度浮点数)',
+    },
+    {
+        value: 'string',
+        label: 'text(字符串)',
+    },
+    {
+        value: 'boolean',
+        label: 'boolean(布尔型)',
+    },
+    {
+        value: 'date',
+        label: 'date(时间型)',
+    },
+    {
+        value: 'enum',
+        label: 'enum(枚举)',
+    },
+    {
+        value: 'array',
+        label: 'array(数组)',
+    },
+    {
+        value: 'object',
+        label: 'object(结构体)',
+    },
+    {
+        value: 'file',
+        label: 'file(文件)',
+    },
+    {
+        value: 'password',
+        label: 'password(密码)',
+    },
+    {
+        value: 'geoPoint',
+        label: 'geoPoint(地理位置)',
+    },
+];
+
+export const findTypeItem = (value: string) => {
+    return type.find(item => item.value === value)
+}
+
+export const getTypeMap = () => {
+    return type.reduce((prev, next) => {
+        prev[next.value] = next.label
+        return prev
+    }, {})
+}
+
+export default type
diff --git a/src/components/Metadata/Table/components/Type/index.vue b/src/components/Metadata/Table/components/Type/index.vue
new file mode 100644
index 00000000..d6192693
--- /dev/null
+++ b/src/components/Metadata/Table/components/Type/index.vue
@@ -0,0 +1,57 @@
+<template>
+  <div :class="{'select-no-value': !value}">
+    <a-select
+      v-bind="props"
+      allow-clear
+      :value="myValue"
+      style="width: 100%"
+      placeholder="请选择数据类型"
+      :dropdownStyle="{
+        zIndex: 1071
+      }"
+      :options="options"
+      :getPopupContainer="(node) => tableWrapperRef || node"
+      @change="change"
+    />
+  </div>
+</template>
+
+<script setup name="MetadataType">
+import { selectProps } from 'ant-design-vue/lib/select';
+import defaultOptions from './data';
+import {useTableWrapper} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  ...selectProps(),
+  filter: {
+    type: Array ,
+    default: () => [],
+  }
+});
+
+const emit = defineEmits(['update:value']);
+
+const myValue = ref(props.value)
+
+const options = computed(() => {
+  return defaultOptions.filter(item => !props.filter.includes(item.value) )
+})
+
+const tableWrapperRef = useTableWrapper()
+const change = (key) => {
+  myValue.value = key
+  emit('update:value', key)
+}
+
+watch(
+  () => props.value,
+  (newValue) => {
+    myValue.value = newValue;
+  },
+);
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/UnitSelect/index.vue b/src/components/Metadata/Table/components/UnitSelect/index.vue
new file mode 100644
index 00000000..a0fe0fa6
--- /dev/null
+++ b/src/components/Metadata/Table/components/UnitSelect/index.vue
@@ -0,0 +1,74 @@
+<template>
+  <Select
+    placeholder="请选择单位"
+    style="width: 100%"
+    mode="tags"
+    v-model:value="myValue"
+    :dropdownStyle="{
+      zIndex: 1071
+    }"
+    :getPopupContainer="(node) => tableWrapperRef || node"
+    :options="options"
+    optionFilterProp="label"
+    @change="change"
+  />
+</template>
+
+<script setup name="MetadataUnitSelect">
+import { Form, Select } from 'ant-design-vue'
+import {useTableWrapper} from "@/components/Metadata/Table/context";
+import {useGetUnit} from "@/views/device/components/Metadata/Base/columns";
+
+const props = defineProps({
+  value: {
+    type: [String, Number],
+    default: undefined
+  },
+  size: {
+    type: String,
+    default: 'middle'
+  },
+  name: {
+    type: String,
+    default: 'maxLength'
+  },
+  rules: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits(['update:value', 'change'])
+
+const myValue = ref(props.value)
+
+const options = useGetUnit()
+
+const formItemContext = Form.useInjectFormItemContext();
+
+const tableWrapperRef = useTableWrapper()
+const change = (v) => {
+  const newValue = v.length > 1 ? v.pop() : v?.[0];
+  myValue.value = [newValue];
+  emit('update:value', newValue);
+  emit('change', newValue);
+  formItemContext.onFieldChange();
+};
+
+const filterOption = (v, option) => {
+  return option.label.includes(v)
+}
+
+watch(
+  () => props.value,
+  (newV) => {
+    myValue.value = newV ? [newV] : undefined;
+  },
+  { immediate: true },
+);
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/components/index.ts b/src/components/Metadata/Table/components/index.ts
new file mode 100644
index 00000000..15839d32
--- /dev/null
+++ b/src/components/Metadata/Table/components/index.ts
@@ -0,0 +1,15 @@
+export { default as ArrayParams } from './Array/index.vue'
+export { default as ObjectParams } from './Object/index.vue'
+export { default as DateParams } from './Date/index.vue'
+export { default as BooleanParams } from './Boolean/index.vue'
+export { default as EnumParams } from './Enum/index.vue'
+export { default as FileParams } from './File/index.vue'
+export { default as IntegerParams } from './Integer/index.vue'
+export { default as DoubleParams } from './Double/index.vue'
+export { default as StringParams } from './String/index.vue'
+
+export { default as PopoverModal } from './Popover/index.vue'
+export { default as UnitSelect } from './UnitSelect/index.vue'
+export { default as TypeSelect } from './type/index.vue'
+export { default as GroupSelect } from './group/index.vue'
+export { default as BooleanSelect } from './BooleanSelect/index.vue'
diff --git a/src/components/Metadata/Table/components/utils.ts b/src/components/Metadata/Table/components/utils.ts
new file mode 100644
index 00000000..5321d0f8
--- /dev/null
+++ b/src/components/Metadata/Table/components/utils.ts
@@ -0,0 +1,156 @@
+import {randomString} from "@/utils/utils";
+import {Ref} from "vue";
+
+let maskIds: string[] = []
+export const maskNodeClassName = 'popover-mask'
+
+const bodyHasScrollbar = () => {
+    return document.body.scrollHeight > document.body.clientHeight;
+};
+
+const updateStyle = (dom: HTMLElement | undefined, style: Record<string, any>) => {
+    if (!dom) return
+
+    Object.keys(style).forEach(key => {
+        dom.style[key] = style[key]
+    })
+}
+
+const bodyHidden = () => {
+    const hasScrollbar = bodyHasScrollbar()
+
+    if (hasScrollbar) {
+        updateStyle(document.body as HTMLElement, {
+            overflow: 'hidden',
+            width: 'calc(100% - 17px)',
+        })
+    }
+}
+
+const getMaskNode = (id: string, warpClassNames: string) => {
+    let maskNode = document.querySelector(`#${id}`) as HTMLElement
+
+    if (maskNode) {
+        return maskNode
+    }
+
+    maskNode = document.createElement('div')
+    maskNode.id = id
+
+    updateStyle(maskNode, {
+        position: 'fixed',
+        top: 0,
+        bottom: 0,
+        left: 0,
+        right: 0,
+        'z-index': 1070,
+        'background-color': '#0003'
+    })
+
+    const warpNode = document.querySelector(`.${warpClassNames}`) as HTMLDivElement
+
+    if (!warpNode) return undefined
+
+    warpNode.insertAdjacentElement('beforebegin', maskNode)
+
+    return maskNode
+
+}
+
+export const useMask = (propVisible: boolean, options: { visibleChange: (visible: boolean) => void }): {
+    warpClassNames: string,
+    visible: Ref<boolean>,
+    hideMask: Function,
+    showMask: Function,
+    visibleChange: (visible: boolean) => void
+} => {
+    const visible = ref(propVisible)
+    const maskDomId = `${maskNodeClassName}-${randomString(6)}`
+
+    const warpClassNames = `${maskNodeClassName}-warp-${randomString(4)}`
+    const createMask = () => {
+        if (!maskIds.includes(maskDomId)) {
+            maskIds.push(maskDomId)
+        }
+
+        return getMaskNode(maskDomId, warpClassNames)
+    }
+
+    const getLastMask = (): HTMLElement | undefined => {
+        const index = maskIds.findIndex(key => key === maskDomId) // 当前遮罩层下标
+
+        let dom = undefined
+        let lastIndex = 0
+
+        if (maskIds.length > 0) {
+
+            lastIndex = index < 0 ? 0 : index - 1
+
+            const lastMaskId = maskIds[lastIndex]
+
+            dom = document.querySelector(`#${lastMaskId}`) as HTMLElement
+        }
+
+        return dom
+    }
+
+    const hideLastMask = () => {
+        const lastMaskNode = getLastMask()
+        updateStyle(lastMaskNode, {
+            display: 'none'
+        })
+    }
+
+    const showLastMask = () => {
+        const lastMaskNode = getLastMask()
+        updateStyle(lastMaskNode, {
+            display: 'block'
+        })
+    }
+
+    const showMask = () => {
+        bodyHidden()
+        setTimeout(() => {
+            hideLastMask()
+            const maskNode = createMask()
+            updateStyle(maskNode, {
+                display: 'block'
+            })
+        }, 10)
+    }
+
+    const hideMask = () => {
+        const maskNode = createMask()
+        showLastMask()
+
+        const index = maskIds.findIndex(key => key === maskDomId) // 当前遮罩层下标
+
+        maskIds.splice(index, 1)
+        if (index === 0) {
+            document.body.style = ''
+            maskIds = []
+        }
+
+        updateStyle(maskNode, {
+            display: 'none'
+        })
+    }
+
+    const visibleChange = (v: boolean) => {
+        visible.value = v
+        options?.visibleChange(v)
+        if (v) {
+            showMask()
+        } else {
+            hideMask()
+        }
+    }
+
+    return {
+        warpClassNames,
+        visible,
+        hideMask,
+        showMask,
+        visibleChange
+    }
+}
diff --git a/src/components/Metadata/Table/consts.ts b/src/components/Metadata/Table/consts.ts
new file mode 100644
index 00000000..1716be80
--- /dev/null
+++ b/src/components/Metadata/Table/consts.ts
@@ -0,0 +1,22 @@
+export const METADATA_GROUP_OPTIONS = Symbol('metadata-group-options')
+
+export const TABLE_WRAPPER = Symbol('table-wrapper')
+export const FULL_SCREEN = Symbol('full')
+
+export const RIGHT_MENU = Symbol('right-menu')
+
+export const TABLE_ERROR = Symbol('table-error')
+
+export const TABLE_GROUP_ERROR = Symbol('table-group-error')
+
+export const TABLE_GROUP_OPTIONS = Symbol('table-group-options')
+
+export const TABLE_DATA_SOURCE = Symbol('table-data-source')
+
+export const TABLE_OPEN_GROUP = Symbol('table-open-group')
+
+export const TABLE_TOOL = Symbol('table-tool')
+
+export const TABLE_FORM_ITEM_ERROR = Symbol('table-form-item-error')
+
+export const TABLE_GROUP_ACTIVE = Symbol('table-group-active')
diff --git a/src/components/Metadata/Table/context.ts b/src/components/Metadata/Table/context.ts
new file mode 100644
index 00000000..57a9d2ab
--- /dev/null
+++ b/src/components/Metadata/Table/context.ts
@@ -0,0 +1,51 @@
+import { provide } from 'vue'
+import {
+    RIGHT_MENU,
+    TABLE_DATA_SOURCE,
+    TABLE_ERROR,
+    TABLE_GROUP_ERROR,
+    TABLE_WRAPPER,
+    TABLE_OPEN_GROUP,
+    TABLE_TOOL,
+    TABLE_GROUP_OPTIONS,
+    TABLE_FORM_ITEM_ERROR,
+    TABLE_GROUP_ACTIVE, FULL_SCREEN
+} from "./consts";
+
+type FiledExpose = {
+
+}
+
+const FormContextKey = 'form-context'
+export const useFormContext = (options: Record<string, any>) => {
+    provide(FormContextKey, options)
+}
+
+export const useInjectForm = () => {
+    return inject(FormContextKey, {
+        addField: (key: string, field: FiledExpose) => {},
+        dataSource: computed(() => []),
+        rules: computed(() => undefined),
+    })
+}
+
+export const useInjectError = () => inject(TABLE_ERROR)
+
+export const useTableWrapper = () => inject(TABLE_WRAPPER)
+
+export const useRightMenuContext = () => inject(RIGHT_MENU)
+
+export const useTableGroupError = () => inject(TABLE_GROUP_ERROR)
+
+export const useTableDataSource = () => inject(TABLE_DATA_SOURCE, [])
+
+export const useTableOpenGroup = () => inject(TABLE_OPEN_GROUP, false)
+
+export const useTableTool = () => inject(TABLE_TOOL, false)
+
+export const useGroupOptions = () => inject(TABLE_GROUP_OPTIONS, [])
+
+export const useFormItemError = () => inject(TABLE_FORM_ITEM_ERROR)
+export const useGroupActive = () => inject(TABLE_GROUP_ACTIVE)
+
+export const useTableFullScreen = () => inject(FULL_SCREEN)
diff --git a/src/components/Metadata/Table/demo.vue b/src/components/Metadata/Table/demo.vue
new file mode 100644
index 00000000..73542089
--- /dev/null
+++ b/src/components/Metadata/Table/demo.vue
@@ -0,0 +1,245 @@
+<template>
+  <Table
+      ref="tableRef"
+      :columns="columns"
+      :dataSource="dataSource"
+      :pagination="false"
+      @scroll-down="onScrollDown"
+    >
+    <template #string="{record}">
+      <div>
+        <a-input />
+        <StringParams v-model:value="record.string"/>
+      </div>
+    </template>
+    <template #double="{record}">
+      <DoubleParams v-model:value="record.double"/>
+    </template>
+    <template #integer="{record}">
+      <IntegerParams v-model:value="record.integer"/>
+    </template>
+    <template #date="{record}">
+      <DateParams v-model:value="record.date"/>
+    </template>
+    <template #boolean="{record}">
+      <BooleanParams v-model:value="record.boolean"/>
+    </template>
+    <template #file="{record}">
+      <FileParams v-model:value="record.file"/>
+    </template>
+    <template #enum="{record}">
+      <EnumParams v-model:value="record.enum"/>
+    </template>
+    <template #object="{record}">
+      <ObjectParams v-model:value="record.object"/>
+    </template>
+    <template #array="{record}">
+      <ArrayParams v-model:value="record.array"/>
+    </template>
+  </Table>
+  <a-button @click="addItem">新增</a-button>
+  <a-button @click="validate">校验</a-button>
+</template>
+
+<script setup name="demo">
+import Table from './Table.vue'
+import TableFormItem from './TableFormItem.vue'
+import {
+  ArrayParams,
+  ObjectParams,
+  DateParams,
+  BooleanParams,
+  EnumParams,
+  FileParams,
+  IntegerParams,
+  DoubleParams,
+  StringParams
+} from './components'
+
+const tableRef = ref()
+const dataSource = ref(new Array(10).fill(0).map((_, index) => {
+  return {
+    string: undefined,
+    double: undefined,
+    integer: undefined,
+    object: undefined,
+    file: undefined,
+    date: undefined,
+    boolean: undefined,
+    enum: undefined,
+    array: undefined,
+  }
+}))
+
+const columns = [
+  {
+    dataIndex: 'string',
+    title: 'string',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入列名')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'double',
+    title: 'double',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入age')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'integer',
+    title: 'integer',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入类型')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'date',
+    title: 'date',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入类型')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'boolean',
+    title: 'boolean',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入类型')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'file',
+    title: 'file',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入类型')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'enum',
+    title: 'enum',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入类型')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'object',
+    title: 'object',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入属性')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  },
+  {
+    dataIndex: 'array',
+    title: 'array',
+    form: {
+      rules: {
+        asyncValidator: (rule, value, cb) => {
+          if (!value) {
+            return Promise.reject('请输入其它')
+          }
+          return Promise.resolve()
+        }
+      }
+    }
+  }
+]
+
+const addItem = async () => {
+  if (dataSource.length) {
+    await validate()
+  }
+
+  dataSource.value.push({
+    string: undefined,
+    double: undefined,
+    integer: undefined,
+    object: undefined,
+    file: undefined,
+    date: undefined,
+    boolean: undefined,
+    enum: undefined,
+    array: undefined,
+  })
+}
+
+const onScrollDown = () => {
+  dataSource.value.push(...(new Array(10).fill(1).map(() =>({
+    string: undefined,
+    double: undefined,
+    integer: undefined,
+    object: undefined,
+    file: undefined,
+    date: undefined,
+    boolean: undefined,
+    enum: undefined,
+    array: undefined,
+  }))))
+}
+
+const validate = async () => {
+  const data = await tableRef.value.validate().catch((error) => {
+    console.log(error)
+  })
+  console.log(data, dataSource.value)
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/components/Metadata/Table/group.vue b/src/components/Metadata/Table/group.vue
new file mode 100644
index 00000000..111ff21f
--- /dev/null
+++ b/src/components/Metadata/Table/group.vue
@@ -0,0 +1,252 @@
+<template>
+  <div class="table-group-warp">
+    <a-tabs type="editable-card" v-model:activeKey="myActiveKey" @edit="onAdd" @change="change">
+      <a-tab-pane v-for="item in options" :key="item.value" :closable="false">
+        <template #tab>
+          <a-dropdown
+            v-if="myActiveKey === item.value"
+            :trigger="['click']"
+            :getPopupContainer="(node) => tableWrapperRef || node"
+          >
+            <template #overlay>
+              <a-menu @click="(e) => { menuClick(e, item)}">
+                <a-menu-item key="edit">
+                  编辑
+                </a-menu-item>
+                <a-menu-item key="delete">
+                  删除
+                </a-menu-item>
+              </a-menu>
+            </template>
+            <div class="table-group-error-warp">
+              {{ item.label }} ({{ item.effective}})
+              <a-tooltip
+                v-if="errorMap[item.value]"
+                color="#ffffff"
+                :arrowPointAtCenter="true"
+                :get-popup-container="popContainer"
+              >
+                <template #title>
+                  <span style="color: #1d2129">校验不合规</span>
+                </template>
+                <div class="table-group-error-target"></div>
+              </a-tooltip>
+            </div>
+          </a-dropdown>
+          <div v-else class="table-group-error-warp">
+            {{ item.label }} ({{ item.effective}})
+            <a-tooltip
+              v-if="errorMap[item.value]"
+              color="#ffffff"
+              :arrowPointAtCenter="true"
+              :getContainer="popContainer"
+            >
+              <template #title>
+                <span style="color: #1d2129">校验不合规</span>
+              </template>
+              <div class="table-group-error-target"></div>
+            </a-tooltip>
+          </div>
+        </template>
+      </a-tab-pane>
+    </a-tabs>
+    <a-modal
+      :visible="visible"
+      title="编辑分组"
+      :maskClosable="false"
+      :getContainer="modalContainer"
+      @cancel="onCancel"
+      @ok="onOk"
+    >
+      <a-form ref="formRef" :model="formData" @finish="onOk">
+        <a-form-item name="label" :rules="[{ required: true, message: '请输入分组名称'}, { max: 16, message: '最多可输入16个字符'}]">
+          <a-input v-model:value="formData.label" placeholder="请输入分组名称"/>
+        </a-form-item>
+        <a-form-item v-show="false">
+          <a-button html-type="submit"></a-button>
+        </a-form-item>
+      </a-form>
+    </a-modal>
+  </div>
+</template>
+
+<script setup name="MetadataBaseTableGroup">
+import {Modal} from "ant-design-vue";
+import {randomNumber} from "@/utils/utils";
+import {isFullScreen} from "@/utils/comm";
+import {useTableGroupError, useTableWrapper} from './context'
+
+const props = defineProps({
+  options: {
+    type: Array,
+    default: () => []
+  },
+  activeKey: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['delete', 'edit', 'add', 'change', 'update:activeKey'])
+
+const myActiveKey = ref(props.activeKey)
+const visible = ref(false)
+const type = ref('新增分组')
+const errorMap = useTableGroupError()
+const tableWrapperRef = useTableWrapper()
+const addIndex = ref(0)
+
+const formRef = ref()
+const formData = reactive({
+  label: undefined
+})
+
+const onAdd = (targetKey, action) => {
+  if (action === 'add') {
+    type.value = 'add'
+    // 获取上一个包含 “分组_” 的信息
+    const groupName = props.options.filter(item => item.label.includes('分组_'))
+    let index = addIndex.value + 1
+    let findStatus = false
+    while (!findStatus) {
+      const status = groupName.some(item => {
+        const [ _, _index] = item.label.split('_')
+        if (index === Number(_index)) {
+          index = Number(_index) + 1
+          return true
+        }
+        return false
+      })
+
+      findStatus = !status
+    }
+
+    addIndex.value = index
+    formData.label = '分组_' + index
+    onOk()
+  }
+}
+
+const onEdit = (record) => {
+  visible.value = true
+  type.value = 'edit'
+  formData.label = record.label
+}
+
+
+const onCancel = () => {
+  formRef.value.resetFields()
+  visible.value = false
+}
+const onOk = () => {
+  const data = { ...formData }
+
+  if (type.value === 'add') {
+    data.value = 'group_'+randomNumber()
+    myActiveKey.value = data.value
+    emit(type.value, data)
+    emit('change', data.value, data.label)
+    emit('update:activeKey', data.value)
+    visible.value = false
+  } else {
+    formRef.value.validate().then(() => {
+      data.value = myActiveKey.value
+      emit(type.value, data)
+      emit('change', data.value, data.label)
+      visible.value = false
+    })
+  }
+}
+
+const change = () => {
+  const item = props.options.find(item => item.value === myActiveKey.value)
+  emit('change', myActiveKey.value, item.label)
+  emit('update:activeKey', myActiveKey.value)
+}
+
+const menuClick = (e, record) => {
+  if (e.key === 'edit') {
+    onEdit(record)
+  } else {
+    Modal.confirm({
+      title: '将会同步删除分组内的数据，确认删除？',
+      onOk: () => {
+        // activeKey 根据数据长度进行左右移动
+        const index = props.options.findIndex(item => item.value === record.value)
+        let label = ''
+
+        if (index !== 0 && index === props.options.length - 1) {
+          myActiveKey.value = props.options[index - 1].value
+          label = props.options[index - 1].label
+        } else if (index === 0 && props.options.length === 1) {
+          myActiveKey.value = props.options[0].value
+          label = props.options[0].label
+        } else {
+          myActiveKey.value = props.options[index + 1].value
+          label = props.options[index + 1].label
+        }
+
+        emit('delete', record.value, index)
+        emit('change', myActiveKey.value, label)
+      },
+    })
+  }
+}
+
+const popContainer = (e) => {
+  return tableWrapperRef.value || e
+}
+
+const modalContainer = (e) =>{
+  if (isFullScreen()) {
+    return tableWrapperRef.value || document.body
+  }
+  return document.body
+}
+
+onMounted(() => {
+  myActiveKey.value = props.options[0]?.value
+  emit('change', myActiveKey.value, props.options[0]?.label)
+  emit('update:activeKey', myActiveKey.value)
+})
+
+watch(() => props.activeKey, (val) => {
+  myActiveKey.value = val
+})
+
+</script>
+
+<style scoped lang="less">
+.table-group-warp {
+  :deep(.ant-tabs-nav) {
+    margin-bottom: 0;
+    .ant-tabs-tab {
+      overflow: hidden;
+      position: relative;
+    }
+    .ant-tabs-tab-active {
+      background-color: #BAE0FF !important;
+      border-color: #91CAFF !important;
+
+    }
+
+    .ant-tabs-nav-add {
+      border: none;
+    }
+  }
+}
+
+.table-group-error-warp {
+  color: #1a1a1a !important;
+
+  .table-group-error-target {
+    position: absolute;
+    right: 0;
+    top: 0;
+    border: 16px solid transparent;
+    border-top-color: @error-color;
+    border-right-width: 0;
+    border-bottom-width: 0;
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/header.vue b/src/components/Metadata/Table/header.vue
new file mode 100644
index 00000000..f2829b09
--- /dev/null
+++ b/src/components/Metadata/Table/header.vue
@@ -0,0 +1,132 @@
+<template>
+  <div class="metadata-edit-table-header-container" :style="style">
+    <div class="metadata-edit-table-header-cell" v-for="(item, index) in columns" :id="item.dataIndex" :style="{width: `${item.width}px`, left: `${item.left}px`}">
+      <div :class="{ 'metadata-edit-table-header-cell-box': true, 'header-cell-box-tool': !!(item.sort || item.filter) }">
+          <div class="table-header-cell-title">
+            <span>{{ item.title }}</span>
+            <span v-if="item.form?.required" class="header-cell-required">*</span>
+          </div>
+          <div v-if="!!(item.sort || item.filter)" class="table-header-cell-trigger">
+            <AIcon
+              v-if="item.filter"
+              type="SearchOutlined"
+              style="color: rgba(0,0,0, 0.25)"
+              @click="() => {showFilter(item.filter.key || item.dataIndex)}"
+            />
+            <Sort
+              v-if="item.sort"
+              v-bind="item.sort"
+              :key="item.dataIndex"
+              :active="tableTool.sortData.dataIndex === item.dataIndex"
+              :selectedRowKeys="tableTool.sortData.dataIndex === item.dataIndex ? tableTool.sortData.orderKeys : []"
+              :dataIndex="item.dataIndex"
+              @click="sortClick"
+            />
+          </div>
+
+      </div>
+    </div>
+    <SearchModal
+      v-if="searchData.visible"
+      :searchKey="searchData.key"
+      @close="searchData.visible = false"
+    />
+  </div>
+</template>
+
+<script setup name="MetadataBaseTableHeader">
+import { SearchModal, Sort } from './components/Search'
+import {useTableTool} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  columns: {
+    type: Array,
+    default: () => []
+  },
+  serial: {
+    type: Boolean,
+    default: false
+  },
+  style: {
+    type: Object,
+    default: undefined
+  }
+})
+
+const tableTool = useTableTool()
+
+const searchData = reactive({
+  visible: false,
+  key: undefined
+})
+
+const showFilter = (key) => {
+  searchData.visible = true
+  searchData.key = key
+}
+
+const sortClick = () => {
+  searchData.visible = false
+}
+
+</script>
+
+<style scoped lang="less">
+.metadata-edit-table-header-container {
+  height: 100%;
+  position: relative;
+  .metadata-edit-table-header-cell {
+    height: 100%;
+    display: inline-flex;
+    align-items: center;
+    float: left;
+    overflow: visible;
+    position: absolute;
+    top: 0;
+
+    .metadata-edit-table-header-cell-box {
+      padding: 0 12px;
+      width: 100%;
+
+      &.header-cell-box-tool {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+
+      .table-header-cell-title {
+        flex: 1;
+        display: flex;
+        align-items: center;
+        font-weight: 600;
+      }
+
+      .header-cell-required {
+        color: @error-color;
+        padding-left: 8px;
+        transform: translateY(3px);
+        font-weight: 500;
+      }
+
+      &::before {
+        position: absolute;
+        top: 50%;
+        right: 1px;
+        width: 1px;
+        height: 1.6em;
+        pointer-events: none;
+        background-color: rgba(0,0,0,.06);
+        transform: translateY(-50%);
+        transition: background-color .3s;
+        content: "";
+      }
+
+      &:not(:last-child) {
+        &::before {
+          background-color: transparent;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/Metadata/Table/hooks/index.ts b/src/components/Metadata/Table/hooks/index.ts
new file mode 100644
index 00000000..42de594f
--- /dev/null
+++ b/src/components/Metadata/Table/hooks/index.ts
@@ -0,0 +1,3 @@
+export * from './useResizeObserver'
+export * from './useValidate'
+export * from './useGroup'
diff --git a/src/components/Metadata/Table/hooks/useGroup.ts b/src/components/Metadata/Table/hooks/useGroup.ts
new file mode 100644
index 00000000..eedb78aa
--- /dev/null
+++ b/src/components/Metadata/Table/hooks/useGroup.ts
@@ -0,0 +1,57 @@
+import { ref, reactive } from 'vue'
+
+type GroupActiveType = {
+    value?: number
+    label?: string
+    len?: number
+}
+
+
+export const useGroup = (openGroup: boolean = false) => {
+
+    const groupOptions = ref<Array<GroupActiveType>>([])
+    const groupActive = reactive<GroupActiveType>({
+        value: undefined,
+        label: undefined
+    })
+
+    /**
+     * 更新当前选择的分组id
+     * @param key
+     * @param name
+     */
+    const updateGroupActive = (key: number, name: string) => {
+        if (openGroup) {
+            groupActive.value = key
+            groupActive.label = name
+        }
+
+    }
+
+    const addGroup = (val: GroupActiveType) => {
+        if (openGroup) {
+            groupOptions.value.push(val)
+        }
+    }
+
+    const removeGroup = (index: number) => {
+        if (openGroup) {
+            groupOptions.value.splice(index, 1)
+        }
+    }
+
+    const updateGroupOptions = (options: Array<GroupActiveType> = []) => {
+        if (openGroup) {
+            groupOptions.value = options
+        }
+    }
+
+    return {
+        groupOptions,
+        groupActive,
+        updateGroupActive,
+        addGroup,
+        removeGroup,
+        updateGroupOptions
+    }
+}
diff --git a/src/components/Metadata/Table/hooks/useResizeObserver.ts b/src/components/Metadata/Table/hooks/useResizeObserver.ts
new file mode 100644
index 00000000..78974757
--- /dev/null
+++ b/src/components/Metadata/Table/hooks/useResizeObserver.ts
@@ -0,0 +1,26 @@
+import {onBeforeUnmount, Ref} from "vue";
+import ResizeObserver from "resize-observer-polyfill";
+import {debounce} from "lodash-es";
+
+export const useResizeObserver = (tableWrapper: Ref<HTMLElement>, cb: Function) => {
+
+    let observer: ResizeObserver
+
+    const onResize = (e: any[]) => {
+        let rect = {}
+        for (const entry of e) {
+            rect = entry.contentRect;
+        }
+
+        cb(rect, e)
+    }
+
+    onMounted(() => {
+        observer = new ResizeObserver(debounce(onResize, 100))
+        observer.observe(tableWrapper.value)
+    })
+
+    onBeforeUnmount(() => {
+        observer?.unobserve(tableWrapper.value)
+    })
+}
diff --git a/src/components/Metadata/Table/hooks/useValidate.ts b/src/components/Metadata/Table/hooks/useValidate.ts
new file mode 100644
index 00000000..222dc04f
--- /dev/null
+++ b/src/components/Metadata/Table/hooks/useValidate.ts
@@ -0,0 +1,112 @@
+import {Ref, watch} from "vue";
+import Schema from "async-validator";
+import {handlePureRecord, collectValidateRules} from "../utils";
+import type {ColumnsType } from "../utils";
+
+type DataSourceType = Array<Record<string, any> & { __validate_id?: string, __validate_index?: number}>
+
+export type ErrorItem = {
+    message: string
+    __serial: number
+    __dataIndex: number
+
+    field: string
+
+    filedValue: any
+
+    groupId: string
+}
+
+export type OptionsType = {
+    onError?: (err: Array<Array<ErrorItem>>) => void
+    onSuccess?: () => void
+    onEdit?: (item: any) => void
+
+    validateRowKey?: Boolean
+}
+
+export const useValidate = (dataSource: Ref<DataSourceType>, columns: ColumnsType, rowKey: string, options: OptionsType = {}): {
+    validate: () => Promise<any>
+    validateItem: (data: Record<string, any> ) => Promise<any>
+    errorMap: Ref<Record<string, any>>
+    rules: Ref<Record<string, any>>
+} => {
+    const errorMap = ref({})
+
+    let schemaInstance: any
+    let rules = ref({})
+
+    const _options = Object.assign({ validateRowKey: false }, options)
+
+
+    const validateItem = (data: Record<string, any>, index: number = 0): Promise<any> => {
+        return new Promise((resolve, reject) => {
+            schemaInstance.validate(data, { firstFields: true, index}, (err: any[]) => {
+                if (err?.length) {
+                    reject(err.map(item => ({ ...item, __serial: data.__serial, __dataIndex: index })))
+                } else {
+                    resolve(data)
+                }
+            })
+        })
+    }
+
+    const validate = () => {
+        return new Promise((resolve, reject) => {
+            const filterDataSource = dataSource.value
+
+            const len = filterDataSource.length
+            const error: any[] = []
+            const success: any[] = []
+            let validateLen = 0
+            const end = () => {
+                validateLen += 1
+                if (validateLen === len) {
+                    const isSuccess = !Object.keys(error).length
+
+                    if (isSuccess) {
+                        resolve(success)
+                        _options.onSuccess?.()
+                    } else {
+                        _options.onError?.(error)
+                        reject(error)
+                    }
+                }
+            }
+
+            const validateRowKey = _options.validateRowKey
+
+            if (filterDataSource.length) {
+                filterDataSource.forEach((record, index) => {
+                    if (validateRowKey || record[rowKey]) {
+                        validateItem(record, index).then(res => {
+                            success.push(handlePureRecord(res))
+                            end()
+                        }).catch(err => {
+                            error.push(err)
+                            end()
+                        })
+                    } else {
+                        end()
+                    }
+                })
+            } else {
+                resolve(filterDataSource)
+            }
+        })
+    }
+
+    const createValidate = () => {
+        rules.value = collectValidateRules(columns)
+        schemaInstance = new Schema(rules.value)
+    }
+
+    createValidate()
+
+    return {
+        validate,
+        validateItem,
+        errorMap,
+        rules,
+    }
+}
diff --git a/src/components/Metadata/Table/index.ts b/src/components/Metadata/Table/index.ts
new file mode 100644
index 00000000..e1f15d3f
--- /dev/null
+++ b/src/components/Metadata/Table/index.ts
@@ -0,0 +1,5 @@
+export { default as EditTable } from './Table.vue'
+export { default as EditTableFormItem } from './TableFormItem.vue'
+export { default as EditTableGroup } from './group.vue'
+
+export * from './components'
diff --git a/src/components/Metadata/Table/props.ts b/src/components/Metadata/Table/props.ts
new file mode 100644
index 00000000..8164084f
--- /dev/null
+++ b/src/components/Metadata/Table/props.ts
@@ -0,0 +1,38 @@
+export const bodyProps = () => ({
+    dataSource: {
+        type: Array,
+        default: () => ([])
+    },
+    columns: {
+        type: Array,
+        default: () => ([])
+    },
+    cellHeight: {
+        type: Number,
+        default: 50
+    },
+    height: {
+        type: Number,
+        default: 300
+    },
+    style: {
+        type: Object,
+        default: () => ({})
+    },
+    disableMenu: {
+        type: Boolean,
+        default: true
+    },
+    rowKey: {
+        type: String,
+        default: 'id'
+    },
+    openGroup: {
+        type: Boolean,
+        default: false
+    },
+    rowSelection: {
+        type: Object,
+        default: undefined
+    }
+})
diff --git a/src/components/Metadata/Table/utils.ts b/src/components/Metadata/Table/utils.ts
new file mode 100644
index 00000000..4d1bccf4
--- /dev/null
+++ b/src/components/Metadata/Table/utils.ts
@@ -0,0 +1,96 @@
+import type { ColumnType } from 'ant-design-vue/lib/table'
+import { omit} from "lodash-es";
+
+
+type ColumnsFormType = {
+    rules: Array<Record<string, any>>,
+    watch: Array<string>
+}
+export type ColumnsType = Array<ColumnType & { form?: ColumnsFormType }>
+
+
+
+/**
+ * 规则收集器，收集columns中的rules和watch
+ * @param columns
+ */
+export const collectValidateRules = (columns: ColumnsType):  Record<string, any> => {
+    const rules = {}
+    columns.forEach(item => {
+        if (item.form) {
+            if (item.form.rules) {
+                rules[item.dataIndex as string] = item.form.rules
+            }
+        }
+    })
+    return rules
+}
+
+export const handlePureRecord = (record: Record<string, any>) => {
+    if (!record) return {}
+
+    // if (record.expands) {
+    //     record.expands = omit(record.expands, ['isProduct'])
+    // }
+    return omit(record, ['__serial', '__index', '__top', '__selected', '__key', '__dataIndex'])
+}
+
+
+
+export const handleColumnsWidth = (columns: any[], warpWidth: number): any[] => {
+
+    let newColumns = [...columns]
+    let noWidthLen = 0 // 没有width属性的长度
+    let hasWidthCount = 0 // 有width属性的合计
+    let average = 0 // 每个column宽度
+    let parseAverage = 0 // 取整宽度
+    let decimalCount = 0 // 收集每个取整后的小数
+    let lastNoWidthIndex : number | undefined = undefined // 最后一个没有width属性的位置
+
+    newColumns.forEach(item => {
+        if (item.width) {
+            hasWidthCount += item.width
+        } else {
+            noWidthLen += 1
+        }
+    })
+
+    if (noWidthLen) {
+        average = (warpWidth - hasWidthCount) / noWidthLen // 剩余平分分配宽度
+        parseAverage = Math.trunc(average)
+        decimalCount = (average - parseAverage) * noWidthLen
+    }
+
+    newColumns.forEach((item, index) => {
+        if (!item.width) {
+            lastNoWidthIndex = index
+        }
+    })
+
+    return newColumns.map((item, index) => {
+        let _width = item.width
+        let left = 0
+
+        if (!item.width) {
+            _width = parseAverage
+        }
+
+        if (index === lastNoWidthIndex) {
+            _width = Math.trunc(decimalCount) + parseAverage
+        }
+
+        if (index !== 0) {
+            left = newColumns[index - 1].width + newColumns[index - 1].left
+        }
+
+
+        item.width = _width
+        item.left = left
+        // prev.push({
+        //     ...next,
+        //     width: _width,
+        //     left
+        // })
+        return item
+    }, [])
+}
diff --git a/src/components/Metadata/components/ReadType.vue b/src/components/Metadata/components/ReadType.vue
index 9a1171f1..d1d6fd3e 100644
--- a/src/components/Metadata/components/ReadType.vue
+++ b/src/components/Metadata/components/ReadType.vue
@@ -1,17 +1,33 @@
 <template>
-<j-form-item name="type" label="读写类型" :rules="[
-  {
-    required: true,
-    message: '请选择读写类型'
-  }
-]">
-  <j-select
-      v-model:value="myValue"
-      mode="multiple"
-      :options="options"
-      :disabled="disabled"
-      placeholder="请选择读写类型"
-      @change="onChange"
+<j-form-item
+  name="type"
+  label="读写类型"
+  :rules="[
+    {
+      required: true,
+      message: '请选择读写类型'
+    }
+  ]"
+  style="margin-bottom: 0"
+>
+<!--  <j-select-->
+<!--      v-model:value="myValue"-->
+<!--      mode="multiple"-->
+<!--      :options="options"-->
+<!--      :disabled="disabled"-->
+<!--      :dropdownStyle="{-->
+<!--        zIndex: 1071-->
+<!--      }"-->
+<!--      :getPopupContainer="(node) => tableWrapperRef || node"-->
+<!--      placeholder="请选择读写类型"-->
+<!--      @change="onChange"-->
+<!--  />-->
+  <CheckButton
+    v-model:value="myValue"
+    :multiple="true"
+    :options="options"
+    :disabled="disabled"
+    @change="onChange"
   />
 </j-form-item>
 </template>
@@ -19,6 +35,7 @@
 <script setup lang="ts" name="ReadType">
 
 import type {PropType} from "vue";
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 
 type Emit = {
   (e: 'update:value', data: Array<string>): void
@@ -43,6 +60,7 @@ const props = defineProps({
 const emit = defineEmits<Emit>()
 
 const myValue = ref<Array<string>>([])
+const tableWrapperRef = useTableWrapper()
 
 const onChange = (keys: Array<string>) =>{
   myValue.value = keys
@@ -58,4 +76,4 @@ watch(() => props.value, () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/components/Metadata/index.ts b/src/components/Metadata/index.ts
new file mode 100644
index 00000000..e69de29b
diff --git a/src/components/Modal/DragModal.vue b/src/components/Modal/DragModal.vue
new file mode 100644
index 00000000..6cb35f85
--- /dev/null
+++ b/src/components/Modal/DragModal.vue
@@ -0,0 +1,326 @@
+<template>
+  <div ref='dialog' :style='styleName' class='dialog'>
+    <Transition name='dialog'>
+      <div class='dialog-sprite' ref='header'>
+        <div class='header' v-if="title !== false">
+          <span>{{ title }}</span>
+          <a-button size='small' type='text' @click.stop='onClose'>
+            <AIcon type='CloseOutlined' />
+          </a-button>
+        </div>
+        <div class='dialog-body' :style="bodyStyle">
+          <slot></slot>
+        </div>
+<!--        <div class='dialog-footer' v-if='slots?.footer'>-->
+<!--          <slot name='footer'></slot>-->
+<!--        </div>-->
+      </div>
+    </Transition>
+<!--    <template v-for='item in rangeList'>-->
+<!--      <div :class="{'range': true, [item.classname]: true}" @mousedown.stop='rangeMove($event,item.classname)'></div>-->
+<!--    </template>-->
+
+    <div :class="{'range': true, 'bottom-right': true}" @mousedown.stop='rangeMove($event,"bottom-right")'></div>
+  </div>
+</template>
+
+<script setup lang='ts'>
+
+defineOptions({
+  name: 'DragModal'
+})
+
+const props = defineProps({
+  title: {
+    type: [String, Boolean],
+    default: ''
+  },
+  width: {
+    type: Number,
+    default: 400
+  },
+  height: {
+    type: Number,
+    default: 100
+  },
+  dragRang: {
+    type: [Array , Number],
+    default: [400, 200]
+  },
+  bodyStyle: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const emits = defineEmits(['close', 'heightChange'])
+const slots = useSlots()
+
+const ele = document.body
+
+const dialog = ref()
+const header = ref()
+const baseWidth = ref(props.width || 400)
+const baseHeight = ref(props.height || 100)
+const baseLeft = ref(100)
+const baseTop = ref(100)
+
+const rangeList = [
+  // {
+  //   classname: 'top-left'
+  // },
+  // {
+  //   classname: 'top-right'
+  // },
+  // {
+  //   classname: 'bottom-left'
+  // },
+  {
+    classname: 'bottom-right'
+  }
+]
+
+const styleName = computed(() => {
+  return {
+    top: getFixed(baseTop.value) + 'px',
+    left: getFixed(baseLeft.value) + 'px',
+    width: getFixed(baseWidth.value) + 'px',
+    height: getFixed(baseHeight.value) + 'px'
+  }
+})
+
+const getFixed = (val: number) => {
+  return Number(val.toFixed(2))
+}
+
+const onDrag = () => {
+  let active = false
+  let initialX: number
+  let initialY: number
+  let initialWindowX: number
+  let initialWindowY: number
+
+  header.value.addEventListener('mousedown', (e: MouseEvent) => {
+    active = true
+
+    initialX = e.clientX
+    initialY = e.clientY
+
+    initialWindowX = dialog.value.offsetLeft
+    initialWindowY = dialog.value.offsetTop
+  })
+
+  document.addEventListener('mouseup', () => {
+    active = false
+  })
+
+  document.addEventListener('mousemove', (e) => {
+    if (active) {
+      const dx = e.clientX - initialX
+      const dy = e.clientY - initialY
+
+      baseLeft.value = initialWindowX + dx
+      baseTop.value = initialWindowY + dy
+    }
+  })
+}
+
+const handleClear = () => {
+  document.onmouseup = () => {
+    document.onmousemove = null
+    document.onmouseup = null
+  }
+}
+
+const rangeMove = (e: MouseEvent, position: string) => {
+  //移动的方向
+  let x: boolean = false
+  let y: boolean = false
+  //移动的位置
+  let xp: boolean = false
+  let yp: boolean = false
+  //移动的正负
+  let xc: boolean = false
+  let yc: boolean = false
+  let disX = e.clientX
+  let disY = e.clientY
+  document.onmousemove = e => {
+    if (position === 'bottom-right') {
+      x = true
+      y = true
+    } else if (position === 'bottom-left') {
+      x = true
+      y = true
+      xp = true
+      xc = true
+    } else if (position === 'top-right') {
+      x = true
+      y = true
+      yp = true
+      yc = true
+    } else if (position === 'top-left') {
+      x = true
+      y = true
+      xp = true
+      xc = true
+      yp = true
+      yc = true
+    }
+    let left = e.clientX - disX
+    let top = e.clientY - disY
+    disX = e.clientX
+    disY = e.clientY
+    if (x) {
+      let calc = left
+
+      if (xc) {
+        calc = -calc
+      }
+
+      if (xp) {
+        baseLeft.value = baseLeft.value - calc
+      }
+
+      const width = baseWidth.value + calc
+
+      baseWidth.value = width <= props.dragRang[0] ? props.dragRang[0] : width
+    }
+    if (y) {
+      let calc = top
+      if (yc) {
+        calc = -calc
+      }
+
+      if (yp) {
+        baseTop.value = baseTop.value - calc
+      }
+
+      const height = baseHeight.value + calc
+
+      baseHeight.value = height <= props.dragRang[1] ? props.dragRang[1] : height
+
+      emits('heightChange', baseHeight.value)
+    }
+  }
+  handleClear()
+}
+
+const onClose = () => {
+  console.log('close---1')
+  emits("close")
+}
+
+onMounted(() => {
+  if (dialog.value && header.value) {
+    onDrag()
+  }
+  if (ele) {
+    const data = ele?.getBoundingClientRect()
+    baseLeft.value = (data?.right - baseWidth.value) / 2 || 0
+    baseTop.value = data?.top + 200 || 0
+  }
+})
+
+watch(() => props.height, () => {
+  if (props.height > baseHeight.value) {
+    baseHeight.value = props.height
+  }
+})
+</script>
+
+<style lang='less' scoped>
+@boxColor: rgb(@primary-color);
+
+// 弹窗动画
+.dialog-enter-active,
+.dialog-leave-active {
+  transition: opacity .5s;
+}
+
+.dialog-enter,
+.dialog-leave-to {
+  opacity: 0;
+}
+
+.dialog {
+  position: fixed;
+  z-index: 1000;
+
+  .dialog-sprite {
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    overflow: hidden;
+    z-index: 23456765435;
+    background-color: #ffffff;
+    border-radius: 4px;
+    border: 1px solid #91CAFF;
+    box-shadow: 0 3px 8px 0 rgba(#1677FF, 0.24);
+
+    .header {
+      padding: 5px 15px;
+      font-size: 18px;
+      font-weight: 700;
+      color: #333;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      border-bottom: 1px solid #f0f0f0;
+      cursor: move;
+    }
+
+    .dialog-body {
+      flex: 1;
+      min-height: 0;
+      overflow-y: auto;
+      padding: 24px 20px;
+    }
+
+    .dialog-footer {
+      border-top: 1px solid #f0f0f0;
+      padding: 5px 15px;
+    }
+  }
+
+  .range {
+    position: absolute;
+    width: 16px;
+    height: 16px;
+    border-radius: 100%;
+    z-index: 23456765436;
+  }
+
+  .bottom-right, .top-left {
+    &:hover {
+      cursor: nwse-resize
+    }
+  }
+
+  .bottom-left, .top-right {
+    &:hover {
+      cursor: nesw-resize
+    }
+  }
+
+  .top-right {
+    top: -6px;
+    right: -6px;
+  }
+
+  .top-left {
+    top: -6px;
+    left: -6px;
+  }
+
+  .bottom-right {
+    bottom: -6px;
+    right: -6px;
+  }
+
+  .bottom-left {
+    bottom: -6px;
+    left: -6px;
+  }
+}
+</style>
diff --git a/src/components/Modal/index.ts b/src/components/Modal/index.ts
new file mode 100644
index 00000000..f5d8c549
--- /dev/null
+++ b/src/components/Modal/index.ts
@@ -0,0 +1 @@
+export { default as DragModal } from './DragModal.vue'
diff --git a/src/components/PermissionButton/index.vue b/src/components/PermissionButton/index.vue
index 08028be5..09230adb 100644
--- a/src/components/PermissionButton/index.vue
+++ b/src/components/PermissionButton/index.vue
@@ -1,123 +1,204 @@
 <template>
-  <template v-if="isPermission">
-    <template v-if="popConfirm">
-      <j-popconfirm :disabled="!isPermission || props.disabled" :overlayStyle='{width: "220px", zIndex: 1075 }' v-bind="popConfirm">
-        <j-tooltip v-if="tooltip" v-bind="tooltip">
-          <slot v-if="noButton"></slot>
-          <j-button v-else v-bind="props" :disabled="_isPermission" :style="props.style">
+    <template v-if="isPermission">
+        <template v-if="popConfirm">
+            <!-- <j-popconfirm
+                :disabled="!isPermission || props.disabled"
+                :overlayStyle="{ width: '220px', zIndex: 1075 }"
+                v-bind="popConfirm"
+            >
+                <j-tooltip v-if="tooltip" v-bind="tooltip">
+                    <slot v-if="noButton"></slot>
+                    <j-button
+                        v-else
+                        v-bind="props"
+                        :disabled="_isPermission"
+                        :style="props.style"
+                    >
+                        <slot></slot>
+                        <template #icon>
+                            <slot name="icon"></slot>
+                        </template>
+                    </j-button>
+                </j-tooltip>
+                <j-button v-else v-bind="props" :disabled="_isPermission">
+                    <slot></slot>
+                    <template #icon>
+                        <slot name="icon"></slot>
+                    </template>
+                </j-button>
+            </j-popconfirm> -->
+            <!-- <a-modal
+                v-if="modalVisible"
+                visible
+                :closable="false"
+                @cancel="modalVisible = false"
+                @ok="modalConfirm"
+                :confirmLoading="confirmLoading"
+                :width="300"
+                centered
+                :maskClosable="false"
+                z-index="9999"
+            >
+                <div class="modalContent">
+                    {{ popConfirm.title }}
+                </div>
+            </a-modal> -->
+            <j-tooltip v-if="tooltip" v-bind="tooltip">
+                <slot v-if="noButton"></slot>
+                <j-button
+                    v-else
+                    v-bind="props"
+                    :disabled="_isPermission"
+                    :style="props.style"
+                    @click="showConfirm"
+                >
+                    <slot></slot>
+                    <template #icon>
+                        <slot name="icon"></slot>
+                    </template>
+                </j-button>
+            </j-tooltip>
+            <j-button
+                v-else
+                v-bind="props"
+                :disabled="_isPermission"
+                @click="showConfirm"
+            >
+                <slot></slot>
+                <template #icon>
+                    <slot name="icon"></slot>
+                </template>
+            </j-button>
+        </template>
+        <template v-else-if="tooltip">
+            <j-tooltip v-bind="tooltip">
+                <slot v-if="noButton"></slot>
+                <j-button
+                    v-else
+                    v-bind="props"
+                    :disabled="_isPermission"
+                    :style="props.style"
+                >
+                    <slot></slot>
+                    <template #icon>
+                        <slot name="icon"></slot>
+                    </template>
+                </j-button>
+            </j-tooltip>
+        </template>
+        <template v-else>
+            <slot v-if="noButton"></slot>
+            <j-button
+                v-else
+                v-bind="props"
+                :disabled="_isPermission"
+                :style="props.style"
+            >
+                <slot></slot>
+                <template #icon>
+                    <slot name="icon"></slot>
+                </template>
+            </j-button>
+        </template>
+    </template>
+    <j-tooltip v-else title="暂无权限，请联系管理员" :placement="placement">
+        <slot v-if="noButton"></slot>
+        <j-button
+            v-else
+            v-bind="props"
+            :disabled="_isPermission"
+            :style="props.style"
+        >
             <slot></slot>
             <template #icon>
-              <slot name="icon"></slot>
+                <slot name="icon"></slot>
             </template>
-          </j-button>
-        </j-tooltip>
-        <j-button v-else v-bind="props" :disabled="_isPermission" >
-          <slot></slot>
-          <template #icon>
-            <slot name="icon"></slot>
-          </template>
         </j-button>
-      </j-popconfirm>
-    </template>
-    <template v-else-if="tooltip">
-      <j-tooltip v-bind="tooltip">
-        <slot v-if="noButton"></slot>
-        <j-button v-else v-bind="props" :disabled="_isPermission" :style="props.style">
-          <slot></slot>
-          <template #icon>
-            <slot name="icon"></slot>
-          </template>
-        </j-button>
-      </j-tooltip>
-    </template>
-    <template v-else>
-      <slot v-if="noButton"></slot>
-      <j-button v-else v-bind="props" :disabled="_isPermission" :style="props.style">
-        <slot></slot>
-        <template #icon>
-          <slot name="icon"></slot>
-        </template>
-      </j-button>
-    </template>
-  </template>
-  <j-tooltip v-else title="暂无权限，请联系管理员" :placement="placement">
-    <slot v-if="noButton"></slot>
-    <j-button v-else v-bind="props" :disabled="_isPermission" :style="props.style">
-      <slot></slot>
-      <template #icon>
-        <slot name="icon"></slot>
-      </template>
-    </j-button>
-  </j-tooltip>
+    </j-tooltip>
 </template>
 <script setup lang="ts" name="PermissionButton">
-import { CSSProperties, PropType } from 'vue'
-import { TooltipProps, PopconfirmProps } from 'ant-design-vue/es'
-import { buttonProps } from 'ant-design-vue/es/button/button'
+import { CSSProperties, PropType } from 'vue';
+import { TooltipProps, PopconfirmProps } from 'ant-design-vue/es';
+import { buttonProps } from 'ant-design-vue/es/button/button';
 import { usePermissionStore } from '@/store/permission';
 import { omit } from 'lodash-es';
+import { Modal } from 'ant-design-vue';
 
-// interface PermissionButtonEmits {
-//   (e: 'click', data: MouseEvent): void;
-// }
-
-// const emits = defineEmits<PermissionButtonEmits>()
-
-// interface PermissionButtonProps extends ButtonProps {
-//   tooltip?: TooltipProps;
-//   popConfirm?: PopconfirmProps;
-//   hasPermission?: string | Array<string>;
-//   noButton?: boolean;
-// }
-// const props = withDefaults(defineProps<PermissionButtonProps>(), {
-//   noButton: false,
-// })
 const props = defineProps({
-  noButton: {
-    type: Boolean,
-    default: () => false
-  },
-  tooltip: {
-    type: Object as PropType<TooltipProps>,
-  },
-  popConfirm: {
-    type: Object as PropType<PopconfirmProps>,
-  },
-  hasPermission: {
-    type: [String , Array, Boolean],
-  },
-  style: {
-    type: Object as PropType<CSSProperties>
-  },
-  placement:{
-    type: String,
-    default: 'top'
-  },
-  ...omit(buttonProps(), 'icon')
-})
-
-// const { tooltip, popConfirm, hasPermission, noButton, ..._buttonProps } = props;
-
-const permissionStore = usePermissionStore()
+    noButton: {
+        type: Boolean,
+        default: () => false,
+    },
+    tooltip: {
+        type: Object as PropType<TooltipProps>,
+    },
+    popConfirm: {
+        type: Object as PropType<PopconfirmProps>,
+    },
+    hasPermission: {
+        type: [String, Array, Boolean],
+    },
+    style: {
+        type: Object as PropType<CSSProperties>,
+    },
+    placement: {
+        type: String,
+        default: 'top',
+    },
+    ...omit(buttonProps(), 'icon'),
+});
+// const modalVisible = ref(false);
+// const confirmLoading = ref(false);
+const permissionStore = usePermissionStore();
 
 const isPermission = computed(() => {
-  if (!props.hasPermission || props.hasPermission === true) {
-    return true
-  }
-  return permissionStore.hasPermission(props.hasPermission)
-})
+    if (!props.hasPermission || props.hasPermission === true) {
+        return true;
+    }
+    return permissionStore.hasPermission(props.hasPermission);
+});
 const _isPermission = computed(() =>
-  'hasPermission' in props && isPermission.value
-    ? 'disabled' in props
-      ? props.disabled as boolean
-      : false
-    : true
-)
+    'hasPermission' in props && isPermission.value
+        ? 'disabled' in props
+            ? (props.disabled as boolean)
+            : false
+        : true,
+);
 
-// const conform = (e: MouseEvent) => {
-//   props.popConfirm?.onConfirm?.(e)
-// }
+// const modalConfirm =  async (e: MouseEvent) => {
+//     if (typeof props.popConfirm?.onConfirm === 'function') {
+//         confirmLoading.value = true;
+//         const res: any =  await props.popConfirm?.onConfirm(e)?.finally(()=>{
+//             confirmLoading.value = false;
+//             modalVisible.value = false;
+//             return
+//         });
+//         if(!res?.finally){
+//             confirmLoading.value = false;
+//             modalVisible.value = false;
+//         }
+//     } else {
+//         modalVisible.value = false;
+//     }
+// };
+const showConfirm = () => {
+    Modal.confirm({
+        title: props.popConfirm?.title,
+        content: props.popConfirm?.content,
+        onOk() {
+            return props.popConfirm?.onConfirm();
+        },
+        onCancel() {},
+    });
+};
 </script>
 <style scoped lang="less">
-
+// .modalContent {
+//     text-align: center;
+// }
+// .control {
+//     margin-top: 20px;
+//     display: flex;
+//     justify-content: space-between;
+// }
 </style>
diff --git a/src/components/Player/ScreenPlayer.vue b/src/components/Player/ScreenPlayer.vue
index b1dbf270..c0b552b2 100644
--- a/src/components/Player/ScreenPlayer.vue
+++ b/src/components/Player/ScreenPlayer.vue
@@ -75,24 +75,20 @@
                                         >
                                             <j-space>
                                                 <span>{{ item.name }}</span>
-                                                <j-popconfirm
-                                                    title="确认删除?"
-                                                    ok-text="确认"
-                                                    cancel-text="取消"
-                                                    @confirm="(e: any) => {
+                                                <PermissionButton
+                                                    type="text"
+                                                    :popConfirm="{
+                                                    title: '确认删除？',
+                                                    onConfirm: (e: any) => {
                                                         e?.stopPropagation();
                                                         deleteHistory(item.key);
                                                     }
-                                                    "
+                                                }"
                                                 >
                                                     <AIcon
                                                         type="DeleteOutlined"
-                                                        @click="
-                                                            (e:any) =>
-                                                                e?.stopPropagation()
-                                                        "
                                                     />
-                                                </j-popconfirm>
+                                                </PermissionButton>
                                             </j-space>
                                         </j-menu-item>
                                     </j-menu>
@@ -316,12 +312,15 @@ const getHistory = async () => {
  * 删除历史分屏
  * @param id
  */
-const deleteHistory = async (id: string) => {
-    const res = await deleteSearchHistory(DEFAULT_SAVE_CODE, id);
-    if (res.success) {
-        getHistory();
-        visible.value = false;
-    }
+const deleteHistory =  (id: string) => {
+    const response =  deleteSearchHistory(DEFAULT_SAVE_CODE, id);
+    response.then((res)=>{
+        if(res.success){
+            getHistory();
+            visible.value = false;
+        }
+    })
+    return response
 };
 
 /**
@@ -458,16 +457,16 @@ defineExpose({
 
 <style lang="less" scoped>
 @import './index.less';
-:deep(.live-player-stretch-btn){
-  display: none;
+:deep(.live-player-stretch-btn) {
+    display: none;
 }
-:deep(.vjs-icon-spinner){
-  display: none;
+:deep(.vjs-icon-spinner) {
+    display: none;
 }
-.refreshBtn{
-   opacity: 0;
+.refreshBtn {
+    opacity: 0;
 }
-.refreshBtn:hover{
+.refreshBtn:hover {
     opacity: 1;
 }
 </style>
diff --git a/src/components/Player/index.less b/src/components/Player/index.less
index b199fe65..64ff8ccd 100644
--- a/src/components/Player/index.less
+++ b/src/components/Player/index.less
@@ -1,5 +1,6 @@
 .live-player-warp {
     display: flex;
+    height: 100%;
 
     .live-player-content {
         display: flex;
@@ -25,6 +26,7 @@
                 position: relative;
                 display: grid;
                 box-sizing: border-box;
+                height: 100%;
 
                 &.screen-1 {
                     grid-template-columns: 1fr;
@@ -46,7 +48,18 @@
                 }
 
                 .active {
-                    border: 2px solid red;
+                    position: relative;
+                    &::after {
+                        content: '';
+                        position: absolute;
+                        width: 100%;
+                        height: 100%;
+                        top: 0;
+                        left: 0;
+                        z-index: 99;
+                        border: 2px solid red;
+                        pointer-events: none;
+                    }
                 }
 
                 .full-screen {
diff --git a/src/components/Player/index.vue b/src/components/Player/index.vue
index 95fa97c7..2dd1ce83 100644
--- a/src/components/Player/index.vue
+++ b/src/components/Player/index.vue
@@ -1,28 +1,37 @@
 <!-- 视频播放 -->
 <template>
-    <LivePlayer
-        ref="player"
-        fluent
-        :protocol="props.protocol || 'mp4'"
-        :class="props.className"
-        :loading="props.loading"
-        :live="'live' in props ? props.live !== false : true"
-        :autoplay="'autoplay' in props ? props.autoplay !== false : true"
-        :muted="'muted' in props ? props.muted !== false : true"
-        :hide-big-play-button="true"
-        :poster="props.poster || ''"
-        :timeout="props.timeout || 30"
-        :video-url="url || ''"
-        @play="props.onPlay"
-        @pause="props.onPause"
-        @ended="props.onEnded"
-        @error="props.onError"
-        @timeupdate="props.onTimeUpdate"
-    />
+<!--    <LivePlayer-->
+<!--        ref="player"-->
+<!--        fluent-->
+<!--        :protocol="props.protocol || 'mp4'"-->
+<!--        :class="props.className"-->
+<!--        :loading="props.loading"-->
+<!--        :live="'live' in props ? props.live !== false : true"-->
+<!--        :autoplay="'autoplay' in props ? props.autoplay !== false : true"-->
+<!--        :muted="'muted' in props ? props.muted !== false : true"-->
+<!--        :hide-big-play-button="true"-->
+<!--        :poster="props.poster || ''"-->
+<!--        :timeout="props.timeout || 30"-->
+<!--        :video-url="url || ''"-->
+<!--        @play="props.onPlay"-->
+<!--        @pause="props.onPause"-->
+<!--        @ended="props.onEnded"-->
+<!--        @error="props.onError"-->
+<!--        @timeupdate="props.onTimeUpdate"-->
+<!--    />-->
+  <div class="media-player-container" >
+    <div ref="playerElement">
+      <span v-if="!props.url">
+        No Video
+      </span>
+    </div>
+
+  </div>
 </template>
 
-<script setup lang="ts">
-import LivePlayer from '@liveqing/liveplayer-v3';
+<script setup lang="ts" name="LivePlayer">
+import Player, { Events, Sniffer } from 'xgplayer'
+import { settingEnum } from './utils'
 
 type PlayerProps = {
     url?: string;
@@ -35,7 +44,7 @@ type PlayerProps = {
     updateTime?: number;
     key?: string | number;
     loading?: boolean;
-    protocol?: 'mp4' | 'flv' | 'hls' | 'rtc';
+    protocol?: 'mp4' | 'flv' | 'm3u8' | 'rtc';
     onDestroy?: (e?: any) => void;
     onMessage?: (msg: any) => void;
     onError?: (err: any) => void;
@@ -52,34 +61,115 @@ type PlayerProps = {
 
 const props = defineProps<PlayerProps>();
 
-const player = ref<HTMLVideoElement>();
-const url = ref(props.url);
-
-watchEffect(() => {
-    url.value = props.url;
-});
+const playerElement = ref<HTMLVideoElement>();
+let player: any = null
 
 /**
  * 播放
  */
 const play = () => {
-    player.value?.play();
+    player?.play();
 };
 
 /**
  * 暂停
  */
 const pause = () => {
-    player.value?.pause();
+    player?.pause();
 };
 
 /**
  * 暂停状态
  */
 const paused = () => {
-    return player.value?.paused;
+    return player?.paused;
 };
 
+const destroy = () => {
+  if (player) {
+    player.destroy()
+    player = null
+  }
+}
+
+const init = () => {
+
+  destroy()
+  setTimeout(() => {
+
+    console.log(props.protocol)
+
+    player = new Player({
+      el: playerElement.value,
+      // autoplay: props.autoplay ?? true,
+      url: props.url,
+      isLive: props.live,
+      width: '100%',
+      height: '100%',
+      hasStart: false,
+      playbackRate: false,
+      ignores: ['progress', 'volume', 'time', 'replay'],
+      closeVideoClick: true,
+      closeVideoDblclick: true,
+      closeVideoTouch: true,
+      closePlayerBlur: true,
+      closeControlsBlur: true,
+      closeFocusVideoFocus: true,
+      closePlayVideoFocus: true,
+      ...settingEnum[props.protocol || 'mp4']
+    })
+
+    player.on(Events.PLAY, (ev) => {
+      console.log('-播放开始-', ev);
+      props.onPlay?.()
+    })
+    player.on(Events.PAUSE, (ev) => {
+      console.log('-播放暂停-', ev);
+      props.onPause?.()
+    })
+    player.on(Events.ENDED, (ev) => {
+      console.log('-播放结束-', ev);
+      props.onEnded?.()
+    })
+    player.on(Events.TIME_UPDATE, (ev) => {
+      props.onTimeUpdate?.(ev)
+    })
+    player.on(Events.CANPLAY, (ev) => {
+      console.log('-媒体数据加载好了-', ev);
+      if (props.autoplay !== false) {
+        play()
+      }
+    })
+    player.on(Events.SEEKED, (ev) => {
+      console.log('-跳着播放-', ev);
+      if (props.live) {
+        init()
+      }
+    })
+    player.on(Events.ERROR, (ev) => {
+      console.log('-播放错误-', ev);
+      if (props.live) {
+        setTimeout(() => {
+          init()
+        }, 5000)
+      }
+      props.onError?.(ev)
+    })
+  }, 30)
+}
+
+watch(() => props.url, () => {
+  if (props.url) {
+    nextTick(() => {
+      init()
+    })
+  }
+}, { immediate: true })
+
+onBeforeUnmount(() => {
+  destroy()
+})
+
 defineExpose({
     play,
     pause,
@@ -93,4 +183,13 @@ defineExpose({
 :deep(.vjs-icon-spinner){
   display: none;
 }
+.media-player-container {
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: #fff;
+}
 </style>
diff --git a/src/components/Player/utils.ts b/src/components/Player/utils.ts
new file mode 100644
index 00000000..44655adb
--- /dev/null
+++ b/src/components/Player/utils.ts
@@ -0,0 +1,13 @@
+import FlvPlugin from 'xgplayer-flv'
+import HlsPlugin from "xgplayer-hls"
+export const settingEnum = {
+    mp4: {
+        isLive: false,
+    },
+    flv: {
+        plugins: [FlvPlugin],
+    },
+    m3u8: {
+        plugins: [HlsPlugin],
+    }
+}
diff --git a/src/components/RadioCard/index.vue b/src/components/RadioCard/index.vue
index d66d59fb..c4a3a502 100644
--- a/src/components/RadioCard/index.vue
+++ b/src/components/RadioCard/index.vue
@@ -114,15 +114,15 @@ const handleRadio = (item: any) => {
         border-radius: 2px;
         display: flex;
         align-items: center;
-        
+
         cursor: pointer;
         .img {
             width: 32px;
             height: 32px;
         }
         &.active {
-            color: #1d39c4;
-            border-color: #1d39c4;
+            color: @primary-color;
+            border-color: @primary-color;
         }
     }
 }
@@ -195,8 +195,8 @@ const handleRadio = (item: any) => {
             height: 100px;
         }
         &.active {
-            color: #1d39c4;
-            border-color: #1d39c4;
+            color: @primary-color;
+            border-color: @primary-color;
         }
 
     }
diff --git a/src/components/ValueItem/index.vue b/src/components/ValueItem/index.vue
index da46528a..9e17e7a9 100644
--- a/src/components/ValueItem/index.vue
+++ b/src/components/ValueItem/index.vue
@@ -3,11 +3,12 @@
     <div class="value-item-warp">
         <j-select
             v-if="typeMap.get(itemType) === 'select'"
-            :mode="mode"
             v-model:value="myValue"
-            :options="options"
-            allowClear
             style="width: 100%"
+            allowClear
+            :mode="mode"
+            v-bind="extra"
+            :options="options"
             :getPopupContainer="getPopupContainer"
             @change='selectChange'
         />
@@ -17,6 +18,7 @@
           allowClear
           valueFormat="HH:mm:ss"
           style="width: 100%"
+          v-bind="extra"
           :getPopupContainer="getPopupContainer"
           @change='timeChange'
         />
@@ -26,7 +28,8 @@
             allowClear
             showTime
             valueFormat="YYYY-MM-DD HH:mm:ss"
-            style="width: 100%"
+            style="width: 100%;"
+            v-bind="extra"
             :getPopupContainer="getPopupContainer"
             @change='dateChange'
         />
@@ -35,12 +38,14 @@
             v-model:value="myValue"
             allowClear
             style="width: 100%"
+            v-bind="extra"
             @change='inputChange'
         />
         <j-input
             allowClear
             v-else-if="typeMap.get(itemType) === 'object'"
             v-model:value="myValue"
+            v-bind="extra"
             @change='inputChange'
         >
             <template #addonAfter>
@@ -50,11 +55,13 @@
         <GeoComponent
             v-else-if="typeMap.get(itemType) === 'geoPoint'"
             v-model:point="myValue"
+            v-bind="extra"
             @change='inputChange'
         />
         <j-input
             v-else-if="typeMap.get(itemType) === 'file'"
             v-model:value="myValue"
+            v-bind="extra"
             placeholder="请输入链接"
             allowClear
             @change='inputChange'
@@ -75,6 +82,7 @@
             v-else-if="typeMap.get(itemType) === 'password'"
             allowClear
             type="password"
+            v-bind="extra"
             v-model:value="myValue"
             style="width: 100%"
             @change='inputChange'
@@ -85,6 +93,7 @@
             allowClear
             type="text"
             v-model:value="myValue"
+            v-bind="extra"
             style="width: 100%"
             @change='inputChange'
         />
@@ -113,11 +122,10 @@ import { PropType } from 'vue';
 import { UploadChangeParam, UploadFile } from 'ant-design-vue';
 import { DefaultOptionType } from 'ant-design-vue/lib/select';
 import GeoComponent from '@/components/GeoComponent/index.vue';
-import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
+import { TOKEN_KEY } from '@/utils/variable';
 import { LocalStore } from '@/utils/comm';
 import { ItemData, ITypes } from './types';
 import { FILE_UPLOAD } from '@/api/comm';
-import { Upload } from 'jetlinks-ui-components'
 
 type Emits = {
     (e: 'update:modelValue', data: string | number | boolean): void;
@@ -157,6 +165,10 @@ const props = defineProps({
     getPopupContainer: {
         type: Function,
         default: undefined
+    },
+    extra: {
+      type: Object,
+      default: () => ({})
     }
 });
 // type Props = {
@@ -182,6 +194,7 @@ const componentsType = ref<ITypes>({
     object: 'object',
     geoPoint: 'geoPoint',
     file: 'file',
+    time: 'time',
 });
 const typeMap = new Map(Object.entries(componentsType.value));
 
diff --git a/src/components/ValueItem/types.d.ts b/src/components/ValueItem/types.d.ts
index 5da7e778..e1b2d4f3 100644
--- a/src/components/ValueItem/types.d.ts
+++ b/src/components/ValueItem/types.d.ts
@@ -16,4 +16,6 @@ export type ITypes = {
     object: string
     geoPoint: string
     file: string
-}
\ No newline at end of file
+
+    time: string
+}
diff --git a/src/components/index.ts b/src/components/index.ts
index 3b389b9e..c96510a2 100644
--- a/src/components/index.ts
+++ b/src/components/index.ts
@@ -12,12 +12,16 @@ import { BasicLayoutPage, BlankLayoutPage, FullPage } from './Layout'
 import RadioCard from './RadioCard/index.vue'
 import { PageContainer, AIcon, Ellipsis } from 'jetlinks-ui-components'
 import MarkDown from './Markdown'
+import CardSelect from './CardSelect'
 // import Ellipsis from './Ellipsis/index.vue'
 import JEmpty from './Empty/index.vue'
-import AMapComponent from './AMapComponent/index.vue'
+import AMapComponent from './AMapComponent/AMap.vue'
 import PathSimplifier from './AMapComponent/PathSimplifier.vue'
 import ValueItem from './ValueItem/index.vue'
 import RowPagination from './RowPagination/index.vue'
+import LevelIcon from './AlarmLeveIcon/index.vue'
+import CheckButton from "./CheckButton";
+import ConfirmModal from './ConfirmModal/index.vue'
 
 export default  {
     install(app: App) {
@@ -43,5 +47,9 @@ export default  {
             .component('FullPage', FullPage)
             .component('RadioCard', RadioCard)
             .component('MarkDown', MarkDown)
+            .component('CardSelect', CardSelect)
+            .component('CheckButton', CheckButton)
+            .component('ConfirmModal',ConfirmModal)
+            .component('LevelIcon',LevelIcon)
     }
 }
diff --git a/src/hook/index.ts b/src/hook/index.ts
index f222b03e..eb54c2d6 100644
--- a/src/hook/index.ts
+++ b/src/hook/index.ts
@@ -1 +1,2 @@
 export * from './useRequest'
+export * from './useAlarmLevel'
diff --git a/src/hook/useAlarmLevel.ts b/src/hook/useAlarmLevel.ts
new file mode 100644
index 00000000..5684cb83
--- /dev/null
+++ b/src/hook/useAlarmLevel.ts
@@ -0,0 +1,30 @@
+import { useRequest } from './useRequest'
+import { queryLevel } from '@/api/rule-engine/config';
+
+type LevelListType = Array<{ label: number, value: string}>
+export const useAlarmLevel = () => {
+    const levelMap = ref({})
+    const levelList =  ref<LevelListType>([])
+
+    useRequest(queryLevel, {
+        onSuccess(res) {
+            if (res.result?.levels?.length) {
+                const arr: LevelListType = []
+                levelMap.value = res.result.levels.reduce((prev: Record<string, string>, next: Record<string, any>) => {
+                    prev[next.level] = next.title
+                    arr.push({
+                        label: next.title,
+                        value: next.level
+                    })
+                    return prev
+                }, {})
+                levelList.value = arr
+            }
+        }
+    })
+
+    return {
+        levelMap,
+        levelList
+    }
+}
diff --git a/src/hook/useRequest.ts b/src/hook/useRequest.ts
index 6d2d9c03..c8ec0720 100644
--- a/src/hook/useRequest.ts
+++ b/src/hook/useRequest.ts
@@ -21,6 +21,8 @@ interface RequestOptions<T, S> {
     defaultParams: S | any | any[]
 
     handleResponse: (data: any) => any
+
+    defaultValue?: S
 }
 
 const defaultOptions: any = {
@@ -38,7 +40,7 @@ export const useRequest = <T = any, S = any>(
     loading: Ref<boolean>,
     run: Run
 } => {
-    const data = ref<S>()
+    const data = ref<S | undefined>(options.defaultValue)
     const loading = ref(false)
     const _options = {
         ...defaultOptions,
@@ -68,7 +70,7 @@ export const useRequest = <T = any, S = any>(
         }
     }
 
-    if (_options.immediate) { // 主动触发
+    function reload () { // 重新触发
         if (_options.defaultParams) {
             isArray(_options.defaultParams) ? run(..._options.defaultParams) : run(_options.defaultParams)
         } else {
@@ -76,6 +78,10 @@ export const useRequest = <T = any, S = any>(
         }
     }
 
+    if (_options.immediate) { // 主动触发
+        reload()
+    }
+
     onUnmounted(() => {
         // 销毁时，撤销该请求
         if (request && isFunction(request)) {
@@ -87,6 +93,7 @@ export const useRequest = <T = any, S = any>(
     return {
         data,
         loading,
-        run
+        run,
+        reload
     }
 }
diff --git a/src/i18n/index.ts b/src/i18n/index.ts
new file mode 100644
index 00000000..6ea76908
--- /dev/null
+++ b/src/i18n/index.ts
@@ -0,0 +1,17 @@
+import { createI18n } from 'vue-i18n'
+import zh from './locale/zh.json'
+import en from './locale/en.json'
+
+const messages = {
+    en,
+    zh,
+}
+const language = (navigator.language || 'en').toLocaleLowerCase() // 这是获取浏览器的语言
+const i18n = createI18n({
+    locale: localStorage.getItem('lang') || language.split('-')[0] || 'en', // 首先从缓存里拿，没有的话就用浏览器语言，
+    fallbackLocale: 'en', // 设置备用语言
+    messages,
+    legacy: false
+})
+
+export default i18n
diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
new file mode 100644
index 00000000..5107d2cc
--- /dev/null
+++ b/src/i18n/locale/en.json
@@ -0,0 +1,1773 @@
+{
+	"Login.index.265048-0": "keep on record:",
+	"Login.index.265048-1": "YuICPBei No. 19017719-1",
+	"Login.index.265048-2": "account number",
+	"Login.index.265048-3": "Please enter your account number",
+	"Login.index.265048-4": "password",
+	"Login.index.265048-5": "Please input a password",
+	"Login.index.265048-6": "Verification Code",
+	"Login.index.265048-7": "Please enter the verification code",
+	"Login.index.265048-8": "Remember me",
+	"Login.index.265048-9": "Sign in",
+	"Login.index.265048-10": "Other login methods",
+	"Login.index.265048-11": "JETLINKS team's new visual large screen system",
+	"Login.index.265048-12": "Experience DEMO",
+	"Login.index.265048-13": "Please enter your account!",
+	"Login.index.265048-14": "Please input a password!",
+	"Login.index.265048-15": "Please enter the verification code!",
+	"BooleanParam.index.966482-0": "",
+	"BooleanParam.index.966482-1": "",
+	"BooleanParam.index.966482-2": "",
+	"BooleanParam.index.966482-3": "",
+	"BooleanParam.index.966482-4": "",
+	"BooleanParam.index.966482-5": "",
+	"BooleanParam.index.966482-6": "",
+	"Save.GateWayFormItem.039083-0": "",
+	"Save.GateWayFormItem.039083-1": "",
+	"DevOpsHome.index.152181-0": "",
+	"DevOpsHome.index.152181-1": "",
+	"DevOpsHome.index.152181-2": "",
+	"DevOpsHome.index.152181-3": "",
+	"DevOpsHome.index.152181-4": "",
+	"DevOpsHome.index.152181-5": "",
+	"DevOpsHome.index.152181-6": "",
+	"DevOpsHome.index.152181-7": "",
+	"DevOpsHome.index.152181-8": "",
+	"DevOpsHome.index.152181-9": "",
+	"DevOpsHome.index.152181-10": "",
+	"DevOpsHome.index.152181-11": "",
+	"DevOpsHome.index.152181-12": "",
+	"DevOpsHome.index.152181-13": "",
+	"DevOpsHome.index.152181-14": "",
+	"DevOpsHome.index.152181-15": "",
+	"Task2.index.551010-0": "",
+	"Task2.index.551010-1": "",
+	"Task2.index.551010-2": "",
+	"Task2.index.551010-3": "",
+	"Task2.index.551010-4": "",
+	"Task2.index.551010-5": "",
+	"Task2.index.551010-6": "",
+	"Task2.index.551010-7": "",
+	"Task2.index.551010-8": "",
+	"Task2.index.551010-9": "",
+	"Task2.index.551010-10": "",
+	"Detail.index.551010-0": "",
+	"Detail.index.551010-1": "",
+	"Detail.index.551010-2": "",
+	"Detail.index.551010-3": "",
+	"Detail.index.551010-4": "",
+	"Detail.index.551010-5": "",
+	"Detail.index.551010-6": "",
+	"Detail.index.551010-7": "",
+	"Detail.index.551010-8": "",
+	"Detail.index.551010-9": "",
+	"Detail.index.551010-10": "",
+	"Detail.index.551010-11": "",
+	"Detail.index.551010-12": "",
+	"Detail.index.551010-13": "",
+	"Detail.index.551010-14": "",
+	"Detail.index.551010-15": "",
+	"Task.index.551010-0": "",
+	"Task.index.551010-1": "",
+	"Task.index.551010-2": "",
+	"Task.index.551010-3": "",
+	"Task.index.551010-4": "",
+	"Task.index.551010-5": "",
+	"Task.index.551010-6": "",
+	"Task.index.551010-7": "",
+	"Task.index.551010-8": "",
+	"Task.index.551010-9": "",
+	"Task.index.551010-10": "",
+	"Task.index.551010-11": "",
+	"Task.index.551010-12": "",
+	"Save.index.551010-0": "",
+	"Save.index.551010-1": "",
+	"Save.index.551010-2": "",
+	"Save.index.551010-3": "",
+	"Save.index.551010-4": "",
+	"Save.index.551010-5": "",
+	"Save.index.551010-6": "",
+	"Save.index.551010-7": "",
+	"Save.index.551010-8": "",
+	"Save.index.551010-9": "",
+	"Save.index.551010-10": "",
+	"Save.index.551010-11": "",
+	"Save.index.551010-12": "",
+	"Save.index.551010-13": "",
+	"Save.index.551010-14": "",
+	"Save.index.551010-15": "",
+	"Save.index.551010-16": "",
+	"Save.index.551010-17": "",
+	"Save.index.551010-18": "",
+	"Save.index.551010-19": "",
+	"Save.index.551010-20": "",
+	"Save.index.551010-21": "",
+	"Save.index.551010-22": "",
+	"Save.index.551010-23": "",
+	"Save.FileUpload.551010-0": "",
+	"Save.FileUpload.551010-1": "",
+	"Save.FileUpload.551010-2": "",
+	"Save.FileUpload.551010-3": "",
+	"Save.FileUpload.551010-4": "",
+	"Save.index.551010-24": "",
+	"Save.index.551010-25": "",
+	"Save.index.551010-26": "",
+	"Save.index.551010-27": "",
+	"Save.index.551010-28": "",
+	"Save.index.551010-29": "",
+	"Save.index.551010-30": "",
+	"Save.index.551010-31": "",
+	"Save.index.551010-32": "",
+	"Save.index.551010-33": "",
+	"Save.index.551009-0": "",
+	"Save.index.551009-1": "",
+	"Save.index.551009-2": "",
+	"Save.index.551009-3": "",
+	"Save.index.551009-4": "",
+	"Save.index.551009-5": "",
+	"Save.index.551009-6": "",
+	"Save.index.551009-7": "",
+	"Save.index.551009-8": "",
+	"Save.index.551009-9": "",
+	"Save.index.551009-10": "",
+	"Save.index.551009-11": "",
+	"Save.index.551009-12": "",
+	"Save.index.551009-13": "",
+	"Save.index.551009-14": "",
+	"Save.index.551009-15": "",
+	"Save.index.551009-16": "",
+	"Save.index.551009-17": "",
+	"Save.index.551009-18": "",
+	"Save.index.551009-19": "",
+	"Save.index.551009-20": "",
+	"Save.index.551009-21": "",
+	"Save.index.551009-22": "",
+	"Save.index.551009-23": "",
+	"Save.SelectDevices.551010-0": "",
+	"Save.SelectDevices.551010-1": "",
+	"Save.SelectDevices.551010-2": "",
+	"Save.SelectDevices.551010-3": "",
+	"Save.SelectDevices.551010-4": "",
+	"Save.SelectDevices.551010-5": "",
+	"Save.SelectDevices.551010-6": "",
+	"Save.SelectDevices.551010-7": "",
+	"Save.SelectDevices.551010-8": "",
+	"Save.SelectDevices.551010-9": "",
+	"Save.SelectDevices.551010-10": "",
+	"Save.SelectDevices.551010-11": "",
+	"Detail.PropertyAMap.551011-0": "",
+	"Detail.PropertyAMap.551011-1": "",
+	"Detail.PropertyAMap.551011-2": "",
+	"Instance.index.551009-0": "",
+	"Instance.index.551009-1": "",
+	"Instance.index.551009-2": "",
+	"Instance.index.551009-3": "",
+	"Instance.index.551009-4": "",
+	"Instance.index.551009-5": "",
+	"Instance.index.551009-6": "",
+	"Instance.index.551009-7": "",
+	"Instance.index.551009-8": "",
+	"Instance.index.551009-9": "",
+	"Instance.index.551009-10": "",
+	"Instance.index.551009-11": "",
+	"Instance.index.551009-12": "",
+	"Instance.index.551009-13": "",
+	"Instance.index.551009-14": "",
+	"Instance.index.551009-15": "",
+	"Instance.index.551009-16": "",
+	"Instance.index.551009-17": "",
+	"Instance.index.551009-18": "",
+	"Instance.index.551009-19": "",
+	"Instance.index.551009-20": "",
+	"Instance.index.551009-21": "",
+	"Instance.index.551009-22": "",
+	"Instance.index.551009-23": "",
+	"Instance.index.551009-24": "",
+	"Instance.index.551009-25": "",
+	"Instance.index.551009-26": "",
+	"Instance.index.551009-27": "",
+	"Instance.index.551009-28": "",
+	"Instance.index.551009-29": "",
+	"Instance.index.551009-30": "",
+	"Instance.index.551009-31": "",
+	"Instance.index.551009-32": "",
+	"Instance.index.551009-33": "",
+	"Instance.index.551009-34": "",
+	"Instance.index.551009-35": "",
+	"Instance.index.551009-36": "",
+	"Instance.index.551009-37": "",
+	"DeviceAccess.index.551011-0": "",
+	"DeviceAccess.index.551011-1": "",
+	"DeviceAccess.index.551011-2": "",
+	"DeviceAccess.index.551011-3": "",
+	"DeviceAccess.index.551011-4": "",
+	"DeviceAccess.index.551011-5": "",
+	"DeviceAccess.index.551011-6": "",
+	"DeviceAccess.index.551011-7": "",
+	"DeviceAccess.index.551011-8": "",
+	"DeviceAccess.index.551011-9": "",
+	"DeviceAccess.index.551011-10": "",
+	"DeviceAccess.index.551011-11": "",
+	"DeviceAccess.index.551011-12": "",
+	"DeviceAccess.index.551011-13": "",
+	"DeviceAccess.index.551011-14": "",
+	"DeviceAccess.index.551011-15": "",
+	"DeviceAccess.index.551011-16": "",
+	"DeviceAccess.index.551011-17": "",
+	"DeviceAccess.index.551011-18": "",
+	"DeviceAccess.index.551011-19": "",
+	"DeviceAccess.index.551011-20": "",
+	"DeviceAccess.index.551011-21": "",
+	"DeviceAccess.index.551011-22": "",
+	"DeviceAccess.index.551011-23": "",
+	"DeviceAccess.index.551011-24": "",
+	"DeviceAccess.index.551011-25": "",
+	"DeviceAccess.index.551011-26": "",
+	"DeviceAccess.index.551011-27": "",
+	"DeviceAccess.index.551011-28": "",
+	"DeviceAccess.index.551011-29": "",
+	"DeviceAccess.index.551011-30": "",
+	"DeviceAccess.index.551011-31": "",
+	"DeviceAccess.index.551011-32": "",
+	"Firmware.index.551009-0": "",
+	"Firmware.index.551009-1": "",
+	"Firmware.index.551009-2": "",
+	"Firmware.index.551009-3": "",
+	"Firmware.index.551009-4": "",
+	"Firmware.index.551009-5": "",
+	"Firmware.index.551009-6": "",
+	"Firmware.index.551009-7": "",
+	"Firmware.index.551009-8": "",
+	"Firmware.index.551009-9": "",
+	"Firmware.index.551009-10": "",
+	"Firmware.index.551009-11": "",
+	"Firmware.index.551009-12": "",
+	"Firmware.index.551009-13": "",
+	"Firmware.index.551009-14": "",
+	"Property.Indicators.551010-0": "",
+	"Property.Indicators.551010-1": "",
+	"Property.Indicators.551010-2": "",
+	"Property.Indicators.551010-3": "",
+	"Property.Indicators.551010-4": "",
+	"Property.Indicators.551010-5": "",
+	"Detail.TimeComponent.551010-0": "",
+	"Detail.TimeComponent.551010-1": "",
+	"Detail.TimeComponent.551010-2": "",
+	"Detail.TimeComponent.551010-3": "",
+	"Detail.TimeComponent.551010-4": "",
+	"Event.index.551010-0": "",
+	"Event.index.551010-1": "",
+	"Event.index.551010-2": "",
+	"Event.index.551010-3": "",
+	"Event.index.551010-4": "",
+	"Detail.Table.551010-0": "",
+	"Detail.Table.551010-1": "",
+	"Detail.Table.551010-2": "",
+	"Detail.Table.551010-3": "",
+	"Detail.Table.551010-4": "",
+	"Detail.index.551011-0": "",
+	"Detail.index.551011-1": "",
+	"Detail.index.551011-2": "",
+	"Detail.index.551011-3": "",
+	"DeviceAccess.accessModal.551011-0": "",
+	"DeviceAccess.accessModal.551011-1": "",
+	"DeviceAccess.accessModal.551011-2": "",
+	"DeviceAccess.accessModal.551011-3": "",
+	"DeviceAccess.accessModal.551011-4": "",
+	"DeviceAccess.accessModal.551011-5": "",
+	"DeviceAccess.accessModal.551011-6": "",
+	"DeviceAccess.accessModal.551011-7": "",
+	"DeviceAccess.accessModal.551011-8": "",
+	"DeviceAccess.accessModal.551011-9": "",
+	"DeviceAccess.accessModal.551011-10": "",
+	"DeviceAccess.accessModal.551011-11": "",
+	"components.TagSearch.551010-0": "",
+	"components.TagSearch.551010-1": "",
+	"components.TagSearch.551010-2": "",
+	"components.TagSearch.551010-3": "",
+	"components.TagSearch.551010-4": "",
+	"device.data.551010-0": "",
+	"device.data.551010-1": "",
+	"device.data.551010-2": "",
+	"device.data.551010-3": "",
+	"device.data.551010-4": "",
+	"device.data.551010-5": "",
+	"device.data.551010-6": "",
+	"device.data.551010-7": "",
+	"device.data.551010-8": "",
+	"device.data.551010-9": "",
+	"device.data.551010-10": "",
+	"device.data.551010-11": "",
+	"device.data.551010-12": "",
+	"device.data.551010-13": "",
+	"device.data.551010-14": "",
+	"device.data.551010-15": "",
+	"device.data.551010-16": "",
+	"device.data.551010-17": "",
+	"device.data.551010-18": "",
+	"device.data.551010-19": "",
+	"device.data.551010-20": "",
+	"device.data.551010-21": "",
+	"device.data.551010-22": "",
+	"device.data.551010-23": "",
+	"device.data.551010-24": "",
+	"Import.modal.551010-0": "",
+	"Import.modal.551010-1": "",
+	"Import.modal.551010-2": "",
+	"Import.modal.551010-3": "",
+	"Import.modal.551010-4": "",
+	"Import.modal.551010-5": "",
+	"Import.modal.551010-6": "",
+	"Import.modal.551010-7": "",
+	"Import.modal.551010-8": "",
+	"Import.modal.551010-9": "",
+	"Import.modal.551010-10": "",
+	"Import.modal.551010-11": "",
+	"Import.modal.551010-12": "",
+	"Import.modal.551010-13": "",
+	"Import.modal.551010-14": "",
+	"Import.modal.551010-15": "",
+	"MetadataMap.index.551011-0": "",
+	"MetadataMap.index.551011-1": "",
+	"MetadataMap.index.551011-2": "",
+	"MetadataMap.index.551011-3": "",
+	"MetadataMap.index.551011-4": "",
+	"MetadataMap.index.551011-5": "",
+	"MetadataMap.index.551011-6": "",
+	"MetadataMap.index.551011-7": "",
+	"MetadataMap.index.551011-8": "",
+	"MetadataMap.index.551011-9": "",
+	"MetadataMap.index.551011-10": "",
+	"MetadataMap.index.551011-11": "",
+	"MetadataMap.index.551011-12": "",
+	"MetadataMap.index.551011-13": "",
+	"MetadataMap.index.551011-14": "",
+	"MetadataMap.index.551011-15": "",
+	"MetadataMap.index.551011-16": "",
+	"MetadataMap.index.551011-17": "",
+	"MetadataMap.index.551011-18": "",
+	"MetadataMap.index.551011-19": "",
+	"MetadataMap.index.551011-20": "",
+	"MetadataMap.index.551011-21": "",
+	"MetadataMap.index.551011-22": "",
+	"MetadataMap.index.551011-23": "",
+	"MetadataMap.index.551011-24": "",
+	"MetadataMap.index.551011-25": "",
+	"MetadataMap.index.551011-26": "",
+	"MetadataMap.index.551011-27": "",
+	"Import.file.551010-0": "",
+	"Import.file.551010-1": "",
+	"Import.file.551010-2": "",
+	"Import.file.551010-3": "",
+	"Import.file.551010-4": "",
+	"Import.file.551010-5": "",
+	"Import.file.551010-6": "",
+	"Import.file.551010-7": "",
+	"Import.file.551010-8": "",
+	"Import.file.551010-9": "",
+	"Import.file.551010-10": "",
+	"Import.file.551010-11": "",
+	"Import.file.551010-12": "",
+	"Import.file.551010-13": "",
+	"Import.file.551010-14": "",
+	"Import.file.551010-15": "",
+	"Import.file.551010-16": "",
+	"Import.file.551010-17": "",
+	"Running.index.551010-0": "",
+	"Running.index.551010-1": "",
+	"Detail.index.551010-16": "",
+	"Detail.index.551010-17": "",
+	"Property.Save.551010-0": "",
+	"Property.Save.551010-1": "",
+	"Property.Save.551010-2": "",
+	"Property.Save.551010-3": "",
+	"Property.Save.551010-4": "",
+	"Detail.index.551010-18": "",
+	"Detail.index.551010-19": "",
+	"Detail.index.551010-20": "",
+	"Detail.index.551010-21": "",
+	"Detail.index.551010-22": "",
+	"Detail.index.551010-23": "",
+	"Detail.index.551010-24": "",
+	"BasicInfo.indev.551011-0": "",
+	"BasicInfo.indev.551011-1": "",
+	"BasicInfo.indev.551011-2": "",
+	"BasicInfo.indev.551011-3": "",
+	"BasicInfo.indev.551011-4": "",
+	"BasicInfo.indev.551011-5": "",
+	"BasicInfo.indev.551011-6": "",
+	"BasicInfo.indev.551011-7": "",
+	"BasicInfo.indev.551011-8": "",
+	"DataAnalysis.index.551011-0": "",
+	"DataAnalysis.index.551011-1": "",
+	"DataAnalysis.index.551011-2": "",
+	"DataAnalysis.index.551011-3": "",
+	"DataAnalysis.index.551011-4": "",
+	"DataAnalysis.index.551011-5": "",
+	"DataAnalysis.index.551011-6": "",
+	"DataAnalysis.index.551011-7": "",
+	"DataAnalysis.index.551011-8": "",
+	"DataAnalysis.index.551011-9": "",
+	"DataAnalysis.index.551011-10": "",
+	"DataAnalysis.index.551011-11": "",
+	"Config.Save.551011-0": "",
+	"Config.Save.551011-1": "",
+	"Config.Save.551011-2": "",
+	"Config.Save.551011-3": "",
+	"Function.index.551011-0": "",
+	"Function.index.551011-1": "",
+	"Function.index.551011-2": "",
+	"Function.index.551011-3": "",
+	"Config.index.551011-0": "",
+	"Config.index.551011-1": "",
+	"Config.index.551011-2": "",
+	"Config.index.551011-3": "",
+	"Config.index.551011-4": "",
+	"Config.index.551011-5": "",
+	"Config.index.551011-6": "",
+	"Config.index.551011-7": "",
+	"Config.index.551011-8": "",
+	"Config.index.551011-9": "",
+	"Config.index.551011-10": "",
+	"Property.ValueRender.551010-0": "",
+	"Property.ValueRender.551010-1": "",
+	"Property.ValueRender.551010-2": "",
+	"Property.ValueRender.551010-3": "",
+	"EditTable.index.551011-0": "",
+	"EditTable.index.551011-1": "",
+	"EditTable.index.551011-2": "",
+	"EditTable.index.551011-3": "",
+	"EditTable.index.551011-4": "",
+	"EditTable.index.551011-5": "",
+	"EditTable.index.551011-6": "",
+	"EditTable.index.551011-7": "",
+	"EditTable.index.551011-8": "",
+	"EditTable.index.551011-9": "",
+	"EditTable.index.551011-10": "",
+	"EditTable.index.551011-11": "",
+	"EditTable.index.551011-12": "",
+	"EditTable.index.551011-13": "",
+	"EditTable.index.551011-14": "",
+	"EditTable.index.551011-15": "",
+	"EditTable.index.551011-16": "",
+	"EditTable.index.551011-17": "",
+	"Status.DiagnosticAdvice.551011-0": "",
+	"Status.DiagnosticAdvice.551011-1": "",
+	"Status.DiagnosticAdvice.551011-2": "",
+	"Status.DiagnosticAdvice.551011-3": "",
+	"Status.DiagnosticAdvice.551011-4": "",
+	"Status.DiagnosticAdvice.551011-5": "",
+	"components.MSelect.551011-0": "",
+	"EditTable.PatchMapping.551011-0": "",
+	"EditTable.PatchMapping.551011-1": "",
+	"EditTable.PatchMapping.551011-2": "",
+	"EditTable.PatchMapping.551011-3": "",
+	"EditTable.PatchMapping.551011-4": "",
+	"EditTable.PatchMapping.551011-5": "",
+	"EditTable.PatchMapping.551011-6": "",
+	"EditTable.PatchMapping.551011-7": "",
+	"EditTable.PatchMapping.551011-8": "",
+	"BindParentDevice.index.551012-0": "",
+	"BindParentDevice.index.551012-1": "",
+	"BindParentDevice.index.551012-2": "",
+	"BindParentDevice.index.551012-3": "",
+	"BindParentDevice.index.551012-4": "",
+	"BindParentDevice.index.551012-5": "",
+	"BindParentDevice.index.551012-6": "",
+	"BindParentDevice.index.551012-7": "",
+	"BindParentDevice.index.551012-8": "",
+	"BindParentDevice.index.551012-9": "",
+	"BindParentDevice.index.551012-10": "",
+	"BindParentDevice.index.551012-11": "",
+	"Diagnose.index.551011-0": "",
+	"Diagnose.index.551011-1": "",
+	"Diagnose.index.551011-2": "",
+	"Diagnose.index.551011-3": "",
+	"DeviceAccess.util.551011-0": "",
+	"DeviceAccess.util.551011-1": "",
+	"DeviceAccess.util.551011-2": "",
+	"DeviceAccess.util.551011-3": "",
+	"DeviceAccess.util.551011-4": "",
+	"DeviceAccess.util.551011-5": "",
+	"DeviceAccess.util.551011-6": "",
+	"DeviceAccess.util.551011-7": "",
+	"Detail.Charts.551011-0": "",
+	"Detail.Charts.551011-1": "",
+	"Detail.Charts.551011-2": "",
+	"Detail.Charts.551011-3": "",
+	"Detail.Charts.551011-4": "",
+	"Detail.Charts.551011-5": "",
+	"Detail.Charts.551011-6": "",
+	"Detail.Charts.551011-7": "",
+	"Detail.Charts.551011-8": "",
+	"Detail.Charts.551011-9": "",
+	"Detail.Charts.551011-10": "",
+	"Detail.Charts.551011-11": "",
+	"DeviceAccess.metadataModal.551011-0": "",
+	"DeviceAccess.metadataModal.551011-1": "",
+	"DeviceAccess.metadataModal.551011-2": "",
+	"DeviceAccess.metadataModal.551011-3": "",
+	"DeviceAccess.metadataModal.551011-4": "",
+	"DeviceAccess.metadataModal.551011-5": "",
+	"DeviceAccess.metadataModal.551011-6": "",
+	"DeviceAccess.metadataModal.551011-7": "",
+	"DeviceAccess.metadataModal.551011-8": "",
+	"DeviceAccess.metadataModal.551011-9": "",
+	"DeviceAccess.metadataModal.551011-10": "",
+	"DeviceAccess.metadataModal.551011-11": "",
+	"DeviceAccess.metadataModal.551011-12": "",
+	"DeviceAccess.metadataModal.551011-13": "",
+	"DeviceAccess.metadataModal.551011-14": "",
+	"DeviceAccess.metadataModal.551011-15": "",
+	"DeviceAccess.metadataModal.551011-16": "",
+	"DeviceAccess.metadataModal.551011-17": "",
+	"Relation.Save.551011-0": "",
+	"Relation.Save.551011-1": "",
+	"Relation.Save.551011-2": "",
+	"Relation.Save.551011-3": "",
+	"Tags.index.551011-0": "",
+	"Tags.index.551011-1": "",
+	"Tags.Save.551011-0": "",
+	"Tags.Save.551011-1": "",
+	"Tags.Save.551011-2": "",
+	"Tags.Save.551011-3": "",
+	"Relation.index.551011-0": "",
+	"Relation.index.551011-1": "",
+	"Relation.index.551011-2": "",
+	"InklingModal.index.551011-0": "",
+	"InklingModal.index.551011-1": "",
+	"Parsing.index.551010-0": "",
+	"Parsing.index.551010-1": "",
+	"Parsing.index.551010-2": "",
+	"Parsing.index.551010-3": "",
+	"Parsing.index.551010-4": "",
+	"Parsing.index.551010-5": "",
+	"Parsing.index.551010-6": "",
+	"Parsing.index.551010-7": "",
+	"Parsing.index.551010-8": "",
+	"Parsing.index.551010-9": "",
+	"Parsing.index.551010-10": "",
+	"Parsing.index.551010-11": "",
+	"Parsing.index.551010-12": "",
+	"Parsing.index.551010-13": "",
+	"Parsing.index.551010-14": "",
+	"Parsing.index.551010-15": "",
+	"Parsing.index.551010-16": "",
+	"Parsing.index.551010-17": "",
+	"Parsing.index.551010-18": "",
+	"Parsing.index.551010-19": "",
+	"Property.PropertyCard.551010-0": "",
+	"Property.ValueDetail.551010-0": "",
+	"Property.ValueDetail.551010-1": "",
+	"Property.ValueDetail.551010-2": "",
+	"Property.index.551010-0": "",
+	"Property.index.551010-1": "",
+	"Property.index.551010-2": "",
+	"Property.index.551010-3": "",
+	"Property.index.551010-4": "",
+	"Property.index.551010-5": "",
+	"Property.index.551010-6": "",
+	"Property.index.551010-7": "",
+	"Property.index.551010-8": "",
+	"Property.index.551010-9": "",
+	"Status.util.551011-0": "",
+	"Status.util.551011-1": "",
+	"Status.util.551011-2": "",
+	"Status.util.551011-3": "",
+	"Status.util.551011-4": "",
+	"Status.util.551011-5": "",
+	"Status.util.551011-6": "",
+	"Status.util.551011-7": "",
+	"Status.util.551011-8": "",
+	"Status.util.551011-9": "",
+	"Status.util.551011-10": "",
+	"Status.util.551011-11": "",
+	"EdgeMap.MSelect.551011-0": "",
+	"Base.Base.551013-0": "",
+	"Base.Base.551013-1": "",
+	"Base.Base.551013-2": "",
+	"Base.Base.551013-3": "",
+	"Base.Base.551013-4": "",
+	"Base.Base.551013-5": "",
+	"Base.Base.551013-6": "",
+	"Base.Base.551013-7": "",
+	"Base.Base.551013-8": "",
+	"Base.Base.551013-9": "",
+	"Base.Base.551013-10": "",
+	"Base.Base.551013-11": "",
+	"Base.Base.551013-12": "",
+	"Base.Base.551013-13": "",
+	"Base.Base.551013-14": "",
+	"Base.Base.551013-15": "",
+	"Base.Base.551013-16": "",
+	"Base.Base.551013-17": "",
+	"Base.Base.551013-18": "",
+	"Base.Base.551013-19": "",
+	"components.Simple.551011-0": "",
+	"components.Simple.551011-1": "",
+	"components.Simple.551011-2": "",
+	"components.Simple.551011-3": "",
+	"components.Simple.551011-4": "",
+	"components.Simple.551011-5": "",
+	"components.Simple.551011-6": "",
+	"components.Simple.551011-7": "",
+	"components.Simple.551011-8": "",
+	"components.Simple.551011-9": "",
+	"components.Advance.551011-0": "",
+	"components.Advance.551011-1": "",
+	"components.Advance.551011-2": "",
+	"components.Advance.551011-3": "",
+	"EdgeMap.PatchMapping.551011-0": "",
+	"EdgeMap.PatchMapping.551011-1": "",
+	"EdgeMap.PatchMapping.551011-2": "",
+	"EdgeMap.PatchMapping.551011-3": "",
+	"EdgeMap.PatchMapping.551011-4": "",
+	"EdgeMap.PatchMapping.551011-5": "",
+	"EdgeMap.PatchMapping.551011-6": "",
+	"EdgeMap.PatchMapping.551011-7": "",
+	"EdgeMap.PatchMapping.551011-8": "",
+	"Import.index.551012-0": "",
+	"Import.index.551012-1": "",
+	"Import.index.551012-2": "",
+	"Import.index.551012-3": "",
+	"Import.index.551012-4": "",
+	"Import.index.551012-5": "",
+	"Import.index.551012-6": "",
+	"Import.index.551012-7": "",
+	"Import.index.551012-8": "",
+	"Import.index.551012-9": "",
+	"Import.index.551012-10": "",
+	"Import.index.551012-11": "",
+	"Import.index.551012-12": "",
+	"Import.index.551012-13": "",
+	"Import.index.551012-14": "",
+	"Import.index.551012-15": "",
+	"Import.index.551012-16": "",
+	"Import.index.551012-17": "",
+	"Import.index.551012-18": "",
+	"Import.index.551012-19": "",
+	"Import.index.551012-20": "",
+	"Import.index.551012-21": "",
+	"Import.index.551012-22": "",
+	"Import.index.551012-23": "",
+	"Import.index.551012-24": "",
+	"Import.index.551012-25": "",
+	"Import.index.551012-26": "",
+	"Import.index.551012-27": "",
+	"Import.index.551012-28": "",
+	"Import.index.551012-29": "",
+	"Import.index.551012-30": "",
+	"Import.index.551012-31": "",
+	"Import.index.551012-32": "",
+	"Import.index.551012-33": "",
+	"Import.index.551012-34": "",
+	"Import.index.551012-35": "",
+	"Import.index.551012-36": "",
+	"Import.index.551012-37": "",
+	"Import.index.551012-38": "",
+	"Import.index.551012-39": "",
+	"Import.index.551012-40": "",
+	"Import.index.551012-41": "",
+	"Import.index.551012-42": "",
+	"Import.index.551012-43": "",
+	"Import.index.551012-44": "",
+	"Import.index.551012-45": "",
+	"Import.index.551012-46": "",
+	"Import.index.551012-47": "",
+	"Import.index.551012-48": "",
+	"Import.index.551012-49": "",
+	"Import.index.551012-50": "",
+	"Import.index.551012-51": "",
+	"Import.index.551012-52": "",
+	"Import.index.551012-53": "",
+	"Import.index.551012-54": "",
+	"Import.index.551012-55": "",
+	"Import.index.551012-56": "",
+	"Import.index.551012-57": "",
+	"Import.index.551012-58": "",
+	"Import.index.551012-59": "",
+	"Import.index.551012-60": "",
+	"Diagnose.util.551011-0": "",
+	"Diagnose.util.551011-1": "",
+	"Diagnose.util.551011-2": "",
+	"Diagnose.util.551011-3": "",
+	"Diagnose.util.551011-4": "",
+	"Diagnose.util.551011-5": "",
+	"EdgeMap.index.551011-0": "",
+	"EdgeMap.index.551011-1": "",
+	"EdgeMap.index.551011-2": "",
+	"EdgeMap.index.551011-3": "",
+	"EdgeMap.index.551011-4": "",
+	"EdgeMap.index.551011-5": "",
+	"EdgeMap.index.551011-6": "",
+	"EdgeMap.index.551011-7": "",
+	"EdgeMap.index.551011-8": "",
+	"EdgeMap.index.551011-9": "",
+	"EdgeMap.index.551011-10": "",
+	"EdgeMap.index.551011-11": "",
+	"EdgeMap.index.551011-12": "",
+	"EdgeMap.index.551011-13": "",
+	"EdgeMap.index.551011-14": "",
+	"EdgeMap.index.551011-15": "",
+	"EdgeMap.index.551011-16": "",
+	"EdgeMap.index.551011-17": "",
+	"EdgeMap.index.551011-18": "",
+	"EdgeMap.index.551011-19": "",
+	"EdgeMap.index.551011-20": "",
+	"EdgeMap.index.551011-21": "",
+	"Log.index.551011-0": "",
+	"Log.index.551011-1": "",
+	"Log.index.551011-2": "",
+	"Log.index.551011-3": "",
+	"Log.index.551011-4": "",
+	"Log.index.551011-5": "",
+	"Import.valideta.551012-0": "",
+	"Import.valideta.551012-1": "",
+	"Import.valideta.551012-2": "",
+	"Import.valideta.551012-3": "",
+	"Import.valideta.551012-4": "",
+	"Import.valideta.551012-5": "",
+	"Import.valideta.551012-6": "",
+	"Import.valideta.551012-7": "",
+	"Import.valideta.551012-8": "",
+	"Import.valideta.551012-9": "",
+	"Import.valideta.551012-10": "",
+	"Import.valideta.551012-11": "",
+	"Import.valideta.551012-12": "",
+	"Import.valideta.551012-13": "",
+	"Message.index.551011-0": "",
+	"Message.index.551011-1": "",
+	"Message.index.551011-2": "",
+	"Message.index.551011-3": "",
+	"Message.index.551011-4": "",
+	"Message.index.551011-5": "",
+	"Message.index.551011-6": "",
+	"Message.index.551011-7": "",
+	"SaveChild.index.551011-0": "",
+	"SaveChild.index.551011-1": "",
+	"SaveChild.index.551011-2": "",
+	"SaveChild.index.551011-3": "",
+	"SaveChild.index.551011-4": "",
+	"SaveChild.index.551011-5": "",
+	"DashBoard.index.551011-0": "",
+	"DashBoard.index.551011-1": "",
+	"DashBoard.index.551011-2": "",
+	"DashBoard.index.551011-3": "",
+	"DashBoard.index.551011-4": "",
+	"DashBoard.index.551011-5": "",
+	"DashBoard.index.551011-6": "",
+	"DashBoard.index.551011-7": "",
+	"DashBoard.index.551011-8": "",
+	"DashBoard.index.551011-9": "",
+	"DashBoard.index.551011-10": "",
+	"DashBoard.index.551011-11": "",
+	"DashBoard.index.551011-12": "",
+	"DashBoard.index.551011-13": "",
+	"DashBoard.index.551011-14": "",
+	"DashBoard.index.551011-15": "",
+	"DashBoard.index.551011-16": "",
+	"DashBoard.index.551011-17": "",
+	"DashBoard.index.551011-18": "",
+	"DashBoard.index.551011-19": "",
+	"DashBoard.index.551011-20": "",
+	"components.TimeSelect.551011-0": "",
+	"components.TimeSelect.551011-1": "",
+	"components.TimeSelect.551011-2": "",
+	"components.TimeSelect.551011-3": "",
+	"AlarmRecord.index.551011-0": "",
+	"AlarmRecord.index.551011-1": "",
+	"Status.ManualInspection.551011-0": "",
+	"Status.ManualInspection.551011-1": "",
+	"Status.ManualInspection.551011-2": "",
+	"Status.ManualInspection.551011-3": "",
+	"Status.ManualInspection.551011-4": "",
+	"Status.ManualInspection.551011-5": "",
+	"Status.ManualInspection.551011-6": "",
+	"Status.ManualInspection.551011-7": "",
+	"Status.ManualInspection.551011-8": "",
+	"Status.ManualInspection.551011-9": "",
+	"Status.ManualInspection.551011-10": "",
+	"Status.ManualInspection.551011-11": "",
+	"Status.ManualInspection.551011-12": "",
+	"Status.ManualInspection.551011-13": "",
+	"Status.ManualInspection.551011-14": "",
+	"Status.ManualInspection.551011-15": "",
+	"Function.index.551012-0": "",
+	"Function.index.551012-1": "",
+	"Function.index.551012-2": "",
+	"Function.index.551012-3": "",
+	"Function.index.551012-4": "",
+	"Function.index.551012-5": "",
+	"Function.index.551012-6": "",
+	"Function.index.551012-7": "",
+	"Function.index.551012-8": "",
+	"Dialog.index.551012-0": "",
+	"Dialog.index.551012-1": "",
+	"Dialog.index.551012-2": "",
+	"Dialog.index.551012-3": "",
+	"Dialog.index.551012-4": "",
+	"Dialog.index.551012-5": "",
+	"Dialog.index.551012-6": "",
+	"Dialog.index.551012-7": "",
+	"EdgeMap.MSelect.551012-0": "",
+	"Function.EditTable.551012-0": "",
+	"Function.EditTable.551012-1": "",
+	"Function.EditTable.551012-2": "",
+	"Function.EditTable.551012-3": "",
+	"Function.EditTable.551012-4": "",
+	"Function.EditTable.551012-5": "",
+	"EdgeMap.PatchMapping.551012-0": "",
+	"EdgeMap.PatchMapping.551012-1": "",
+	"EdgeMap.PatchMapping.551012-2": "",
+	"EdgeMap.PatchMapping.551012-3": "",
+	"EdgeMap.PatchMapping.551012-4": "",
+	"EdgeMap.PatchMapping.551012-5": "",
+	"EdgeMap.PatchMapping.551012-6": "",
+	"EdgeMap.PatchMapping.551012-7": "",
+	"EdgeMap.PatchMapping.551012-8": "",
+	"EdgeMap.index.551012-0": "",
+	"EdgeMap.index.551012-1": "",
+	"EdgeMap.index.551012-2": "",
+	"EdgeMap.index.551012-3": "",
+	"EdgeMap.index.551012-4": "",
+	"EdgeMap.index.551012-5": "",
+	"EdgeMap.index.551012-6": "",
+	"EdgeMap.index.551012-7": "",
+	"EdgeMap.index.551012-8": "",
+	"EdgeMap.index.551012-9": "",
+	"EdgeMap.index.551012-10": "",
+	"EdgeMap.index.551012-11": "",
+	"EdgeMap.index.551012-12": "",
+	"EdgeMap.index.551012-13": "",
+	"EdgeMap.index.551012-14": "",
+	"EdgeMap.index.551012-15": "",
+	"EdgeMap.index.551012-16": "",
+	"EdgeMap.index.551012-17": "",
+	"EdgeMap.index.551012-18": "",
+	"EdgeMap.index.551012-19": "",
+	"EdgeMap.index.551012-20": "",
+	"Export.index.551012-0": "",
+	"Export.index.551012-1": "",
+	"Export.index.551012-2": "",
+	"Export.index.551012-3": "",
+	"Export.index.551012-4": "",
+	"Export.index.551012-5": "",
+	"components.AlarmLog.551012-0": "",
+	"components.AlarmLog.551012-1": "",
+	"Metadata.index.551012-0": "",
+	"Metadata.index.551012-1": "",
+	"Metadata.index.551012-2": "",
+	"Metadata.index.551012-3": "",
+	"Metadata.index.551012-4": "",
+	"Metadata.index.551012-5": "",
+	"Metadata.index.551012-6": "",
+	"Metadata.index.551012-7": "",
+	"Metadata.index.551012-8": "",
+	"Metadata.index.551012-9": "",
+	"Metadata.index.551012-10": "",
+	"Cat.index.551012-0": "",
+	"Cat.index.551012-1": "",
+	"Cat.index.551012-2": "",
+	"Cat.index.551012-3": "",
+	"Cat.index.551012-4": "",
+	"Cat.index.551012-5": "",
+	"Cat.index.551012-6": "",
+	"Cat.index.551012-7": "",
+	"InklingDevice.index.551012-0": "",
+	"InklingDevice.index.551012-1": "",
+	"InklingDevice.index.551012-2": "",
+	"InklingDevice.index.551012-3": "",
+	"Category.index.551012-0": "",
+	"Category.index.551012-1": "",
+	"Category.index.551012-2": "",
+	"Category.index.551012-3": "",
+	"Category.index.551012-4": "",
+	"Category.index.551012-5": "",
+	"Category.index.551012-6": "",
+	"Category.index.551012-7": "",
+	"Category.index.551012-8": "",
+	"Category.index.551012-9": "",
+	"Category.index.551012-10": "",
+	"Category.index.551012-11": "",
+	"Category.index.551012-12": "",
+	"Category.index.551012-13": "",
+	"Category.index.551012-14": "",
+	"Category.index.551012-15": "",
+	"Alarm.index.551012-0": "",
+	"Alarm.index.551012-1": "",
+	"Alarm.index.551012-2": "",
+	"Alarm.index.551012-3": "",
+	"Alarm.index.551012-4": "",
+	"Alarm.index.551012-5": "",
+	"Alarm.index.551012-6": "",
+	"Alarm.index.551012-7": "",
+	"Alarm.index.551012-8": "",
+	"Alarm.index.551012-9": "",
+	"Alarm.index.551012-10": "",
+	"Alarm.index.551012-11": "",
+	"Alarm.index.551012-12": "",
+	"Alarm.index.551012-13": "",
+	"Alarm.index.551012-14": "",
+	"Alarm.index.551012-15": "",
+	"Base.utils.551012-0": "",
+	"Base.utils.551012-1": "",
+	"Base.utils.551012-2": "",
+	"Base.utils.551012-3": "",
+	"Base.utils.551012-4": "",
+	"Base.utils.551012-5": "",
+	"Base.utils.551012-6": "",
+	"Base.utils.551012-7": "",
+	"Base.utils.551012-8": "",
+	"Base.index.551012-0": "",
+	"Base.index.551012-1": "",
+	"Base.index.551012-2": "",
+	"Base.index.551012-3": "",
+	"Base.index.551012-4": "",
+	"Base.index.551012-5": "",
+	"Base.index.551012-6": "",
+	"Base.index.551012-7": "",
+	"Base.index.551012-8": "",
+	"Base.index.551012-9": "",
+	"Base.index.551012-10": "",
+	"Base.index.551012-11": "",
+	"Base.index.551012-12": "",
+	"Base.index.551012-13": "",
+	"Base.index.551012-14": "",
+	"Base.index.551012-15": "",
+	"Base.index.551012-16": "",
+	"Base.index.551012-17": "",
+	"Base.index.551012-18": "",
+	"Base.index.551012-19": "",
+	"Base.index.551012-20": "",
+	"Base.index.551012-21": "",
+	"Base.index.551012-22": "",
+	"Invalid.index.551012-0": "",
+	"Invalid.index.551012-1": "",
+	"Invalid.index.551012-2": "",
+	"Invalid.index.551012-3": "",
+	"components.ConfigModal.551013-0": "",
+	"components.ConfigModal.551013-1": "",
+	"components.ConfigModal.551013-2": "",
+	"components.ConfigModal.551013-3": "",
+	"components.ConfigModal.551013-4": "",
+	"components.ConfigModal.551013-5": "",
+	"components.ConfigModal.551013-6": "",
+	"components.ConfigModal.551013-7": "",
+	"components.ConfigModal.551013-8": "",
+	"components.ConfigModal.551013-9": "",
+	"components.ConfigModal.551013-10": "",
+	"components.ConfigModal.551013-11": "",
+	"components.Source.551013-0": "",
+	"components.Source.551013-1": "",
+	"components.Source.551013-2": "",
+	"components.Source.551013-3": "",
+	"components.Source.551013-4": "",
+	"components.Source.551013-5": "",
+	"components.Source.551013-6": "",
+	"components.Source.551013-7": "",
+	"BindChildDevice.index.551012-0": "",
+	"BindChildDevice.index.551012-1": "",
+	"BindChildDevice.index.551012-2": "",
+	"BindChildDevice.index.551012-3": "",
+	"BindChildDevice.index.551012-4": "",
+	"BindChildDevice.index.551012-5": "",
+	"BindChildDevice.index.551012-6": "",
+	"BindChildDevice.index.551012-7": "",
+	"BindChildDevice.index.551012-8": "",
+	"BindChildDevice.index.551012-9": "",
+	"BindChildDevice.index.551012-10": "",
+	"BindChildDevice.index.551012-11": "",
+	"Log.index.551012-0": "",
+	"Log.index.551012-1": "",
+	"Log.index.551012-2": "",
+	"Log.index.551012-3": "",
+	"Log.index.551012-4": "",
+	"Log.index.551012-5": "",
+	"Log.index.551012-6": "",
+	"Log.index.551012-7": "",
+	"Edit.index.551013-0": "",
+	"Edit.index.551013-1": "",
+	"Edit.index.551013-2": "",
+	"Edit.index.551013-3": "",
+	"Edit.index.551013-4": "",
+	"Edit.index.551013-5": "",
+	"Edit.index.551013-6": "",
+	"Edit.index.551013-7": "",
+	"Edit.index.551013-8": "",
+	"Edit.index.551013-9": "",
+	"Edit.validator.551013-0": "",
+	"Edit.validator.551013-1": "",
+	"Edit.validator.551013-2": "",
+	"Edit.validator.551013-3": "",
+	"Edit.validator.551013-4": "",
+	"Edit.validator.551013-5": "",
+	"Edit.validator.551013-6": "",
+	"Edit.validator.551013-7": "",
+	"Edit.validator.551013-8": "",
+	"DetailModal.utils.551013-0": "",
+	"DetailModal.utils.551013-1": "",
+	"DetailModal.utils.551013-2": "",
+	"Edit.BaseForm.551013-0": "",
+	"Edit.BaseForm.551013-1": "",
+	"Edit.BaseForm.551013-2": "",
+	"Edit.BaseForm.551013-3": "",
+	"Edit.BaseForm.551013-4": "",
+	"Edit.BaseForm.551013-5": "",
+	"Edit.BaseForm.551013-6": "",
+	"Edit.BaseForm.551013-7": "",
+	"Edit.BaseForm.551013-8": "",
+	"Edit.BaseForm.551013-9": "",
+	"Edit.BaseForm.551013-10": "",
+	"Edit.BaseForm.551013-11": "",
+	"Edit.BaseForm.551013-12": "",
+	"Edit.BaseForm.551013-13": "",
+	"Edit.BaseForm.551013-14": "",
+	"Edit.BaseForm.551013-15": "",
+	"Edit.BaseForm.551013-16": "",
+	"Edit.BaseForm.551013-17": "",
+	"Edit.BaseForm.551013-18": "",
+	"Edit.BaseForm.551013-19": "",
+	"modifyModal.index.551013-0": "",
+	"modifyModal.index.551013-1": "",
+	"modifyModal.index.551013-2": "",
+	"modifyModal.index.551013-3": "",
+	"modifyModal.index.551013-4": "",
+	"modifyModal.index.551013-5": "",
+	"modifyModal.index.551013-6": "",
+	"modifyModal.index.551013-7": "",
+	"modifyModal.index.551013-8": "",
+	"modifyModal.index.551013-9": "",
+	"modifyModal.index.551013-10": "",
+	"modifyModal.index.551013-11": "",
+	"modifyModal.index.551013-12": "",
+	"DetailModal.TagsModal.551013-0": "",
+	"DetailModal.TagsModal.551013-1": "",
+	"DetailModal.TagsModal.551013-2": "",
+	"DetailModal.TagsModal.551013-3": "",
+	"DetailModal.TagsModal.551013-4": "",
+	"DetailModal.TagsModal.551013-5": "",
+	"DetailModal.TagsModal.551013-6": "",
+	"DetailModal.TagsModal.551013-7": "",
+	"DetailModal.TagsModal.551013-8": "",
+	"DetailModal.TagsModal.551013-9": "",
+	"DetailModal.TagsModal.551013-10": "",
+	"DetailModal.TagsModal.551013-11": "",
+	"DetailModal.TagsModal.551013-12": "",
+	"DetailModal.TagsModal.551013-13": "",
+	"DetailModal.TagsModal.551013-14": "",
+	"DetailModal.TagsModal.551013-15": "",
+	"DetailModal.TagsModal.551013-16": "",
+	"DetailModal.TagsModal.551013-17": "",
+	"DetailModal.TagsModal.551013-18": "",
+	"DetailModal.TagsModal.551013-19": "",
+	"DetailModal.TagsModal.551013-20": "",
+	"DetailModal.TagsModal.551013-21": "",
+	"DetailModal.TagsModal.551013-22": "",
+	"DetailModal.PropertiesModal.551013-0": "",
+	"DetailModal.PropertiesModal.551013-1": "",
+	"DetailModal.PropertiesModal.551013-2": "",
+	"DetailModal.PropertiesModal.551013-3": "",
+	"DetailModal.PropertiesModal.551013-4": "",
+	"DetailModal.PropertiesModal.551013-5": "",
+	"DetailModal.PropertiesModal.551013-6": "",
+	"DetailModal.PropertiesModal.551013-7": "",
+	"DetailModal.PropertiesModal.551013-8": "",
+	"DetailModal.PropertiesModal.551013-9": "",
+	"DetailModal.PropertiesModal.551013-10": "",
+	"DetailModal.PropertiesModal.551013-11": "",
+	"DetailModal.PropertiesModal.551013-12": "",
+	"DetailModal.PropertiesModal.551013-13": "",
+	"DetailModal.PropertiesModal.551013-14": "",
+	"DetailModal.PropertiesModal.551013-15": "",
+	"DetailModal.PropertiesModal.551013-16": "",
+	"DetailModal.PropertiesModal.551013-17": "",
+	"DetailModal.PropertiesModal.551013-18": "",
+	"DetailModal.PropertiesModal.551013-19": "",
+	"DetailModal.PropertiesModal.551013-20": "",
+	"DetailModal.PropertiesModal.551013-21": "",
+	"DetailModal.PropertiesModal.551013-22": "",
+	"DetailModal.PropertiesModal.551013-23": "",
+	"DetailModal.PropertiesModal.551013-24": "",
+	"DetailModal.PropertiesModal.551013-25": "",
+	"DetailModal.PropertiesModal.551013-26": "",
+	"Base.columns.551013-0": "",
+	"Base.columns.551013-1": "",
+	"Base.columns.551013-2": "",
+	"Base.columns.551013-3": "",
+	"Base.columns.551013-4": "",
+	"Base.columns.551013-5": "",
+	"Base.columns.551013-6": "",
+	"Base.columns.551013-7": "",
+	"Base.columns.551013-8": "",
+	"Base.columns.551013-9": "",
+	"Base.columns.551013-10": "",
+	"Base.columns.551013-11": "",
+	"Base.columns.551013-12": "",
+	"Base.columns.551013-13": "",
+	"Base.columns.551013-14": "",
+	"Base.columns.551013-15": "",
+	"Base.columns.551013-16": "",
+	"Base.columns.551013-17": "",
+	"Base.columns.551013-18": "",
+	"Base.columns.551013-19": "",
+	"Base.columns.551013-20": "",
+	"Base.columns.551013-21": "",
+	"Base.columns.551013-22": "",
+	"Base.columns.551013-23": "",
+	"Base.columns.551013-24": "",
+	"Base.columns.551013-25": "",
+	"Base.columns.551013-26": "",
+	"Base.columns.551013-27": "",
+	"Base.columns.551013-28": "",
+	"Base.columns.551013-29": "",
+	"Base.columns.551013-30": "",
+	"Base.columns.551013-31": "",
+	"Base.columns.551013-32": "",
+	"Base.columns.551013-33": "",
+	"Base.columns.551013-34": "",
+	"Base.columns.551013-35": "",
+	"Base.columns.551013-36": "",
+	"Base.columns.551013-37": "",
+	"Base.columns.551013-38": "",
+	"Base.columns.551013-39": "",
+	"Base.columns.551013-40": "",
+	"Base.columns.551013-41": "",
+	"Base.columns.551013-42": "",
+	"Base.columns.551013-43": "",
+	"Base.columns.551013-44": "",
+	"Base.columns.551013-45": "",
+	"DetailModal.EventModal.551013-0": "",
+	"DetailModal.EventModal.551013-1": "",
+	"DetailModal.EventModal.551013-2": "",
+	"DetailModal.EventModal.551013-3": "",
+	"DetailModal.EventModal.551013-4": "",
+	"DetailModal.EventModal.551013-5": "",
+	"DetailModal.EventModal.551013-6": "",
+	"DetailModal.EventModal.551013-7": "",
+	"DetailModal.EventModal.551013-8": "",
+	"DetailModal.EventModal.551013-9": "",
+	"Edit.ValueTypeForm.551013-0": "",
+	"Edit.ValueTypeForm.551013-1": "",
+	"Edit.ValueTypeForm.551013-2": "",
+	"Edit.ValueTypeForm.551013-3": "",
+	"Edit.ValueTypeForm.551013-4": "",
+	"Edit.ValueTypeForm.551013-5": "",
+	"Edit.ValueTypeForm.551013-6": "",
+	"Edit.ValueTypeForm.551013-7": "",
+	"Edit.ValueTypeForm.551013-8": "",
+	"Edit.ValueTypeForm.551013-9": "",
+	"Edit.ValueTypeForm.551013-10": "",
+	"Edit.ValueTypeForm.551013-11": "",
+	"Edit.ValueTypeForm.551013-12": "",
+	"Edit.ValueTypeForm.551013-13": "",
+	"Edit.ValueTypeForm.551013-14": "",
+	"Edit.ValueTypeForm.551013-15": "",
+	"VirtualRule.DetailModal.551013-0": "",
+	"Metrics.BooleanSelect.551013-0": "",
+	"Metrics.BooleanSelect.551013-1": "",
+	"components.DataType.551013-0": "",
+	"components.DataType.551013-1": "",
+	"components.DataType.551013-2": "",
+	"components.DataType.551013-3": "",
+	"components.DataType.551013-4": "",
+	"components.DataType.551013-5": "",
+	"components.DataType.551013-6": "",
+	"components.DataType.551013-7": "",
+	"components.DataType.551013-8": "",
+	"components.DataType.551013-9": "",
+	"components.DataType.551013-10": "",
+	"Metrics.Metrics.551013-0": "",
+	"Metrics.Metrics.551013-1": "",
+	"Metrics.Metrics.551013-2": "",
+	"Metrics.Metrics.551013-3": "",
+	"Metrics.Metrics.551013-4": "",
+	"Metrics.Metrics.551013-5": "",
+	"Metrics.Metrics.551013-6": "",
+	"Metrics.Metrics.551013-7": "",
+	"Metrics.Metrics.551013-8": "",
+	"Metrics.Metrics.551013-9": "",
+	"Metrics.Metrics.551013-10": "",
+	"Metrics.Metrics.551013-11": "",
+	"Metrics.Metrics.551013-12": "",
+	"VirtualRule.Rule.551013-0": "",
+	"components.DataTypeObjectChild.551013-0": "",
+	"VirtualRule.index.551013-0": "",
+	"VirtualRule.index.551013-1": "",
+	"VirtualRule.index.551013-2": "",
+	"VirtualRule.index.551013-3": "",
+	"VirtualRule.index.551013-4": "",
+	"VirtualRule.index.551013-5": "",
+	"VirtualRule.index.551013-6": "",
+	"VirtualRule.index.551013-7": "",
+	"VirtualRule.index.551013-8": "",
+	"VirtualRule.index.551013-9": "",
+	"VirtualRule.index.551013-10": "",
+	"VirtualRule.index.551013-11": "",
+	"VirtualRule.index.551013-12": "",
+	"VirtualRule.index.551013-13": "",
+	"VirtualRule.index.551013-14": "",
+	"VirtualRule.index.551013-15": "",
+	"VirtualRule.index.551013-16": "",
+	"VirtualRule.index.551013-17": "",
+	"VirtualRule.index.551013-18": "",
+	"VirtualRule.index.551013-19": "",
+	"VirtualRule.index.551013-20": "",
+	"VirtualRule.index.551013-21": "",
+	"Metrics.item.551013-0": "",
+	"Metrics.item.551013-1": "",
+	"Tags.Type.551013-0": "",
+	"Tags.Type.551013-1": "",
+	"Tags.Type.551013-2": "",
+	"Tags.Type.551013-3": "",
+	"Detail.Save.551010-0": "",
+	"Detail.Save.551010-1": "",
+	"Detail.Save.551010-2": "",
+	"Detail.Save.551010-3": "",
+	"Events.OtherConfigInfo.551013-0": "",
+	"Events.ConfigParams.551013-0": "",
+	"Events.ConfigParams.551013-1": "",
+	"Events.ConfigParams.551013-2": "",
+	"Events.ConfigParams.551013-3": "",
+	"Events.ConfigParams.551013-4": "",
+	"Events.ConfigParams.551013-5": "",
+	"Events.ConfigParams.551013-6": "",
+	"Events.ConfigParams.551013-7": "",
+	"Events.ConfigParams.551013-8": "",
+	"Events.ConfigParams.551013-9": "",
+	"Events.ConfigParams.551013-10": "",
+	"Events.ConfigParams.551013-11": "",
+	"Events.ConfigParams.551013-12": "",
+	"Product.index.551010-0": "",
+	"Product.index.551010-1": "",
+	"Product.index.551010-2": "",
+	"Product.index.551010-3": "",
+	"Product.index.551010-4": "",
+	"Product.index.551010-5": "",
+	"Product.index.551010-6": "",
+	"Product.index.551010-7": "",
+	"Product.index.551010-8": "",
+	"Product.index.551010-9": "",
+	"Product.index.551010-10": "",
+	"Product.index.551010-11": "",
+	"Product.index.551010-12": "",
+	"Product.index.551010-13": "",
+	"Product.index.551010-14": "",
+	"Product.index.551010-15": "",
+	"Product.index.551010-16": "",
+	"Product.index.551010-17": "",
+	"Product.index.551010-18": "",
+	"Product.index.551010-19": "",
+	"Product.index.551010-20": "",
+	"Product.index.551010-21": "",
+	"Product.index.551010-22": "",
+	"Product.index.551010-23": "",
+	"Product.index.551010-24": "",
+	"Product.index.551010-25": "",
+	"Product.index.551010-26": "",
+	"Product.index.551010-27": "",
+	"Product.index.551010-28": "",
+	"Product.index.551010-29": "",
+	"Product.index.551010-30": "",
+	"Product.index.551010-31": "",
+	"Product.index.551010-32": "",
+	"Product.index.551010-33": "",
+	"Events.ValueObject.551013-0": "",
+	"Function.InputParams.551013-0": "",
+	"Function.InputParams.551013-1": "",
+	"Function.InputParams.551013-2": "",
+	"Function.InputParams.551013-3": "",
+	"Function.InputParams.551013-4": "",
+	"Function.InputParams.551013-5": "",
+	"Function.InputParams.551013-6": "",
+	"Function.InputParams.551013-7": "",
+	"Function.InputParams.551013-8": "",
+	"Function.InputParams.551013-9": "",
+	"Function.InputParams.551013-10": "",
+	"Function.InputParams.551013-11": "",
+	"Function.InputParams.551013-12": "",
+	"Function.InputParams.551013-13": "",
+	"Function.InputParams.551013-14": "",
+	"Function.InputParams.551013-15": "",
+	"Function.AsyncSelect.551013-0": "",
+	"Metrics.ValueItem.551013-0": "",
+	"Metrics.ValueItem.551013-1": "",
+	"Metrics.ValueItem.551013-2": "",
+	"Metrics.ValueItem.551013-3": "",
+	"Metrics.ValueItem.551013-4": "",
+	"Metrics.ValueItem.551013-5": "",
+	"Metrics.ValueItem.551013-6": "",
+	"Metrics.ValueItem.551013-7": "",
+	"Metrics.ValueItem.551013-8": "",
+	"DialogTips.index.551010-0": "",
+	"DialogTips.index.551010-1": "",
+	"DialogTips.index.551010-2": "",
+	"DialogTips.index.551010-3": "",
+	"DialogTips.index.551010-4": "",
+	"DialogTips.index.551010-5": "",
+	"DialogTips.index.551010-6": "",
+	"DialogTips.index.551010-7": "",
+	"DialogTips.index.551010-8": "",
+	"DialogTips.index.551010-9": "",
+	"DialogTips.index.551010-10": "",
+	"DialogTips.index.551010-11": "",
+	"DialogTips.index.551010-12": "",
+	"components.Constraint.551013-0": "",
+	"components.Constraint.551013-1": "",
+	"Properties.OtherSetting.551013-0": "",
+	"Properties.OtherSetting.551013-1": "",
+	"Properties.OtherSetting.551013-2": "",
+	"Properties.OtherSetting.551013-3": "",
+	"Properties.OtherSetting.551013-4": "",
+	"Properties.OtherSetting.551013-5": "",
+	"Properties.OtherSetting.551013-6": "",
+	"Properties.OtherSetting.551013-7": "",
+	"Properties.OtherSetting.551013-8": "",
+	"Properties.OtherSetting.551013-9": "",
+	"Properties.OtherSetting.551013-10": "",
+	"Properties.OtherSetting.551013-11": "",
+	"Properties.OtherSetting.551013-12": "",
+	"Properties.OtherSetting.551013-13": "",
+	"Properties.OtherSetting.551013-14": "",
+	"Properties.OtherSetting.551013-15": "",
+	"Properties.OtherSetting.551013-16": "",
+	"Properties.OtherSetting.551013-17": "",
+	"Properties.OtherSetting.551013-18": "",
+	"Properties.OtherSetting.551013-19": "",
+	"Properties.OtherSetting.551013-20": "",
+	"Properties.OtherSetting.551013-21": "",
+	"Properties.OtherSetting.551013-22": "",
+	"Properties.OtherSetting.551013-23": "",
+	"ChildDevice.index.551011-0": "",
+	"ChildDevice.index.551011-1": "",
+	"ChildDevice.index.551011-2": "",
+	"ChildDevice.index.551011-3": "",
+	"ChildDevice.index.551011-4": "",
+	"ChildDevice.index.551011-5": "",
+	"ChildDevice.index.551011-6": "",
+	"ChildDevice.index.551011-7": "",
+	"ChildDevice.index.551011-8": "",
+	"ChildDevice.index.551011-9": "",
+	"ChildDevice.index.551011-10": "",
+	"ChildDevice.index.551011-11": "",
+	"ChildDevice.index.551011-12": "",
+	"ChildDevice.index.551011-13": "",
+	"ChildDevice.index.551011-14": "",
+	"ChildDevice.index.551011-15": "",
+	"ChildDevice.index.551011-16": "",
+	"ChildDevice.index.551011-17": "",
+	"ChildDevice.index.551011-18": "",
+	"ChildDevice.index.551011-19": "",
+	"ChildDevice.index.551011-20": "",
+	"Status.index.551011-0": "",
+	"Status.index.551011-1": "",
+	"Status.index.551011-2": "",
+	"Status.index.551011-3": "",
+	"Status.index.551011-4": "",
+	"Status.index.551011-5": "",
+	"Status.index.551011-6": "",
+	"Status.index.551011-7": "",
+	"Status.index.551011-8": "",
+	"Status.index.551011-9": "",
+	"Status.index.551011-10": "",
+	"Status.index.551011-11": "",
+	"Status.index.551011-12": "",
+	"Status.index.551011-13": "",
+	"Status.index.551011-14": "",
+	"Status.index.551011-15": "",
+	"Status.index.551011-16": "",
+	"Status.index.551011-17": "",
+	"Status.index.551011-18": "",
+	"Status.index.551011-19": "",
+	"Status.index.551011-20": "",
+	"Status.index.551011-21": "",
+	"Status.index.551011-22": "",
+	"Status.index.551011-23": "",
+	"Status.index.551011-24": "",
+	"Status.index.551011-25": "",
+	"Status.index.551011-26": "",
+	"Status.index.551011-27": "",
+	"Status.index.551011-28": "",
+	"Status.index.551011-29": "",
+	"Status.index.551011-30": "",
+	"Status.index.551011-31": "",
+	"Status.index.551011-32": "",
+	"Status.index.551011-33": "",
+	"Status.index.551011-34": "",
+	"Status.index.551011-35": "",
+	"Status.index.551011-36": "",
+	"Status.index.551011-37": "",
+	"Status.index.551011-38": "",
+	"Status.index.551011-39": "",
+	"Status.index.551011-40": "",
+	"Status.index.551011-41": "",
+	"Status.index.551011-42": "",
+	"Status.index.551011-43": "",
+	"Status.index.551011-44": "",
+	"Status.index.551011-45": "",
+	"Status.index.551011-46": "",
+	"Status.index.551011-47": "",
+	"Status.index.551011-48": "",
+	"Status.index.551011-49": "",
+	"Status.index.551011-50": "",
+	"Status.index.551011-51": "",
+	"Status.index.551011-52": "",
+	"Status.index.551011-53": "",
+	"Status.index.551011-54": "",
+	"Status.index.551011-55": "",
+	"Status.index.551011-56": "",
+	"Status.index.551011-57": "",
+	"Status.index.551011-58": "",
+	"Status.index.551011-59": "",
+	"Status.index.551011-60": "",
+	"Status.index.551011-61": "",
+	"Status.index.551011-62": "",
+	"Status.index.551011-63": "",
+	"Status.index.551011-64": "",
+	"Status.index.551011-65": "",
+	"Status.index.551011-66": "",
+	"Status.index.551011-67": "",
+	"Status.index.551011-68": "",
+	"Status.index.551011-69": "",
+	"components.ModelButton.551013-0": "",
+	"Properties.StorageSetting.551013-0": "",
+	"Properties.StorageSetting.551013-1": "",
+	"Properties.StorageSetting.551013-2": "",
+	"Function.OutputParams.551013-0": "",
+	"Function.OutputParams.551013-1": "",
+	"Function.OutputParams.551013-2": "",
+	"Function.OutputParams.551013-3": "",
+	"Function.OutputParams.551013-4": "",
+	"Function.OutputParams.551013-5": "",
+	"Function.OutputParams.551013-6": "",
+	"Function.OutputParams.551013-7": "",
+	"Function.OutputParams.551013-8": "",
+	"Function.OutputParams.551013-9": "",
+	"Function.OutputParams.551013-10": "",
+	"Events.SelectColumn.551013-0": "",
+	"Import.index.551010-0": "",
+	"Import.index.551010-1": "",
+	"Import.index.551010-2": "",
+	"Import.index.551010-3": "",
+	"Import.index.551010-4": "",
+	"Import.index.551010-5": "",
+	"components.EditTable.626395-0": "Up to 64 characters can be entered",
+	"components.EditTable.626395-1": "Please enter {0}",
+	"components.EditTable.626395-2": "add to",
+	"components.EditTable.626395-3": "operation",
+	"Process.index.551010-0": "",
+	"Process.index.551010-1": "",
+	"Process.index.551010-2": "",
+	"Process.index.551010-3": "",
+	"Process.index.551010-4": "",
+	"Process.index.551010-5": "",
+	"Process.index.551010-6": "",
+	"Process.index.551010-7": "",
+	"Process.index.551010-8": "",
+	"Info.index.506529-0": "",
+	"Info.index.506529-1": "",
+	"Info.index.506529-2": "",
+	"Info.index.506529-3": "",
+	"Info.index.506529-4": "",
+	"Info.index.506529-5": "",
+	"Info.index.506529-6": "",
+	"Info.index.506529-7": "",
+	"Info.index.506529-8": "",
+	"Info.index.506529-9": "",
+	"Info.index.506529-10": "",
+	"Info.index.506529-11": "",
+	"Info.index.506529-12": "",
+	"Info.index.506529-13": "",
+	"Info.index.506529-14": "",
+	"Info.index.506529-15": "",
+	"Info.index.506529-16": "",
+	"Save.GateWayFormItem.366202-0": "",
+	"Save.GateWayFormItem.366202-1": "",
+	"Save.GateWayFormItem.340184-0": "",
+	"Save.GateWayFormItem.340184-1": "",
+	"DeviceHome.index.152181-0": "",
+	"DeviceHome.index.152181-1": "",
+	"DeviceHome.index.152181-2": "",
+	"DeviceHome.index.152181-3": "",
+	"DeviceHome.index.152181-4": "",
+	"DeviceHome.index.152181-5": "",
+	"DeviceHome.index.152181-6": "",
+	"DeviceHome.index.152181-7": "",
+	"DeviceHome.index.152181-8": "",
+	"DeviceHome.index.152181-9": "",
+	"DeviceHome.index.152181-10": "",
+	"DeviceHome.index.152181-11": "",
+	"DeviceHome.index.152181-12": "",
+	"DeviceHome.index.152181-13": "",
+	"DeviceHome.index.152181-14": "",
+	"InitHome.index.152181-0": "",
+	"InitHome.index.152181-1": "",
+	"ComprehensiveHome.index.152181-0": "",
+	"ComprehensiveHome.index.152181-1": "",
+	"ComprehensiveHome.index.152181-2": "",
+	"ComprehensiveHome.index.152181-3": "",
+	"ComprehensiveHome.index.152181-4": "",
+	"ComprehensiveHome.index.152181-5": "",
+	"ComprehensiveHome.index.152181-6": "",
+	"ComprehensiveHome.index.152181-7": "",
+	"ComprehensiveHome.index.152181-8": "",
+	"ComprehensiveHome.index.152181-9": "",
+	"ComprehensiveHome.index.152181-10": "",
+	"ComprehensiveHome.index.152181-11": "",
+	"ComprehensiveHome.index.152181-12": "",
+	"ComprehensiveHome.index.152181-13": "",
+	"ComprehensiveHome.index.152181-14": "",
+	"ComprehensiveHome.index.152181-15": "",
+	"ComprehensiveHome.index.152181-16": "",
+	"ComprehensiveHome.index.152181-17": "",
+	"ComprehensiveHome.index.152181-18": "",
+	"ComprehensiveHome.index.152181-19": "",
+	"ComprehensiveHome.index.152181-20": "",
+	"ComprehensiveHome.index.152181-21": "",
+	"ComprehensiveHome.index.152181-22": "",
+	"ComprehensiveHome.index.152181-23": "",
+	"ComprehensiveHome.index.152181-24": "",
+	"ComprehensiveHome.index.152181-25": "",
+	"ComprehensiveHome.index.152181-26": "",
+	"ComprehensiveHome.index.152181-27": "",
+	"ComprehensiveHome.index.152181-28": "",
+	"ComprehensiveHome.index.152181-29": "",
+	"ComprehensiveHome.index.152181-30": "",
+	"dialogs.DeviceChooseDialog.152181-0": "",
+	"dialogs.DeviceChooseDialog.152181-1": "",
+	"dialogs.DeviceChooseDialog.152181-2": "",
+	"dialogs.DeviceChooseDialog.152181-3": "",
+	"dialogs.DeviceChooseDialog.152181-4": "",
+	"dialogs.DeviceChooseDialog.152181-5": "",
+	"dialogs.DeviceChooseDialog.152181-6": "",
+	"dialogs.DeviceChooseDialog.152181-7": "",
+	"dialogs.DeviceChooseDialog.152181-8": "",
+	"components.BootCard.152181-0": "",
+	"components.BasicCountCard.152181-0": "",
+	"components.BasicCountCard.152181-1": "",
+	"components.BasicCountCard.152181-2": "",
+	"components.BasicCountCard.152181-3": "",
+	"components.BootCardSmall.152181-0": "",
+	"components.StepCard.152181-0": "",
+	"dialogs.ProductChooseDialog.152181-0": "",
+	"dialogs.ProductChooseDialog.152181-1": "",
+	"dialogs.ProductChooseDialog.152181-2": "",
+	"home.index.152180-0": "",
+	"components.PlatformPicCard.152181-0": "",
+	"components.DeviceCountCard.152181-0": "",
+	"components.DeviceCountCard.152181-1": "",
+	"components.DeviceCountCard.152181-2": "",
+	"components.DeviceCountCard.152181-3": "",
+	"Save.GateWayDeviceModal.039083-0": "",
+	"Save.GateWayDeviceModal.039083-1": "",
+	"Save.GateWayDeviceModal.039083-2": "",
+	"Save.GateWayDeviceModal.039083-3": "",
+	"Save.GateWayDeviceModal.039083-4": "",
+	"Save.GateWayDeviceModal.039083-5": "",
+	"Save.GateWayDeviceModal.039083-6": "",
+	"Save.GateWayDeviceModal.039083-7": "",
+	"Save.GateWayDeviceModal.039083-8": "",
+	"Save.index.039083-0": "",
+	"Save.index.039083-1": "",
+	"Save.index.039083-2": "",
+	"Save.index.039083-3": "",
+	"Save.index.039083-4": "",
+	"Save.index.039083-5": "",
+	"Save.index.039083-6": "",
+	"Save.index.039083-7": "",
+	"Save.index.039083-8": "",
+	"Save.index.039083-9": "",
+	"Save.index.039083-10": "",
+	"Save.index.039083-11": "",
+	"Save.index.039083-12": "",
+	"Save.index.039083-13": "",
+	"Save.index.039083-14": "",
+	"Save.index.039083-15": "",
+	"Save.index.039083-16": "",
+	"Save.index.039083-17": "",
+	"Save.index.039083-18": "",
+	"Save.index.039083-19": "",
+	"Save.index.039083-20": "",
+	"Save.index.039083-21": "",
+	"Save.index.039083-22": "",
+	"Save.index.039083-23": "",
+	"Save.index.039083-24": "",
+	"Save.index.039083-25": "",
+	"Save.index.039083-26": "",
+	"Save.index.039083-27": "",
+	"Save.index.039083-28": "",
+	"Save.index.039083-29": "",
+	"Save.index.039083-30": "",
+	"Save.index.039083-31": "",
+	"Save.index.039083-32": "",
+	"Save.index.039083-33": "",
+	"Save.index.039083-34": "",
+	"Save.index.039083-35": "",
+	"Save.index.039083-36": "",
+	"Save.index.039083-37": "",
+	"Center.index.340051-0": "",
+	"Center.index.340051-1": "",
+	"Center.index.340051-2": "",
+	"Center.index.340051-3": "",
+	"Center.index.340051-4": "",
+	"Center.index.340051-5": "",
+	"Center.index.340051-6": "",
+	"Center.index.340051-7": "",
+	"Center.index.361874-0": "",
+	"Center.index.361874-1": "",
+	"Center.index.361874-2": "",
+	"Center.index.361874-3": "",
+	"Center.index.361874-4": "",
+	"Center.index.361874-5": "",
+	"Center.index.361874-6": "",
+	"Center.index.361874-7": "",
+	"Import.index.657743-0": "",
+	"Import.index.657743-1": "",
+	"Import.index.657743-2": "",
+	"Import.index.657743-3": "",
+	"Import.index.657743-4": "",
+	"Import.index.657743-5": "",
+	"Import.index.657743-6": "",
+	"Import.index.657743-7": "",
+	"Import.index.657743-8": "",
+	"Import.index.657743-9": "",
+	"Import.index.657743-10": "",
+	"Import.index.657743-11": "",
+	"Import.index.657743-12": "",
+	"Import.index.657743-13": "",
+	"Import.index.657743-14": "",
+	"Import.index.657743-15": "",
+	"Import.index.657743-16": "",
+	"Import.index.657743-17": "",
+	"Import.index.657743-18": "",
+	"Import.index.657743-19": "",
+	"Import.index.657743-20": "",
+	"Import.index.657743-21": "",
+	"Import.index.657743-22": "",
+	"Import.index.657743-23": "",
+	"Import.index.657743-24": "",
+	"Import.index.657743-25": "",
+	"Import.index.657743-26": "",
+	"Import.index.657743-27": "",
+	"Import.index.657743-28": "",
+	"Import.index.657743-29": "",
+	"Import.index.657743-30": "",
+	"Import.index.657743-31": "",
+	"Import.index.657743-32": "",
+	"Import.index.657743-33": "",
+	"Import.index.657743-34": "",
+	"Import.index.657743-35": "",
+	"Import.index.657743-36": "",
+	"Import.index.657743-37": "",
+	"Import.index.657743-38": "",
+	"Import.index.657743-39": "",
+	"Import.index.657743-40": "",
+	"Import.index.657743-41": "",
+	"Import.index.657743-42": "",
+	"Import.index.657743-43": "",
+	"Import.index.657743-44": "",
+	"Import.index.657743-45": "",
+	"Import.index.657743-46": "",
+	"Import.index.657743-47": "",
+	"Import.index.657743-48": "",
+	"Import.index.657743-49": "",
+	"Import.index.657743-50": "",
+	"Import.index.657743-51": "",
+	"Import.index.657743-52": "",
+	"Import.index.657743-53": "",
+	"Import.index.657743-54": "",
+	"Import.index.657743-55": "",
+	"Import.index.657743-56": "",
+	"Import.index.657743-57": "",
+	"Import.index.657743-58": "",
+	"Import.index.657743-59": "",
+	"Import.index.657743-60": "",
+	"ComprehensiveHome.index.926510-0": "IoT guidance",
+	"ComprehensiveHome.index.926510-1": "Operations guidance",
+	"ComprehensiveHome.index.926510-2": "Recommended steps for device access",
+	"ComprehensiveHome.index.926510-3": "Different devices may have different access steps due to differences in communication protocols",
+	"ComprehensiveHome.index.926510-4": "Recommended steps for operation and maintenance management",
+	"ComprehensiveHome.index.926510-5": "Please perform selective operations on the following steps according to business needs.",
+	"ComprehensiveHome.index.926510-6": "Create product",
+	"ComprehensiveHome.index.926510-7": "Create device",
+	"ComprehensiveHome.index.926510-8": "Rule engine",
+	"ComprehensiveHome.index.926510-9": "A product is a collection of devices, usually referring to a group of devices with the same functionality. IoT devices must be configured through product access methods.",
+	"ComprehensiveHome.index.926510-10": "Configure product access methods",
+	"ComprehensiveHome.index.926510-11": "Configure unified access methods for devices of the same type through products. Please refer to the instructions on the device nameplate to select the matching access method.",
+	"ComprehensiveHome.index.926510-12": "Add testing equipment",
+	"ComprehensiveHome.index.926510-13": "Add a single device to verify if the product model is configured correctly.",
+	"ComprehensiveHome.index.926510-14": "Functional debugging",
+	"ComprehensiveHome.index.926510-15": "Perform functional debugging on the added testing equipment to verify if it can connect to the platform and if the device's functions are configured correctly.",
+	"ComprehensiveHome.index.926510-16": "Batch Add Devices",
+	"ComprehensiveHome.index.926510-17": "Batch adding devices under the same product",
+	"ComprehensiveHome.index.926510-18": "Device access configuration",
+	"ComprehensiveHome.index.926510-19": "Log troubleshooting",
+	"ComprehensiveHome.index.926510-20": "Real time monitoring",
+	"ComprehensiveHome.index.926510-21": "Protocol management",
+	"ComprehensiveHome.index.926510-22": "Customize and develop corresponding product (device model) access protocols according to business needs, and upload them to the platform.",
+	"ComprehensiveHome.index.926510-23": "Certificate Management",
+	"ComprehensiveHome.index.926510-24": "Unified maintenance of certificates within the platform for data communication encryption.",
+	"ComprehensiveHome.index.926510-25": "Network components",
+	"ComprehensiveHome.index.926510-26": "Configure platform underlying network component related parameters based on different transmission types.",
+	"ComprehensiveHome.index.926510-27": "Device access gateway",
+	"ComprehensiveHome.index.926510-28": "According to different transmission types, associate message protocols, and configure device access gateway related parameters.",
+	"ComprehensiveHome.index.926510-29": "Log management",
+	"ComprehensiveHome.index.926510-30": "Monitor system logs and promptly handle system exceptions.",
+	"components.BootCardSmall.926510-0": "No permission at the moment, please contact the administrator",
+	"components.BasicCountCard.926510-0": "Basic statistics",
+	"components.BasicCountCard.926510-1": "details",
+	"components.BasicCountCard.926510-2": "CPU usage rate",
+	"components.BasicCountCard.926510-3": "JVM memory",
+	"components.BootCard.926510-0": "No permission at the moment, please contact the administrator",
+	"dialogs.DeviceChooseDialog.926510-0": "Select device",
+	"dialogs.DeviceChooseDialog.926510-1": "Please select a device",
+	"dialogs.DeviceChooseDialog.926510-2": "Device ID",
+	"dialogs.DeviceChooseDialog.926510-3": "Device Name",
+	"dialogs.DeviceChooseDialog.926510-4": "Product Name",
+	"dialogs.DeviceChooseDialog.926510-5": "Registration time",
+	"dialogs.DeviceChooseDialog.926510-6": "state",
+	"dialogs.DeviceChooseDialog.926510-7": "on-line",
+	"dialogs.DeviceChooseDialog.926510-8": "off-line",
+	"DevOpsHome.index.926510-0": "Operations guidance",
+	"DevOpsHome.index.926510-1": "Recommended steps for operation and maintenance management",
+	"DevOpsHome.index.926510-2": "Please perform selective operations on the following steps according to business needs.",
+	"DevOpsHome.index.926510-3": "Device access configuration",
+	"DevOpsHome.index.926510-4": "Log troubleshooting",
+	"DevOpsHome.index.926510-5": "Real time monitoring",
+	"DevOpsHome.index.926510-6": "Protocol management",
+	"DevOpsHome.index.926510-7": "Customize and develop corresponding product (device model) access protocols according to business needs, and upload them to the platform.",
+	"DevOpsHome.index.926510-8": "Certificate Management",
+	"DevOpsHome.index.926510-9": "Unified maintenance of certificates within the platform for data communication encryption.",
+	"DevOpsHome.index.926510-10": "Network components",
+	"DevOpsHome.index.926510-11": "Configure platform underlying network component related parameters based on different transmission types.",
+	"DevOpsHome.index.926510-12": "Device access gateway",
+	"DevOpsHome.index.926510-13": "According to different transmission types, associate message protocols, and configure device access gateway related parameters.",
+	"DevOpsHome.index.926510-14": "Log management",
+	"DevOpsHome.index.926510-15": "Monitor system logs and promptly handle system exceptions.",
+	"dialogs.ProductChooseDialog.926510-0": "Select product",
+	"dialogs.ProductChooseDialog.926510-1": "product",
+	"dialogs.ProductChooseDialog.926510-2": "Please select a product",
+	"components.DeviceCountCard.926510-0": "Equipment statistics",
+	"components.DeviceCountCard.926510-1": "details",
+	"components.DeviceCountCard.926510-2": "Product quantity",
+	"components.DeviceCountCard.926510-3": "Number of devices",
+	"home.index.926510-0": "essential information",
+	"components.PlatformPicCard.926510-0": "Platform architecture diagram",
+	"InitHome.index.926510-0": "Please select the homepage view",
+	"InitHome.index.926510-1": "Save modifications",
+	"DeviceHome.index.926510-0": "IoT guidance",
+	"DeviceHome.index.926510-1": "Recommended steps for device access",
+	"DeviceHome.index.926510-2": "Different devices may have different access steps due to differences in communication protocols",
+	"DeviceHome.index.926510-3": "Create product",
+	"DeviceHome.index.926510-4": "Create device",
+	"DeviceHome.index.926510-5": "Rule engine",
+	"DeviceHome.index.926510-6": "A product is a collection of devices, usually referring to a group of devices with the same functionality. IoT devices must be configured through product access methods.",
+	"DeviceHome.index.926510-7": "Configure product access methods",
+	"DeviceHome.index.926510-8": "Configure unified access methods for devices of the same type through products. Please refer to the instructions on the device nameplate to select the matching access method.",
+	"DeviceHome.index.926510-9": "Add testing equipment",
+	"DeviceHome.index.926510-10": "Add a single device to verify if the product model is configured correctly.",
+	"DeviceHome.index.926510-11": "Functional debugging",
+	"DeviceHome.index.926510-12": "Perform functional debugging on the added testing equipment to verify if it can connect to the platform and if the device's functions are configured correctly.",
+	"DeviceHome.index.926510-13": "Batch Add Devices",
+	"DeviceHome.index.926510-14": "Batch adding devices under the same product",
+	"components.StepCard.926510-0": "No permission at the moment, please contact the administrator"
+}
\ No newline at end of file
diff --git a/src/i18n/locale/zh.json b/src/i18n/locale/zh.json
new file mode 100644
index 00000000..8890ca98
--- /dev/null
+++ b/src/i18n/locale/zh.json
@@ -0,0 +1,1773 @@
+{
+	"Login.index.265048-0": "备案：",
+	"Login.index.265048-1": "渝ICP备19017719号-1",
+	"Login.index.265048-2": "账号",
+	"Login.index.265048-3": "请输入账号",
+	"Login.index.265048-4": "密码",
+	"Login.index.265048-5": "请输入密码",
+	"Login.index.265048-6": "验证码",
+	"Login.index.265048-7": "请输入验证码",
+	"Login.index.265048-8": "记住我",
+	"Login.index.265048-9": "登录",
+	"Login.index.265048-10": "其他登录方式",
+	"Login.index.265048-11": "JETLINKS团队全新力作可视化大屏系统",
+	"Login.index.265048-12": "体验DEMO",
+	"Login.index.265048-13": "请输入账号!",
+	"Login.index.265048-14": "请输入密码!",
+	"Login.index.265048-15": "请输入验证码!",
+	"BooleanParam.index.966482-0": "请输入trueText",
+	"BooleanParam.index.966482-1": "最多可输入64个字符",
+	"BooleanParam.index.966482-2": "请输入trueValue",
+	"BooleanParam.index.966482-3": "请输入falseText",
+	"BooleanParam.index.966482-4": "请输入falseValue",
+	"BooleanParam.index.966482-5": "是",
+	"BooleanParam.index.966482-6": "否",
+	"Save.GateWayFormItem.039083-0": "选择网关设备",
+	"Save.GateWayFormItem.039083-1": "重新选择",
+	"DevOpsHome.index.152181-0": "运维引导",
+	"DevOpsHome.index.152181-1": "运维管理推荐步骤",
+	"DevOpsHome.index.152181-2": "请根据业务需要对下述步骤进行选择性操作。",
+	"DevOpsHome.index.152181-3": "设备接入配置",
+	"DevOpsHome.index.152181-4": "日志排查",
+	"DevOpsHome.index.152181-5": "实时监控",
+	"DevOpsHome.index.152181-6": "协议管理",
+	"DevOpsHome.index.152181-7": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+	"DevOpsHome.index.152181-8": "证书管理",
+	"DevOpsHome.index.152181-9": "统一维护平台内的证书，用于数据通信加密。",
+	"DevOpsHome.index.152181-10": "网络组件",
+	"DevOpsHome.index.152181-11": "根据不同的传输类型配置平台底层网络组件相关参数。",
+	"DevOpsHome.index.152181-12": "设备接入网关",
+	"DevOpsHome.index.152181-13": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+	"DevOpsHome.index.152181-14": "日志管理",
+	"DevOpsHome.index.152181-15": "监控系统日志，及时处理系统异常。",
+	"Task2.index.551010-0": "升级任务",
+	"Task2.index.551010-1": "+ 新增任务",
+	"Task2.index.551010-2": "完成比例",
+	"Task2.index.551010-3": "任务详情",
+	"Task2.index.551010-4": "响应超时时间",
+	"Task2.index.551010-5": "升级超时时间",
+	"Task2.index.551010-6": "升级设备",
+	"Task2.index.551010-7": "选择设备",
+	"Task2.index.551010-8": "所有设备",
+	"Task2.index.551010-9": "说明",
+	"Task2.index.551010-10": "操作成功",
+	"Detail.index.551010-0": "任务详情",
+	"Detail.index.551010-1": "全部暂停",
+	"Detail.index.551010-2": "全部开始",
+	"Detail.index.551010-3": "批量重试",
+	"Detail.index.551010-4": "刷新状态",
+	"Detail.index.551010-5": "当前进度",
+	"Detail.index.551010-6": "共",
+	"Detail.index.551010-7": "个任务",
+	"Detail.index.551010-8": "关闭弹窗不会影响任务执行状态",
+	"Detail.index.551010-9": "关闭",
+	"Detail.index.551010-10": "设备名称",
+	"Detail.index.551010-11": "所属产品",
+	"Detail.index.551010-12": "创建时间",
+	"Detail.index.551010-13": "完成时间",
+	"Detail.index.551010-14": "状态",
+	"Detail.index.551010-15": "操作成功",
+	"Task.index.551010-0": "新增",
+	"Task.index.551010-1": "任务名称",
+	"Task.index.551010-2": "推送方式",
+	"Task.index.551010-3": "设备拉取",
+	"Task.index.551010-4": "平台推送",
+	"Task.index.551010-5": "说明",
+	"Task.index.551010-6": "完成比例",
+	"Task.index.551010-7": "操作",
+	"Task.index.551010-8": "详情",
+	"Task.index.551010-9": "查看",
+	"Task.index.551010-10": "停止",
+	"Task.index.551010-11": "操作成功",
+	"Task.index.551010-12": "继续升级",
+	"Save.index.551010-0": "编辑",
+	"Save.index.551010-1": "新增",
+	"Save.index.551010-2": "确认",
+	"Save.index.551010-3": "取消",
+	"Save.index.551010-4": "名称",
+	"Save.index.551010-5": "请输入名称",
+	"Save.index.551010-6": "所属产品",
+	"Save.index.551010-7": "请选择所属产品",
+	"Save.index.551010-8": "版本号",
+	"Save.index.551010-9": "请输入版本号",
+	"Save.index.551010-10": "版本序号",
+	"Save.index.551010-11": "请输入版本序号",
+	"Save.index.551010-12": "签名方式",
+	"Save.index.551010-13": "请选择签名方式",
+	"Save.index.551010-14": "签名",
+	"Save.index.551010-15": "请输入本地文件进行签名加密后的值",
+	"Save.index.551010-16": "请输入签名",
+	"Save.index.551010-17": "固件上传",
+	"Save.index.551010-18": "其他配置",
+	"Save.index.551010-19": "请输入KEY",
+	"Save.index.551010-20": "请输入VALUE",
+	"Save.index.551010-21": "操作",
+	"Save.index.551010-22": "确认删除吗？",
+	"Save.index.551010-23": "添加",
+	"Save.FileUpload.551010-0": "请上传文件",
+	"Save.FileUpload.551010-1": "上传文件",
+	"Save.FileUpload.551010-2": "上传成功！",
+	"Save.FileUpload.551010-3": "系统提示",
+	"Save.FileUpload.551010-4": "系统未知错误，请反馈给管理员",
+	"Save.index.551010-24": "说明",
+	"Save.index.551010-25": "请输入说明",
+	"Save.index.551010-26": "签名不一致，请检查文件是否上传正确",
+	"Save.index.551010-27": "版本序号已存在",
+	"Save.index.551010-28": "当前产品不存在，请选择产品",
+	"Save.index.551010-29": "请输入1~99999之间的正整数",
+	"Save.index.551010-30": "最多可输入64个字符",
+	"Save.index.551010-31": "请上传文件",
+	"Save.index.551010-32": "最多可输入200个字符",
+	"Save.index.551010-33": "操作成功",
+	"Save.index.551009-0": "确定",
+	"Save.index.551009-1": "取消",
+	"Save.index.551009-2": "若不填写，系统将自动生成唯一ID",
+	"Save.index.551009-3": "请输入ID",
+	"Save.index.551009-4": "名称",
+	"Save.index.551009-5": "请输入名称",
+	"Save.index.551009-6": "产品分类",
+	"Save.index.551009-7": "请选择产品分类",
+	"Save.index.551009-8": "设备类型",
+	"Save.index.551009-9": "说明",
+	"Save.index.551009-10": "请输入说明",
+	"Save.index.551009-11": "直连设备",
+	"Save.index.551009-12": "直连物联网平台的设备",
+	"Save.index.551009-13": "网关子设备",
+	"Save.index.551009-14": "作为网关的子设备，由网关代理连接到物联网平台",
+	"Save.index.551009-15": "网关设备",
+	"Save.index.551009-16": "能挂载子设备与平台进行通信的设备",
+	"Save.index.551009-17": "请输入英文或者数字或者-或者_",
+	"Save.index.551009-18": "ID重复",
+	"Save.index.551009-19": "请选择设备类型",
+	"Save.index.551009-20": "最多可输入64位字符",
+	"Save.index.551009-21": "最多可输入200位字符",
+	"Save.index.551009-22": "保存成功！",
+	"Save.index.551009-23": "操作失败",
+	"Save.SelectDevices.551010-0": "请选择设备",
+	"Save.SelectDevices.551010-1": "选择设备",
+	"Save.SelectDevices.551010-2": "确认",
+	"Save.SelectDevices.551010-3": "取消",
+	"Save.SelectDevices.551010-4": "全选",
+	"Save.SelectDevices.551010-5": "设备名称",
+	"Save.SelectDevices.551010-6": "固件版本",
+	"Save.SelectDevices.551010-7": "注册时间",
+	"Save.SelectDevices.551010-8": "状态",
+	"Save.SelectDevices.551010-9": "在线",
+	"Save.SelectDevices.551010-10": "离线",
+	"Save.SelectDevices.551010-11": "禁用",
+	"Detail.PropertyAMap.551011-0": "开始动画",
+	"Detail.PropertyAMap.551011-1": "暂停动画",
+	"Detail.PropertyAMap.551011-2": "继续动画",
+	"Instance.index.551009-0": "新增",
+	"Instance.index.551009-1": "设备类型",
+	"Instance.index.551009-2": "产品名称",
+	"Instance.index.551009-3": "设备名称",
+	"Instance.index.551009-4": "创建时间",
+	"Instance.index.551009-5": "状态",
+	"Instance.index.551009-6": "禁用",
+	"Instance.index.551009-7": "离线",
+	"Instance.index.551009-8": "在线",
+	"Instance.index.551009-9": "产品分类",
+	"Instance.index.551009-10": "网关类型",
+	"Instance.index.551009-11": "接入方式",
+	"Instance.index.551009-12": "直连设备",
+	"Instance.index.551009-13": "网关子设备",
+	"Instance.index.551009-14": "网关设备",
+	"Instance.index.551009-15": "所属组织",
+	"Instance.index.551009-16": "设备标签",
+	"Instance.index.551009-17": "说明",
+	"Instance.index.551009-18": "操作",
+	"Instance.index.551009-19": "查看",
+	"Instance.index.551009-20": "编辑",
+	"Instance.index.551009-21": "启用",
+	"Instance.index.551009-22": "确认${\r\n                    data.state.value !== 'notActive' ? '禁用' : '启用'\r\n                }?",
+	"Instance.index.551009-23": "操作成功！",
+	"Instance.index.551009-24": "操作失败！",
+	"Instance.index.551009-25": "删除",
+	"Instance.index.551009-26": "已启用的设备不能删除",
+	"Instance.index.551009-27": "确认删除?",
+	"Instance.index.551009-28": "请选择设备",
+	"Instance.index.551009-29": "批量导出设备",
+	"Instance.index.551009-30": "批量导入设备",
+	"Instance.index.551009-31": "启用全部设备",
+	"Instance.index.551009-32": "确认启用全部设备？",
+	"Instance.index.551009-33": "同步设备状态",
+	"Instance.index.551009-34": "批量删除设备",
+	"Instance.index.551009-35": "已启用的设备无法删除，确认删除选中的禁用状态设备？",
+	"Instance.index.551009-36": "批量禁用设备",
+	"Instance.index.551009-37": "确认禁用选中设备?",
+	"DeviceAccess.index.551011-0": "请先",
+	"DeviceAccess.index.551011-1": "选择",
+	"DeviceAccess.index.551011-2": "设备接入网关，用以提供设备接入能力",
+	"DeviceAccess.index.551011-3": "请联系管理员配置产品接入方式",
+	"DeviceAccess.index.551011-4": "接入方式",
+	"DeviceAccess.index.551011-5": "更换",
+	"DeviceAccess.index.551011-6": "消息协议",
+	"DeviceAccess.index.551011-7": "连接信息",
+	"DeviceAccess.index.551011-8": "暂无连接信息",
+	"DeviceAccess.index.551011-9": "产品类型",
+	"DeviceAccess.index.551011-10": "请选择产品类型",
+	"DeviceAccess.index.551011-11": "此配置来自于产品接入方式所选择的协议",
+	"DeviceAccess.index.551011-12": "请选择",
+	"DeviceAccess.index.551011-13": "请输入",
+	"DeviceAccess.index.551011-14": "存储策略",
+	"DeviceAccess.index.551011-15": "若修改存储策略,需要手动做数据迁移,平台只能搜索最新存储策略中的数据",
+	"DeviceAccess.index.551011-16": "保存",
+	"DeviceAccess.index.551011-17": "URL信息",
+	"DeviceAccess.index.551011-18": "我知道了",
+	"DeviceAccess.index.551011-19": "不再提示",
+	"DeviceAccess.index.551011-20": "下一步",
+	"DeviceAccess.index.551011-21": "上一步",
+	"DeviceAccess.index.551011-22": "上下行",
+	"DeviceAccess.index.551011-23": "说明",
+	"DeviceAccess.index.551011-24": "地址",
+	"DeviceAccess.index.551011-25": "示例",
+	"DeviceAccess.index.551011-26": "上行",
+	"DeviceAccess.index.551011-27": "下行",
+	"DeviceAccess.index.551011-28": "分组",
+	"DeviceAccess.index.551011-29": "流传输模式",
+	"DeviceAccess.index.551011-30": "操作成功！",
+	"DeviceAccess.index.551011-31": "产品下有设备实例时不能更换接入方式",
+	"DeviceAccess.index.551011-32": "停用产品后才可更换接入方式",
+	"Firmware.index.551009-0": "新增",
+	"Firmware.index.551009-1": "固件名称",
+	"Firmware.index.551009-2": "固件版本",
+	"Firmware.index.551009-3": "所属产品",
+	"Firmware.index.551009-4": "签名方式",
+	"Firmware.index.551009-5": "创建时间",
+	"Firmware.index.551009-6": "说明",
+	"Firmware.index.551009-7": "操作",
+	"Firmware.index.551009-8": "升级任务",
+	"Firmware.index.551009-9": "编辑",
+	"Firmware.index.551009-10": "删除",
+	"Firmware.index.551009-11": "确认删除?",
+	"Firmware.index.551009-12": "确定",
+	"Firmware.index.551009-13": "取消",
+	"Firmware.index.551009-14": "操作成功",
+	"Property.Indicators.551010-0": "编辑指标",
+	"Property.Indicators.551010-1": "场景联动页面可引用指标配置触发条件",
+	"Property.Indicators.551010-2": "请${\r\n                                    ['date', 'boolean'].includes(\r\n                                        data?.valueType?.type,\r\n                                    )\r\n                                        ? '选择'\r\n                                        : '输入'\r\n                                }指标值",
+	"Property.Indicators.551010-3": "指标值",
+	"Property.Indicators.551010-4": "请${\r\n                                        ['date', 'boolean'].includes(\r\n                                            data?.valueType?.type,\r\n                                        )\r\n                                            ? '选择'\r\n                                            : '输入'\r\n                                    }指标值",
+	"Property.Indicators.551010-5": "操作成功！",
+	"Detail.TimeComponent.551010-0": "今日",
+	"Detail.TimeComponent.551010-1": "近一周",
+	"Detail.TimeComponent.551010-2": "近一月",
+	"Detail.TimeComponent.551010-3": "开始时间",
+	"Detail.TimeComponent.551010-4": "结束时间",
+	"Event.index.551010-0": "详情",
+	"Event.index.551010-1": "关闭",
+	"Event.index.551010-2": "时间",
+	"Event.index.551010-3": "操作",
+	"Event.index.551010-4": "数据",
+	"Detail.Table.551010-0": "详情",
+	"Detail.Table.551010-1": "自定义属性",
+	"Detail.Table.551010-2": "时间",
+	"Detail.Table.551010-3": "操作",
+	"Detail.Table.551010-4": "二进制",
+	"Detail.index.551011-0": "详情",
+	"Detail.index.551011-1": "列表",
+	"Detail.index.551011-2": "图表",
+	"Detail.index.551011-3": "轨迹",
+	"DeviceAccess.accessModal.551011-0": "设备接入配置",
+	"DeviceAccess.accessModal.551011-1": "确定",
+	"DeviceAccess.accessModal.551011-2": "取消",
+	"DeviceAccess.accessModal.551011-3": "新增",
+	"DeviceAccess.accessModal.551011-4": "协议",
+	"DeviceAccess.accessModal.551011-5": "名称",
+	"DeviceAccess.accessModal.551011-6": "网关类型",
+	"DeviceAccess.accessModal.551011-7": "状态",
+	"DeviceAccess.accessModal.551011-8": "正常",
+	"DeviceAccess.accessModal.551011-9": "禁用",
+	"DeviceAccess.accessModal.551011-10": "说明",
+	"DeviceAccess.accessModal.551011-11": "请选择接入方式",
+	"components.TagSearch.551010-0": "筛选条件",
+	"components.TagSearch.551010-1": "设备标签:",
+	"components.TagSearch.551010-2": "请输入标签key",
+	"components.TagSearch.551010-3": "请输入标签value",
+	"components.TagSearch.551010-4": "添加",
+	"device.data.551010-0": "整数型",
+	"device.data.551010-1": "长整数型",
+	"device.data.551010-2": "单精度浮点型",
+	"device.data.551010-3": "双精度浮点数",
+	"device.data.551010-4": "字符串",
+	"device.data.551010-5": "布尔型",
+	"device.data.551010-6": "时间型",
+	"device.data.551010-7": "枚举",
+	"device.data.551010-8": "数组",
+	"device.data.551010-9": "结构体",
+	"device.data.551010-10": "文件",
+	"device.data.551010-11": "密码",
+	"device.data.551010-12": "地理位置",
+	"device.data.551010-13": "设备",
+	"device.data.551010-14": "手动",
+	"device.data.551010-15": "规则",
+	"device.data.551010-16": "链接",
+	"device.data.551010-17": "Base64编码",
+	"device.data.551010-18": "二进制",
+	"device.data.551010-19": "普通",
+	"device.data.551010-20": "警告",
+	"device.data.551010-21": "紧急",
+	"device.data.551010-22": "读",
+	"device.data.551010-23": "写",
+	"device.data.551010-24": "上报",
+	"Import.modal.551010-0": "批量导入",
+	"Import.modal.551010-1": "选择导入方式",
+	"Import.modal.551010-2": "取消",
+	"Import.modal.551010-3": "上一步",
+	"Import.modal.551010-4": "下一步",
+	"Import.modal.551010-5": "确认",
+	"Import.modal.551010-6": "导入完成",
+	"Import.modal.551010-7": "已完成 新增设备",
+	"Import.modal.551010-8": "文件导入",
+	"Import.modal.551010-9": "支持上传XLSX、CSV格式文件",
+	"Import.modal.551010-10": "插件导入",
+	"Import.modal.551010-11": "读取插件中的设备信息同步至平台",
+	"Import.modal.551010-12": "请选择产品",
+	"Import.modal.551010-13": "请选择导入方式",
+	"Import.modal.551010-14": "操作成功",
+	"Import.modal.551010-15": "请选择设备",
+	"MetadataMap.index.551011-0": "请选择属性名称",
+	"MetadataMap.index.551011-1": "目标属性",
+	"MetadataMap.index.551011-2": "协议包中物模型下的属性",
+	"MetadataMap.index.551011-3": "已映射",
+	"MetadataMap.index.551011-4": "未映射",
+	"MetadataMap.index.551011-5": "置顶已映射数据",
+	"MetadataMap.index.551011-6": "置顶未映射数据",
+	"MetadataMap.index.551011-7": "请选择",
+	"MetadataMap.index.551011-8": "功能说明",
+	"MetadataMap.index.551011-9": "该功能用于将协议包中的",
+	"MetadataMap.index.551011-10": "物模型属性标识",
+	"MetadataMap.index.551011-11": "与",
+	"MetadataMap.index.551011-12": "平台物模型属性标识",
+	"MetadataMap.index.551011-13": "进行映射,当两方属性标识不一致时，可在当前页面直接修改映射管理，系统将以映射后的物模型属性进行数据处理。",
+	"MetadataMap.index.551011-14": "未完成映射的属性标识“目标属性”列数据为空，代表该属性值来源以在平台配置的来源为准。",
+	"MetadataMap.index.551011-15": "数据条背景亮起代表",
+	"MetadataMap.index.551011-16": "标识一致",
+	"MetadataMap.index.551011-17": "或",
+	"MetadataMap.index.551011-18": "已完成映射",
+	"MetadataMap.index.551011-19": "的属性。",
+	"MetadataMap.index.551011-20": "功能图示",
+	"MetadataMap.index.551011-21": "序号",
+	"MetadataMap.index.551011-22": "平台属性",
+	"MetadataMap.index.551011-23": "操作成功",
+	"MetadataMap.index.551011-24": "功能图示",
+	"MetadataMap.index.551011-25": "序号",
+	"MetadataMap.index.551011-26": "平台属性",
+	"MetadataMap.index.551011-27": "操作成功",
+	"Import.file.551010-0": "文件上传",
+	"Import.file.551010-1": "导入系统已存在的设备数据，不会更改已存在设备的所属产品信息",
+	"Import.file.551010-2": "点击或拖拽上传文件",
+	"Import.file.551010-3": "格式：.xlsx, .csv",
+	"Import.file.551010-4": "导入并启用",
+	"Import.file.551010-5": "正在导入",
+	"Import.file.551010-6": "导入完成",
+	"Import.file.551010-7": "导入成功：",
+	"Import.file.551010-8": "个",
+	"Import.file.551010-9": "导入失败：",
+	"Import.file.551010-10": "下载",
+	"Import.file.551010-11": "下载模板",
+	"Import.file.551010-12": "模板格式.xlsx",
+	"Import.file.551010-13": "模板格式.csv",
+	"Import.file.551010-14": "设备导入模板",
+	"Import.file.551010-15": "请上传.xlsx或.csv格式文件",
+	"Import.file.551010-16": "暂无权限，请联系管理员",
+	"Import.file.551010-17": "请先上传文件",
+	"Running.index.551010-0": "请输入事件名称",
+	"Running.index.551010-1": "属性",
+	"Detail.index.551010-16": "物联网卡",
+	"Detail.index.551010-17": "设备诊断",
+	"Property.Save.551010-0": "编辑",
+	"Property.Save.551010-1": "当数据来源为设备时，填写的值将下发到设备",
+	"Property.Save.551010-2": "自定义属性",
+	"Property.Save.551010-3": "该字段是必填字段",
+	"Property.Save.551010-4": "操作成功！",
+	"Detail.index.551010-18": "数据解析",
+	"Detail.index.551010-19": "数采映射",
+	"Detail.index.551010-20": "子设备",
+	"Detail.index.551010-21": "边缘端映射",
+	"Detail.index.551010-22": "物模型映射",
+	"Detail.index.551010-23": "操作成功！",
+	"Detail.index.551010-24": "操作成功",
+	"BasicInfo.indev.551011-0": "配置信息",
+	"BasicInfo.indev.551011-1": "产品分类",
+	"BasicInfo.indev.551011-2": "设备类型",
+	"BasicInfo.indev.551011-3": "接入方式",
+	"BasicInfo.indev.551011-4": "配置接入方式",
+	"BasicInfo.indev.551011-5": "创建时间",
+	"BasicInfo.indev.551011-6": "更新时间",
+	"BasicInfo.indev.551011-7": "说明",
+	"BasicInfo.indev.551011-8": "编辑",
+	"DataAnalysis.index.551011-0": "脚本语言:",
+	"DataAnalysis.index.551011-1": "模拟输入",
+	"DataAnalysis.index.551011-2": "请输入Topic",
+	"DataAnalysis.index.551011-3": "请输入URL",
+	"DataAnalysis.index.551011-4": "运行结果",
+	"DataAnalysis.index.551011-5": "需输入脚本和模拟数据后再点击",
+	"DataAnalysis.index.551011-6": "调试",
+	"DataAnalysis.index.551011-7": "请先调试",
+	"DataAnalysis.index.551011-8": "保存",
+	"DataAnalysis.index.551011-9": "保存成功",
+	"DataAnalysis.index.551011-10": "请输入topic",
+	"DataAnalysis.index.551011-11": "请输入url",
+	"Config.Save.551011-0": "编辑配置",
+	"Config.Save.551011-1": "保存",
+	"Config.Save.551011-2": "请输入{0}",
+	"Config.Save.551011-3": "操作成功！",
+	"Function.index.551011-0": "请配置对应产品的",
+	"Function.index.551011-1": "物模型属性功能",
+	"Function.index.551011-2": "精简模式",
+	"Function.index.551011-3": "高级模式",
+	"Config.index.551011-0": "配置",
+	"Config.index.551011-1": "编辑",
+	"Config.index.551011-2": "确认重新应用该配置？",
+	"Config.index.551011-3": "应用配置",
+	"Config.index.551011-4": "修改配置后需重新应用后才能生效。",
+	"Config.index.551011-5": "确认恢复默认配置？",
+	"Config.index.551011-6": "恢复默认",
+	"Config.index.551011-7": "该设备单独编辑过配置信息，点击此将恢复成默认的配置信息，请谨慎操作。",
+	"Config.index.551011-8": "有效值:${\r\n                            instanceStore.current?.configuration?.[\r\n                                item.property\r\n                            ]\r\n                        }",
+	"Config.index.551011-9": "操作成功",
+	"Config.index.551011-10": "恢复默认配置成功",
+	"Property.ValueRender.551010-0": "二进制",
+	"Property.ValueRender.551010-1": "域名为https时，不支持访问http地址",
+	"Property.ValueRender.551010-2": "该图片无法访问",
+	"Property.ValueRender.551010-3": "当前仅支持播放.mp4,.flv,.m3u8格式的视频",
+	"EditTable.index.551011-0": "批量映射",
+	"EditTable.index.551011-1": "保存",
+	"EditTable.index.551011-2": "采集器",
+	"EditTable.index.551011-3": "数据采集中配置的真实物理设备",
+	"EditTable.index.551011-4": "请选择",
+	"EditTable.index.551011-5": "请选择采集器",
+	"EditTable.index.551011-6": "请选择点位",
+	"EditTable.index.551011-7": "已绑定",
+	"EditTable.index.551011-8": "未绑定",
+	"EditTable.index.551011-9": "解绑",
+	"EditTable.index.551011-10": "确认解绑",
+	"EditTable.index.551011-11": "暂无数据，请配置物模型",
+	"EditTable.index.551011-12": "名称",
+	"EditTable.index.551011-13": "通道",
+	"EditTable.index.551011-14": "点位",
+	"EditTable.index.551011-15": "状态",
+	"EditTable.index.551011-16": "操作",
+	"EditTable.index.551011-17": "操作成功！",
+	"Status.DiagnosticAdvice.551011-0": "设备诊断",
+	"Status.DiagnosticAdvice.551011-1": "诊断建议",
+	"Status.DiagnosticAdvice.551011-2": "所有诊断均无异常但设备仍未上线，请检查以下内容",
+	"Status.DiagnosticAdvice.551011-3": "连接信息",
+	"Status.DiagnosticAdvice.551011-4": "设备ID",
+	"Status.DiagnosticAdvice.551011-5": "连接地址",
+	"components.MSelect.551011-0": "请选择",
+	"EditTable.PatchMapping.551011-0": "批量映射",
+	"EditTable.PatchMapping.551011-1": "采集器的点位名称与属性名称一致时将自动映射绑定；有多个采集器点位名称与属性名称一致时以第1个采集器的点位数据进行绑定",
+	"EditTable.PatchMapping.551011-2": "源数据",
+	"EditTable.PatchMapping.551011-3": "加入右侧",
+	"EditTable.PatchMapping.551011-4": "采集器",
+	"EditTable.PatchMapping.551011-5": "确定删除?",
+	"EditTable.PatchMapping.551011-6": "请选择采集器",
+	"EditTable.PatchMapping.551011-7": "操作成功",
+	"EditTable.PatchMapping.551011-8": "暂无对应属性的映射",
+	"BindParentDevice.index.551012-0": "绑定父设备",
+	"BindParentDevice.index.551012-1": "确定",
+	"BindParentDevice.index.551012-2": "取消",
+	"BindParentDevice.index.551012-3": "设备名称",
+	"BindParentDevice.index.551012-4": "所属产品",
+	"BindParentDevice.index.551012-5": "注册时间",
+	"BindParentDevice.index.551012-6": "状态",
+	"BindParentDevice.index.551012-7": "禁用",
+	"BindParentDevice.index.551012-8": "离线",
+	"BindParentDevice.index.551012-9": "在线",
+	"BindParentDevice.index.551012-10": "请选择需要绑定的设备",
+	"BindParentDevice.index.551012-11": "操作成功",
+	"Diagnose.index.551011-0": "已诊断",
+	"Diagnose.index.551011-1": "个",
+	"Diagnose.index.551011-2": "连接状态",
+	"Diagnose.index.551011-3": "消息通信",
+	"DeviceAccess.util.551011-0": "配置物模型",
+	"DeviceAccess.util.551011-1": "配置产品物模型，实现设备在云端的功能描述。",
+	"DeviceAccess.util.551011-2": "启用产品",
+	"DeviceAccess.util.551011-3": "启用产品后，可在产品下新增设备。",
+	"DeviceAccess.util.551011-4": "添加设备",
+	"DeviceAccess.util.551011-5": "添加设备，并连接到平台。",
+	"DeviceAccess.util.551011-6": "填写配置",
+	"DeviceAccess.util.551011-7": "填写设备接入所需的配置参数。",
+	"Detail.Charts.551011-0": "统计周期：",
+	"Detail.Charts.551011-1": "统计规则：",
+	"Detail.Charts.551011-2": "平均值",
+	"Detail.Charts.551011-3": "最大值",
+	"Detail.Charts.551011-4": "最小值",
+	"Detail.Charts.551011-5": "总数",
+	"Detail.Charts.551011-6": "时间",
+	"Detail.Charts.551011-7": "实际值",
+	"Detail.Charts.551011-8": "按分钟统计",
+	"Detail.Charts.551011-9": "按小时统计",
+	"Detail.Charts.551011-10": "按天统计",
+	"Detail.Charts.551011-11": "按周统计",
+	"DeviceAccess.metadataModal.551011-0": "选择处理方式",
+	"DeviceAccess.metadataModal.551011-1": "确定",
+	"DeviceAccess.metadataModal.551011-2": "取消",
+	"DeviceAccess.metadataModal.551011-3": "平台",
+	"DeviceAccess.metadataModal.551011-4": "物模型",
+	"DeviceAccess.metadataModal.551011-5": "中已有数据，请选择处理方式。",
+	"DeviceAccess.metadataModal.551011-6": "默认采用覆盖的方式处理功能、事件、标签下的数据",
+	"DeviceAccess.metadataModal.551011-7": "处理方式",
+	"DeviceAccess.metadataModal.551011-8": "请选择处理方式",
+	"DeviceAccess.metadataModal.551011-9": "取交集",
+	"DeviceAccess.metadataModal.551011-10": "仅保留标识一致的属性",
+	"DeviceAccess.metadataModal.551011-11": "取并集",
+	"DeviceAccess.metadataModal.551011-12": "保留平台、插件中的所有属性",
+	"DeviceAccess.metadataModal.551011-13": "忽略",
+	"DeviceAccess.metadataModal.551011-14": "仅保留平台中的属性",
+	"DeviceAccess.metadataModal.551011-15": "覆盖",
+	"DeviceAccess.metadataModal.551011-16": "仅保留插件中的属性",
+	"DeviceAccess.metadataModal.551011-17": "操作成功！",
+	"Relation.Save.551011-0": "编辑",
+	"Relation.Save.551011-1": "保存",
+	"Relation.Save.551011-2": "请选择{0}",
+	"Relation.Save.551011-3": "操作成功！",
+	"Tags.index.551011-0": "标签",
+	"Tags.index.551011-1": "编辑",
+	"Tags.Save.551011-0": "编辑标签",
+	"Tags.Save.551011-1": "名称",
+	"Tags.Save.551011-2": "值",
+	"Tags.Save.551011-3": "操作成功！",
+	"Relation.index.551011-0": "关系信息",
+	"Relation.index.551011-1": "编辑",
+	"Relation.index.551011-2": "管理设备与其他业务的关联关系，关系来源于关系配置",
+	"InklingModal.index.551011-0": "设备ID映射",
+	"InklingModal.index.551011-1": "请选择设备",
+	"Parsing.index.551010-0": "当前数据解析内容已脱离产品影响，",
+	"Parsing.index.551010-1": "重置",
+	"Parsing.index.551010-2": "后将继承产品数据解析内容",
+	"Parsing.index.551010-3": "当前数据解析内容继承自产品,",
+	"Parsing.index.551010-4": "修改",
+	"Parsing.index.551010-5": "后将脱离产品影响。",
+	"Parsing.index.551010-6": "脚本语言:",
+	"Parsing.index.551010-7": "请点击上方修改字样,用以编辑脚本",
+	"Parsing.index.551010-8": "模拟输入",
+	"Parsing.index.551010-9": "请输入Topic",
+	"Parsing.index.551010-10": "请输入URL",
+	"Parsing.index.551010-11": "运行结果",
+	"Parsing.index.551010-12": "需输入脚本和模拟数据后再点击",
+	"Parsing.index.551010-13": "调试",
+	"Parsing.index.551010-14": "请先调试",
+	"Parsing.index.551010-15": "保存",
+	"Parsing.index.551010-16": "操作成功",
+	"Parsing.index.551010-17": "保存成功",
+	"Parsing.index.551010-18": "请输入topic",
+	"Parsing.index.551010-19": "请输入url",
+	"Property.PropertyCard.551010-0": "更新时间",
+	"Property.ValueDetail.551010-0": "详情",
+	"Property.ValueDetail.551010-1": "确定",
+	"Property.ValueDetail.551010-2": "取消",
+	"Property.index.551010-0": "请输入名称",
+	"Property.index.551010-1": "名称",
+	"Property.index.551010-2": "值",
+	"Property.index.551010-3": "更新时间",
+	"Property.index.551010-4": "操作",
+	"Property.index.551010-5": "设置属性至设备",
+	"Property.index.551010-6": "指标",
+	"Property.index.551010-7": "获取最新属性值",
+	"Property.index.551010-8": "操作成功！",
+	"Property.index.551010-9": "详情",
+	"Status.util.551011-0": "网络组件",
+	"Status.util.551011-1": "诊断网络组件配置是否正确，配置错误将导致设备连接失败",
+	"Status.util.551011-2": "正在诊断中...",
+	"Status.util.551011-3": "设备接入网关",
+	"Status.util.551011-4": "诊断设备接入网关状态是否正常，禁用状态将导致连接失败",
+	"Status.util.551011-5": "产品状态",
+	"Status.util.551011-6": "诊断产品状态是否正常，禁用状态将导致设备连接失败",
+	"Status.util.551011-7": "设备状态",
+	"Status.util.551011-8": "诊断设备状态是否正常，禁用状态将导致设备连接失败",
+	"Status.util.551011-9": "诊断设备接入网关状态是否正常，网关配置是否正确",
+	"Status.util.551011-10": "网关父设备",
+	"Status.util.551011-11": "诊断网关父设备状态是否正常，禁用或离线将导致连接失败",
+	"EdgeMap.MSelect.551011-0": "请选择",
+	"Base.Base.551013-0": "请输入搜索名称",
+	"Base.Base.551013-1": "已查询到",
+	"Base.Base.551013-2": "条相关数据",
+	"Base.Base.551013-3": "当前的存储方式不支持删改、新增",
+	"Base.Base.551013-4": "保存",
+	"Base.Base.551013-5": "该设备受所属产品的存储策略影响，无法进行删改、新增操作",
+	"Base.Base.551013-6": "修改存储策略",
+	"Base.Base.551013-7": "请输入标识",
+	"Base.Base.551013-8": "请输入名称",
+	"Base.Base.551013-9": "配置",
+	"Base.Base.551013-10": "读",
+	"Base.Base.551013-11": "写",
+	"Base.Base.551013-12": "上报",
+	"Base.Base.551013-13": "请选择读写类型",
+	"Base.Base.551013-14": "是",
+	"Base.Base.551013-15": "否",
+	"Base.Base.551013-16": "请输入说明",
+	"Base.Base.551013-17": "操作成功！",
+	"Base.Base.551013-18": "页面改动数据未保存",
+	"Base.Base.551013-19": "不保存",
+	"components.Simple.551011-0": "精简模式下参数只支持输入框的方式录入",
+	"components.Simple.551011-1": "请按照json格式输入",
+	"components.Simple.551011-2": "该字段为必填字段",
+	"components.Simple.551011-3": "执行",
+	"components.Simple.551011-4": "清空",
+	"components.Simple.551011-5": "执行结果：",
+	"components.Simple.551011-6": "参数名称",
+	"components.Simple.551011-7": "输入类型",
+	"components.Simple.551011-8": "值",
+	"components.Simple.551011-9": "操作成功",
+	"components.Advance.551011-0": "执行",
+	"components.Advance.551011-1": "清空",
+	"components.Advance.551011-2": "执行结果：",
+	"components.Advance.551011-3": "操作成功",
+	"EdgeMap.PatchMapping.551011-0": "批量映射",
+	"EdgeMap.PatchMapping.551011-1": "采集器的点位名称与属性名称一致时将自动映射绑定；有多个采集器点位名称与属性名称一致时以第1个采集器的点位数据进行绑定",
+	"EdgeMap.PatchMapping.551011-2": "源数据",
+	"EdgeMap.PatchMapping.551011-3": "加入右侧",
+	"EdgeMap.PatchMapping.551011-4": "采集器",
+	"EdgeMap.PatchMapping.551011-5": "确定删除?",
+	"EdgeMap.PatchMapping.551011-6": "请选择采集器",
+	"EdgeMap.PatchMapping.551011-7": "操作成功",
+	"EdgeMap.PatchMapping.551011-8": "暂无对应属性的映射",
+	"Import.index.551012-0": "导入物模型",
+	"Import.index.551012-1": "导入的物模型会覆盖原来的属性、功能、事件、标签，请谨慎操作。",
+	"Import.index.551012-2": "导入时会根据标识跳过继承自产品物模型的属性、功能、事件、标签。",
+	"Import.index.551012-3": "导入方式",
+	"Import.index.551012-4": "请选择导入方式",
+	"Import.index.551012-5": "拷贝产品",
+	"Import.index.551012-6": "选择产品",
+	"Import.index.551012-7": "请选择产品",
+	"Import.index.551012-8": "物模型类型",
+	"Import.index.551012-9": "请选择物模型类型",
+	"Import.index.551012-10": "导入类型",
+	"Import.index.551012-11": "请选择导入类型",
+	"Import.index.551012-12": "文件上传",
+	"Import.index.551012-13": "脚本",
+	"Import.index.551012-14": "请上传文件",
+	"Import.index.551012-15": "上传文件",
+	"Import.index.551012-16": "支持扩展名：.json",
+	"Import.index.551012-17": "请输入物模型",
+	"Import.index.551012-18": "物模型",
+	"Import.index.551012-19": "在编辑器中编写物模型脚本",
+	"Import.index.551012-20": "属性定义第{0}个数组中缺失id属性",
+	"Import.index.551012-21": "属性定义第{0}个数组中id属性不能包含中文",
+	"Import.index.551012-22": "属性定义第{0}个数组中缺失name属性",
+	"Import.index.551012-23": "标签定义第{0}个数组中缺失valueType.type属性",
+	"Import.index.551012-24": "属性定义第{0}个数组中缺失expands.source属性",
+	"Import.index.551012-25": "属性定义第{0}个数组中缺失type属性",
+	"Import.index.551012-26": "方法定义第{0}个数组中缺失id属性",
+	"Import.index.551012-27": "方法定义第{0}个数组中id属性不能包含中文",
+	"Import.index.551012-28": "方法定义第{0}个数组中缺失name属性",
+	"Import.index.551012-29": "事件定义第{0}个数组中缺失id属性",
+	"Import.index.551012-30": "事件定义第{0}个数组中id属性不能包含中文",
+	"Import.index.551012-31": "事件定义第{0}个数组中缺失name属性",
+	"Import.index.551012-32": "事件定义第{0}个数组中缺失valueType.type属性",
+	"Import.index.551012-33": "事件定义第{0}个数组中缺失expands.level属性",
+	"Import.index.551012-34": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的id属性",
+	"Import.index.551012-35": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的name属性",
+	"Import.index.551012-36": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的valueType.type属性",
+	"Import.index.551012-37": "事件定义第${\r\n                            index + 1\r\n                        }个数组中缺失valueType.properties数组",
+	"Import.index.551012-38": "标签定义第{0}个数组中缺失id属性",
+	"Import.index.551012-39": "标签定义第{0}个数组中id属性不能包含中文",
+	"Import.index.551012-40": "标签定义第{0}个数组中缺失name属性",
+	"Import.index.551012-41": "属性定义第{0}个数组中缺失identifier属性",
+	"Import.index.551012-42": "属性定义第{0}个数组中缺失dataType.type属性",
+	"Import.index.551012-43": "方法定义第{0}个数组中缺失identifier属性",
+	"Import.index.551012-44": "方法定义第{0}个数组中缺失callType属性",
+	"Import.index.551012-45": "事件定义第{0}个数组中缺失identifier属性",
+	"Import.index.551012-46": "事件定义第{0}个数组中缺失type属性",
+	"Import.index.551012-47": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的id属性",
+	"Import.index.551012-48": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的name属性",
+	"Import.index.551012-49": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的dataType.type属性",
+	"Import.index.551012-50": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的dataType.specs属性",
+	"Import.index.551012-51": "事件定义第{0}个数组中缺失outputData数组",
+	"Import.index.551012-52": "操作成功！",
+	"Import.index.551012-53": "文件内容不能为空",
+	"Import.index.551012-54": "请上传json格式的文件",
+	"Import.index.551012-55": "导入成功",
+	"Import.index.551012-56": "物模型数据不正确",
+	"Import.index.551012-57": "上传json格式的物模型文件",
+	"Import.index.551012-58": "导入数据存在虚拟属性，请及时添加虚拟属性计算规则。",
+	"Import.index.551012-59": "确认",
+	"Import.index.551012-60": "标准物模型",
+	"Diagnose.util.551011-0": "正在诊断中",
+	"Diagnose.util.551011-1": "发现连接问题",
+	"Diagnose.util.551011-2": "连接状态正常",
+	"Diagnose.util.551011-3": "已诊断XX个",
+	"Diagnose.util.551011-4": "请处理连接异常",
+	"Diagnose.util.551011-5": "现在可调试消息通信",
+	"EdgeMap.index.551011-0": "批量映射",
+	"EdgeMap.index.551011-1": "保存",
+	"EdgeMap.index.551011-2": "采集器",
+	"EdgeMap.index.551011-3": "边缘网关代理的真实物理设备",
+	"EdgeMap.index.551011-4": "请选择",
+	"EdgeMap.index.551011-5": "请选择采集器",
+	"EdgeMap.index.551011-6": "请选择点位",
+	"EdgeMap.index.551011-7": "启用",
+	"EdgeMap.index.551011-8": "禁用",
+	"EdgeMap.index.551011-9": "未绑定",
+	"EdgeMap.index.551011-10": "解绑",
+	"EdgeMap.index.551011-11": "暂无权限，请联系管理员",
+	"EdgeMap.index.551011-12": "确认解绑？",
+	"EdgeMap.index.551011-13": "确认禁用？",
+	"EdgeMap.index.551011-14": "确认启用?",
+	"EdgeMap.index.551011-15": "暂无数据，请配置物模型",
+	"EdgeMap.index.551011-16": "名称",
+	"EdgeMap.index.551011-17": "通道",
+	"EdgeMap.index.551011-18": "点位",
+	"EdgeMap.index.551011-19": "状态",
+	"EdgeMap.index.551011-20": "操作",
+	"EdgeMap.index.551011-21": "操作成功！",
+	"Log.index.551011-0": "类型",
+	"Log.index.551011-1": "时间",
+	"Log.index.551011-2": "内容",
+	"Log.index.551011-3": "操作",
+	"Log.index.551011-4": "查看",
+	"Log.index.551011-5": "详细信息",
+	"Import.valideta.551012-0": "方法定义inputs第{0}个数组ValueType中缺失必填属性",
+	"Import.valideta.551012-1": "方法定义inputs第{0}个数组ValueType中缺失elementType属性",
+	"Import.valideta.551012-2": "方法定义inputs第{0}个数组ValueType中缺失fileType属性",
+	"Import.valideta.551012-3": "方法定义inputs第{0}个数组ValueType中缺失properties属性",
+	"Import.valideta.551012-4": "方法定义inputs第{0}个数组中缺失id属性",
+	"Import.valideta.551012-5": "方法定义inputs第{0}个数组中缺失name属性",
+	"Import.valideta.551012-6": "方法定义inputs第{0}个数组中缺失valueType.type属性",
+	"Import.valideta.551012-7": "方法定义inputs第{0}个数组dataType中缺失必填属性",
+	"Import.valideta.551012-8": "方法定义inputs第{0}个数组dataType中elements缺失必填属性",
+	"Import.valideta.551012-9": "方法定义inputs第{0}个数组dataType中缺失elements属性",
+	"Import.valideta.551012-10": "方法定义inputs第{0}个数组dataType中缺失elementType属性",
+	"Import.valideta.551012-11": "方法定义inputs第{0}个数组dataType中缺失fileType属性",
+	"Import.valideta.551012-12": "方法定义inputs第{0}个数组dataType中缺失properties属性",
+	"Import.valideta.551012-13": "方法定义inputs第{0}个数组中缺失dataType.type属性",
+	"Message.index.551011-0": "调试",
+	"Message.index.551011-1": "日志",
+	"Message.index.551011-2": "上行消息诊断中",
+	"Message.index.551011-3": "下行消息诊断中",
+	"Message.index.551011-4": "下行消息通信异常",
+	"Message.index.551011-5": "下行消息通信正常",
+	"Message.index.551011-6": "上行消息通信异常",
+	"Message.index.551011-7": "上行消息通信正常",
+	"SaveChild.index.551011-0": "基本信息",
+	"SaveChild.index.551011-1": "返回",
+	"SaveChild.index.551011-2": "设备名称",
+	"SaveChild.index.551011-3": "请输入设备名称",
+	"SaveChild.index.551011-4": "产品名称",
+	"SaveChild.index.551011-5": "请选择产品名称",
+	"DashBoard.index.551011-0": "产品数量",
+	"DashBoard.index.551011-1": "设备数量",
+	"DashBoard.index.551011-2": "当前在线",
+	"DashBoard.index.551011-3": "今日设备消息量",
+	"DashBoard.index.551011-4": "设备消息",
+	"DashBoard.index.551011-5": "最近1小时",
+	"DashBoard.index.551011-6": "最近24小时",
+	"DashBoard.index.551011-7": "近一周",
+	"DashBoard.index.551011-8": "设备分布",
+	"DashBoard.index.551011-9": "正常",
+	"DashBoard.index.551011-10": "禁用",
+	"DashBoard.index.551011-11": "在线",
+	"DashBoard.index.551011-12": "离线",
+	"DashBoard.index.551011-13": "昨日在线",
+	"DashBoard.index.551011-14": "当月设备消息量",
+	"DashBoard.index.551011-15": "在线数",
+	"DashBoard.index.551011-16": "消息量",
+	"DashBoard.index.551011-17": "M月dd日 HH:mm",
+	"DashBoard.index.551011-18": "M月dd日 HH:mm:ss",
+	"DashBoard.index.551011-19": "yyyy年-M月",
+	"DashBoard.index.551011-20": "{0}时",
+	"components.TimeSelect.551011-0": "今日",
+	"components.TimeSelect.551011-1": "近一周",
+	"components.TimeSelect.551011-2": "近一月",
+	"components.TimeSelect.551011-3": "近一年",
+	"AlarmRecord.index.551011-0": "告警数据",
+	"AlarmRecord.index.551011-1": "无效数据",
+	"Status.ManualInspection.551011-0": "请检查配置项是否填写正确，若您确定该项无需诊断可",
+	"Status.ManualInspection.551011-1": "忽略",
+	"Status.ManualInspection.551011-2": "诊断项说明",
+	"Status.ManualInspection.551011-3": "接口地址",
+	"Status.ManualInspection.551011-4": "通知Token",
+	"Status.ManualInspection.551011-5": "SIP 域",
+	"Status.ManualInspection.551011-6": "集群",
+	"Status.ManualInspection.551011-7": "共享配置",
+	"Status.ManualInspection.551011-8": "独立配置",
+	"Status.ManualInspection.551011-9": "SIP 地址",
+	"Status.ManualInspection.551011-10": "公网 Host",
+	"Status.ManualInspection.551011-11": "节点",
+	"Status.ManualInspection.551011-12": "节点名称",
+	"Status.ManualInspection.551011-13": "人工检查",
+	"Status.ManualInspection.551011-14": "去修改",
+	"Status.ManualInspection.551011-15": "确认无误",
+	"Function.index.551012-0": "请选择",
+	"Function.index.551012-1": "读取属性",
+	"Function.index.551012-2": "修改属性",
+	"Function.index.551012-3": "调用功能",
+	"Function.index.551012-4": "请选择属性",
+	"Function.index.551012-5": "请输入值",
+	"Function.index.551012-6": "请选择功能",
+	"Function.index.551012-7": "发送",
+	"Function.index.551012-8": "参数列表",
+	"Dialog.index.551012-0": "连接",
+	"Dialog.index.551012-1": "权限验证",
+	"Dialog.index.551012-2": "解码",
+	"Dialog.index.551012-3": "编码",
+	"Dialog.index.551012-4": "请求",
+	"Dialog.index.551012-5": "响应",
+	"Dialog.index.551012-6": "下行消息",
+	"Dialog.index.551012-7": "上行消息",
+	"EdgeMap.MSelect.551012-0": "请选择",
+	"Function.EditTable.551012-0": "该字段为必填字段",
+	"Function.EditTable.551012-1": "是",
+	"Function.EditTable.551012-2": "否",
+	"Function.EditTable.551012-3": "参数名称",
+	"Function.EditTable.551012-4": "类型",
+	"Function.EditTable.551012-5": "值",
+	"EdgeMap.PatchMapping.551012-0": "批量映射",
+	"EdgeMap.PatchMapping.551012-1": "采集器的点位名称与属性名称一致时将自动映射绑定；有多个采集器点位名称与属性名称一致时以第1个采集器的点位数据进行绑定",
+	"EdgeMap.PatchMapping.551012-2": "源数据",
+	"EdgeMap.PatchMapping.551012-3": "加入右侧",
+	"EdgeMap.PatchMapping.551012-4": "采集器",
+	"EdgeMap.PatchMapping.551012-5": "确定删除?",
+	"EdgeMap.PatchMapping.551012-6": "请选择采集器",
+	"EdgeMap.PatchMapping.551012-7": "操作成功",
+	"EdgeMap.PatchMapping.551012-8": "暂无对应属性的映射",
+	"EdgeMap.index.551012-0": "点位映射",
+	"EdgeMap.index.551012-1": "批量映射",
+	"EdgeMap.index.551012-2": "保存并应用",
+	"EdgeMap.index.551012-3": "采集器",
+	"EdgeMap.index.551012-4": "边缘网关代理的真实物理设备",
+	"EdgeMap.index.551012-5": "请选择",
+	"EdgeMap.index.551012-6": "请选择采集器",
+	"EdgeMap.index.551012-7": "请选择点位",
+	"EdgeMap.index.551012-8": "已绑定",
+	"EdgeMap.index.551012-9": "未绑定",
+	"EdgeMap.index.551012-10": "解绑",
+	"EdgeMap.index.551012-11": "确认解绑",
+	"EdgeMap.index.551012-12": "暂无数据，请配置物模型",
+	"EdgeMap.index.551012-13": "名称",
+	"EdgeMap.index.551012-14": "通道",
+	"EdgeMap.index.551012-15": "点位",
+	"EdgeMap.index.551012-16": "状态",
+	"EdgeMap.index.551012-17": "操作",
+	"EdgeMap.index.551012-18": "操作成功！",
+	"EdgeMap.index.551012-19": "请配置物模型",
+	"EdgeMap.index.551012-20": "保存成功",
+	"Export.index.551012-0": "导出",
+	"Export.index.551012-1": "选择单个产品时可导出其下属设备的详细数据,不选择产品时导出所有设备的基础数据。",
+	"Export.index.551012-2": "产品",
+	"Export.index.551012-3": "请选择产品",
+	"Export.index.551012-4": "文件格式",
+	"Export.index.551012-5": "请选择文件格式",
+	"components.AlarmLog.551012-0": "告警日志",
+	"components.AlarmLog.551012-1": "处理",
+	"Metadata.index.551012-0": "确认重置？",
+	"Metadata.index.551012-1": "重置后将使用产品的物模型配置",
+	"Metadata.index.551012-2": "重置操作",
+	"Metadata.index.551012-3": "快速导入",
+	"Metadata.index.551012-4": "物模型TSL",
+	"Metadata.index.551012-5": "设备会默认继承产品的物模型，继承的物模型不支持删改",
+	"Metadata.index.551012-6": "属性定义",
+	"Metadata.index.551012-7": "功能定义",
+	"Metadata.index.551012-8": "事件定义",
+	"Metadata.index.551012-9": "标签定义",
+	"Metadata.index.551012-10": "操作成功",
+	"Cat.index.551012-0": "查看物模型",
+	"Cat.index.551012-1": "导出",
+	"Cat.index.551012-2": "物模型是对设备在云端的功能描述，包括设备的属性、服务和事件。物联网平台通过定义一种物的描述语言来描述物模型，称之为",
+	"Cat.index.551012-3": "TSL（即 Thing Specification Language），采用 JSON 格式，您可以根据 TSL",
+	"Cat.index.551012-4": "组装上报设备的数据。您可以导出完整物模型，用于云端应用开发。",
+	"Cat.index.551012-5": "{0}-物模型",
+	"Cat.index.551012-6": "请先配置物模型",
+	"Cat.index.551012-7": "标准物模型",
+	"InklingDevice.index.551012-0": "全选",
+	"InklingDevice.index.551012-1": "该设备已绑定平台设备",
+	"InklingDevice.index.551012-2": "暂无数据",
+	"InklingDevice.index.551012-3": "第 {0} - ${\r\n                                    MaxSize > pageData.total\r\n                                        ? pageData.total\r\n                                        : MaxSize\r\n                                } 条/总共 {1} 条",
+	"Category.index.551012-0": "新增",
+	"Category.index.551012-1": "名称",
+	"Category.index.551012-2": "排序",
+	"Category.index.551012-3": "说明",
+	"Category.index.551012-4": "操作",
+	"Category.index.551012-5": "编辑",
+	"Category.index.551012-6": "编辑分类",
+	"Category.index.551012-7": "添加子分类",
+	"Category.index.551012-8": "新增子分类",
+	"Category.index.551012-9": "删除",
+	"Category.index.551012-10": "确认删除?",
+	"Category.index.551012-11": "确定",
+	"Category.index.551012-12": "取消",
+	"Category.index.551012-13": "操作成功！",
+	"Category.index.551012-14": "操作失败！",
+	"Category.index.551012-15": "新增分类",
+	"Alarm.index.551012-0": "告警时间",
+	"Alarm.index.551012-1": "原始值",
+	"Alarm.index.551012-2": "告警持续时长",
+	"Alarm.index.551012-3": "触发条件",
+	"Alarm.index.551012-4": "告警原因",
+	"Alarm.index.551012-5": "处理时间",
+	"Alarm.index.551012-6": "处理类型",
+	"Alarm.index.551012-7": "人工",
+	"Alarm.index.551012-8": "系统",
+	"Alarm.index.551012-9": "状态",
+	"Alarm.index.551012-10": "无告警",
+	"Alarm.index.551012-11": "告警中",
+	"Alarm.index.551012-12": "操作",
+	"Alarm.index.551012-13": "查看详情",
+	"Alarm.index.551012-14": "查看日志",
+	"Alarm.index.551012-15": "告警处理",
+	"Base.utils.551012-0": "普通",
+	"Base.utils.551012-1": "警告",
+	"Base.utils.551012-2": "紧急",
+	"Base.utils.551012-3": "设备",
+	"Base.utils.551012-4": "手动",
+	"Base.utils.551012-5": "规则",
+	"Base.utils.551012-6": "读",
+	"Base.utils.551012-7": "写",
+	"Base.utils.551012-8": "上报",
+	"Base.index.551012-0": "请输入名称",
+	"Base.index.551012-1": "当前的存储方式不支持新增",
+	"Base.index.551012-2": "新增",
+	"Base.index.551012-3": "是",
+	"Base.index.551012-4": "否",
+	"Base.index.551012-5": "当前的存储方式不支持编辑",
+	"Base.index.551012-6": "编辑",
+	"Base.index.551012-7": "确认删除？",
+	"Base.index.551012-8": "删除",
+	"Base.index.551012-9": "普通",
+	"Base.index.551012-10": "警告",
+	"Base.index.551012-11": "紧急",
+	"Base.index.551012-12": "设备",
+	"Base.index.551012-13": "手动",
+	"Base.index.551012-14": "规则",
+	"Base.index.551012-15": "读",
+	"Base.index.551012-16": "写",
+	"Base.index.551012-17": "上报",
+	"Base.index.551012-18": "操作",
+	"Base.index.551012-19": "第 {0} - {1} 条/总共 {2} 条",
+	"Base.index.551012-20": "修改物模型后会脱离产品物模型",
+	"Base.index.551012-21": "操作成功！",
+	"Base.index.551012-22": "操作失败！",
+	"Invalid.index.551012-0": "上报时间",
+	"Invalid.index.551012-1": "阈值限制",
+	"Invalid.index.551012-2": "上报数据",
+	"Invalid.index.551012-3": "原始值",
+	"components.ConfigModal.551013-0": "无",
+	"components.ConfigModal.551013-1": "参数标识",
+	"components.ConfigModal.551013-2": "该标识已存在",
+	"components.ConfigModal.551013-3": "请输入标识",
+	"components.ConfigModal.551013-4": "最多可输入64个字符",
+	"components.ConfigModal.551013-5": "标识只能由数字、字母、下划线、中划线组成",
+	"components.ConfigModal.551013-6": "参数名称",
+	"components.ConfigModal.551013-7": "请输入参数名称",
+	"components.ConfigModal.551013-8": "数据类型",
+	"components.ConfigModal.551013-9": "请选择数据类型",
+	"components.ConfigModal.551013-10": "其他配置",
+	"components.ConfigModal.551013-11": "操作",
+	"components.Source.551013-0": "请选择来源",
+	"components.Source.551013-1": "编辑",
+	"components.Source.551013-2": "重置",
+	"components.Source.551013-3": "重置为产品属性规则",
+	"components.Source.551013-4": "设备",
+	"components.Source.551013-5": "手动",
+	"components.Source.551013-6": "规则",
+	"components.Source.551013-7": "操作成功！",
+	"BindChildDevice.index.551012-0": "绑定子设备",
+	"BindChildDevice.index.551012-1": "确定",
+	"BindChildDevice.index.551012-2": "取消",
+	"BindChildDevice.index.551012-3": "设备名称",
+	"BindChildDevice.index.551012-4": "所属产品",
+	"BindChildDevice.index.551012-5": "注册时间",
+	"BindChildDevice.index.551012-6": "状态",
+	"BindChildDevice.index.551012-7": "禁用",
+	"BindChildDevice.index.551012-8": "离线",
+	"BindChildDevice.index.551012-9": "在线",
+	"BindChildDevice.index.551012-10": "请选择需要绑定的设备",
+	"BindChildDevice.index.551012-11": "操作成功",
+	"Log.index.551012-0": "连接",
+	"Log.index.551012-1": "权限验证",
+	"Log.index.551012-2": "解码",
+	"Log.index.551012-3": "编码",
+	"Log.index.551012-4": "请求",
+	"Log.index.551012-5": "响应",
+	"Log.index.551012-6": "下行消息",
+	"Log.index.551012-7": "上行消息",
+	"Edit.index.551013-0": "保存",
+	"Edit.index.551013-1": "属性",
+	"Edit.index.551013-2": "事件",
+	"Edit.index.551013-3": "功能",
+	"Edit.index.551013-4": "标签",
+	"Edit.index.551013-5": "新增",
+	"Edit.index.551013-6": "编辑",
+	"Edit.index.551013-7": "标识已存在",
+	"Edit.index.551013-8": "操作成功！",
+	"Edit.index.551013-9": "操作失败！",
+	"Edit.validator.551013-0": "请配置枚举项",
+	"Edit.validator.551013-1": "请输入元素配置",
+	"Edit.validator.551013-2": "配置参数",
+	"Edit.validator.551013-3": "请输入{0}",
+	"Edit.validator.551013-4": "请输入标识",
+	"Edit.validator.551013-5": "请输入名称",
+	"Edit.validator.551013-6": "数据类型",
+	"Edit.validator.551013-7": "请选择{0}",
+	"Edit.validator.551013-8": "请选择文件类型",
+	"DetailModal.utils.551013-0": "参数标识",
+	"DetailModal.utils.551013-1": "参数名称",
+	"DetailModal.utils.551013-2": "参数类型",
+	"Edit.BaseForm.551013-0": "标识",
+	"Edit.BaseForm.551013-1": "请输入标识",
+	"Edit.BaseForm.551013-2": "最多可输入64个字符",
+	"Edit.BaseForm.551013-3": "标识只能由数字、字母、下划线、中划线组成",
+	"Edit.BaseForm.551013-4": "名称",
+	"Edit.BaseForm.551013-5": "请输入名称",
+	"Edit.BaseForm.551013-6": "数据类型",
+	"Edit.BaseForm.551013-7": "是否异步",
+	"Edit.BaseForm.551013-8": "请选择是否异步",
+	"Edit.BaseForm.551013-9": "是",
+	"Edit.BaseForm.551013-10": "否",
+	"Edit.BaseForm.551013-11": "输入参数",
+	"Edit.BaseForm.551013-12": "输出参数",
+	"Edit.BaseForm.551013-13": "级别",
+	"Edit.BaseForm.551013-14": "请选择级别",
+	"Edit.BaseForm.551013-15": "读写类型",
+	"Edit.BaseForm.551013-16": "请选择读写类型",
+	"Edit.BaseForm.551013-17": "说明",
+	"Edit.BaseForm.551013-18": "最多可输入200个字符",
+	"Edit.BaseForm.551013-19": "请输入说明",
+	"modifyModal.index.551013-0": "确定",
+	"modifyModal.index.551013-1": "取消",
+	"modifyModal.index.551013-2": "名称",
+	"modifyModal.index.551013-3": "请输入名称",
+	"modifyModal.index.551013-4": "排序",
+	"modifyModal.index.551013-5": "请输入排序",
+	"modifyModal.index.551013-6": "说明",
+	"modifyModal.index.551013-7": "请输入说明",
+	"modifyModal.index.551013-8": "最多可输入64个字符",
+	"modifyModal.index.551013-9": "请输入正整数",
+	"modifyModal.index.551013-10": "操作成功！",
+	"modifyModal.index.551013-11": "操作失败！",
+	"modifyModal.index.551013-12": "树形结构最多添加5层",
+	"DetailModal.TagsModal.551013-0": "标签详情",
+	"DetailModal.TagsModal.551013-1": "标签标识",
+	"DetailModal.TagsModal.551013-2": "标签名称",
+	"DetailModal.TagsModal.551013-3": "标签类型",
+	"DetailModal.TagsModal.551013-4": "单位",
+	"DetailModal.TagsModal.551013-5": "精度",
+	"DetailModal.TagsModal.551013-6": "最大长度",
+	"DetailModal.TagsModal.551013-7": "文件类型",
+	"DetailModal.TagsModal.551013-8": "格式",
+	"DetailModal.TagsModal.551013-9": "读写类型",
+	"DetailModal.TagsModal.551013-10": "存储方式",
+	"DetailModal.TagsModal.551013-11": "确认",
+	"DetailModal.TagsModal.551013-12": "设备",
+	"DetailModal.TagsModal.551013-13": "手动",
+	"DetailModal.TagsModal.551013-14": "规则",
+	"DetailModal.TagsModal.551013-15": "读",
+	"DetailModal.TagsModal.551013-16": "写",
+	"DetailModal.TagsModal.551013-17": "上报",
+	"DetailModal.TagsModal.551013-18": "指标标识",
+	"DetailModal.TagsModal.551013-19": "指标名称",
+	"DetailModal.TagsModal.551013-20": "指标治",
+	"DetailModal.TagsModal.551013-21": "标识",
+	"DetailModal.TagsModal.551013-22": "名称",
+	"DetailModal.PropertiesModal.551013-0": "属性详情",
+	"DetailModal.PropertiesModal.551013-1": "属性标识",
+	"DetailModal.PropertiesModal.551013-2": "属性名称",
+	"DetailModal.PropertiesModal.551013-3": "属性类型",
+	"DetailModal.PropertiesModal.551013-4": "单位",
+	"DetailModal.PropertiesModal.551013-5": "精度",
+	"DetailModal.PropertiesModal.551013-6": "最大长度",
+	"DetailModal.PropertiesModal.551013-7": "文件类型",
+	"DetailModal.PropertiesModal.551013-8": "格式",
+	"DetailModal.PropertiesModal.551013-9": "属性来源",
+	"DetailModal.PropertiesModal.551013-10": "查看",
+	"DetailModal.PropertiesModal.551013-11": "读写类型",
+	"DetailModal.PropertiesModal.551013-12": "存储方式",
+	"DetailModal.PropertiesModal.551013-13": "指标配置",
+	"DetailModal.PropertiesModal.551013-14": "确认",
+	"DetailModal.PropertiesModal.551013-15": "设备",
+	"DetailModal.PropertiesModal.551013-16": "手动",
+	"DetailModal.PropertiesModal.551013-17": "规则",
+	"DetailModal.PropertiesModal.551013-18": "读",
+	"DetailModal.PropertiesModal.551013-19": "写",
+	"DetailModal.PropertiesModal.551013-20": "上报",
+	"DetailModal.PropertiesModal.551013-21": "序号",
+	"DetailModal.PropertiesModal.551013-22": "指标标识",
+	"DetailModal.PropertiesModal.551013-23": "指标名称",
+	"DetailModal.PropertiesModal.551013-24": "指标值",
+	"DetailModal.PropertiesModal.551013-25": "标识",
+	"DetailModal.PropertiesModal.551013-26": "名称",
+	"Base.columns.551013-0": "设备",
+	"Base.columns.551013-1": "手动",
+	"Base.columns.551013-2": "规则",
+	"Base.columns.551013-3": "读",
+	"Base.columns.551013-4": "写",
+	"Base.columns.551013-5": "上报",
+	"Base.columns.551013-6": "请添加枚举项",
+	"Base.columns.551013-7": "请选择元素类型",
+	"Base.columns.551013-8": "请添加参数",
+	"Base.columns.551013-9": "请选择时间格式",
+	"Base.columns.551013-10": "请选择文件类型",
+	"Base.columns.551013-11": "是",
+	"Base.columns.551013-12": "否",
+	"Base.columns.551013-13": "继承自产品物模型的数据不支持修改",
+	"Base.columns.551013-14": "标识",
+	"Base.columns.551013-15": "该标识已存在",
+	"Base.columns.551013-16": "最多可输入64个字符",
+	"Base.columns.551013-17": "标识只能由数字、字母、下划线组成",
+	"Base.columns.551013-18": "名称",
+	"Base.columns.551013-19": "请输入名称",
+	"Base.columns.551013-20": "数据类型",
+	"Base.columns.551013-21": "请选择数据类型",
+	"Base.columns.551013-22": "属性来源",
+	"Base.columns.551013-23": "请选择读写类型",
+	"Base.columns.551013-24": "请选择属性来源",
+	"Base.columns.551013-25": "其它配置",
+	"Base.columns.551013-26": "是否异步",
+	"Base.columns.551013-27": "输入参数",
+	"Base.columns.551013-28": "输出参数",
+	"Base.columns.551013-29": "说明",
+	"Base.columns.551013-30": "最多可输入20个字符",
+	"Base.columns.551013-31": "事件级别",
+	"Base.columns.551013-32": "请添加配置参数",
+	"Base.columns.551013-33": "整数型",
+	"Base.columns.551013-34": "长整数型",
+	"Base.columns.551013-35": "单精度浮点型",
+	"Base.columns.551013-36": "双精度浮点数",
+	"Base.columns.551013-37": "字符串",
+	"Base.columns.551013-38": "布尔型",
+	"Base.columns.551013-39": "时间型",
+	"Base.columns.551013-40": "枚举",
+	"Base.columns.551013-41": "数组",
+	"Base.columns.551013-42": "结构体",
+	"Base.columns.551013-43": "文件",
+	"Base.columns.551013-44": "密码",
+	"Base.columns.551013-45": "地理位置",
+	"DetailModal.EventModal.551013-0": "事件详情",
+	"DetailModal.EventModal.551013-1": "事件标识",
+	"DetailModal.EventModal.551013-2": "事件名称",
+	"DetailModal.EventModal.551013-3": "事件级别",
+	"DetailModal.EventModal.551013-4": "输出参数",
+	"DetailModal.EventModal.551013-5": "存储方式",
+	"DetailModal.EventModal.551013-6": "确认",
+	"DetailModal.EventModal.551013-7": "普通",
+	"DetailModal.EventModal.551013-8": "警告",
+	"DetailModal.EventModal.551013-9": "紧急",
+	"Edit.ValueTypeForm.551013-0": "请选择{0}",
+	"Edit.ValueTypeForm.551013-1": "单位",
+	"Edit.ValueTypeForm.551013-2": "精度",
+	"Edit.ValueTypeForm.551013-3": "请输入精度",
+	"Edit.ValueTypeForm.551013-4": "时间格式",
+	"Edit.ValueTypeForm.551013-5": "布尔值",
+	"Edit.ValueTypeForm.551013-6": "枚举项",
+	"Edit.ValueTypeForm.551013-7": "最大长度",
+	"Edit.ValueTypeForm.551013-8": "字节",
+	"Edit.ValueTypeForm.551013-9": "请输入最大长度",
+	"Edit.ValueTypeForm.551013-10": "元素配置",
+	"Edit.ValueTypeForm.551013-11": "JSON对象",
+	"Edit.ValueTypeForm.551013-12": "文件类型",
+	"Edit.ValueTypeForm.551013-13": "请选择文件类型",
+	"Edit.ValueTypeForm.551013-14": "数据类型",
+	"Edit.ValueTypeForm.551013-15": "结构体",
+	"VirtualRule.DetailModal.551013-0": "规则",
+	"Metrics.BooleanSelect.551013-0": "固定值",
+	"Metrics.BooleanSelect.551013-1": "范围值",
+	"components.DataType.551013-0": "参数标识",
+	"components.DataType.551013-1": "该标识已存在",
+	"components.DataType.551013-2": "请输入标识",
+	"components.DataType.551013-3": "最多可输入64个字符",
+	"components.DataType.551013-4": "标识只能由数字、字母、下划线、中划线组成",
+	"components.DataType.551013-5": "参数名称",
+	"components.DataType.551013-6": "请输入参数名称",
+	"components.DataType.551013-7": "数据类型",
+	"components.DataType.551013-8": "请选择数据类型",
+	"components.DataType.551013-9": "其他配置",
+	"components.DataType.551013-10": "操作",
+	"Metrics.Metrics.551013-0": "请输入标识",
+	"Metrics.Metrics.551013-1": "请输入名称",
+	"Metrics.Metrics.551013-2": "添加指标值",
+	"Metrics.Metrics.551013-3": "指标标识",
+	"Metrics.Metrics.551013-4": "该标识已存在",
+	"Metrics.Metrics.551013-5": "最多可输入64个字符",
+	"Metrics.Metrics.551013-6": "标识只能由数字、字母、下划线、中划线组成",
+	"Metrics.Metrics.551013-7": "指标名称",
+	"Metrics.Metrics.551013-8": "请输入指标名称",
+	"Metrics.Metrics.551013-9": "指标配置",
+	"Metrics.Metrics.551013-10": "请配置指标",
+	"Metrics.Metrics.551013-11": "操作",
+	"Metrics.Metrics.551013-12": "指标值",
+	"VirtualRule.Rule.551013-0": "编辑规则",
+	"components.DataTypeObjectChild.551013-0": "无",
+	"VirtualRule.index.551013-0": "请选择触发属性",
+	"VirtualRule.index.551013-1": "触发属性",
+	"VirtualRule.index.551013-2": "选择当前产品物模型下的属性作为触发属性",
+	"VirtualRule.index.551013-3": "任意属性值更新时将触发下方计算规则",
+	"VirtualRule.index.551013-4": "任意属性",
+	"VirtualRule.index.551013-5": "计算规则",
+	"VirtualRule.index.551013-6": "窗口",
+	"VirtualRule.index.551013-7": "请选择窗口类型",
+	"VirtualRule.index.551013-8": "无",
+	"VirtualRule.index.551013-9": "时间窗口",
+	"VirtualRule.index.551013-10": "频次窗口",
+	"VirtualRule.index.551013-11": "聚合函数",
+	"VirtualRule.index.551013-12": "请选择聚合函数",
+	"VirtualRule.index.551013-13": "窗口长度",
+	"VirtualRule.index.551013-14": "次",
+	"VirtualRule.index.551013-15": "请输入窗口长度",
+	"VirtualRule.index.551013-16": "请输入1-999999之间的正整数",
+	"VirtualRule.index.551013-17": "步长",
+	"VirtualRule.index.551013-18": "请输入步长",
+	"VirtualRule.index.551013-19": "写",
+	"VirtualRule.index.551013-20": "上报",
+	"VirtualRule.index.551013-21": "读",
+	"Metrics.item.551013-0": "请输入",
+	"Metrics.item.551013-1": "请选择",
+	"Tags.Type.551013-0": "读",
+	"Tags.Type.551013-1": "写",
+	"Tags.Type.551013-2": "上报",
+	"Tags.Type.551013-3": "请选择读写类型",
+	"Detail.Save.551010-0": "查看",
+	"Detail.Save.551010-1": "确认",
+	"Detail.Save.551010-2": "取消",
+	"Detail.Save.551010-3": "失败原因：",
+	"Events.OtherConfigInfo.551013-0": "无",
+	"Events.ConfigParams.551013-0": "配置",
+	"Events.ConfigParams.551013-1": "参数标识",
+	"Events.ConfigParams.551013-2": "该标识已存在",
+	"Events.ConfigParams.551013-3": "请输入标识",
+	"Events.ConfigParams.551013-4": "最多可输入64个字符",
+	"Events.ConfigParams.551013-5": "标识只能由数字、字母、下划线、中划线组成",
+	"Events.ConfigParams.551013-6": "参数名称",
+	"Events.ConfigParams.551013-7": "请输入参数名称",
+	"Events.ConfigParams.551013-8": "数据类型",
+	"Events.ConfigParams.551013-9": "请选择数据类型",
+	"Events.ConfigParams.551013-10": "其他配置",
+	"Events.ConfigParams.551013-11": "操作",
+	"Events.ConfigParams.551013-12": "请选择",
+	"Product.index.551010-0": "新增",
+	"Product.index.551010-1": "导入",
+	"Product.index.551010-2": "正常",
+	"Product.index.551010-3": "禁用",
+	"Product.index.551010-4": "设备类型",
+	"Product.index.551010-5": "接入方式",
+	"Product.index.551010-6": "未接入",
+	"Product.index.551010-7": "产品名称",
+	"Product.index.551010-8": "状态",
+	"Product.index.551010-9": "说明",
+	"Product.index.551010-10": "操作",
+	"Product.index.551010-11": "查看",
+	"Product.index.551010-12": "编辑",
+	"Product.index.551010-13": "导出",
+	"Product.index.551010-14": "产品",
+	"Product.index.551010-15": "启用",
+	"Product.index.551010-16": "确认{0}?",
+	"Product.index.551010-17": "操作成功！",
+	"Product.index.551010-18": "操作失败！",
+	"Product.index.551010-19": "删除",
+	"Product.index.551010-20": "已启用的产品不能删除",
+	"Product.index.551010-21": "确认删除?",
+	"Product.index.551010-22": "请上传json格式文件",
+	"Product.index.551010-23": "文件内容不能为空",
+	"Product.index.551010-24": "请上传正确格式文件",
+	"Product.index.551010-25": "缺少deviceType字段或对应的值",
+	"Product.index.551010-26": "操作成功",
+	"Product.index.551010-27": "名称",
+	"Product.index.551010-28": "网关类型",
+	"Product.index.551010-29": "直连设备",
+	"Product.index.551010-30": "网关子设备",
+	"Product.index.551010-31": "网关设备",
+	"Product.index.551010-32": "产品分类",
+	"Product.index.551010-33": "所属组织",
+	"Events.ValueObject.551013-0": "请选择",
+	"Function.InputParams.551013-0": "必填",
+	"Function.InputParams.551013-1": "不必填",
+	"Function.InputParams.551013-2": "配置",
+	"Function.InputParams.551013-3": "请选择",
+	"Function.InputParams.551013-4": "参数标识",
+	"Function.InputParams.551013-5": "该标识已存在",
+	"Function.InputParams.551013-6": "请输入标识",
+	"Function.InputParams.551013-7": "最多可输入64个字符",
+	"Function.InputParams.551013-8": "标识只能由数字、字母、下划线、中划线组成",
+	"Function.InputParams.551013-9": "参数名称",
+	"Function.InputParams.551013-10": "请输入名称",
+	"Function.InputParams.551013-11": "填写约束",
+	"Function.InputParams.551013-12": "数据类型",
+	"Function.InputParams.551013-13": "请选择数据类型",
+	"Function.InputParams.551013-14": "其他配置",
+	"Function.InputParams.551013-15": "操作",
+	"Function.AsyncSelect.551013-0": "请选择",
+	"Metrics.ValueItem.551013-0": "请输入指标值",
+	"Metrics.ValueItem.551013-1": "配置",
+	"Metrics.ValueItem.551013-2": "是",
+	"Metrics.ValueItem.551013-3": "否",
+	"Metrics.ValueItem.551013-4": "请输入",
+	"Metrics.ValueItem.551013-5": "请选择",
+	"Metrics.ValueItem.551013-6": "{0}指标值",
+	"Metrics.ValueItem.551013-7": "需大于左侧数值",
+	"Metrics.ValueItem.551013-8": "最多可输入64个字符",
+	"DialogTips.index.551010-0": "产品创建成功",
+	"DialogTips.index.551010-1": "关闭",
+	"DialogTips.index.551010-2": "产品ID:",
+	"DialogTips.index.551010-3": "查看详情",
+	"DialogTips.index.551010-4": "接下来推荐操作:",
+	"DialogTips.index.551010-5": "1、配置产品接入方式",
+	"DialogTips.index.551010-6": "点击具体产品的查看按钮,进入“设备接入”tab页，并参照设备铭牌说明选择匹配的接入方式",
+	"DialogTips.index.551010-7": "2、添加测试设备",
+	"DialogTips.index.551010-8": "进入设备列表，添加单个设备，用于验证产品模型是否配置正确",
+	"DialogTips.index.551010-9": "3、功能调试",
+	"DialogTips.index.551010-10": "点击查看具体设备，进入“设备诊断”对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确",
+	"DialogTips.index.551010-11": "4、批量添加设备",
+	"DialogTips.index.551010-12": "进入设备列表页面，点击批量导入设备，批量添加同一产品下的设备",
+	"components.Constraint.551013-0": "不必填",
+	"components.Constraint.551013-1": "必填",
+	"Properties.OtherSetting.551013-0": "指标配置",
+	"Properties.OtherSetting.551013-1": "场景联动页面可引用指标配置作为触发条件",
+	"Properties.OtherSetting.551013-2": "拓展配置",
+	"Properties.OtherSetting.551013-3": "重置",
+	"Properties.OtherSetting.551013-4": "阈值限制",
+	"Properties.OtherSetting.551013-5": "下限",
+	"Properties.OtherSetting.551013-6": "上限",
+	"Properties.OtherSetting.551013-7": "阈值",
+	"Properties.OtherSetting.551013-8": "请输入下限",
+	"Properties.OtherSetting.551013-9": "请输入上限",
+	"Properties.OtherSetting.551013-10": "超出阈值数据处理方式",
+	"Properties.OtherSetting.551013-11": "忽略",
+	"Properties.OtherSetting.551013-12": "仅记录",
+	"Properties.OtherSetting.551013-13": "记录并发送告警",
+	"Properties.OtherSetting.551013-14": "没有动态配置项",
+	"Properties.OtherSetting.551013-15": "配置",
+	"Properties.OtherSetting.551013-16": "平台将忽略超出阈值的数据，无法查看上报记录",
+	"Properties.OtherSetting.551013-17": "您可以在告警记录-无效数据页面查看超出阈值的数据上报记录",
+	"Properties.OtherSetting.551013-18": "您可以在设备详情-告警记录 页面查看告警情况",
+	"Properties.OtherSetting.551013-19": "否",
+	"Properties.OtherSetting.551013-20": "是",
+	"Properties.OtherSetting.551013-21": "参数名称",
+	"Properties.OtherSetting.551013-22": "输入类型",
+	"Properties.OtherSetting.551013-23": "值",
+	"ChildDevice.index.551011-0": "新增并绑定",
+	"ChildDevice.index.551011-1": "绑定",
+	"ChildDevice.index.551011-2": "确定解绑吗？",
+	"ChildDevice.index.551011-3": "批量解除",
+	"ChildDevice.index.551011-4": "设备名称",
+	"ChildDevice.index.551011-5": "所属产品",
+	"ChildDevice.index.551011-6": "注册时间",
+	"ChildDevice.index.551011-7": "状态",
+	"ChildDevice.index.551011-8": "禁用",
+	"ChildDevice.index.551011-9": "离线",
+	"ChildDevice.index.551011-10": "在线",
+	"ChildDevice.index.551011-11": "说明",
+	"ChildDevice.index.551011-12": "操作",
+	"ChildDevice.index.551011-13": "查看",
+	"ChildDevice.index.551011-14": "解绑",
+	"ChildDevice.index.551011-15": "确认解绑吗？",
+	"ChildDevice.index.551011-16": "确定",
+	"ChildDevice.index.551011-17": "取消",
+	"ChildDevice.index.551011-18": "操作成功！",
+	"ChildDevice.index.551011-19": "编辑",
+	"ChildDevice.index.551011-20": "请勾选需要解绑的数据",
+	"Status.index.551011-0": "网络组件",
+	"Status.index.551011-1": "诊断网络组件配置是否正确，配置错误将导致设备连接失败",
+	"Status.index.551011-2": "正常",
+	"Status.index.551011-3": "异常",
+	"Status.index.551011-4": "网络组件已禁用，请先",
+	"Status.index.551011-5": "确认启用",
+	"Status.index.551011-6": "操作成功！",
+	"Status.index.551011-7": "启用",
+	"Status.index.551011-8": "请检查服务器端口是否开放，如未开放，请开放后尝试重新连接",
+	"Status.index.551011-9": "请检查服务器防火策略，如有开启防火墙，请关闭防火墙或调整防火墙策略后重试",
+	"Status.index.551011-10": "请求发生错误",
+	"Status.index.551011-11": "设备不含accessId",
+	"Status.index.551011-12": "诊断设备接入网关状态是否正常，网关配置是否正确",
+	"Status.index.551011-13": "诊断设备接入网关状态是否正常，禁用状态将导致连接失败",
+	"Status.index.551011-14": "设备接入网关",
+	"Status.index.551011-15": "可能存在异常",
+	"Status.index.551011-16": "请",
+	"Status.index.551011-17": "{0}配置",
+	"Status.index.551011-18": "人工检查",
+	"Status.index.551011-19": "网关配置是否已填写正确，若您确定该项无需诊断可",
+	"Status.index.551011-20": "确认忽略？",
+	"Status.index.551011-21": "忽略",
+	"Status.index.551011-22": "设备接入网关已禁用，请先",
+	"Status.index.551011-23": "网关父设备",
+	"Status.index.551011-24": "诊断网关父设备状态是否正常，禁用或离线将导致连接失败",
+	"Status.index.551011-25": "未绑定父设备，请先",
+	"Status.index.551011-26": "绑定",
+	"Status.index.551011-27": "父设备后重试",
+	"Status.index.551011-28": "网关父设备已禁用，请先",
+	"Status.index.551011-29": "网关父设备已离线，请先排查网关设备故障",
+	"Status.index.551011-30": "产品状态",
+	"Status.index.551011-31": "诊断产品状态是否正常，禁用状态将导致设备连接失败",
+	"Status.index.551011-32": "产品已禁用，请",
+	"Status.index.551011-33": "产品",
+	"Status.index.551011-34": "设备状态",
+	"Status.index.551011-35": "诊断设备状态是否正常，禁用状态将导致设备连接失败",
+	"Status.index.551011-36": "设备已禁用，请",
+	"Status.index.551011-37": "离线",
+	"Status.index.551011-38": "设备",
+	"Status.index.551011-39": "产品-{0}",
+	"Status.index.551011-40": "诊断产品{0}认证配置是否正确，错误的配置将导致连接失败",
+	"Status.index.551011-41": "正在诊断中...",
+	"Status.index.551011-42": "请根据设备接入配置需要",
+	"Status.index.551011-43": "填写",
+	"Status.index.551011-44": "，若您确定该项无需诊断可",
+	"Status.index.551011-45": "配置是否已填写正确,若您确定该项无需诊断可",
+	"Status.index.551011-46": "设备-{0}",
+	"Status.index.551011-47": "诊断设备{0}认证配置是否正确，错误的配置将导致连接失败",
+	"Status.index.551011-48": "设备-OneNet配置",
+	"Status.index.551011-49": "诊断设备OneNet是否已配置，未配置将导致连接失败",
+	"Status.index.551011-50": "设备-OneNet配置是否已填写正确,若您确定该项无需诊断可",
+	"Status.index.551011-51": "设备-CTWing配置",
+	"Status.index.551011-52": "诊断设备CTWing是否已配置，未配置将导致连接失败",
+	"Status.index.551011-53": "设备-CTWing配置是否已填写正确,若您确定该项无需诊断可",
+	"Status.index.551011-54": "请检查设备运行状态是否正常",
+	"Status.index.551011-55": "请检查设备网络是否畅通，并确保设备已连接到以下地址之一:",
+	"Status.index.551011-56": "请检查设备网络是否畅通，并确保设备已连接到:",
+	"Status.index.551011-57": "请根据",
+	"Status.index.551011-58": "设备接入配置",
+	"Status.index.551011-59": "中",
+	"Status.index.551011-60": "信息，任意上报一条数据",
+	"Status.index.551011-61": "请联系管理员提供",
+	"Status.index.551011-62": "信息，并根据URL信息任意上报一条数据",
+	"Status.index.551011-63": "请检查设备网络是否畅通，并确保设备已连接到：SIP",
+	"Status.index.551011-64": "需要三方云平台主动发送一条消息通知到本平台，触发设备状态为在线",
+	"Status.index.551011-65": "请检查三方平台配置项是否填写正确",
+	"Status.index.551011-66": "未开发",
+	"Status.index.551011-67": "连接详情",
+	"Status.index.551011-68": "一键修复",
+	"Status.index.551011-69": "重新诊断",
+	"components.ModelButton.551013-0": "配置",
+	"Properties.StorageSetting.551013-0": "参数名称",
+	"Properties.StorageSetting.551013-1": "输入类型",
+	"Properties.StorageSetting.551013-2": "值",
+	"Function.OutputParams.551013-0": "参数标识",
+	"Function.OutputParams.551013-1": "该标识已存在",
+	"Function.OutputParams.551013-2": "请输入标识",
+	"Function.OutputParams.551013-3": "最多可输入64个字符",
+	"Function.OutputParams.551013-4": "标识只能由数字、字母、下划线、中划线组成",
+	"Function.OutputParams.551013-5": "参数名称",
+	"Function.OutputParams.551013-6": "请输入参数名称",
+	"Function.OutputParams.551013-7": "数据类型",
+	"Function.OutputParams.551013-8": "请选择数据类型",
+	"Function.OutputParams.551013-9": "其他配置",
+	"Function.OutputParams.551013-10": "操作",
+	"Events.SelectColumn.551013-0": "请选择",
+	"Import.index.551010-0": "导入",
+	"Import.index.551010-1": "产品",
+	"Import.index.551010-2": "请选择产品",
+	"Import.index.551010-3": "文件格式",
+	"Import.index.551010-4": "文件上传",
+	"Import.index.551010-5": "关闭",
+	"components.EditTable.626395-0": "最多可输入64个字符",
+	"components.EditTable.626395-1": "请输入{0}",
+	"components.EditTable.626395-2": "添加",
+	"components.EditTable.626395-3": "操作",
+	"Process.index.551010-0": "启用",
+	"Process.index.551010-1": "同步",
+	"Process.index.551010-2": "正在启用全部设备",
+	"Process.index.551010-3": "正在同步设备状态",
+	"Process.index.551010-4": "成功：",
+	"Process.index.551010-5": "条",
+	"Process.index.551010-6": "启用失败：",
+	"Process.index.551010-7": "实例信息页面中的配置项未完善",
+	"Process.index.551010-8": "完成",
+	"Info.index.506529-0": "设备信息",
+	"Info.index.506529-1": "编辑",
+	"Info.index.506529-2": "设备ID",
+	"Info.index.506529-3": "通过调用SDK或HTTP请求的方式接入第三方系统设备数据时，第三方系统与平台当前设备对应的设备ID。",
+	"Info.index.506529-4": "如双方ID值一致，则无需填写",
+	"Info.index.506529-5": "未映射",
+	"Info.index.506529-6": "已映射",
+	"Info.index.506529-7": "产品名称",
+	"Info.index.506529-8": "设备类型",
+	"Info.index.506529-9": "固件版本",
+	"Info.index.506529-10": "连接协议",
+	"Info.index.506529-11": "消息协议",
+	"Info.index.506529-12": "创建时间",
+	"Info.index.506529-13": "注册时间",
+	"Info.index.506529-14": "最后上线时间",
+	"Info.index.506529-15": "父设备",
+	"Info.index.506529-16": "说明",
+	"Save.GateWayFormItem.366202-0": "选择网关设备",
+	"Save.GateWayFormItem.366202-1": "重新选择",
+	"Save.GateWayFormItem.340184-0": "选择网关设备",
+	"Save.GateWayFormItem.340184-1": "重新选择",
+	"DeviceHome.index.152181-0": "物联网引导",
+	"DeviceHome.index.152181-1": "设备接入推荐步骤",
+	"DeviceHome.index.152181-2": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+	"DeviceHome.index.152181-3": "创建产品",
+	"DeviceHome.index.152181-4": "创建设备",
+	"DeviceHome.index.152181-5": "规则引擎",
+	"DeviceHome.index.152181-6": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+	"DeviceHome.index.152181-7": "配置产品接入方式",
+	"DeviceHome.index.152181-8": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+	"DeviceHome.index.152181-9": "添加测试设备",
+	"DeviceHome.index.152181-10": "添加单个设备，用于验证产品模型是否配置正确。",
+	"DeviceHome.index.152181-11": "功能调试",
+	"DeviceHome.index.152181-12": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+	"DeviceHome.index.152181-13": "批量添加设备",
+	"DeviceHome.index.152181-14": "批量添加同一产品下的设备",
+	"InitHome.index.152181-0": "请选择首页视图",
+	"InitHome.index.152181-1": "保存修改",
+	"ComprehensiveHome.index.152181-0": "物联网引导",
+	"ComprehensiveHome.index.152181-1": "运维引导",
+	"ComprehensiveHome.index.152181-2": "设备接入推荐步骤",
+	"ComprehensiveHome.index.152181-3": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+	"ComprehensiveHome.index.152181-4": "运维管理推荐步骤",
+	"ComprehensiveHome.index.152181-5": "请根据业务需要对下述步骤进行选择性操作。",
+	"ComprehensiveHome.index.152181-6": "创建产品",
+	"ComprehensiveHome.index.152181-7": "创建设备",
+	"ComprehensiveHome.index.152181-8": "规则引擎",
+	"ComprehensiveHome.index.152181-9": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+	"ComprehensiveHome.index.152181-10": "配置产品接入方式",
+	"ComprehensiveHome.index.152181-11": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+	"ComprehensiveHome.index.152181-12": "添加测试设备",
+	"ComprehensiveHome.index.152181-13": "添加单个设备，用于验证产品模型是否配置正确。",
+	"ComprehensiveHome.index.152181-14": "功能调试",
+	"ComprehensiveHome.index.152181-15": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+	"ComprehensiveHome.index.152181-16": "批量添加设备",
+	"ComprehensiveHome.index.152181-17": "批量添加同一产品下的设备",
+	"ComprehensiveHome.index.152181-18": "设备接入配置",
+	"ComprehensiveHome.index.152181-19": "日志排查",
+	"ComprehensiveHome.index.152181-20": "实时监控",
+	"ComprehensiveHome.index.152181-21": "协议管理",
+	"ComprehensiveHome.index.152181-22": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+	"ComprehensiveHome.index.152181-23": "证书管理",
+	"ComprehensiveHome.index.152181-24": "统一维护平台内的证书，用于数据通信加密。",
+	"ComprehensiveHome.index.152181-25": "网络组件",
+	"ComprehensiveHome.index.152181-26": "根据不同的传输类型配置平台底层网络组件相关参数。",
+	"ComprehensiveHome.index.152181-27": "设备接入网关",
+	"ComprehensiveHome.index.152181-28": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+	"ComprehensiveHome.index.152181-29": "日志管理",
+	"ComprehensiveHome.index.152181-30": "监控系统日志，及时处理系统异常。",
+	"dialogs.DeviceChooseDialog.152181-0": "选择设备",
+	"dialogs.DeviceChooseDialog.152181-1": "请选择设备",
+	"dialogs.DeviceChooseDialog.152181-2": "设备ID",
+	"dialogs.DeviceChooseDialog.152181-3": "设备名称",
+	"dialogs.DeviceChooseDialog.152181-4": "产品名称",
+	"dialogs.DeviceChooseDialog.152181-5": "注册时间",
+	"dialogs.DeviceChooseDialog.152181-6": "状态",
+	"dialogs.DeviceChooseDialog.152181-7": "在线",
+	"dialogs.DeviceChooseDialog.152181-8": "离线",
+	"components.BootCard.152181-0": "暂无权限，请联系管理员",
+	"components.BasicCountCard.152181-0": "基础统计",
+	"components.BasicCountCard.152181-1": "详情",
+	"components.BasicCountCard.152181-2": "CPU使用率",
+	"components.BasicCountCard.152181-3": "JVM内存",
+	"components.BootCardSmall.152181-0": "暂无权限，请联系管理员",
+	"components.StepCard.152181-0": "暂无权限，请联系管理员",
+	"dialogs.ProductChooseDialog.152181-0": "选择产品",
+	"dialogs.ProductChooseDialog.152181-1": "产品",
+	"dialogs.ProductChooseDialog.152181-2": "请选择产品",
+	"home.index.152180-0": "基本信息",
+	"components.PlatformPicCard.152181-0": "平台架构图",
+	"components.DeviceCountCard.152181-0": "设备统计",
+	"components.DeviceCountCard.152181-1": "详情",
+	"components.DeviceCountCard.152181-2": "产品数量",
+	"components.DeviceCountCard.152181-3": "设备数量",
+	"Save.GateWayDeviceModal.039083-0": "选择网关设备",
+	"Save.GateWayDeviceModal.039083-1": "设备类型",
+	"Save.GateWayDeviceModal.039083-2": "产品名称",
+	"Save.GateWayDeviceModal.039083-3": "设备名称",
+	"Save.GateWayDeviceModal.039083-4": "创建时间",
+	"Save.GateWayDeviceModal.039083-5": "状态",
+	"Save.GateWayDeviceModal.039083-6": "禁用",
+	"Save.GateWayDeviceModal.039083-7": "离线",
+	"Save.GateWayDeviceModal.039083-8": "在线",
+	"Save.index.039083-0": "编辑",
+	"Save.index.039083-1": "新增",
+	"Save.index.039083-2": "通道名称",
+	"Save.index.039083-3": "请输入通道名称",
+	"Save.index.039083-4": "通讯协议",
+	"Save.index.039083-5": "请选择通讯协议",
+	"Save.index.039083-6": "Modbus主机IP",
+	"Save.index.039083-7": "支持ipv4、ipv6、域名",
+	"Save.index.039083-8": "请输入Modbus主机IP",
+	"Save.index.039083-9": "端口",
+	"Save.index.039083-10": "请输入端口",
+	"Save.index.039083-11": "端点url",
+	"Save.index.039083-12": "请输入端点url",
+	"Save.index.039083-13": "安全策略",
+	"Save.index.039083-14": "请选择安全策略",
+	"Save.index.039083-15": "请选择网关设备",
+	"Save.index.039083-16": "选择网关设备",
+	"Save.index.039083-17": "安全模式",
+	"Save.index.039083-18": "请选择安全模式",
+	"Save.index.039083-19": "证书",
+	"Save.index.039083-20": "请选择证书",
+	"Save.index.039083-21": "权限认证",
+	"Save.index.039083-22": "用户名",
+	"Save.index.039083-23": "请输入用户名",
+	"Save.index.039083-24": "密码",
+	"Save.index.039083-25": "请输入密码",
+	"Save.index.039083-26": "BACNet实例号",
+	"Save.index.039083-27": "请输入BACNet实例号",
+	"Save.index.039083-28": "网卡",
+	"Save.index.039083-29": "请选择网卡",
+	"Save.index.039083-30": "广播端口",
+	"Save.index.039083-31": "请输入广播端口",
+	"Save.index.039083-32": "说明",
+	"Save.index.039083-33": "请输入说明",
+	"Save.index.039083-34": "取消",
+	"Save.index.039083-35": "确认",
+	"Save.index.039083-36": "请输入BACnet实例号",
+	"Save.index.039083-37": "请输入正确的BACnet实例号",
+	"Center.index.340051-0": "查看详情",
+	"Center.index.340051-1": "编辑资料",
+	"Center.index.340051-2": "修改密码",
+	"Center.index.340051-3": "首页视图",
+	"Center.index.340051-4": "绑定第三方账号",
+	"Center.index.340051-5": "我的订阅",
+	"Center.index.340051-6": "站内信",
+	"Center.index.340051-7": "操作成功",
+	"Center.index.361874-0": "查看详情",
+	"Center.index.361874-1": "编辑资料",
+	"Center.index.361874-2": "修改密码",
+	"Center.index.361874-3": "首页视图",
+	"Center.index.361874-4": "绑定第三方账号",
+	"Center.index.361874-5": "我的订阅",
+	"Center.index.361874-6": "站内信",
+	"Center.index.361874-7": "操作成功",
+	"Import.index.657743-0": "导入物模型",
+	"Import.index.657743-1": "导入的物模型会覆盖原来的属性、功能、事件、标签，请谨慎操作。",
+	"Import.index.657743-2": "导入时会根据标识跳过继承自产品物模型的属性、功能、事件、标签。",
+	"Import.index.657743-3": "导入方式",
+	"Import.index.657743-4": "请选择导入方式",
+	"Import.index.657743-5": "拷贝产品",
+	"Import.index.657743-6": "选择产品",
+	"Import.index.657743-7": "请选择产品",
+	"Import.index.657743-8": "物模型类型",
+	"Import.index.657743-9": "请选择物模型类型",
+	"Import.index.657743-10": "导入类型",
+	"Import.index.657743-11": "请选择导入类型",
+	"Import.index.657743-12": "文件上传",
+	"Import.index.657743-13": "脚本",
+	"Import.index.657743-14": "请上传文件",
+	"Import.index.657743-15": "上传文件",
+	"Import.index.657743-16": "支持扩展名：.json",
+	"Import.index.657743-17": "请输入物模型",
+	"Import.index.657743-18": "物模型",
+	"Import.index.657743-19": "在编辑器中编写物模型脚本",
+	"Import.index.657743-20": "属性定义第{0}个数组中缺失id属性",
+	"Import.index.657743-21": "属性定义第{0}个数组中id属性不能包含中文",
+	"Import.index.657743-22": "属性定义第{0}个数组中缺失name属性",
+	"Import.index.657743-23": "标签定义第{0}个数组中缺失valueType.type属性",
+	"Import.index.657743-24": "属性定义第{0}个数组中缺失expands.source属性",
+	"Import.index.657743-25": "属性定义第{0}个数组中缺失type属性",
+	"Import.index.657743-26": "方法定义第{0}个数组中缺失id属性",
+	"Import.index.657743-27": "方法定义第{0}个数组中id属性不能包含中文",
+	"Import.index.657743-28": "方法定义第{0}个数组中缺失name属性",
+	"Import.index.657743-29": "事件定义第{0}个数组中缺失id属性",
+	"Import.index.657743-30": "事件定义第{0}个数组中id属性不能包含中文",
+	"Import.index.657743-31": "事件定义第{0}个数组中缺失name属性",
+	"Import.index.657743-32": "事件定义第{0}个数组中缺失valueType.type属性",
+	"Import.index.657743-33": "事件定义第{0}个数组中缺失expands.level属性",
+	"Import.index.657743-34": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的id属性",
+	"Import.index.657743-35": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的name属性",
+	"Import.index.657743-36": "事件定义第${\r\n                                        index + 1\r\n                                    }个数组中缺失valueType.properties数组第${\r\n                                        number + 1\r\n                                    }项的valueType.type属性",
+	"Import.index.657743-37": "事件定义第${\r\n                            index + 1\r\n                        }个数组中缺失valueType.properties数组",
+	"Import.index.657743-38": "标签定义第{0}个数组中缺失id属性",
+	"Import.index.657743-39": "标签定义第{0}个数组中id属性不能包含中文",
+	"Import.index.657743-40": "标签定义第{0}个数组中缺失name属性",
+	"Import.index.657743-41": "属性定义第{0}个数组中缺失identifier属性",
+	"Import.index.657743-42": "属性定义第{0}个数组中缺失dataType.type属性",
+	"Import.index.657743-43": "方法定义第{0}个数组中缺失identifier属性",
+	"Import.index.657743-44": "方法定义第{0}个数组中缺失callType属性",
+	"Import.index.657743-45": "事件定义第{0}个数组中缺失identifier属性",
+	"Import.index.657743-46": "事件定义第{0}个数组中缺失type属性",
+	"Import.index.657743-47": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的id属性",
+	"Import.index.657743-48": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的name属性",
+	"Import.index.657743-49": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的dataType.type属性",
+	"Import.index.657743-50": "事件定义第${\r\n                                    index + 1\r\n                                }个数组中缺失outputData数组第${\r\n                                    number + 1\r\n                                }项的dataType.specs属性",
+	"Import.index.657743-51": "事件定义第{0}个数组中缺失outputData数组",
+	"Import.index.657743-52": "操作成功！",
+	"Import.index.657743-53": "文件内容不能为空",
+	"Import.index.657743-54": "请上传json格式的文件",
+	"Import.index.657743-55": "导入成功",
+	"Import.index.657743-56": "物模型数据不正确",
+	"Import.index.657743-57": "上传json格式的物模型文件",
+	"Import.index.657743-58": "导入数据存在虚拟属性，请及时添加虚拟属性计算规则。",
+	"Import.index.657743-59": "确认",
+	"Import.index.657743-60": "标准物模型",
+	"ComprehensiveHome.index.926510-0": "物联网引导",
+	"ComprehensiveHome.index.926510-1": "运维引导",
+	"ComprehensiveHome.index.926510-2": "设备接入推荐步骤",
+	"ComprehensiveHome.index.926510-3": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+	"ComprehensiveHome.index.926510-4": "运维管理推荐步骤",
+	"ComprehensiveHome.index.926510-5": "请根据业务需要对下述步骤进行选择性操作。",
+	"ComprehensiveHome.index.926510-6": "创建产品",
+	"ComprehensiveHome.index.926510-7": "创建设备",
+	"ComprehensiveHome.index.926510-8": "规则引擎",
+	"ComprehensiveHome.index.926510-9": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+	"ComprehensiveHome.index.926510-10": "配置产品接入方式",
+	"ComprehensiveHome.index.926510-11": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+	"ComprehensiveHome.index.926510-12": "添加测试设备",
+	"ComprehensiveHome.index.926510-13": "添加单个设备，用于验证产品模型是否配置正确。",
+	"ComprehensiveHome.index.926510-14": "功能调试",
+	"ComprehensiveHome.index.926510-15": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+	"ComprehensiveHome.index.926510-16": "批量添加设备",
+	"ComprehensiveHome.index.926510-17": "批量添加同一产品下的设备",
+	"ComprehensiveHome.index.926510-18": "设备接入配置",
+	"ComprehensiveHome.index.926510-19": "日志排查",
+	"ComprehensiveHome.index.926510-20": "实时监控",
+	"ComprehensiveHome.index.926510-21": "协议管理",
+	"ComprehensiveHome.index.926510-22": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+	"ComprehensiveHome.index.926510-23": "证书管理",
+	"ComprehensiveHome.index.926510-24": "统一维护平台内的证书，用于数据通信加密。",
+	"ComprehensiveHome.index.926510-25": "网络组件",
+	"ComprehensiveHome.index.926510-26": "根据不同的传输类型配置平台底层网络组件相关参数。",
+	"ComprehensiveHome.index.926510-27": "设备接入网关",
+	"ComprehensiveHome.index.926510-28": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+	"ComprehensiveHome.index.926510-29": "日志管理",
+	"ComprehensiveHome.index.926510-30": "监控系统日志，及时处理系统异常。",
+	"components.BootCardSmall.926510-0": "暂无权限，请联系管理员",
+	"components.BasicCountCard.926510-0": "基础统计",
+	"components.BasicCountCard.926510-1": "详情",
+	"components.BasicCountCard.926510-2": "CPU使用率",
+	"components.BasicCountCard.926510-3": "JVM内存",
+	"components.BootCard.926510-0": "暂无权限，请联系管理员",
+	"dialogs.DeviceChooseDialog.926510-0": "选择设备",
+	"dialogs.DeviceChooseDialog.926510-1": "请选择设备",
+	"dialogs.DeviceChooseDialog.926510-2": "设备ID",
+	"dialogs.DeviceChooseDialog.926510-3": "设备名称",
+	"dialogs.DeviceChooseDialog.926510-4": "产品名称",
+	"dialogs.DeviceChooseDialog.926510-5": "注册时间",
+	"dialogs.DeviceChooseDialog.926510-6": "状态",
+	"dialogs.DeviceChooseDialog.926510-7": "在线",
+	"dialogs.DeviceChooseDialog.926510-8": "离线",
+	"DevOpsHome.index.926510-0": "运维引导",
+	"DevOpsHome.index.926510-1": "运维管理推荐步骤",
+	"DevOpsHome.index.926510-2": "请根据业务需要对下述步骤进行选择性操作。",
+	"DevOpsHome.index.926510-3": "设备接入配置",
+	"DevOpsHome.index.926510-4": "日志排查",
+	"DevOpsHome.index.926510-5": "实时监控",
+	"DevOpsHome.index.926510-6": "协议管理",
+	"DevOpsHome.index.926510-7": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+	"DevOpsHome.index.926510-8": "证书管理",
+	"DevOpsHome.index.926510-9": "统一维护平台内的证书，用于数据通信加密。",
+	"DevOpsHome.index.926510-10": "网络组件",
+	"DevOpsHome.index.926510-11": "根据不同的传输类型配置平台底层网络组件相关参数。",
+	"DevOpsHome.index.926510-12": "设备接入网关",
+	"DevOpsHome.index.926510-13": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+	"DevOpsHome.index.926510-14": "日志管理",
+	"DevOpsHome.index.926510-15": "监控系统日志，及时处理系统异常。",
+	"dialogs.ProductChooseDialog.926510-0": "选择产品",
+	"dialogs.ProductChooseDialog.926510-1": "产品",
+	"dialogs.ProductChooseDialog.926510-2": "请选择产品",
+	"components.DeviceCountCard.926510-0": "设备统计",
+	"components.DeviceCountCard.926510-1": "详情",
+	"components.DeviceCountCard.926510-2": "产品数量",
+	"components.DeviceCountCard.926510-3": "设备数量",
+	"home.index.926510-0": "基本信息",
+	"components.PlatformPicCard.926510-0": "平台架构图",
+	"InitHome.index.926510-0": "请选择首页视图",
+	"InitHome.index.926510-1": "保存修改",
+	"DeviceHome.index.926510-0": "物联网引导",
+	"DeviceHome.index.926510-1": "设备接入推荐步骤",
+	"DeviceHome.index.926510-2": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+	"DeviceHome.index.926510-3": "创建产品",
+	"DeviceHome.index.926510-4": "创建设备",
+	"DeviceHome.index.926510-5": "规则引擎",
+	"DeviceHome.index.926510-6": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+	"DeviceHome.index.926510-7": "配置产品接入方式",
+	"DeviceHome.index.926510-8": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+	"DeviceHome.index.926510-9": "添加测试设备",
+	"DeviceHome.index.926510-10": "添加单个设备，用于验证产品模型是否配置正确。",
+	"DeviceHome.index.926510-11": "功能调试",
+	"DeviceHome.index.926510-12": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+	"DeviceHome.index.926510-13": "批量添加设备",
+	"DeviceHome.index.926510-14": "批量添加同一产品下的设备",
+	"components.StepCard.926510-0": "暂无权限，请联系管理员"
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926838.json b/src/i18n/temp/home_2024-7-4-926838.json
new file mode 100644
index 00000000..4cb9fbf6
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926838.json
@@ -0,0 +1,8 @@
+{
+	"zh": {
+		"components.StepCard.926510-0": "暂无权限，请联系管理员"
+	},
+	"en": {
+		"components.StepCard.926510-0": "No permission at the moment, please contact the administrator"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926841.json b/src/i18n/temp/home_2024-7-4-926841.json
new file mode 100644
index 00000000..9e0eed24
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926841.json
@@ -0,0 +1,36 @@
+{
+	"zh": {
+		"DeviceHome.index.926510-0": "物联网引导",
+		"DeviceHome.index.926510-1": "设备接入推荐步骤",
+		"DeviceHome.index.926510-2": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+		"DeviceHome.index.926510-3": "创建产品",
+		"DeviceHome.index.926510-4": "创建设备",
+		"DeviceHome.index.926510-5": "规则引擎",
+		"DeviceHome.index.926510-6": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+		"DeviceHome.index.926510-7": "配置产品接入方式",
+		"DeviceHome.index.926510-8": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+		"DeviceHome.index.926510-9": "添加测试设备",
+		"DeviceHome.index.926510-10": "添加单个设备，用于验证产品模型是否配置正确。",
+		"DeviceHome.index.926510-11": "功能调试",
+		"DeviceHome.index.926510-12": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+		"DeviceHome.index.926510-13": "批量添加设备",
+		"DeviceHome.index.926510-14": "批量添加同一产品下的设备"
+	},
+	"en": {
+		"DeviceHome.index.926510-0": "IoT guidance",
+		"DeviceHome.index.926510-1": "Recommended steps for device access",
+		"DeviceHome.index.926510-2": "Different devices may have different access steps due to differences in communication protocols",
+		"DeviceHome.index.926510-3": "Create product",
+		"DeviceHome.index.926510-4": "Create device",
+		"DeviceHome.index.926510-5": "Rule engine",
+		"DeviceHome.index.926510-6": "A product is a collection of devices, usually referring to a group of devices with the same functionality. IoT devices must be configured through product access methods.",
+		"DeviceHome.index.926510-7": "Configure product access methods",
+		"DeviceHome.index.926510-8": "Configure unified access methods for devices of the same type through products. Please refer to the instructions on the device nameplate to select the matching access method.",
+		"DeviceHome.index.926510-9": "Add testing equipment",
+		"DeviceHome.index.926510-10": "Add a single device to verify if the product model is configured correctly.",
+		"DeviceHome.index.926510-11": "Functional debugging",
+		"DeviceHome.index.926510-12": "Perform functional debugging on the added testing equipment to verify if it can connect to the platform and if the device's functions are configured correctly.",
+		"DeviceHome.index.926510-13": "Batch Add Devices",
+		"DeviceHome.index.926510-14": "Batch adding devices under the same product"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926843.json b/src/i18n/temp/home_2024-7-4-926843.json
new file mode 100644
index 00000000..38ac6c6a
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926843.json
@@ -0,0 +1,10 @@
+{
+	"zh": {
+		"InitHome.index.926510-0": "请选择首页视图",
+		"InitHome.index.926510-1": "保存修改"
+	},
+	"en": {
+		"InitHome.index.926510-0": "Please select the homepage view",
+		"InitHome.index.926510-1": "Save modifications"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926845.json b/src/i18n/temp/home_2024-7-4-926845.json
new file mode 100644
index 00000000..3ff40f9b
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926845.json
@@ -0,0 +1,8 @@
+{
+	"zh": {
+		"components.PlatformPicCard.926510-0": "平台架构图"
+	},
+	"en": {
+		"components.PlatformPicCard.926510-0": "Platform architecture diagram"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926846.json b/src/i18n/temp/home_2024-7-4-926846.json
new file mode 100644
index 00000000..9ab032e9
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926846.json
@@ -0,0 +1,8 @@
+{
+	"zh": {
+		"home.index.926510-0": "基本信息"
+	},
+	"en": {
+		"home.index.926510-0": "essential information"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926849.json b/src/i18n/temp/home_2024-7-4-926849.json
new file mode 100644
index 00000000..c9a0cd56
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926849.json
@@ -0,0 +1,14 @@
+{
+	"zh": {
+		"components.DeviceCountCard.926510-0": "设备统计",
+		"components.DeviceCountCard.926510-1": "详情",
+		"components.DeviceCountCard.926510-2": "产品数量",
+		"components.DeviceCountCard.926510-3": "设备数量"
+	},
+	"en": {
+		"components.DeviceCountCard.926510-0": "Equipment statistics",
+		"components.DeviceCountCard.926510-1": "details",
+		"components.DeviceCountCard.926510-2": "Product quantity",
+		"components.DeviceCountCard.926510-3": "Number of devices"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926853.json b/src/i18n/temp/home_2024-7-4-926853.json
new file mode 100644
index 00000000..5749f904
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926853.json
@@ -0,0 +1,12 @@
+{
+	"zh": {
+		"dialogs.ProductChooseDialog.926510-0": "选择产品",
+		"dialogs.ProductChooseDialog.926510-1": "产品",
+		"dialogs.ProductChooseDialog.926510-2": "请选择产品"
+	},
+	"en": {
+		"dialogs.ProductChooseDialog.926510-0": "Select product",
+		"dialogs.ProductChooseDialog.926510-1": "product",
+		"dialogs.ProductChooseDialog.926510-2": "Please select a product"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926855.json b/src/i18n/temp/home_2024-7-4-926855.json
new file mode 100644
index 00000000..9f83e384
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926855.json
@@ -0,0 +1,38 @@
+{
+	"zh": {
+		"DevOpsHome.index.926510-0": "运维引导",
+		"DevOpsHome.index.926510-1": "运维管理推荐步骤",
+		"DevOpsHome.index.926510-2": "请根据业务需要对下述步骤进行选择性操作。",
+		"DevOpsHome.index.926510-3": "设备接入配置",
+		"DevOpsHome.index.926510-4": "日志排查",
+		"DevOpsHome.index.926510-5": "实时监控",
+		"DevOpsHome.index.926510-6": "协议管理",
+		"DevOpsHome.index.926510-7": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+		"DevOpsHome.index.926510-8": "证书管理",
+		"DevOpsHome.index.926510-9": "统一维护平台内的证书，用于数据通信加密。",
+		"DevOpsHome.index.926510-10": "网络组件",
+		"DevOpsHome.index.926510-11": "根据不同的传输类型配置平台底层网络组件相关参数。",
+		"DevOpsHome.index.926510-12": "设备接入网关",
+		"DevOpsHome.index.926510-13": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+		"DevOpsHome.index.926510-14": "日志管理",
+		"DevOpsHome.index.926510-15": "监控系统日志，及时处理系统异常。"
+	},
+	"en": {
+		"DevOpsHome.index.926510-0": "Operations guidance",
+		"DevOpsHome.index.926510-1": "Recommended steps for operation and maintenance management",
+		"DevOpsHome.index.926510-2": "Please perform selective operations on the following steps according to business needs.",
+		"DevOpsHome.index.926510-3": "Device access configuration",
+		"DevOpsHome.index.926510-4": "Log troubleshooting",
+		"DevOpsHome.index.926510-5": "Real time monitoring",
+		"DevOpsHome.index.926510-6": "Protocol management",
+		"DevOpsHome.index.926510-7": "Customize and develop corresponding product (device model) access protocols according to business needs, and upload them to the platform.",
+		"DevOpsHome.index.926510-8": "Certificate Management",
+		"DevOpsHome.index.926510-9": "Unified maintenance of certificates within the platform for data communication encryption.",
+		"DevOpsHome.index.926510-10": "Network components",
+		"DevOpsHome.index.926510-11": "Configure platform underlying network component related parameters based on different transmission types.",
+		"DevOpsHome.index.926510-12": "Device access gateway",
+		"DevOpsHome.index.926510-13": "According to different transmission types, associate message protocols, and configure device access gateway related parameters.",
+		"DevOpsHome.index.926510-14": "Log management",
+		"DevOpsHome.index.926510-15": "Monitor system logs and promptly handle system exceptions."
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926856.json b/src/i18n/temp/home_2024-7-4-926856.json
new file mode 100644
index 00000000..0ef7cd87
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926856.json
@@ -0,0 +1,24 @@
+{
+	"zh": {
+		"dialogs.DeviceChooseDialog.926510-0": "选择设备",
+		"dialogs.DeviceChooseDialog.926510-1": "请选择设备",
+		"dialogs.DeviceChooseDialog.926510-2": "设备ID",
+		"dialogs.DeviceChooseDialog.926510-3": "设备名称",
+		"dialogs.DeviceChooseDialog.926510-4": "产品名称",
+		"dialogs.DeviceChooseDialog.926510-5": "注册时间",
+		"dialogs.DeviceChooseDialog.926510-6": "状态",
+		"dialogs.DeviceChooseDialog.926510-7": "在线",
+		"dialogs.DeviceChooseDialog.926510-8": "离线"
+	},
+	"en": {
+		"dialogs.DeviceChooseDialog.926510-0": "Select device",
+		"dialogs.DeviceChooseDialog.926510-1": "Please select a device",
+		"dialogs.DeviceChooseDialog.926510-2": "Device ID",
+		"dialogs.DeviceChooseDialog.926510-3": "Device Name",
+		"dialogs.DeviceChooseDialog.926510-4": "Product Name",
+		"dialogs.DeviceChooseDialog.926510-5": "Registration time",
+		"dialogs.DeviceChooseDialog.926510-6": "state",
+		"dialogs.DeviceChooseDialog.926510-7": "on-line",
+		"dialogs.DeviceChooseDialog.926510-8": "off-line"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926861.json b/src/i18n/temp/home_2024-7-4-926861.json
new file mode 100644
index 00000000..735a27d0
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926861.json
@@ -0,0 +1,8 @@
+{
+	"zh": {
+		"components.BootCard.926510-0": "暂无权限，请联系管理员"
+	},
+	"en": {
+		"components.BootCard.926510-0": "No permission at the moment, please contact the administrator"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926866.json b/src/i18n/temp/home_2024-7-4-926866.json
new file mode 100644
index 00000000..a5798994
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926866.json
@@ -0,0 +1,14 @@
+{
+	"zh": {
+		"components.BasicCountCard.926510-0": "基础统计",
+		"components.BasicCountCard.926510-1": "详情",
+		"components.BasicCountCard.926510-2": "CPU使用率",
+		"components.BasicCountCard.926510-3": "JVM内存"
+	},
+	"en": {
+		"components.BasicCountCard.926510-0": "Basic statistics",
+		"components.BasicCountCard.926510-1": "details",
+		"components.BasicCountCard.926510-2": "CPU usage rate",
+		"components.BasicCountCard.926510-3": "JVM memory"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926873.json b/src/i18n/temp/home_2024-7-4-926873.json
new file mode 100644
index 00000000..6381e024
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926873.json
@@ -0,0 +1,8 @@
+{
+	"zh": {
+		"components.BootCardSmall.926510-0": "暂无权限，请联系管理员"
+	},
+	"en": {
+		"components.BootCardSmall.926510-0": "No permission at the moment, please contact the administrator"
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/home_2024-7-4-926911.json b/src/i18n/temp/home_2024-7-4-926911.json
new file mode 100644
index 00000000..7bbaae03
--- /dev/null
+++ b/src/i18n/temp/home_2024-7-4-926911.json
@@ -0,0 +1,68 @@
+{
+	"zh": {
+		"ComprehensiveHome.index.926510-0": "物联网引导",
+		"ComprehensiveHome.index.926510-1": "运维引导",
+		"ComprehensiveHome.index.926510-2": "设备接入推荐步骤",
+		"ComprehensiveHome.index.926510-3": "不同的设备因为通信协议的不同，存在接入步骤的差异",
+		"ComprehensiveHome.index.926510-4": "运维管理推荐步骤",
+		"ComprehensiveHome.index.926510-5": "请根据业务需要对下述步骤进行选择性操作。",
+		"ComprehensiveHome.index.926510-6": "创建产品",
+		"ComprehensiveHome.index.926510-7": "创建设备",
+		"ComprehensiveHome.index.926510-8": "规则引擎",
+		"ComprehensiveHome.index.926510-9": "产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。",
+		"ComprehensiveHome.index.926510-10": "配置产品接入方式",
+		"ComprehensiveHome.index.926510-11": "通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。",
+		"ComprehensiveHome.index.926510-12": "添加测试设备",
+		"ComprehensiveHome.index.926510-13": "添加单个设备，用于验证产品模型是否配置正确。",
+		"ComprehensiveHome.index.926510-14": "功能调试",
+		"ComprehensiveHome.index.926510-15": "对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。",
+		"ComprehensiveHome.index.926510-16": "批量添加设备",
+		"ComprehensiveHome.index.926510-17": "批量添加同一产品下的设备",
+		"ComprehensiveHome.index.926510-18": "设备接入配置",
+		"ComprehensiveHome.index.926510-19": "日志排查",
+		"ComprehensiveHome.index.926510-20": "实时监控",
+		"ComprehensiveHome.index.926510-21": "协议管理",
+		"ComprehensiveHome.index.926510-22": "根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。",
+		"ComprehensiveHome.index.926510-23": "证书管理",
+		"ComprehensiveHome.index.926510-24": "统一维护平台内的证书，用于数据通信加密。",
+		"ComprehensiveHome.index.926510-25": "网络组件",
+		"ComprehensiveHome.index.926510-26": "根据不同的传输类型配置平台底层网络组件相关参数。",
+		"ComprehensiveHome.index.926510-27": "设备接入网关",
+		"ComprehensiveHome.index.926510-28": "根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。",
+		"ComprehensiveHome.index.926510-29": "日志管理",
+		"ComprehensiveHome.index.926510-30": "监控系统日志，及时处理系统异常。"
+	},
+	"en": {
+		"ComprehensiveHome.index.926510-0": "IoT guidance",
+		"ComprehensiveHome.index.926510-1": "Operations guidance",
+		"ComprehensiveHome.index.926510-2": "Recommended steps for device access",
+		"ComprehensiveHome.index.926510-3": "Different devices may have different access steps due to differences in communication protocols",
+		"ComprehensiveHome.index.926510-4": "Recommended steps for operation and maintenance management",
+		"ComprehensiveHome.index.926510-5": "Please perform selective operations on the following steps according to business needs.",
+		"ComprehensiveHome.index.926510-6": "Create product",
+		"ComprehensiveHome.index.926510-7": "Create device",
+		"ComprehensiveHome.index.926510-8": "Rule engine",
+		"ComprehensiveHome.index.926510-9": "A product is a collection of devices, usually referring to a group of devices with the same functionality. IoT devices must be configured through product access methods.",
+		"ComprehensiveHome.index.926510-10": "Configure product access methods",
+		"ComprehensiveHome.index.926510-11": "Configure unified access methods for devices of the same type through products. Please refer to the instructions on the device nameplate to select the matching access method.",
+		"ComprehensiveHome.index.926510-12": "Add testing equipment",
+		"ComprehensiveHome.index.926510-13": "Add a single device to verify if the product model is configured correctly.",
+		"ComprehensiveHome.index.926510-14": "Functional debugging",
+		"ComprehensiveHome.index.926510-15": "Perform functional debugging on the added testing equipment to verify if it can connect to the platform and if the device's functions are configured correctly.",
+		"ComprehensiveHome.index.926510-16": "Batch Add Devices",
+		"ComprehensiveHome.index.926510-17": "Batch adding devices under the same product",
+		"ComprehensiveHome.index.926510-18": "Device access configuration",
+		"ComprehensiveHome.index.926510-19": "Log troubleshooting",
+		"ComprehensiveHome.index.926510-20": "Real time monitoring",
+		"ComprehensiveHome.index.926510-21": "Protocol management",
+		"ComprehensiveHome.index.926510-22": "Customize and develop corresponding product (device model) access protocols according to business needs, and upload them to the platform.",
+		"ComprehensiveHome.index.926510-23": "Certificate Management",
+		"ComprehensiveHome.index.926510-24": "Unified maintenance of certificates within the platform for data communication encryption.",
+		"ComprehensiveHome.index.926510-25": "Network components",
+		"ComprehensiveHome.index.926510-26": "Configure platform underlying network component related parameters based on different transmission types.",
+		"ComprehensiveHome.index.926510-27": "Device access gateway",
+		"ComprehensiveHome.index.926510-28": "According to different transmission types, associate message protocols, and configure device access gateway related parameters.",
+		"ComprehensiveHome.index.926510-29": "Log management",
+		"ComprehensiveHome.index.926510-30": "Monitor system logs and promptly handle system exceptions."
+	}
+}
\ No newline at end of file
diff --git a/src/i18n/temp/user_2024-7-4-265143.json b/src/i18n/temp/user_2024-7-4-265143.json
new file mode 100644
index 00000000..d9b82986
--- /dev/null
+++ b/src/i18n/temp/user_2024-7-4-265143.json
@@ -0,0 +1,38 @@
+{
+	"zh": {
+		"Login.index.265048-0": "备案：",
+		"Login.index.265048-1": "渝ICP备19017719号-1",
+		"Login.index.265048-2": "账号",
+		"Login.index.265048-3": "请输入账号",
+		"Login.index.265048-4": "密码",
+		"Login.index.265048-5": "请输入密码",
+		"Login.index.265048-6": "验证码",
+		"Login.index.265048-7": "请输入验证码",
+		"Login.index.265048-8": "记住我",
+		"Login.index.265048-9": "登录",
+		"Login.index.265048-10": "其他登录方式",
+		"Login.index.265048-11": "JETLINKS团队全新力作可视化大屏系统",
+		"Login.index.265048-12": "体验DEMO",
+		"Login.index.265048-13": "请输入账号!",
+		"Login.index.265048-14": "请输入密码!",
+		"Login.index.265048-15": "请输入验证码!"
+	},
+	"en": {
+		"Login.index.265048-0": "keep on record:",
+		"Login.index.265048-1": "YuICPBei No. 19017719-1",
+		"Login.index.265048-2": "account number",
+		"Login.index.265048-3": "Please enter your account number",
+		"Login.index.265048-4": "password",
+		"Login.index.265048-5": "Please input a password",
+		"Login.index.265048-6": "Verification Code",
+		"Login.index.265048-7": "Please enter the verification code",
+		"Login.index.265048-8": "Remember me",
+		"Login.index.265048-9": "Sign in",
+		"Login.index.265048-10": "Other login methods",
+		"Login.index.265048-11": "JETLINKS team's new visual large screen system",
+		"Login.index.265048-12": "Experience DEMO",
+		"Login.index.265048-13": "Please enter your account!",
+		"Login.index.265048-14": "Please input a password!",
+		"Login.index.265048-15": "Please enter the verification code!"
+	}
+}
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index 4f371d2c..bb085aed 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,6 +7,10 @@ import './style.less'
 import 'ant-design-vue/dist/antd.variable.min.css'
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
+import i18n from './i18n'
+import 'xgplayer/dist/index.min.css'
+import '@/style/global.less'
+
 dayjs.locale('zh-cn');
 
 const app = createApp(App)
@@ -14,4 +18,5 @@ const app = createApp(App)
 app.use(store)
   .use(router)
   .use(components)
+    .use(i18n)
   .mount('#app')
diff --git a/src/store/alarm.ts b/src/store/alarm.ts
index b0f998e4..1b7ca75d 100644
--- a/src/store/alarm.ts
+++ b/src/store/alarm.ts
@@ -6,7 +6,6 @@ export const useAlarmStore = defineStore('alarm', () => {
     current: {},
     solveVisible: false,
     logVisible: false,
-    defaultLevel: [],
     columns: [
       {
         dataIndex: 'alarmConfigName',
diff --git a/src/store/system.ts b/src/store/system.ts
index 204a4298..9e413c9e 100644
--- a/src/store/system.ts
+++ b/src/store/system.ts
@@ -5,6 +5,9 @@ import {getDetails_api, settingDetail} from '@/api/system/basis';
 import type { ConfigInfoType } from '@/views/system/Basis/typing';
 import { LocalStore } from '@/utils/comm'
 import { SystemConst } from '@/utils/consts'
+import {
+    getTagsColor,  
+} from '@/api/system/calendar'
 
 type SystemStateType = {
     isCommunity: boolean;
@@ -20,6 +23,7 @@ type SystemStateType = {
         collapsed: boolean
         pure: boolean
     }
+    calendarTagColor:Map<string,string>
 }
 
 export const useSystem = defineStore('system', {
@@ -37,7 +41,8 @@ export const useSystem = defineStore('system', {
             openKeys: [],
             collapsed: false,
             pure: false
-        }
+        },
+        calendarTagColor:new Map()
     }),
     actions: {
         getSystemVersion(): Promise<any[]> {
@@ -73,7 +78,7 @@ export const useSystem = defineStore('system', {
             }
         },
         async getSystemConfig() {
-            const params = ['front', 'amap', 'paths'];
+            const params = ['front', 'amap', 'paths','media'];
             const { status, result } = await getDetails_api(params);
             if (status === 200) {
                 params.forEach((key: string) => {
@@ -87,6 +92,14 @@ export const useSystem = defineStore('system', {
                     this.setDocumentTitle()
                 })
             }
+        },
+        async getTagsColor(){
+            const answer:any = await getTagsColor();
+            if (answer.success) {
+                Object.keys(answer.result).forEach((i) => {
+                    this.calendarTagColor.set(i, answer.result[i]);
+                });
+            }
         }
     }
 })
diff --git a/src/style/global.less b/src/style/global.less
new file mode 100644
index 00000000..8440adb9
--- /dev/null
+++ b/src/style/global.less
@@ -0,0 +1,2 @@
+@import "./scrollbar.less";
+@import "./modal.less";
diff --git a/src/style/modal.less b/src/style/modal.less
new file mode 100644
index 00000000..4431f6e9
--- /dev/null
+++ b/src/style/modal.less
@@ -0,0 +1,9 @@
+.ant-modal-content {
+  border-radius: 8px !important;
+
+  .ant-modal-header {
+    border-top-left-radius: 8px !important;
+    border-top-right-radius: 8px !important;
+  }
+}
+
diff --git a/src/style/scrollbar.less b/src/style/scrollbar.less
new file mode 100644
index 00000000..f3706a50
--- /dev/null
+++ b/src/style/scrollbar.less
@@ -0,0 +1,28 @@
+/* 自定义滚动条整体样式 */
+::-webkit-scrollbar {
+  width: 6px; /* 对于垂直滚动条，设置宽度 */
+  height: 10px; /* 对于水平滚动条，设置高度 */
+
+}
+
+/* 自定义滚动条轨道样式 */
+::-webkit-scrollbar-track {
+  background: transparent; /* 背景色 */
+}
+
+/* 自定义滚动条滑块样式 */
+::-webkit-scrollbar-thumb {
+  background: #E7E9EF; /* 滑块颜色 */
+  border-radius: 5px;
+}
+
+/* 当滑块悬停或活动时的样式 */
+::-webkit-scrollbar-thumb:hover {
+  background: #E7E9EF; /* 滑块悬停颜色 */
+}
+
+/* 针对Select下拉菜单的滚动条的样式 */
+//.rc-virtual-list-scrollbar {
+//  scrollbar-color: #d8d8d8 #fafafa; /* 滚动条的颜色 */
+//  width: 5px !important;/* 滚动条的宽度 */
+//}
diff --git a/src/style/variable.less b/src/style/variable.less
index da23b801..0c56fbe9 100644
--- a/src/style/variable.less
+++ b/src/style/variable.less
@@ -1,5 +1,10 @@
 @import "ant-design-vue/es/style/themes/index.less";
 @import 'jetlinks-ui-components/es/style/variable.less';
+@import './scrollbar.less';
+
+html {
+    --ant-primary-color: #1677FF !important;
+}
 
 .ellipsisFn(@num: 1, @width: 100%) {
     display: -webkit-box;
diff --git a/src/utils/comm.ts b/src/utils/comm.ts
index 30b81596..e8082392 100644
--- a/src/utils/comm.ts
+++ b/src/utils/comm.ts
@@ -104,10 +104,11 @@ export const modifySearchColumnValue = (e: any, column: object) => {
  * @param msg 消息内容
  * @param type 消息类型
  */
-export const onlyMessage = (msg: string, type: 'success' | 'error' | 'warning' = 'success') => {
+export const onlyMessage = (msg: string, type: 'success' | 'error' | 'warning' = 'success', extra?: any) => {
   message[type]({
     content: msg,
-    key: type
+    key: type,
+    ...extra
   })
 }
 
@@ -184,4 +185,12 @@ export const getBase64 = (img: File, callback: (base64Url: string) => void) => {
     console.log(result)
     callback(result.target.result)
   }
-}
\ No newline at end of file
+}
+
+export const isFullScreen = () => {
+  return !!(document.fullscreen ||
+      document.mozFullScreen ||
+      document.webkitIsFullScreen ||
+      document.webkitFullScreen ||
+      document.msFullScreen)
+}
diff --git a/src/utils/menu.ts b/src/utils/menu.ts
index 143e1e12..08f6a06b 100644
--- a/src/utils/menu.ts
+++ b/src/utils/menu.ts
@@ -1,7 +1,9 @@
-import { BlankLayoutPage, BasicLayoutPage, SinglePage } from 'components/Layout'
-import { isNoCommunity } from '@/utils/utils'
+import { BlankLayoutPage, BasicLayoutPage, SinglePage } from '@/components/Layout'
 import Iframe from '../views/iframe/index.vue'
-import { shallowRef, defineAsyncComponent, h } from 'vue'
+import { defineAsyncComponent, h } from 'vue'
+import {
+  USER_CENTER_MENU_CODE
+} from '@/utils/consts'
 
 const pagesComponent = import.meta.glob('../views/**/*.vue');
 
@@ -158,6 +160,7 @@ const extraRouteObj = {
 
 type Buttons = Array<{ id: string }>
 
+const hideInMenuCode = [USER_CENTER_MENU_CODE]
 const hasAppID = (item: any): { isApp: boolean, appUrl: string } => {
   const isApp = !!item.appId || item.options?.owner
   const isLowCode = !!item.options?.LowCode
@@ -173,10 +176,11 @@ const handleButtons = (buttons?: Buttons) => {
 
 const handleMeta = (item: MenuItem, isApp: boolean) => {
   const meta = item.meta
+
   return {
     icon: item.icon,
     title: meta?.title || item.name,
-    hideInMenu: meta?.hideInMenu ?? item.isShow === false,
+    hideInMenu: hideInMenuCode.includes(item.code) || (meta?.hideInMenu ?? item.isShow === false),
     buttons: handleButtons(item.buttons),
     isApp
   }
@@ -322,10 +326,6 @@ export const handleMenusMap = (menuData: any[], cb: (data: any) => void) => {
   }
 }
 
-const hideInMenu = (code: string) => {
-  return ['account-center', 'account-center', 'message-subscribe'].includes(code)
-}
-
 export const handleSiderMenu = (menuData: any[]) => {
   if (menuData && menuData.length) {
     return menuData.filter(item => {
@@ -352,8 +352,6 @@ export const handleSiderMenu = (menuData: any[]) => {
         route.children = handleSiderMenu(route.children)
       }
 
-      // route.meta.hideInMenu = hideInMenu(item.code)
-
       return route
     })
   }
diff --git a/src/utils/request.ts b/src/utils/request.ts
index bff63680..403459b5 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,4 +1,5 @@
 import axios from 'axios'
+
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable'
 import { notification as Notification, Modal } from 'jetlinks-ui-components'
 import router from '@/router'
@@ -11,6 +12,7 @@ export interface AxiosResponseRewrite<T = any[]> extends AxiosResponse<T, any> {
   success: boolean
 }
 
+
 export const SUCCESS_CODE = 200 // 成功代码
 
 const filterApiUrl = [
@@ -28,7 +30,7 @@ const filterApiUrl = [
 export const request = axios.create({
   withCredentials: false,
   baseURL: BASE_API_PATH,
-  timeout: 1000 * 15
+  timeout: 1000 * 15,
 })
 
 /**
@@ -49,7 +51,7 @@ export const post = function <T>(url: string, data = {}, params = {}, ext = {})
     params,
     method: 'POST',
     url,
-    data
+    data: data,
   })
 }
 
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index e313716c..835366e1 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -85,6 +85,13 @@ export const randomString = (length?: number) => {
   return pwd;
 };
 
+export const randomNumber = () => {
+  const randomStr = Math.random().toString().substring(2, 10)
+  const time = (new Date().getTime()).toString().substring(8)
+
+  return Number(randomStr) + Number(time)
+}
+
 /**
  * 时间戳转时分秒文本
  * @param time
diff --git a/src/utils/variable.ts b/src/utils/variable.ts
index 692d66f4..3a1c865c 100644
--- a/src/utils/variable.ts
+++ b/src/utils/variable.ts
@@ -1,5 +1,6 @@
 export const BASE_API_PATH = import.meta.env.VITE_APP_BASE_API
 
 export const TOKEN_KEY = 'X-Access-Token'
+export const TOKEN_KEY_URL = ':X_Access_Token'
 
 export const Version_Code = 'version_code'
diff --git a/src/views/DataCollect/Channel/Save/index.vue b/src/views/DataCollect/Channel/Save/index.vue
index b0a11b75..e1dc242f 100644
--- a/src/views/DataCollect/Channel/Save/index.vue
+++ b/src/views/DataCollect/Channel/Save/index.vue
@@ -208,7 +208,7 @@
                     <j-input-number
                         v-model:value="formData.configuration.overIp.port"
                         style="width: 100%"
-                        :min="0"
+                        :min="1"
                         :max="65535"
                         :precision="0"
                         placeholder="请输入广播端口"
diff --git a/src/views/DataCollect/Channel/index.vue b/src/views/DataCollect/Channel/index.vue
index c9bf3703..9122f618 100644
--- a/src/views/DataCollect/Channel/index.vue
+++ b/src/views/DataCollect/Channel/index.vue
@@ -43,7 +43,9 @@
                         >
                             <template #img>
                                 <slot name="img">
-                                    <img :src="ImageMap.get(slotProps.provider)" />
+                                    <img
+                                        :src="ImageMap.get(slotProps.provider)"
+                                    />
                                 </slot>
                             </template>
                             <template #content>
@@ -67,9 +69,19 @@
                                             <div class="card-item-content-text">
                                                 <j-tooltip>
                                                     <template #title>{{
-                                                        protocolList.find(item => item.value === slotProps.provider)?.label
+                                                        protocolList.find(
+                                                            (item) =>
+                                                                item.value ===
+                                                                slotProps.provider,
+                                                        )?.label
                                                     }}</template>
-                                                    {{ protocolList.find(item => item.value === slotProps.provider)?.label }}
+                                                    {{
+                                                        protocolList.find(
+                                                            (item) =>
+                                                                item.value ===
+                                                                slotProps.provider,
+                                                        )?.label
+                                                    }}
                                                 </j-tooltip>
                                             </div>
                                         </j-col>
@@ -104,9 +116,9 @@
                                                 说明
                                             </div>
                                             <j-ellipsis>
-                                              <div class="explain">
-                                                {{slotProps.description}}
-                                              </div>
+                                                <div class="explain">
+                                                    {{ slotProps.description }}
+                                                </div>
                                             </j-ellipsis>
                                         </j-col>
                                     </j-row>
@@ -145,7 +157,12 @@
 <script lang="ts" setup name="DataCollectPage">
 import type { ActionsType } from '@/components/Table/index';
 import { getImage } from '@/utils/comm';
-import { query, remove, update ,getProviders} from '@/api/data-collect/channel';
+import {
+    query,
+    remove,
+    update,
+    getProviders,
+} from '@/api/data-collect/channel';
 import { onlyMessage } from '@/utils/comm';
 import { StatusColorEnum, updateStatus } from './data';
 import { useMenuStore } from 'store/menu';
@@ -161,16 +178,15 @@ const current = ref({});
 
 const opcImage = getImage('/DataCollect/device-opcua.png');
 const modbusImage = getImage('/DataCollect/device-modbus.png');
-const s7Image = getImage('/DataCollect/s7.png')
-const gatewayImage = getImage('/DataCollect/gateway.png')
-const iecImage = getImage('/DataCollect/IEC104.png')
-const ImageMap = new Map()
-ImageMap.set('OPC_UA',opcImage)
-ImageMap.set('MODBUS_TCP',modbusImage)
-ImageMap.set('snap7',s7Image)
-ImageMap.set('iec104',iecImage)
-ImageMap.set('COLLECTOR_GATEWAY',gatewayImage)
-
+const s7Image = getImage('/DataCollect/s7.png');
+const gatewayImage = getImage('/DataCollect/gateway.png');
+const iecImage = getImage('/DataCollect/IEC104.png');
+const ImageMap = new Map();
+ImageMap.set('OPC_UA', opcImage);
+ImageMap.set('MODBUS_TCP', modbusImage);
+ImageMap.set('snap7', s7Image);
+ImageMap.set('iec104', iecImage);
+ImageMap.set('COLLECTOR_GATEWAY', gatewayImage);
 
 const columns = [
     {
@@ -190,20 +206,27 @@ const columns = [
         ellipsis: true,
         search: {
             type: 'select',
-            options: async() =>{
+            options: async () => {
                 const resp: any = await getProviders();
                 if (resp.status === 200) {
-        const arr = resp.result
-            .filter(
-                (item: any) =>  ['GATEWAY', 'Modbus/TCP', 'opc-ua','snap7', 'IEC104','BACNetIp'].includes(item.name),
-            )
-            .map((it: any) => it.name);
-        const providers: any = protocolList.filter((item: any) =>
-            arr.includes(item.alias),
-        );
-        return providers
-    }
-            }
+                    const arr = resp.result
+                        .filter((item: any) =>
+                            [
+                                'GATEWAY',
+                                'Modbus/TCP',
+                                'opc-ua',
+                                'snap7',
+                                'IEC104',
+                                'BACNet/IP',
+                            ].includes(item.name),
+                        )
+                        .map((it: any) => it.name);
+                    const providers: any = protocolList.filter((item: any) =>
+                        arr.includes(item.alias),
+                    );
+                    return providers;
+                }
+            },
         },
     },
     {
@@ -268,7 +291,7 @@ const getActions = (
             },
             icon: 'EditOutlined',
             onClick: () => {
-                handlEdit(data);
+                handleEdit(data);
             },
         },
         {
@@ -280,12 +303,15 @@ const getActions = (
             icon: state === 'enabled' ? 'StopOutlined' : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${stateText}?`,
-                onConfirm: async () => {
-                    const res = await update(data.id, updateStatus[state]);
-                    if (res.success) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value?.reload();
-                    }
+                onConfirm: () => {
+                    const response = update(data.id, updateStatus[state]);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value?.reload();
+                        }
+                    });
+                    return response
                 },
             },
         },
@@ -295,17 +321,20 @@ const getActions = (
             disabled: state === 'enabled',
             tooltip: {
                 title:
-                    state === 'enabled' ? '请先禁用该组件，再删除。' : '删除',
+                    state === 'enabled' ? '请先禁用该通道，再删除。' : '删除',
             },
             popConfirm: {
                 placement: 'topRight',
                 title: '该操作将会删除下属采集器与点位，确定删除?',
-                onConfirm: async () => {
-                    const res = await remove(data.id);
-                    if (res.success) {
+                onConfirm:  () => {
+                    const response =  remove(data.id);
+                    response.then((res)=>{
+                        if (res.success) {
                         onlyMessage('操作成功', 'success');
                         tableRef.value.reload();
                     }
+                    })
+                   return response
                 },
             },
             icon: 'DeleteOutlined',
@@ -319,7 +348,7 @@ const handlAdd = () => {
     visible.value = true;
 };
 
-const handlEdit = (data: object) => {
+const handleEdit = (data: object) => {
     current.value = _.cloneDeep(data);
     visible.value = true;
 };
@@ -372,7 +401,7 @@ const handleSearch = (e: any) => {
         white-space: nowrap; //溢出不换行
     }
     .explain {
-      margin-top: 10px;
+        margin-top: 10px;
     }
 }
 .details-text {
diff --git a/src/views/DataCollect/Collector/Point/Save/DeathArea.vue b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
index 80e2394f..d318c6e3 100644
--- a/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
+++ b/src/views/DataCollect/Collector/Point/Save/DeathArea.vue
@@ -169,7 +169,7 @@ const handlePercent = (e: any) => {
     if (e) {
         _value.value = [
             {
-                column: `this['currentValue'] - this['lastValue'] * ${e}/100`,
+                column: `this['currentValue'] - this['lastValue'] * ${100- e}/100`,
                 value: 0,
                 termType: 'lt',
                 type: 'or',
@@ -202,8 +202,8 @@ const handlePercent = (e: any) => {
 
 const handlePercentProps = (arr: any) => {
     const obj = arr.find((item: any) => item.termType === 'lt')
-    const val = obj.column.split('*')[1].split('/')[0]
-    percentValue.value = val !== 'init' ? val : undefined
+    const val =  obj.column.split('*')[1].split('/')[0]
+    percentValue.value = val !== 'init' ? 100 - val : undefined
 }
 
 const handleChange = () => {
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
index 20beddc7..213ea561 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveModBus.vue
@@ -63,7 +63,8 @@
                 />
             </j-form-item>
             <p style="color: #616161" v-if="formData.configuration.function">
-                PLC地址: {{
+                PLC地址:
+                {{
                     InitAddress[formData.configuration.function] +
                         Number(formData.pointKey) || 0
                 }}
@@ -85,7 +86,11 @@
             </j-form-item>
 
             <j-form-item
-                v-if="['HoldingRegisters', 'InputRegisters'].includes(formData.configuration.function)"
+                v-if="
+                    ['HoldingRegisters', 'InputRegisters'].includes(
+                        formData.configuration.function,
+                    )
+                "
                 label="数据类型"
                 :name="['configuration', 'codec', 'provider']"
                 :rules="[
@@ -271,7 +276,7 @@ import {
 import { ModBusRules, checkProviderData } from '../../data.ts';
 import type { FormInstance } from 'ant-design-vue';
 import type { Rule } from 'ant-design-vue/lib/form';
-import {cloneDeep, omit} from 'lodash-es';
+import { cloneDeep, omit } from 'lodash-es';
 
 const props = defineProps({
     data: {
@@ -329,7 +334,11 @@ const handleOk = async () => {
     delete data?.nspwc;
     const { codec } = data?.configuration;
 
-    if (!['HoldingRegisters', 'InputRegisters'].includes(data?.configuration.function)) {
+    if (
+        !['HoldingRegisters', 'InputRegisters'].includes(
+            data?.configuration.function,
+        )
+    ) {
         codec.provider = 'int8';
     }
     const { interval } = formData.value.configuration;
@@ -343,16 +352,18 @@ const handleOk = async () => {
 
     // address是多余字段，但是react版本上使用到了这个字段
     params.configuration.parameter = {
-      ...params.configuration.parameter,
-      address: data?.pointKey,
+        ...params.configuration.parameter,
+        address: data?.pointKey,
     };
 
     if (props.data.provider === 'COLLECTOR_GATEWAY') {
-      const configuration = cloneDeep(params.configuration)
-      params.configuration = {
-        configuration: configuration,
-        interval: params.interval
-      }
+        const configuration = cloneDeep(params.configuration);
+        // 兼容导入数据格式 24.7.9
+        //   params.configuration = {
+        //     configuration: configuration,
+        //     interval: params.interval
+        //   }
+        params.configuration = configuration;
     }
 
     loading.value = true;
@@ -388,7 +399,11 @@ const changeWriteByteCount = (value: Array<string>) => {
     formData.value.configuration.parameter.writeByteCount = value[0];
 };
 const changeFunction = (value: string) => {
-    formData.value.accessModes = ['InputRegisters', 'DiscreteInputs'].includes(value) ? ['read'] : ['read', 'write'];
+    formData.value.accessModes = ['InputRegisters', 'DiscreteInputs'].includes(
+        value,
+    )
+        ? ['read']
+        : ['read', 'write'];
 };
 
 const checkProvider = (_rule: Rule, value: string): Promise<any> =>
@@ -447,31 +462,42 @@ watch(
 watch(
     () => props.data,
     (value) => {
-        if (value.id && ['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(value.provider)) {
+         // 兼容导入数据格式 24.7.9
+        if (
+            value.id &&
+            ['MODBUS_TCP', 'COLLECTOR_GATEWAY'].includes(value.provider)
+        ) {
             const _value: any = cloneDeep(value);
             const { writeByteCount, byteCount } =
-            props.data.provider === 'COLLECTOR_GATEWAY' ? _value.configuration.configuration.parameter: _value.configuration.parameter;
+                props.data.provider === 'COLLECTOR_GATEWAY' &&
+                _value.configuration?.configuration
+                    ? _value.configuration?.configuration.parameter
+                    : _value.configuration.parameter;
 
-          if (props.data.provider === 'COLLECTOR_GATEWAY') {
-            formData.value = {
-              ...omit(_value, ['configuration']),
-              ..._value.configuration,
+            if (props.data.provider === 'COLLECTOR_GATEWAY') {
+                _value.configuration?.configuration
+                    ? (formData.value = {
+                          ...omit(_value, ['configuration']),
+                          ..._value.configuration,
+                      })
+                    : (formData.value = {
+                          ..._value,
+                      });
+            } else {
+                formData.value = _value;
             }
-          } else {
-            formData.value = _value;
-          }
 
-          if (!!_value.accessModes[0]?.value) {
-            formData.value.accessModes = value.accessModes.map(
-                (i: any) => i.value,
-            );
-          }
-          if (!!_value.features[0]?.value) {
-            formData.value.features = value.features.map(
-                (i: any) => i.value,
-            );
-          }
-          formData.value.nspwc = !!writeByteCount || !!byteCount;
+            if (!!_value.accessModes[0]?.value) {
+                formData.value.accessModes = value.accessModes.map(
+                    (i: any) => i.value,
+                );
+            }
+            if (!!_value.features[0]?.value) {
+                formData.value.features = value.features.map(
+                    (i: any) => i.value,
+                );
+            }
+            formData.value.nspwc = !!writeByteCount || !!byteCount;
         }
     },
     { immediate: true, deep: true },
diff --git a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
index dcc7f498..35f236fd 100644
--- a/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
+++ b/src/views/DataCollect/Collector/Point/Save/SaveS7.vue
@@ -43,7 +43,7 @@
                 trigger: 'blur',
             }">
                 <j-input-number type="number" style="width: 100%" addon-after="字节" v-model:value="form.configuration.bytes"
-                    placeholder="请输入字符串长度" :precision="0" :controls="false" :maxlength="64" :disabled="disabled" />
+                    placeholder="请输入字符串长度" :precision="0" :controls="false" :disabled="disabled" :max="65535" :min="0" />
             </j-form-item>
 
             <j-form-item v-if="form.configuration.type == 'Bool'" label="位偏移量（bit）" :name="['configuration', 'bits']"
diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 63688e69..4b939cd3 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -192,16 +192,17 @@
                 </template>
 
                 <template v-if="dataIndex === 'action'">
-                    <j-tooltip title="删除">
-                        <j-popconfirm
-                            title="确认删除"
-                            @confirm="clickDelete(record.id)"
-                        >
-                            <a style="color: red"
-                                ><AIcon type="DeleteOutlined"
-                            /></a>
-                        </j-popconfirm>
-                    </j-tooltip>
+                    <PermissionButton
+                        :tooltip="{
+                            title: '删除',
+                        }"
+                        :popConfirm="{
+                            title: '确认删除？',
+                            onConfirm: () => clickDelete(record.id),
+                        }"
+                    >
+                        <a style="color: red"><AIcon type="DeleteOutlined" /></a
+                    ></PermissionButton>
                 </template>
             </template>
         </j-table>
@@ -234,7 +235,7 @@ const checkLength = (_rule: Rule, value: string): Promise<any> =>
                 ? reject('最多可输入64个字符')
                 : resolve('');
         } else {
-            resolve('')
+            resolve('');
         }
     });
 
@@ -244,9 +245,8 @@ const filterOption = (input: string, option: any) => {
 
 const clickDelete = (value: string) => {
     emits('change', value);
-    
-    // 删除时需要做同上操作 todo
 
+    // 删除时需要做同上操作 todo
 };
 
 const getTargetData = (index: number, type: string) => {
diff --git a/src/views/DataCollect/Collector/Point/Scan/Tree.vue b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
index f036dfe3..04cb42a0 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Tree.vue
@@ -2,32 +2,42 @@
     <div class="tree-content">
         <div class="tree-header">
             <div>数据源</div>
-            <j-checkbox v-model:checked="isSelected">隐藏已有节点</j-checkbox>
+            <!-- <j-checkbox v-model:checked="isSelected">隐藏已有节点</j-checkbox> -->
         </div>
         <j-spin :spinning="spinning">
-            <j-tree
-                v-if="!!treeData"
-                :load-data="onLoadData"
-                :tree-data="treeData"
-                v-model:checkedKeys="checkedKeys"
-                :selectedKeys="selectedKeys"
-                :selectable="false"
-                checkable
-                @check="onCheck"
-                :height="600"
-            >
-                <template #title="{ name, key }">
+            <a-breadcrumb>
+                <a-breadcrumb-item
+                    v-for="(i, index) in breadcrumb"
+                    @click="() => jumpFile(index, i.nodeId)"
+                    ><a href="javascript:void(0);">{{
+                        i.breadcrumbName
+                    }}</a></a-breadcrumb-item
+                >
+            </a-breadcrumb>
+            <a-button @click="allControl" block style="margin-bottom: 10px">{{
+                controlAllType ? '全部撤销' : '全部添加'
+            }}</a-button>
+            <div v-if="!!treeData" class="treeContainer">
+                <div
+                    v-for="i in treeData"
+                    class="treeItem"
+                    @click="() => clickItem(i)"
+                >
+                    <AIcon
+                        :type="i?.folder ? 'icon-wenjianjia' : 'icon-dianwei'"
+                        style="margin-right: 10px"
+                    ></AIcon>
                     <span
                         :class="[
-                            selectKeys.includes(key)
+                            selectKeys.includes(i.key)
                                 ? 'tree-selected'
                                 : 'tree-title',
                         ]"
                     >
-                        {{ name }}
+                        {{ i.name }}
                     </span>
-                </template>
-            </j-tree>
+                </div>
+            </div>
             <j-empty v-else style="margin-top: 22%" />
         </j-spin>
     </div>
@@ -47,12 +57,11 @@ const props = defineProps({
         default: () => [],
     },
     unSelectKeys: {
-        type: String,
+        type: String || Array,
         default: '',
     },
 });
-const emits = defineEmits(['change']);
-
+const emits = defineEmits(['change', 'cancelAll', 'addAll']);
 const channelId = props.data?.channelId;
 const checkedKeys = ref<string[]>([]);
 const selectKeys = ref<string[]>([]);
@@ -60,58 +69,22 @@ const spinning = ref(false);
 
 const isSelected = ref(false);
 const treeData = ref<TreeProps['treeData']>();
-const treeAllData = ref<TreeProps['treeData']>();
-
-const onLoadData = (node: any) =>
-    new Promise<void>(async (resolve) => {
-        if ((node?.children && node.children?.length) || !node?.folder) {
-            resolve();
-            return;
-        }
-        const resp: any = await scanOpcUAList({
-            id: channelId,
-            nodeId: node.key,
+const breadcrumb = ref([
+    {
+        breadcrumbName: '全部',
+        nodeId: undefined,
+    },
+]);
+const controlAllType = computed(() => {
+    return treeData.value?.some((i: any) => {
+        return checkedKeys.value.some((item: any) => {
+            return item === i.id;
         });
-        if (resp.status === 200) {
-            const list: any = resp.result.map((item: any) => {
-                return {
-                    ...item,
-                    key: item.id,
-                    title: item.name,
-                    disabled: item?.folder,
-                    isLeaf: !item?.folder,
-                };
-            });
-
-            treeAllData.value = updateTreeData(
-                cloneDeep(treeAllData.value),
-                node.key,
-                [...list],
-            );
-        }
-        resolve();
     });
+});
 
-const handleData = (arr: any): any[] => {
-    const data = arr.filter((item: any) => {
-        return (
-            (isSelected && !selectKeys.value.includes(item.id)) || !isSelected
-        );
-    });
-    return data.map((item: any) => {
-        if (item.children && item.children?.length) {
-            return {
-                ...item,
-                children: handleData(item.children),
-            };
-        } else {
-            return item;
-        }
-    });
-};
-
-const onCheck = (checkedKeys: any, info: any) => {
-    const one: any = { ...info.node };
+const onCheck = (info: any) => {
+    const one: any = { ...info };
     const list: any = [];
     const last: any = list.length ? list[list.length - 1] : undefined;
     if (list.map((i: any) => i?.id).includes(one.id)) {
@@ -142,7 +115,23 @@ const onCheck = (checkedKeys: any, info: any) => {
             nodeId: one?.id,
         },
     };
-    emits('change', item, info.checked);
+    const controlType = checkedKeys.value?.includes(one.id);
+    if (!controlType) {
+        checkedKeys.value.push(one.id);
+        emits('change', item, true);
+    }
+};
+
+const clickItem = async (node: any) => {
+    if (node?.folder) {
+        getScanOpcUAList(node.key);
+        breadcrumb.value.push({
+            breadcrumbName: node.name,
+            nodeId: node.key,
+        });
+    } else {
+        onCheck(node);
+    }
 };
 
 const updateTreeData = (list: any, key: string, children: any[]): any[] => {
@@ -182,51 +171,90 @@ const getPoint = async () => {
     if (res.status === 200) {
         selectKeys.value = res.result.map((item: any) => item.pointKey);
     }
-    getScanOpcUAList();
+    getScanOpcUAList(undefined);
     spinning.value = false;
 };
 
-onMounted(() => {
-    getPoint();
-});
+const allControl = () => {
+    const currentPoints: any = [];
+    treeData.value?.forEach((i) => {
+        if (!i.folder) {
+            const one: any = { ...i };
+            const item = {
+                features: {
+                    value: (one?.features || []).includes('changedOnly'),
+                    check: true,
+                },
+                id: one?.id || '',
+                name: one?.name || '',
+                accessModes: {
+                    value: one?.accessModes || [],
+                    check: true,
+                },
+                type: one?.type,
+                configuration: {
+                    ...one?.configuration,
+                    interval: {
+                        value: one?.configuration?.interval || 3000,
+                        check: true,
+                    },
+                    nodeId: one?.id,
+                },
+            };
+            currentPoints.push(item);
+        }
+    });
+    if (controlAllType.value) {
+        emits('cancelAll', currentPoints);
+    } else {
+        currentPoints.forEach((i: any) => {
+            checkedKeys.value.push(i.id);
+        });
+        emits('addAll', currentPoints);
+    }
+};
 
-const getScanOpcUAList = async () => {
+const getScanOpcUAList = async (nodeId: string | undefined) => {
+    const params = nodeId
+        ? {
+              id: channelId,
+              nodeId: nodeId,
+          }
+        : {
+              id: channelId,
+          };
     spinning.value = true;
-    const res: any = await scanOpcUAList({ id: channelId });
-    treeAllData.value = res.result.map((item: any) => ({
+    const res: any = await scanOpcUAList(params);
+    treeData.value = res.result.map((item: any) => ({
         ...item,
         key: item.id,
         title: item.name,
-        disabled: item?.folder || false,
     }));
     spinning.value = false;
 };
-// getScanOpcUAList();
-
-watch(
-    () => isSelected.value,
-    (value) => {
-        treeData.value = value
-            ? handleData(treeAllData.value)
-            : treeAllData.value;
-    },
-    { deep: true },
-);
-watch(
-    () => treeAllData.value,
-    (value) => {
-        treeData.value = isSelected.value ? handleData(value) : value;
-    },
-    { deep: true },
-);
 
+const jumpFile = (breadcrumbNumber: number, nodeId: string) => {
+    breadcrumb.value.splice(breadcrumbNumber + 1, breadcrumb.value.length - 1);
+    getScanOpcUAList(nodeId);
+};
 watch(
     () => props.unSelectKeys,
     (value) => {
-        checkedKeys.value = checkedKeys.value.filter((i) => i !== value);
+        if (typeof value === 'string') {
+            checkedKeys.value = checkedKeys.value.filter((i) => i !== value);
+        } else {
+            checkedKeys.value = checkedKeys.value.filter((i) => {
+                return !value?.some((item) => {
+                    return item === i;
+                });
+            });
+        }
     },
     { deep: true },
 );
+onMounted(() => {
+    getPoint();
+});
 </script>
 
 <style lang="less" scoped>
@@ -248,4 +276,11 @@ watch(
         color: black;
     }
 }
+.treeContainer {
+    max-height: 600px;
+    overflow-y: auto;
+    .treeItem {
+        cursor: pointer;
+    }
+}
 </style>
diff --git a/src/views/DataCollect/Collector/Point/Scan/index.vue b/src/views/DataCollect/Collector/Point/Scan/index.vue
index dd757afe..04c57c10 100644
--- a/src/views/DataCollect/Collector/Point/Scan/index.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/index.vue
@@ -5,6 +5,8 @@
                 :data="treeData"
                 class="tree"
                 @change="changeTree"
+                @cancelAll="cancelAll"
+                @addAll="addAll"
                 :unSelectKeys="unSelectKeys"
             ></Tree>
             <Table
@@ -89,6 +91,23 @@ const changeTable = (value: string) => {
     tableDataMap.delete(value);
     tableData.value = [...tableDataMap.values()];
 };
+const cancelAll = (points:Array<any>)=>{
+    unSelectKeys.value = []
+    points.forEach((i:any)=>{
+        if(tableDataMap.has(i.id)){
+            tableDataMap.delete(i.id);
+            unSelectKeys.value.push(i.id)
+        }
+    })
+    tableData.value = [...tableDataMap.values()];
+}
+
+const addAll = (points: Array<any>)=>{
+    points.forEach((i:any)=>{
+        tableDataMap.set(i.id,i)
+    })
+    tableData.value = [...tableDataMap.values()]
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/DataCollect/Collector/Point/ScanBacnet/Table.vue b/src/views/DataCollect/Collector/Point/ScanBacnet/Table.vue
index d9257491..5f351dbe 100644
--- a/src/views/DataCollect/Collector/Point/ScanBacnet/Table.vue
+++ b/src/views/DataCollect/Collector/Point/ScanBacnet/Table.vue
@@ -1,13 +1,16 @@
 <template>
     <j-form class="table" ref="formTableRef" :model="modelRef">
-        <j-table
+        <EditTable
             v-if="modelRef.dataSource.length !== 0"
             :dataSource="modelRef.dataSource"
             :columns="BacnetFormTableColumns"
-            :scroll="{ y: 580 }"
+            :height="580"
+            :cellHeight="80"
+            :disableMenu="false"
             :pagination="false"
+            :serial="false"
         >
-            <template #headerCell="{ column }">
+            <!-- <template #headerCell="{ column }">
                 <template
                     v-if="column.key === 'nodeId' || column.key === 'action'"
                 >
@@ -17,9 +20,9 @@
                     <span> {{ column.title }} </span>
                     <span style="margin-left: 5px; color: red">*</span>
                 </template>
-            </template>
-            <template #bodyCell="{ column: { dataIndex }, record, index }">
-                <template v-if="dataIndex === 'name'">
+            </template> -->
+            <!-- <template #bodyCell="{ column: { dataIndex }, record, index }"> -->
+                <template #name="{record,index}">
                     <j-form-item
                         :name="['dataSource', index, 'name']"
                         :rules="[
@@ -34,24 +37,24 @@
                         ]"
                     >
                         <j-input
-                            v-model:value="record[dataIndex]"
+                            v-model:value="record.name"
                             placeholder="请输入"
                             style="width: 80%"
                             allowClear
                         ></j-input>
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'type'">
+                <template #type="{record}">
                     <j-form-item>
                         {{ record.objectId?.type }}
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'instanceNumber'">
+                <template #instanceNumber="{record}">
                     <j-form-item>
                         {{ record.objectId?.instanceNumber }}
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'propertyId'">
+                <template #propertyId="{record,index}">
                     <j-form-item
                         :name="['dataSource', index, 'propertyId']"
                         :rules="{
@@ -60,7 +63,7 @@
                         }"
                     >
                         <PropertyId
-                            v-model:value="record[dataIndex]"
+                            v-model:value="record.propertyId"
                             :valueTypeList="valueTypeList"
                             :collectorId="collectorData.collectorId"
                             :objectId="record.objectId"
@@ -69,7 +72,7 @@
                         ></PropertyId>
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'valueType'">
+                <template #valueType="{record,index}">
                     <j-form-item
                         :name="['dataSource', index, 'valueType']"
                         :rules="{
@@ -78,7 +81,7 @@
                         }"
                     >
                         <j-select
-                            v-model:value="record[dataIndex]"
+                            v-model:value="record.valueType"
                             style="width: 80%"
                             placeholder="请选择"
                         >
@@ -91,7 +94,7 @@
                         </j-select>
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'accessModes'">
+                <template #accessModes="{record,index}">
                     <j-form-item
                         class="form-item"
                         :name="['dataSource', index, 'accessModes', 'value']"
@@ -103,8 +106,8 @@
                         ]"
                     >
                         <j-select
-                            style="width: 75%"
-                            v-model:value="record[dataIndex].value"
+                            style="width: 72%"
+                            v-model:value="record.accessModes.value"
                             placeholder="请选择"
                             allowClear
                             mode="multiple"
@@ -114,20 +117,20 @@
                                 { label: '写', value: 'write' },
                                 { label: '订阅', value: 'subscribe' },
                             ]"
-                            :disabled="index !== 0 && record[dataIndex].check"
-                            @change="changeValue(index, dataIndex)"
+                            :disabled="index !== 0 && record.accessModes.check"
+                            @change="changeValue(index, 'accessModes')"
                         >
                         </j-select>
                         <j-checkbox
                             style="margin-left: 5px"
                             v-if="index !== 0"
-                            v-model:checked="record[dataIndex].check"
-                            @click="changeCheckbox(index, dataIndex)"
+                            v-model:checked="record.accessModes.check"
+                            @click="changeCheckbox(index, 'accessModes')"
                             >同上</j-checkbox
                         >
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'interval'">
+                <template #interval="{record,index}">
                     <j-form-item
                         class="form-item"
                         :name="[
@@ -151,7 +154,7 @@
                         <j-input-number
                             style="width: 60%"
                             v-model:value="
-                                record.configuration[dataIndex].value
+                                record.configuration.interval.value
                             "
                             placeholder="请输入"
                             allowClear
@@ -160,22 +163,22 @@
                             :min="0"
                             :disabled="
                                 index !== 0 &&
-                                record.configuration[dataIndex].check
+                                record.configuration.interval.check
                             "
-                            @blur="changeValue(index, dataIndex)"
+                            @blur="changeValue(index, 'interval')"
                         ></j-input-number>
                         <j-checkbox
                             style="margin-left: 5px; margin-top: 5px"
                             v-show="index !== 0"
                             v-model:checked="
-                                record.configuration[dataIndex].check
+                                record.configuration.interval.check
                             "
-                            @click="changeCheckbox(index, dataIndex)"
+                            @click="changeCheckbox(index, 'interval')"
                             >同上</j-checkbox
                         >
                     </j-form-item>
                 </template>
-                <template v-if="dataIndex === 'features'">
+                <template #features="{record,index}">
                     <j-form-item
                         class="form-item"
                         :name="['dataSource', index, 'features', 'value']"
@@ -187,8 +190,8 @@
                         ]"
                     >
                         <j-select
-                            style="width: 40%"
-                            v-model:value="record[dataIndex].value"
+                            style="width: 45%"
+                            v-model:value="record.features.value"
                             placeholder="请选择"
                             allowClear
                             :filter-option="filterOption"
@@ -202,44 +205,48 @@
                                     value: false,
                                 },
                             ]"
-                            :disabled="index !== 0 && record[dataIndex].check"
-                            @change="changeValue(index, dataIndex)"
+                            :disabled="index !== 0 && record.features.check"
+                            @change="changeValue(index, 'features')"
                         >
                         </j-select>
-
                         <j-checkbox
                             style="margin-left: 5px"
                             v-show="index !== 0"
-                            v-model:checked="record[dataIndex].check"
-                            @click="changeCheckbox(index, dataIndex)"
+                            v-model:checked="record.features.check"
+                            @click="changeCheckbox(index, 'features')"
                             >同上</j-checkbox
                         >
                     </j-form-item>
                 </template>
 
-                <template v-if="dataIndex === 'action'">
-                    <j-tooltip title="删除">
-                        <j-popconfirm
-                            title="确认删除"
-                            @confirm="clickDelete(record.nodeId, index)"
-                        >
-                            <a style="color: red"
-                                ><AIcon type="DeleteOutlined"
-                            /></a>
-                        </j-popconfirm>
-                    </j-tooltip>
+                <template #action="{record,index}">
+                    <PermissionButton
+                        type="text"
+                        :tooltip="{
+                            title: '删除',
+                        }"
+                        :popConfirm="{
+                            title: '确认删除？',
+                            onConfirm: () => clickDelete(record.nodeId, index),
+                        }"
+                        ><a style="color: red"
+                            ><AIcon type="DeleteOutlined" /></a
+                    ></PermissionButton>
                 </template>
-            </template>
-        </j-table>
+            <!-- </template> -->
+        </EditTable>
         <j-empty v-else style="margin-top: 10%" />
     </j-form>
 </template>
 
 <script lang="ts" setup>
-import { getBacnetValueType } from '@/api/data-collect/collector';
+import { getBacnetValueType  } from '@/api/data-collect/collector';
 import { BacnetFormTableColumns, regOnlyNumber } from '../../data';
 import { Rule } from 'ant-design-vue/lib/form';
 import PropertyId from './PropertyId.vue';
+import {
+  EditTable
+} from '@/components/Metadata/Table'
 
 const props = defineProps({
     data: {
@@ -347,22 +354,28 @@ defineExpose({
     validate,
 });
 watch(
-    () => props.data,
-    (value, preValue) => {
+    () => props.data.length,
+    (vlength:number, plength:number) => {
+        const value = props.data
         modelRef.dataSource = value;
+        console.log(vlength,plength)
         // 有新增时同上数据
-        const vlength = value.length,
-            plength = preValue.length;
+        // const vlength = value.length,
+        //     plength = preValue.length;
         if (plength !== 0 && plength < vlength) {
             defaultType.forEach((type) => {
                 vlength === 2
                     ? changeValue(0, type)
                     : changeCheckbox(vlength - 1, type);
             });
+        }else if(plength === 0 && vlength > 1){
+            defaultType.forEach((type)=>{
+                changeValue(0,type)
+            })
         }
     },
-    { deep: true },
 );
+
 </script>
 
 <style lang="less" scoped>
@@ -391,4 +404,10 @@ watch(
 .form-item {
     display: flex;
 }
+:deep(.ant-form-item){
+    margin: 0;
+}
+:deep(.body-cell-box){
+    padding: 0
+}
 </style>
diff --git a/src/views/DataCollect/Collector/Point/ScanBacnet/Tree.vue b/src/views/DataCollect/Collector/Point/ScanBacnet/Tree.vue
index d6063eda..11d94d14 100644
--- a/src/views/DataCollect/Collector/Point/ScanBacnet/Tree.vue
+++ b/src/views/DataCollect/Collector/Point/ScanBacnet/Tree.vue
@@ -5,6 +5,9 @@
             <!-- <j-checkbox v-model:checked="isSelected">隐藏已有节点</j-checkbox> -->
         </div>
         {{ unSelectKeys }}
+        <a-button block @click="allControl"
+            >{{ props.tableData.length ? '全部撤销' : '全部添加' }}
+        </a-button>
         <j-spin :spinning="spinning">
             <j-tree
                 v-if="!!treeData"
@@ -28,7 +31,7 @@
                             </span>
                         </j-ellipsis>
                         <j-button type="link" @click="onCheck(data)">
-                            <AIcon type="ArrowRightOutlined"/>
+                            <AIcon type="ArrowRightOutlined" />
                         </j-button>
                     </j-space>
                 </template>
@@ -56,8 +59,12 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    tableData: {
+        type: Array,
+        default: [],
+    },
 });
-const emits = defineEmits(['change']);
+const emits = defineEmits(['change', 'addAll', 'cancelAll']);
 
 const channelId = props.data?.channelId;
 const instanceNumber = props.data?.configuration?.instanceNumber;
@@ -70,8 +77,11 @@ const treeData = ref<TreeProps['treeData']>();
 const treeAllData = ref<TreeProps['treeData']>();
 
 const onLoadData = async () => {
-    spinning.value = true
-    const resp: any = await getBacnetObjectList(channelId, instanceNumber).finally(() => spinning.value = false);
+    spinning.value = true;
+    const resp: any = await getBacnetObjectList(
+        channelId,
+        instanceNumber,
+    ).finally(() => (spinning.value = false));
     if (resp.status === 200) {
         treeData.value = resp.result.map((item: any) => {
             return {
@@ -101,7 +111,7 @@ const handleData = (arr: any): any[] => {
     });
 };
 
-const onCheck = ( info: any) => {
+const onCheck = (info: any) => {
     const one: any = { ...info };
     const list: any = [];
     const last: any = list.length ? list[list.length - 1] : undefined;
@@ -175,27 +185,42 @@ const getPoint = async () => {
     if (res.status === 200) {
         selectKeys.value = res.result.map((item: any) => item.pointKey);
     }
-    // getScanOpcUAList();
 };
 
-onMounted(() => {
-    getPoint();
-    onLoadData();
-});
-
-const getScanOpcUAList = async () => {
-    spinning.value = true;
-    const res: any = await getBacnetObjectList(channelId, instanceNumber);
-    treeAllData.value = res.result.map((item: any) => ({
-        ...item,
-        key: item.id,
-        title: item.name,
-        disabled: item?.folder || false,
-    }));
-    spinning.value = false;
+const allControl = () => {
+    if (props.tableData.length) {
+        emits('cancelAll');
+    } else {
+        const allData = treeData.value?.map((i) => {
+            return {
+                features: {
+                    value: (i?.features || []).includes('changedOnly'),
+                    check: true,
+                },
+                nodeId:
+                    `${i?.objectId.type}:${i?.objectId.instanceNumber}` || '',
+                objectId: i?.objectId || {},
+                name: i?.name || '',
+                propertyId: i?.propertyId || '',
+                valueType: i?.valueType || '',
+                accessModes: {
+                    value: i?.accessModes || [],
+                    check: true,
+                },
+                type: i?.type,
+                configuration: {
+                    ...i?.configuration,
+                    interval: {
+                        value: i?.configuration?.interval || 3000,
+                        check: true,
+                    },
+                    nodeId: i?.id,
+                },
+            };
+        });
+        emits('addAll', allData);
+    }
 };
-// getScanOpcUAList();
-
 watch(
     () => isSelected.value,
     (value) => {
@@ -220,6 +245,11 @@ watch(
     },
     { deep: true },
 );
+
+onMounted(() => {
+    getPoint();
+    onLoadData();
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/DataCollect/Collector/Point/ScanBacnet/index.vue b/src/views/DataCollect/Collector/Point/ScanBacnet/index.vue
index 43269069..9ef4cd59 100644
--- a/src/views/DataCollect/Collector/Point/ScanBacnet/index.vue
+++ b/src/views/DataCollect/Collector/Point/ScanBacnet/index.vue
@@ -3,8 +3,11 @@
         <div class="content">
             <Tree
                 :data="treeData"
+                :tableData="tableData"
                 class="tree"
                 @change="changeTree"
+                @addAll="addAll"
+                @cancel-all="cancelAll"
                 :unSelectKeys="unSelectKeys"
             ></Tree>
             <Table
@@ -86,6 +89,15 @@ const handleCancel = () => {
 const changeTree = (row: any) => {
     tableData.value.push(row)
 };
+
+const addAll = (data:any)=>{
+    tableData.value = data
+}
+
+const cancelAll = () =>{
+    console.log('cancelALl')
+    tableData.value = []
+}
 const changeTable = (value: string, index: number) => {
     tableData.value.splice(index, 1)
 };
diff --git a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
index 4bbc9228..865e0e5b 100644
--- a/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/BatchUpdate/index.vue
@@ -24,7 +24,12 @@
                     allowClear
                     placeholder="请选择值类型"
                 >
-                    <j-select-option v-for="item in bacnetValueType" :key="item" :value="item">{{ item }}</j-select-option>
+                    <j-select-option
+                        v-for="item in bacnetValueType"
+                        :key="item"
+                        :value="item"
+                        >{{ item }}</j-select-option
+                    >
                 </j-select>
             </j-form-item>
             <j-form-item label="访问类型" name="accessModes">
@@ -69,8 +74,10 @@
                     :precision="0"
                 />
             </j-form-item>
-
-            <j-form-item :name="['features']">
+            <j-form-item label="推送控制">
+                <a-switch v-model:checked="formData.pushControl"></a-switch>
+            </j-form-item>
+            <j-form-item :name="['features']" v-if="formData.pushControl"> 
                 <j-checkbox-group v-model:value="formData.features">
                     <j-checkbox value="changedOnly" name="type"
                         >只推送变化的数据</j-checkbox
@@ -95,8 +102,11 @@
 </template>
 <script lang="ts" setup>
 import type { FormInstance } from 'ant-design-vue';
-import { savePointBatch, getBacnetValueType } from '@/api/data-collect/collector';
-import { cloneDeep, isObject } from 'lodash-es';
+import {
+    savePointBatch,
+    getBacnetValueType,
+} from '@/api/data-collect/collector';
+import { cloneDeep, isObject , omit } from 'lodash-es';
 import { regOnlyNumber } from '../../../data';
 
 const props = defineProps({
@@ -107,7 +117,7 @@ const props = defineProps({
     provider: {
         type: String,
         default: '',
-    }
+    },
 });
 
 const emit = defineEmits(['change']);
@@ -118,28 +128,28 @@ const formData = ref({
     accessModes: [],
     interval: undefined,
     features: [],
-    valueType: undefined
+    valueType: undefined,
+    pushControl: false,
 });
 
-const bacnetValueType = ref<string[]>([])
+const bacnetValueType = ref<string[]>([]);
 
 const getIdAndType = async () => {
-  const resp: any = await getBacnetValueType()
-  if(resp.success) {
-    bacnetValueType.value = resp.result
-  }
-}
-
-
+    const resp: any = await getBacnetValueType();
+    if (resp.success) {
+        bacnetValueType.value = resp.result;
+    }
+};
 
 const handleOk = async () => {
     const data = cloneDeep(formData.value);
-    const { accessModes, features, interval, valueType } = data;
+    const { accessModes, features, interval, valueType , pushControl } = data;
     const ischange =
         accessModes.length !== 0 ||
-        features.length !== 0 ||
+        pushControl ||
         Number(interval) === 0 ||
-        !!interval || !!valueType;
+        !!interval ||
+        !!valueType;
     if (ischange) {
         const params = cloneDeep(props.data);
         params.forEach((i: any) => {
@@ -152,11 +162,12 @@ const handleOk = async () => {
                     );
                 }
             }
-            if(features.length !== 0) {
-                i.features = data.features
+            if (features.length !== 0) {
+                i.features = data.features;
             } else {
-                i.features = i.features.map((it: any) =>it.value)
+                i.features = [];
             }
+            
             if (!!interval || Number(interval) === 0) {
                 i.interval = data.interval;
                 i.configuration = {
@@ -164,11 +175,11 @@ const handleOk = async () => {
                     interval: data.interval,
                 };
             }
-            if(data.valueType) {
+            if (data.valueType) {
                 i.configuration = {
                     ...i.configuration,
-                    valueType: data.valueType
-                }
+                    valueType: data.valueType,
+                };
             }
         });
         loading.value = true;
@@ -184,30 +195,34 @@ const handleCancel = () => {
     emit('change', false);
 };
 
-watch(() => props.provider, () => {
-    if(props.provider === 'BACNetIp') {
-        getIdAndType()
-    }
-}, { immediate: true });
+watch(
+    () => props.provider,
+    () => {
+        if (props.provider === 'BACNetIp') {
+            getIdAndType();
+        }
+    },
+    { immediate: true },
+);
 
 const labelName = computed(() => {
-  const arr = [];
-  if (formData.value.accessModes.length) {
-    arr.push('访问类型');
-  }
-  if (!!formData.value.interval) {
-    arr.push('采集频率');
-  }
-  if (formData.value.features.length) {
-    arr.push('只推送变化的数据');
-  }
-  if (formData.value.type) {
-    arr.push('数据类型');
-  }
-  if (formData.value.valueType) {
-    arr.push('值类型');
-  }
-  return arr;
+    const arr = [];
+    if (formData.value.accessModes.length) {
+        arr.push('访问类型');
+    }
+    if (!!formData.value.interval) {
+        arr.push('采集频率');
+    }
+    if (formData.value.features.length) {
+        arr.push('只推送变化的数据');
+    }
+    if (formData.value.type) {
+        arr.push('数据类型');
+    }
+    if (formData.value.valueType) {
+        arr.push('值类型');
+    }
+    return arr;
 });
 </script>
 
diff --git a/src/views/DataCollect/Collector/Point/components/Import/index.vue b/src/views/DataCollect/Collector/Point/components/Import/index.vue
index df3387ff..3f472c52 100644
--- a/src/views/DataCollect/Collector/Point/components/Import/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/Import/index.vue
@@ -66,7 +66,10 @@ const successNumber = ref(0); //导入成功数量
 const failNumber = ref(0); //导入失败数量
 const errorMessage = ref();
 const detailFile = ref('')
+const params = props?.data?.provider === 'COLLECTOR_GATEWAY' ? props?.data?.configuration?.collectorProvider : props?.data?.provider
 const uploadChange = async (info: Record<string, any>) => {
+    successNumber.value = 0;
+    failNumber.value = 0;
     if (info.file.status === 'done') {
         const resp: any = info.file.response || { result: '' };
         handleImport(resp)
@@ -84,11 +87,11 @@ const beforeUpload = (_file: any) => {
     return isCsv || isXlsx;
 };
 const downTemplate = async (type: string) => {
-    const res: any = await exportTemplate(<string>props.data?.provider, type);
+    const res: any = await exportTemplate(<string>params, type);
     if (res) {
         const blob = new Blob([res], { type: type });
         const url = URL.createObjectURL(blob);
-        downloadFileByUrl(url, `${props.data?.provider}导入模版`, type);
+        downloadFileByUrl(url, `${params}导入模版`, type);
     }
 };
 const handleImport = async (file: any) => {
@@ -97,7 +100,7 @@ const handleImport = async (file: any) => {
     let event: EventSource
     event = new EventSource(
         `${BASE_API_PATH}/data-collect/point/${props.data?.collectorId
-        }/${props.data?.provider}/import?:X_Access_Token=${getToken()
+        }/${params}/import?:X_Access_Token=${getToken()
         }&fileUrl=${file.result}`,
         { withCredentials: true },
     );
diff --git a/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue b/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
index ad08e0c9..7e87842b 100644
--- a/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
+++ b/src/views/DataCollect/Collector/Point/components/WritePoint/index.vue
@@ -1,4 +1,4 @@
-<template lang="">
+<template>
     <j-modal title="写入" :visible="true" width="500px" @cancel="handleCancel">
         <j-form
             class="form"
@@ -38,48 +38,75 @@
                         required: true,
                         message: `请输入${data.name}`,
                     },
+                    {
+                        validator: validatorOpc_UA,
+                        trigger: 'change',
+                    },
                 ]"
                 v-else-if="data.provider === 'OPC_UA'"
             >
-                <j-input-number
-                    v-if="['double', 'float', 'llong', 'long', 'integer', 'short'].includes(valueType)"
-                    style="width: 100%"
-                    placeholder="请输入"
-                    v-model:value="formData.value"
-                />
-                <j-select
-                    v-else-if="['boolean'].includes(valueType)"
-                    style="width: 100%"
-                    v-model:value="formData.value"
-                    :options="[
-                        {
-                            label: '是',
-                            value: true,
-                        },
-                        {
-                            label: '否',
-                            value: false,
-                        },
-                    ]"
-                    placeholder="请选择"
-                    allowClear
-                    show-search
-                    :filter-option="filterOption"
-                />
-                <j-date-picker
-                    v-else-if="['datetime'].includes(valueType)"
-                    style="width: 100%"
-                    format="YYYY-MM-DD HH:mm:ss"
-                    show-time
-                    placeholder="请选择"
-                    @change="onChange"
-                />
+                <template v-for="(i, index) in formData.value">
+                    <div style="margin-top: 10px">
+                        <j-input-number
+                            v-if="
+                                [
+                                    'double',
+                                    'float',
+                                    'llong',
+                                    'long',
+                                    'integer',
+                                    'short',
+                                ].includes(valueType)
+                            "
+                            style="width: 100%"
+                            placeholder="请输入"
+                            v-model:value="formData.value[index]"
+                        />
+                        <j-select
+                            v-else-if="['boolean'].includes(valueType)"
+                            style="width: 100%"
+                            v-model:value="formData.value[index]"
+                            :options="[
+                                {
+                                    label: '是',
+                                    value: true,
+                                },
+                                {
+                                    label: '否',
+                                    value: false,
+                                },
+                            ]"
+                            placeholder="请选择"
+                            allowClear
+                            show-search
+                            :filter-option="filterOption"
+                        />
+                        <j-date-picker
+                            v-else-if="['datetime'].includes(valueType)"
+                            style="width: 100%"
+                            format="YYYY-MM-DD HH:mm:ss"
+                            show-time
+                            placeholder="请选择"
+                            @change="(value: Dayjs, dateString: string)=>onChange(value,dateString,index)"
+                        />
 
-                <j-input
-                    v-else
-                    placeholder="请输入"
-                    v-model:value="formData.value"
-                />
+                        <j-input
+                            v-else
+                            placeholder="请输入"
+                            v-model:value="formData.value[index]"
+                        />
+                    </div>
+                </template>
+                <div style="margin-top: 10px">
+                    <a-button @click="formData.value.push('')">+</a-button>
+                    <a-button
+                        v-if="formData.value.length !== 1"
+                        @click="
+                            formData.value.splice(formData.value.length - 1, 1)
+                        "
+                        >-</a-button
+                    >
+                </div>
             </j-form-item>
             <j-form-item
                 :label="data.name"
@@ -126,12 +153,25 @@
             <j-form-item
                 :label="data.name"
                 name="value"
-                :rules="[
-                    {
-                        required: true,
-                        message: `请输入${data.name}`,
-                    },
-                ]"
+                :rules="
+                    ['hex'].includes(valueType)
+                        ? [
+                              {
+                                  required: true,
+                                  message: `请输入${data.name}`,
+                              },
+                              {
+                                  validator: validateHex,
+                                  trigger: 'blur',
+                              },
+                          ]
+                        : [
+                              {
+                                  required: true,
+                                  message: `请输入${data.name}`,
+                              },
+                          ]
+                "
                 v-else
             >
                 <j-input-number
@@ -174,6 +214,43 @@
                     v-model:value="formData.value"
                 />
             </j-form-item>
+            <j-form-item
+                v-if="data?.provider === 'BACNetIp'"
+                :rules="[
+                    {
+                        required: true,
+                        message: `请选择写入优先级`,
+                    },
+                ]"
+                :name="['others', 'priority']"
+            >
+                <template #label>
+                    <div>
+                        <span>写入优先级</span>
+                        <a-tooltip>
+                            <template #title
+                                >写优先级允许系统管理员或控制策略决定哪些写入请求应被优先处理
+                                <br />
+                                ·1表示最高优先级，16表示最低优先级<br />
+                                ·当多个控制器或系统尝试写入同一个点位时，较高优先级的写入请求会覆盖较低优先级的写入请求<br />
+                                ·如果高优先级的写入请求失效，系统会自动恢复次高优先级的写入值，依次类推直至找到有效的写入请求</template
+                            >
+                            <AIcon
+                                type="QuestionCircleOutlined"
+                                style="margin-left: 10px"
+                            ></AIcon>
+                        </a-tooltip>
+                    </div>
+                </template>
+                <a-select v-model:value="formData.others.priority">
+                    <a-select-option
+                        v-for="(i, index) in priority"
+                        :value="index + 1"
+                    >
+                        {{ index + 1 }}
+                    </a-select-option>
+                </a-select>
+            </j-form-item>
         </j-form>
         <template #footer>
             <j-button key="back" @click="handleCancel">取消</j-button>
@@ -214,11 +291,10 @@ const valueTypeArray = [
     'int32',
     'ieee754_float',
     'ieee754_double',
-    'hex,',
     'number',
 ];
 
-const s7Type =[
+const s7Type = [
     'Byte',
     'Word',
     'DWord',
@@ -228,26 +304,57 @@ const s7Type =[
     'UDInt',
     'DInt',
     'Real',
-    'LReal'
-]
+    'LReal',
+];
 
 const emit = defineEmits(['change']);
 const loading = ref(false);
 const formRef = ref<FormInstance>();
+const priority = new Array(16);
+const formData = ref({
+    value: props.data.provider === 'OPC_UA' ? [''] : '',
+    others: {
+        priority: 1,
+    },
+});
+
+const validateHex = async (rule: any, value: any) => {
+    return /^0[xX][0-9A-Fa-f]+$|^[0-9A-Fa-f]+$/.test(value)
+        ? Promise.resolve()
+        : Promise.reject('请输入16进制');
+};
+
+const validatorOpc_UA = async (rule: any, value: any) => {
+    console.log(value);
+    return value.length &&
+        value.every((i) => {
+            return i;
+        })
+        ? Promise.resolve()
+        : Promise.reject(`请输入${props.data.name}`);
+};
 
 const collectorId = props.data.collectorId;
 const pointId: string = props.data.id;
 
-const formData = ref({
-    value: '',
-});
-
-const onChange = (value: Dayjs, dateString: string) => {
-    formData.value.value = dateString;
+const onChange = (value: Dayjs, dateString: string, index?: number) => {
+    if (props.data.provider === 'OPC_UA') {
+        formData.value.value[index] = dateString;
+    } else {
+        formData.value.value = dateString;
+    }
 };
 
 const handleOk = async () => {
-    const data = await formRef.value?.validate();
+    const data:any = await formRef.value?.validate();
+    // if (['hex'].includes(valueType)) {
+    //     if (data?.value) {
+    //         data.value = convertHexToDecimal(data?.value);
+    //     }
+    // }
+    if (props.data.provider === 'OPC_UA') {
+        data.value = data.value.length === 1 ?  data.value[0] : data.value
+    }
     const params: any = {
         ...data,
         pointId,
@@ -265,6 +372,13 @@ const handleCancel = () => {
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
+
+const convertHexToDecimal = (value: any) => {
+    // 去除可能存在的前缀（如0x）
+    let hexString = value.replace(/^0x/i, '');
+    // 将16进制字符串转换为10进制数值
+    return parseInt(hexString, 16);
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 20d484c1..2cf943ab 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -1,6 +1,10 @@
 <template>
     <j-spin :spinning="spinning">
-        <pro-search :columns="columns" target="search-point" @search="handleSearch" />
+        <pro-search
+            :columns="columns"
+            target="search-point"
+            @search="handleSearch"
+        />
         <FullPage>
             <j-scrollbar height="680">
                 <j-pro-table
@@ -11,18 +15,29 @@
                     :gridColumns="[1, 2]"
                     :request="queryPoint"
                     :defaultParams="defaultParams"
+                    :rowSelection="
+                        isCheck
+                            ? {
+                                  selectedRowKeys: _selectedRowKeys,
+                                  onSelectNone: () => (_selectedRowKeys = []),
+                              }
+                            : false
+                    "
                     :params="params"
-                    :rowSelection="{
-                        selectedRowKeys: _selectedRowKeys,
-                        onChange: onSelectChange,
-                    }"
                 >
                     <template #headerTitle>
                         <j-space>
                             <PermissionButton
-                                v-if="['MODBUS_TCP', 'COLLECTOR_GATEWAY','snap7', 'iec104'].includes(data?.provider)"
+                                v-if="
+                                    [
+                                        'MODBUS_TCP',
+                                        'COLLECTOR_GATEWAY',
+                                        'snap7',
+                                        'iec104',
+                                    ].includes(data?.provider)
+                                "
                                 type="primary"
-                                @click="handlAdd"
+                                @click="handleAdd"
                                 hasPermission="DataCollect/Collector:add"
                             >
                                 <template #icon
@@ -31,20 +46,12 @@
                                 新增点位
                             </PermissionButton>
                             <PermissionButton
-                                v-if="['MODBUS_TCP', 'COLLECTOR_GATEWAY','snap7', 'iec104'].includes(data?.provider)"
+                                v-if="
+                                    data?.provider === 'OPC_UA' ||
+                                    data?.provider === 'BACNetIp'
+                                "
                                 type="primary"
-                                @click="handleImport"
-                                hasPermission="DataCollect/Collector:add"
-                            >
-                                <!-- <template #icon
-                                    ><AIcon type="PlusOutlined"
-                                /></template> -->
-                                批量导入
-                            </PermissionButton>
-                            <PermissionButton
-                                v-if="data?.provider === 'OPC_UA' || data?.provider === 'BACNetIp'"
-                                type="primary"
-                                @click="handlScan"
+                                @click="handleScan"
                                 hasPermission="DataCollect/Collector:add"
                             >
                                 <template #icon
@@ -52,48 +59,31 @@
                                 /></template>
                                 扫描
                             </PermissionButton>
-                            <j-dropdown
-                                v-if="data?.provider === 'OPC_UA' || data?.provider === 'BACNetIp'"
+                            <PermissionButton
+                                v-if="data?.id && data.id !== '*'"
+                                type="primary"
+                                @click="handleImport"
+                                hasPermission="DataCollect/Collector:add"
                             >
-                                <j-button @click.prevent="clickBatch"
-                                    >批量操作 <AIcon type="DownOutlined"
-                                /></j-button>
-                                <template #overlay>
-                                    <j-menu v-if="showBatch">
-                                        <j-menu-item>
-                                            <PermissionButton
-                                                hasPermission="DataCollect/Collector:update"
-                                                @click="handlBatchUpdate()"
-                                            >
-                                                <template #icon
-                                                    ><AIcon type="FormOutlined"
-                                                /></template>
-                                                编辑
-                                            </PermissionButton>
-                                        </j-menu-item>
-                                        <j-menu-item>
-                                            <PermissionButton
-                                                hasPermission="DataCollect/Collector:delete"
-                                                :popConfirm="{
-                                                    title: `确定删除？`,
-                                                    onConfirm: () =>
-                                                        handlBatchDelete(),
-                                                }"
-                                            >
-                                                <template #icon
-                                                    ><AIcon type="EditOutlined"
-                                                /></template>
-                                                删除
-                                            </PermissionButton>
-                                        </j-menu-item>
-                                    </j-menu>
-                                </template>
-                            </j-dropdown>
+                                批量导入
+                            </PermissionButton>
+                            <PermissionButton
+                                v-if="data?.id && data.id !== '*'"
+                                type="primary"
+                                @click="handleExport"
+                                hasPermission="DataCollect/Collector:add"
+                            >
+                                数据导出
+                            </PermissionButton>
+                            <BatchDropdown
+                                v-if="data?.id && data.id !== '*'"
+                                ref="batchRef"
+                                v-model:isCheck="isCheck"
+                                :actions="batchActions"
+                                @change="onCheckChange"
+                            />
                         </j-space>
-                        <div
-                            v-if="data?.provider === 'OPC_UA' || data?.provider === 'BACNetIp'"
-                            style="margin-top: 15px"
-                        >
+                        <div v-if="isCheck" style="margin-top: 15px">
                             <j-checkbox
                                 v-model:checked="checkAll"
                                 @change="onCheckAllChange"
@@ -132,9 +122,9 @@
                                         }"
                                         hasPermission="DataCollect/Collector:delete"
                                         :popConfirm="{
-                                            title: `确定删除？`,
+                                            title: `确认删除？`,
                                             onConfirm: () =>
-                                                handlDelete(slotProps.id),
+                                                handleDelete(slotProps.id),
                                         }"
                                     >
                                         <a
@@ -147,9 +137,8 @@
                                     </PermissionButton>
 
                                     <PermissionButton
-                                        class="add-btn"
                                         type="text"
-                                        @click="handlEdit(slotProps)"
+                                        @click="handleEdit(slotProps)"
                                         hasPermission="DataCollect/Collector:update"
                                     >
                                         <a style="font-size: 20px"
@@ -159,7 +148,7 @@
                                 </div>
                             </template>
                             <template #img>
-                                <img :src="ImageMap.get(slotProps.provider)"/>
+                                <img :src="ImageMap.get(slotProps.provider)" />
                             </template>
                             <template #content>
                                 <div class="card-box-content">
@@ -224,13 +213,13 @@
                                             "
                                             class="card-box-content-right-2"
                                         >
-                                            <p>
+                                            <Ellipsis>
                                                 {{
                                                     propertyValue.get(
                                                         slotProps.id,
                                                     )?.hex || ''
                                                 }}
-                                            </p>
+                                            </Ellipsis>
                                             <p>
                                                 {{
                                                     dayjs(
@@ -323,12 +312,28 @@
             :provider="data.provider"
             @change="saveChange"
         />
-        <SaveS7 v-if="visible.saveS7"  :data="current" @change="saveChange"/>
-        <SaveIEC104 v-if="visible.saveIEC104" :data="current" @change="saveChange"/>
-        <SaveBACNet v-if="visible.saveBACNet" :data="current" @change="saveChange"/>
+        <SaveS7 v-if="visible.saveS7" :data="current" @change="saveChange" />
+        <SaveIEC104
+            v-if="visible.saveIEC104"
+            :data="current"
+            @change="saveChange"
+        />
+        <SaveBACNet
+            v-if="visible.saveBACNet"
+            :data="current"
+            @change="saveChange"
+        />
         <Scan v-if="visible.scan" :data="current" @change="saveChange" />
-        <ScanBacnet v-if="visible.scanBacnet" :data="current" @change="saveChange" />
-        <Import v-if="visible.import" :data="current" @close-import="closeImport"/>
+        <ScanBacnet
+            v-if="visible.scanBacnet"
+            :data="current"
+            @change="saveChange"
+        />
+        <Import
+            v-if="visible.import"
+            :data="current"
+            @close-import="closeImport"
+        />
     </j-spin>
 </template>
 <script lang="ts" setup name="PointPage">
@@ -339,7 +344,8 @@ import {
     removePoint,
     readPoint,
     getProviders,
-    getStates
+    getStates,
+    exportPoint,
 } from '@/api/data-collect/collector';
 import { onlyMessage } from '@/utils/comm';
 import PointCardBox from './components/PointCardBox/index.vue';
@@ -355,10 +361,11 @@ import { cloneDeep, isBoolean, isNumber, throttle } from 'lodash-es';
 import { getWebSocket } from '@/utils/websocket';
 import { map } from 'rxjs/operators';
 import dayjs from 'dayjs';
-import { responsiveArray } from 'ant-design-vue/lib/_util/responsiveObserve';
 import SaveS7 from './Save/SaveS7.vue';
 import SaveIEC104 from './Save/SaveIEC104.vue';
-import Import from './components/Import/index.vue'
+import Import from './components/Import/index.vue';
+import { downloadFileByUrl } from '@/utils/utils';
+import BatchDropdown from '@/components/BatchDropdown/index.vue';
 const props = defineProps({
     data: {
         type: Object,
@@ -370,16 +377,15 @@ const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 const opcImage = getImage('/DataCollect/device-opcua.png');
 const modbusImage = getImage('/DataCollect/device-modbus.png');
-const s7Image = getImage('/DataCollect/s7.png')
-const gatewayImage = getImage('/DataCollect/gateway.png')
-const iecImage = getImage('/DataCollect/IEC104.png')
-const ImageMap = new Map()
-ImageMap.set('OPC_UA',opcImage)
-ImageMap.set('MODBUS_TCP',modbusImage)
-ImageMap.set('snap7',s7Image)
-ImageMap.set('iec104',iecImage)
-ImageMap.set('COLLECTOR_GATEWAY',gatewayImage)
-
+const s7Image = getImage('/DataCollect/s7.png');
+const gatewayImage = getImage('/DataCollect/gateway.png');
+const iecImage = getImage('/DataCollect/IEC104.png');
+const ImageMap = new Map();
+ImageMap.set('OPC_UA', opcImage);
+ImageMap.set('MODBUS_TCP', modbusImage);
+ImageMap.set('snap7', s7Image);
+ImageMap.set('iec104', iecImage);
+ImageMap.set('COLLECTOR_GATEWAY', gatewayImage);
 
 const visible = reactive({
     saveModBus: false,
@@ -387,8 +393,8 @@ const visible = reactive({
     writePoint: false,
     batchUpdate: false,
     scan: false,
-    saveS7:false,
-    import:false,
+    saveS7: false,
+    import: false,
     saveIEC104: false,
     scanBacnet: false,
     saveBACNet: false,
@@ -399,7 +405,8 @@ const _selectedRowKeys = ref<string[]>([]);
 const checkAll = ref(false);
 const spinning = ref(false);
 const ReadIdMap = new Map();
-
+const isCheck = ref(false);
+const batchRef = ref();
 const defaultParams = ref({
     sorts: [{ name: 'id', order: 'desc' }],
     terms: [
@@ -408,7 +415,11 @@ const defaultParams = ref({
                 {
                     column: 'collectorId',
                     termType: 'eq',
-                    value: !props.data?.id ? 'undefined' : (props.data.id === '*' ? undefined : props.data.id),
+                    value: !props.data?.id
+                        ? 'undefined'
+                        : props.data.id === '*'
+                        ? undefined
+                        : props.data.id,
                 },
             ],
         },
@@ -441,14 +452,17 @@ const columns = [
         key: 'provider',
         search: {
             type: 'select',
-            options: async () =>{
-              const resp:any = await getProviders();
-              if(resp.success){
-                return resp.result.map((item: any) => ({ label: item.name, value: item.id }))
-              }else{
-                return []
-              }
-            }
+            options: async () => {
+                const resp: any = await getProviders();
+                if (resp.success) {
+                    return resp.result.map((item: any) => ({
+                        label: item.name,
+                        value: item.id,
+                    }));
+                } else {
+                    return [];
+                }
+            },
         },
     },
     {
@@ -466,16 +480,17 @@ const columns = [
         key: 'runningState',
         search: {
             type: 'select',
-            options: async() =>{
-                const resq:any = await getStates();
-                if(resq.status === 200){
-                    return resq.result.map((item:any)=>(
-                        {label:item.text,value:item.value}
-                    ))
-                }else{
-                    return []
+            options: async () => {
+                const resq: any = await getStates();
+                if (resq.status === 200) {
+                    return resq.result.map((item: any) => ({
+                        label: item.text,
+                        value: item.value,
+                    }));
+                } else {
+                    return [];
                 }
-            }
+            },
         },
     },
     {
@@ -490,33 +505,21 @@ const columns = [
 
 const subRef = ref();
 const propertyValue = ref(new Map());
-const cacheIds = ref<string>()
-const showBatch = ref(false);
-
-const clickBatch = () => {
-    if (_selectedRowKeys.value.length === 0) {
-        onlyMessage('请先选择', 'warning');
-        showBatch.value = false;
-    } else {
-        showBatch.value = true;
-    }
-};
-
-const handlAdd = () => {
-    if( props.data?.provider === 'snap7'){
-        console.log(props.data)
-        visible.saveS7 = true
+const batchActions = ref<any>([]);
+const handleAdd = () => {
+    if (props.data?.provider === 'snap7') {
+        visible.saveS7 = true;
         current.value = {
             collectorId: props.data?.id,
             provider: props.data?.provider,
-            deviceType:props.data?.configuration.type,
-        }
-    }else if (props.data?.provider === 'iec104'){
+            deviceType: props.data?.configuration.type,
+        };
+    } else if (props.data?.provider === 'iec104') {
         visible.saveIEC104 = true;
         current.value = {
             collectorId: props.data?.id,
             provider: props.data?.provider,
-        }
+        };
     } else {
         visible.saveModBus = true;
         current.value = {
@@ -524,44 +527,53 @@ const handlAdd = () => {
             provider: props.data?.provider || 'MODBUS_TCP',
         };
     }
-   
 };
-const handlEdit = (data: any) => {
+const handleEdit = (data: any) => {
     if (data?.provider === 'OPC_UA') {
         visible.saveOPCUA = true;
-    } else if(data?.provider === 'snap7'){
-        visible.saveS7 = true
-    } else if(data?.provider === 'iec104') {
-        visible.saveIEC104 = true
+    } else if (data?.provider === 'snap7') {
+        visible.saveS7 = true;
+    } else if (data?.provider === 'iec104') {
+        visible.saveIEC104 = true;
     } else if (data?.provider === 'BACNetIp') {
-        visible.saveBACNet = true
+        visible.saveBACNet = true;
     } else {
         visible.saveModBus = true;
     }
     current.value = cloneDeep({
         ...data,
-        deviceType:props.data?.configuration?.type || props.data?.configuration?.valueType,
+        deviceType:
+            props.data?.configuration?.type ||
+            props.data?.configuration?.valueType,
     });
 };
 
-const handlDelete = async (id: string | undefined = undefined) => {
+const handleDelete = (id: string | undefined = undefined) => {
     spinning.value = true;
-    const res = !id
-        ? await batchDeletePoint(_selectedRowKeys.value).catch(() => {})
-        : await removePoint(id as string).catch(() => {});
-    if (res?.status === 200) {
-        cancelSelect();
-        tableRef.value?.reload();
-        onlyMessage('操作成功', 'success');
-    }
-    spinning.value = false;
+    const response = !id
+        ? batchDeletePoint(_selectedRowKeys.value).catch(() => {})
+        : removePoint(id as string).catch(() => {});
+    response.then((res) => {
+        if (res?.status === 200) {
+            cancelSelect();
+            tableRef.value?.reload();
+            onlyMessage('操作成功', 'success');
+        }
+        spinning.value = false;
+    });
+    return response;
 };
 
-const handlBatchDelete = () => {
-    handlDelete();
+const onCheckChange = () => {
+    _selectedRowKeys.value = [];
+    checkAll.value = false;
 };
 
-const handlBatchUpdate = () => {
+const handleBatchDelete = () => {
+    handleDelete();
+};
+
+const handleBatchUpdate = () => {
     const dataSet = new Set(_selectedRowKeys.value);
     const dataMap = new Map();
     tableRef?.value?._dataSource.forEach((i: any) => {
@@ -570,18 +582,31 @@ const handlBatchUpdate = () => {
     current.value = [...dataMap.values()];
     visible.batchUpdate = true;
 };
-const handlScan = () => {
-    if(props.data?.provider === 'OPC_UA'){
+
+const handleScan = () => {
+    if (props.data?.provider === 'OPC_UA') {
         visible.scan = true;
-    } else if(props.data?.provider === 'BACNetIp'){
-        visible.scanBacnet = true
+    } else if (props.data?.provider === 'BACNetIp') {
+        visible.scanBacnet = true;
     }
     current.value = cloneDeep(props.data);
 };
-const handleImport = () =>{
-    visible.import = true
-    current.value = cloneDeep(props.data)
-}
+const handleImport = () => {
+    visible.import = true;
+    current.value = cloneDeep(props.data);
+};
+const handleExport = async () => {
+    const params =
+        props?.data?.provider === 'COLLECTOR_GATEWAY'
+            ? props?.data?.configuration?.collectorProvider
+            : props?.data?.provider;
+    const res: any = await exportPoint(props.data.collectorId, params);
+    if (res) {
+        const blob = new Blob([res], { type: 'xlsx' });
+        const url = URL.createObjectURL(blob);
+        downloadFileByUrl(url, `${props?.data?.channelName}点位数据`, 'xlsx');
+    }
+};
 const clickEdit = async (data: object) => {
     visible.writePoint = true;
     current.value = cloneDeep(data);
@@ -589,13 +614,12 @@ const clickEdit = async (data: object) => {
 
 // ReadIdMap
 const clickRead = async (data: any) => {
-    console.log('------')
     const res: any = await readPoint(data?.collectorId, [data?.id]);
     if (res.status === 200) {
         const readData: any = res.result[0];
         const _data = ReadIdMap.get(data?.id);
         ReadIdMap.set(data?.id, { ..._data, ...readData });
-        console.log('====',ReadIdMap.get(data.id))
+        console.log('====', ReadIdMap.get(data.id));
         cancelSelect();
         tableRef.value?.reload();
         onlyMessage('操作成功', 'success');
@@ -608,7 +632,7 @@ const getQuantity = (item: Partial<Record<string, any>>) => {
 };
 const getAddress = (item: Partial<Record<string, any>>) => {
     const { address } = item.configuration?.parameter || '';
-    return (!!address || address === 0) ? address + '(地址)' : '';
+    return !!address || address === 0 ? address + '(地址)' : '';
 };
 const getScaleFactor = (item: Partial<Record<string, any>>) => {
     const { scaleFactor } = item.configuration?.codec?.configuration || '';
@@ -639,12 +663,11 @@ const getReadParseData = (item: any) => {
     let _data = '--';
     if (ReadIdMap.has(item.id)) {
         const { parseData, dataType } = ReadIdMap.get(item.id);
-        if(isBoolean(parseData)){
-            _data =  `${parseData}(${dataType || '-'}) `;
-        }else{
+        if (isBoolean(parseData)) {
+            _data = `${parseData}(${dataType || '-'}) `;
+        } else {
             _data = !!parseData ? `${parseData}(${dataType || '-'}) ` : '--';
         }
-        
     }
     return _data;
 };
@@ -660,16 +683,14 @@ const saveChange = (value: object) => {
     }
 };
 
-const onSelectChange = (keys: string[]) => {
-    _selectedRowKeys.value = [...keys];
-};
-
 const cancelSelect = () => {
     _selectedRowKeys.value = [];
 };
 
 const handleClick = (dt: any) => {
-    if (props.data?.provider !== 'OPC_UA' && props.data?.provider !== 'BACNetIp') return;
+    if (!isCheck.value) {
+        return;
+    }
     if (_selectedRowKeys.value.includes(dt.id)) {
         const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
         _selectedRowKeys.value.splice(_index, 1);
@@ -685,16 +706,20 @@ const handleClick = (dt: any) => {
 };
 
 const handleSubscribeValue = throttle((payload: any) => {
-  propertyValue.value.set(payload.pointId, payload);
-})
+    propertyValue.value.set(payload.pointId, payload);
+});
 
 const subscribeProperty = (value: any) => {
     const list = value.map((item: any) => item.id);
     const id = `collector-${props.data?.channelId || 'channel'}-${
-        (props.data?.id || (props.data && props.data.id === '*')) ? 'point' : props.data?.id
+        props.data?.id || (props.data && props.data.id === '*')
+            ? 'point'
+            : props.data?.id
     }-data-${list.join('-')}`;
     const topic = `/collector/${props.data?.channelId || '*'}/${
-      (props.data?.id || (props.data && props.data.id === '*')) ? '*' : props.data?.id
+        props.data?.id || (props.data && props.data.id === '*')
+            ? '*'
+            : props.data?.id
     }/data`;
     subRef.value = getWebSocket(id, topic, {
         pointId: list.join(','),
@@ -702,7 +727,7 @@ const subscribeProperty = (value: any) => {
         ?.pipe(map((res: any) => res.payload))
         .subscribe((payload: any) => {
             //防止刷新过快
-          handleSubscribeValue(payload)
+            handleSubscribeValue(payload);
         });
 };
 
@@ -717,10 +742,10 @@ const onCheckAllChange = (e: any) => {
     }
 };
 
-const closeImport = () =>{
-    visible.import = false
-    tableRef.value.reload()
-}
+const closeImport = () => {
+    visible.import = false;
+    tableRef.value.reload();
+};
 
 watch(
     () => tableRef?.value?._dataSource,
@@ -728,15 +753,15 @@ watch(
         subRef.value?.unsubscribe();
         if (value.length !== 0) {
             setTimeout(() => {
-              subscribeProperty(value);
-              value.forEach((item: any) => {
-                  item?.accessModes?.forEach((i: any) => {
-                      if (i?.value === 'read') {
-                          ReadIdMap.set(item.id, item);
-                      }
-                  });
-              });
-            }, 100)
+                subscribeProperty(value);
+                value.forEach((item: any) => {
+                    item?.accessModes?.forEach((i: any) => {
+                        if (i?.value === 'read') {
+                            ReadIdMap.set(item.id, item);
+                        }
+                    });
+                });
+            }, 100);
         }
         cancelSelect();
         checkAll.value = false;
@@ -762,17 +787,64 @@ watch(
                           label: '订阅',
                           value: 'subscribe',
                       });
-            defaultParams.value.terms[0].terms[0].value = !value.id ? 'undefined' : (value.id === '*' ? undefined : value.id);
+            defaultParams.value.terms[0].terms[0].value = !value.id
+                ? 'undefined'
+                : value.id === '*'
+                ? undefined
+                : value.id;
             tableRef?.value?.reload && tableRef?.value?.reload();
-            cancelSelect();
+            // cancelSelect();
             checkAll.value = false;
+            batchRef.value?.reload();
+            batchActions.value =
+                props?.data?.provider === 'OPC_UA' ||
+                props?.data?.provider === 'BACNetIp'
+                    ? [
+                          {
+                              key: 'update',
+                              text: '批量编辑',
+                              permission: 'DataCollect/Collector:update',
+                              icon: 'FormOutlined',
+                              selected: {
+                                  onClick: handleBatchUpdate,
+                              },
+                          },
+                          {
+                              key: 'delete',
+                              text: '批量删除',
+                              danger: true,
+                              permission: 'DataCollect/Collector:delete',
+                              icon: 'DeleteOutlined',
+                              selected: {
+                                  popConfirm: {
+                                      title: '确认删除？',
+                                      onConfirm: handleBatchDelete,
+                                  },
+                              },
+                          },
+                      ]
+                    : [
+                          {
+                              key: 'delete',
+                              text: '批量删除',
+                              danger: true,
+                              permission: 'DataCollect/Collector:delete',
+                              icon: 'DeleteOutlined',
+                              selected: {
+                                  popConfirm: {
+                                      title: '确认删除？',
+                                      onConfirm: handleBatchDelete,
+                                  },
+                              },
+                          },
+                      ];
         }
     },
     { immediate: true, deep: true },
 );
 
 onUnmounted(() => {
-  subRef.value?.unsubscribe();
+    subRef.value?.unsubscribe();
 });
 
 /**
diff --git a/src/views/DataCollect/Collector/Tree/Save/index.vue b/src/views/DataCollect/Collector/Tree/Save/index.vue
index 9ca815e6..bee39ad9 100644
--- a/src/views/DataCollect/Collector/Tree/Save/index.vue
+++ b/src/views/DataCollect/Collector/Tree/Save/index.vue
@@ -71,8 +71,8 @@
               <j-form-item label="从机地址" :name="['configuration', 'host']" :rules="LeftTreeRules.host">
                 <j-input v-model:value="formData.configuration.host" autocomplete="off" placeholder="请输入" :disabled="false"/>
               </j-form-item>
-              <j-form-item label="从机端口" :name="['configuration', 'port']" >
-                <j-input-number style="width: 100%" v-model:value="formData.configuration.port" :precision="0" autocomplete="off" placeholder="请输入从机端口"/>
+              <j-form-item label="从机端口" :name="['configuration', 'port']" :rules="LeftTreeRules.port" >
+                <j-input-number style="width: 100%" v-model:value="formData.configuration.port" :min="1" :max="65535" :precision="0" autocomplete="off" placeholder="请输入从机端口"/>
               </j-form-item>
               <j-form-item label="分组地址" :name="['configuration', 'terminnalAddress']" :rules="LeftTreeRules.terminnalAddress">
                 <j-input-number style="width: 100%" :min="0" :max="65535" :precision="0" v-model:value="formData.configuration.terminnalAddress" autocomplete="off" placeholder="请输入分组地址"></j-input-number>
@@ -118,21 +118,20 @@
                 :name="['configuration', 'instanceNumber']"
                 :rules="[{ required: true, trigger: 'change' }]"
               >
-                <j-input
-                  type="number"
+                <j-input-number
                   style="width: 100%"
                   v-model:value="formData.configuration.instanceNumber"
                   placeholder="请输入设备实例号"
-                  :maxlength="64"
+                  :min="0"
+                  :precision="0"
                   :disabled="route.query.id ? true : false"
                 />
               </j-form-item>
-              <j-form-item label="地址" :name="['configuration', 'address']">
+              <j-form-item label="地址" :name="['configuration', 'address']"  :rules="LeftTreeRules.address">
                 <j-input
                   style="width: 100%"
                   v-model:value="formData.configuration.address"
                   :maxlength="64"
-                  type="tel"
                   placeholder="请输入地址"
                 >
                 </j-input>
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index f60c5d94..2d75e889 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -10,9 +10,9 @@
 
         <div class="add-btn">
             <PermissionButton
-                class="add-btn"
+                
                 type="primary"
-                @click="handlAdd()"
+                @click="handleAdd()"
                 hasPermission="DataCollect/Collector:add"
             >
                 <template #icon><AIcon type="PlusOutlined" /></template>
@@ -25,11 +25,13 @@
                 :selected-keys="selectedKeys"
                 :fieldNames="{ key: 'id' }"
                 v-if="
-                    !(defualtDataSource.length === 0 ||
-                    defualtDataSource?.[0]?.children?.length === 0)
+                    !(
+                        defualtDataSource.length === 0 ||
+                        defualtDataSource?.[0]?.children?.length === 0
+                    )
                 "
                 :height="660"
-                @select='treeSelect'
+                @select="treeSelect"
                 defaultExpandAll
                 :showLine="{ showLeafIcon: false }"
                 :show-icon="true"
@@ -38,39 +40,41 @@
                     <Ellipsis class="tree-left-title">
                         {{ name }}
                     </Ellipsis>
-<!--                    <j-tag-->
-<!--                        class="tree-left-tag"-->
-<!--                        v-if="data.id !== '*'"-->
-<!--                        :color="-->
-<!--                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
-<!--                          colorMap.get(data?.runningState?.value) :-->
-<!--                          colorMap.get(data?.uniformState?.value)-->
-<!--                        "-->
-<!--                        >{{-->
-<!--                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
-<!--                            data?.runningState?.text :-->
-<!--                            data?.uniformState?.text-->
-<!--                      }}</j-tag-->
-<!--                    >-->
+                    <!--                    <j-tag-->
+                    <!--                        class="tree-left-tag"-->
+                    <!--                        v-if="data.id !== '*'"-->
+                    <!--                        :color="-->
+                    <!--                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+                    <!--                          colorMap.get(data?.runningState?.value) :-->
+                    <!--                          colorMap.get(data?.uniformState?.value)-->
+                    <!--                        "-->
+                    <!--                        >{{-->
+                    <!--                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+                    <!--                            data?.runningState?.text :-->
+                    <!--                            data?.uniformState?.text-->
+                    <!--                      }}</j-tag-->
+                    <!--                    >-->
                     <j-tag
                         class="tree-left-tag"
                         v-if="data.id !== '*'"
                         :color="colorMap.get(data?.uniformState?.value)"
-                    >{{ data?.uniformState?.text }}</j-tag
+                        >{{ data?.uniformState?.text }}</j-tag
                     >
                     <j-tag
                         class="tree-left-tag2"
                         v-if="data.id !== '*'"
                         :color="
-                          data?.state?.value === 'disabled' ? colorMap.get(data?.runningState?.value) :
-                          colorMap.get(data?.state?.value)
+                            data?.state?.value === 'disabled'
+                                ? colorMap.get(data?.runningState?.value)
+                                : colorMap.get(data?.state?.value)
                         "
-                        >
-                      {{
-                       data?.state?.value === 'disabled' ? data?.state?.text : data?.runningState?.text
-                      }}
-                    </j-tag
                     >
+                        {{
+                            data?.state?.value === 'disabled'
+                                ? data?.state?.text
+                                : data?.runningState?.text
+                        }}
+                    </j-tag>
                     <span
                         v-if="data.id !== '*'"
                         class="func-btns"
@@ -81,7 +85,7 @@
                             :tooltip="{
                                 title: '编辑',
                             }"
-                            @click="handlEdit(data)"
+                            @click="handleEdit(data)"
                             hasPermission="DataCollect/Collector:update"
                         >
                             <AIcon type="EditOutlined" />
@@ -94,14 +98,17 @@
                                         ? '启用'
                                         : '禁用',
                             }"
-                            :disabled="data?.runningState?.value === 'stopped' && data?.state?.value!== 'disabled'"
+                            :disabled="
+                                data?.runningState?.value === 'stopped' &&
+                                data?.state?.value !== 'disabled'
+                            "
                             hasPermission="DataCollect/Collector:action"
                             :popConfirm="{
                                 title:
                                     data?.state?.value === 'disabled'
-                                        ? '确定启用?'
-                                        : '确定禁用?',
-                                onConfirm: () => handlUpdate(data),
+                                        ? '确认启用？'
+                                        : '确认禁用？',
+                                onConfirm: () => handleUpdate(data),
                             }"
                         >
                             <AIcon
@@ -125,7 +132,7 @@
                             hasPermission="DataCollect/Collector:delete"
                             :popConfirm="{
                                 title: `该操作将会删除下属点位，确定删除？`,
-                                onConfirm: () => handlDelete(data.id),
+                                onConfirm: () => handleDelete(data.id),
                             }"
                         >
                             <AIcon type="DeleteOutlined" />
@@ -135,7 +142,12 @@
             </j-tree>
             <j-empty v-else description="暂无数据" />
         </j-spin>
-        <Save :channelListAll="channelListAll" v-if="visible" :data="current" @change="saveChange" />
+        <Save
+            :channelListAll="channelListAll"
+            v-if="visible"
+            :data="current"
+            @change="saveChange"
+        />
     </div>
 </template>
 
@@ -167,7 +179,7 @@ const searchValue = ref();
 const visible = ref(false);
 const current = ref({});
 const collectorAll = ref();
-const channelListAll = ref<any[]>([])
+const channelListAll = ref<any[]>([]);
 
 const root = [
     {
@@ -182,49 +194,60 @@ const defualtDataSource: any = ref(_.cloneDeep(root));
 const defualtParams = {
     paging: false,
     sorts: [{ name: 'createTime', order: 'desc' }],
-    terms: !!channelId ? [
-        {
-            terms: [
+    terms: !!channelId
+        ? [
+              {
+                  terms: [
                       {
                           column: 'channelId',
                           value: channelId,
                       },
                   ],
-            type: 'and',
-        },
-    ] : [],
+                  type: 'and',
+              },
+          ]
+        : [],
 };
 const params = ref();
 
-const handlAdd = () => {
+const handleAdd = () => {
     current.value = {};
     visible.value = true;
 };
 
-const handlEdit = (data: object) => {
+const handleEdit = (data: object) => {
     current.value = _.cloneDeep(data);
     visible.value = true;
 };
 
-const handlUpdate = async (data: any) => {
+const handleUpdate = (data: any) => {
     const state = data?.state?.value;
-    const resp = await update(data?.id, {
+    const response = update(data?.id, {
         state: state !== 'disabled' ? 'disabled' : 'enabled',
         runningState: state !== 'disabled' ? 'stopped' : 'running',
     });
-    if (resp.status === 200) {
-        handleSearch(params.value);
-        const _item = collectorAll.value.find((i: any) => i?.id === selectedKeys.value?.[0])
-        emits('change', _item)
-        onlyMessage('操作成功', 'success');
-    }
+    response.then((resp) => {
+        if (resp.status === 200) {
+            handleSearch(params.value);
+            const _item = collectorAll.value.find(
+                (i: any) => i?.id === selectedKeys.value?.[0],
+            );
+            emits('change', _item);
+            onlyMessage('操作成功', 'success');
+        }
+    });
+    return response
 };
-const handlDelete = async (id: string) => {
-    const resp = await remove(id);
-    if (resp.status === 200) {
-        handleSearch(params.value);
-        onlyMessage('操作成功', 'success');
-    }
+const handleDelete = (id: string) => {
+    const response = remove(id);
+    response.then((resp) => {
+        if (resp.status === 200) {
+            selectedKeys.value = [];
+            handleSearch(params.value);
+            onlyMessage('操作成功', 'success');
+        }
+    });
+    return response
 };
 
 const saveChange = (value: object) => {
@@ -263,7 +286,7 @@ const handleSearch = async (value: any) => {
                         termType: 'like',
                     },
                 ],
-            }
+            },
         ];
     } else {
         !!value && (params.value = value);
@@ -297,14 +320,13 @@ const handleSearch = async (value: any) => {
     spinning.value = false;
 };
 const getChannelNoPaging = async () => {
-
     const res: any = await queryChannelNoPaging();
     channelListAll.value = res.result;
 };
 
 const treeSelect = (keys: string, e: any) => {
-  selectedKeys.value = [e.node?.id]
-}
+    selectedKeys.value = [e.node?.id];
+};
 
 onMounted(() => {
     handleSearch(_.cloneDeep(defualtParams));
@@ -314,16 +336,18 @@ onMounted(() => {
 watch(
     () => selectedKeys.value[0],
     (n, p) => {
-        const key = _.isArray(selectedKeys.value) ? selectedKeys.value[0] : selectedKeys.value;
+        const key = _.isArray(selectedKeys.value)
+            ? selectedKeys.value[0]
+            : selectedKeys.value;
         if (key) {
-          if (key !== "*") {
-            const row = collectorAll.value.find((i: any) => i.id === key);
-            emits('change', row);
-          } else {
-            emits('change', {
-              id: '*'
-            });
-          }
+            if (key !== '*') {
+                const row = collectorAll.value.find((i: any) => i.id === key);
+                emits('change', row);
+            } else {
+                emits('change', {
+                    id: '*',
+                });
+            }
         }
     },
 );
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 51bee438..ffc9e226 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -1,3 +1,4 @@
+import { testIpv4_6 } from '@/utils/validate';
 export const colorMap = new Map();
 colorMap.set('running', 'success');
 colorMap.set('partialError', 'warning');
@@ -191,8 +192,8 @@ const validator1 = (rule:any, value:any, callback:any)  => {
     if(value === undefined || value === '' || value === null) {
       return Promise.reject("请输入通道端口")
     } else {
-      if(value < 0 || value > 65535) {
-        return Promise.reject("请输入0~65535的整数")
+      if(value < 1 || value > 65535) {
+        return Promise.reject("请输入1~65535的整数")
       }
       return Promise.resolve()
     }
@@ -239,6 +240,19 @@ const validator1 = (rule:any, value:any, callback:any)  => {
       return Promise.resolve()
     }
   }
+  /**
+ * 校验官网地址
+ */
+const validateUrl = async (_rule: any, value: string) => {
+    if (!value) {
+        return Promise.resolve();
+    } else {
+        if (!testIpv4_6(value)) {
+            return Promise.reject('请输入正确的IP地址');
+        }
+        return Promise.resolve();
+    }
+};
 export const LeftTreeRules = {
     channelId: [{ required: true, message: '请选择所属通道', trigger: 'blur' }],
     name: [
@@ -273,6 +287,7 @@ export const LeftTreeRules = {
     serializable: [{required: true, trigger: 'change', message: '请选择型号'}],
     terminnalAddress: [{required: true, trigger: 'blur', message: '请输入分组地址'}],
     frameAmountMax: [{required: true, message: '请输入确认帧数量', trigger: 'blur'}],
+    address: [{ trigger: 'blur',validator: validateUrl,message: '请输入正确的ip地址'}],
 };
 
 export const FormTableColumns = [
@@ -324,52 +339,76 @@ export const BacnetFormTableColumns = [
         key: 'name',
         width: 140,
         fixed: 'left',
+        form:{
+            required: true
+        }
     },
     {
         title: '对象类型',
         dataIndex: 'type',
         key: 'type',
+        form:{
+            required: true
+        }
     },
     {
         title: '对象号',
         dataIndex: 'instanceNumber',
         key: 'instanceNumber',
+        form:{
+            required: true
+        }
     },
     {
         title: '属性ID',
         dataIndex: 'propertyId',
         key: 'propertyId',
+         form:{
+            required: true
+        },
         width: 200,
     },
     {
         title: '值类型',
         dataIndex: 'valueType',
         key: 'valueType',
+        form:{
+            required: true
+        },
         width: 200,
     },
     {
         title: '访问类型',
         dataIndex: 'accessModes',
         key: 'accessModes',
+        form:{
+            required: true
+        },
         width: 260,
     },
     {
         title: '采集频率',
         key: 'interval',
         dataIndex: 'interval',
+        form:{
+            required: true
+        },
         width: 200,
     },
     {
         title: '只推送变化的数据',
         key: 'features',
         dataIndex: 'features',
-        width: 140,
+        form:{
+            required: true
+        },
+        width: 150,
     },
     {
         title: '操作',
         key: 'action',
         dataIndex: 'action',
         fixed: 'right',
-        width: 50,
+        width: 70,
     },
 ]
\ No newline at end of file
diff --git a/src/views/DataCollect/Dashboard/tool.ts b/src/views/DataCollect/Dashboard/tool.ts
index a6c2cf5a..effe2d0d 100644
--- a/src/views/DataCollect/Dashboard/tool.ts
+++ b/src/views/DataCollect/Dashboard/tool.ts
@@ -12,7 +12,7 @@ const getParams = (dt: any) => {
             return {
                 limit: 7,
                 interval: '1d',
-                format: 'YYYY-MM-dd HH:mm',
+                format: 'YYYY-MM-dd',
             };
         case 'hour':
             return {
@@ -41,7 +41,7 @@ const getParams = (dt: any) => {
                 return {
                     limit: Math.abs(Math.ceil(time / days)) + 1,
                     interval: '1d',
-                    format: 'YYYY-MM-dd HH:mm',
+                    format: 'YYYY-MM-dd',
                 };
             } else if (time > days*90) {
                 return {
@@ -53,7 +53,7 @@ const getParams = (dt: any) => {
                 return {
                     limit: Math.abs(Math.ceil(time / days)) + 1,
                     interval: '1d',
-                    format: 'YYYY-MM-dd HH:mm',
+                    format: 'YYYY-MM-dd',
                 };
             }
     }
@@ -86,7 +86,7 @@ export const pointParams = (data: any) => {
                 from: Number(data.time.time[0]),
                 to: Number(data.time.time[1]),
                 interval: getParams(data.time).interval,
-                format: 'YYYY-MM-dd HH:mm',
+                format: getParams(data.time).format
             },
         },
     ];
diff --git a/src/views/Log/Access/index.vue b/src/views/Log/Access/index.vue
index 7cbe6f91..cc52cc10 100644
--- a/src/views/Log/Access/index.vue
+++ b/src/views/Log/Access/index.vue
@@ -39,33 +39,23 @@
 
             <template #action="slotProps">
                 <j-space :size="16">
-                    <j-tooltip
-                        v-for="i in getActions(slotProps)"
-                        :key="i.key"
-                        v-bind="i.tooltip"
-                    >
-                        <j-popconfirm v-if="i.popConfirm" v-bind="i.popConfirm">
-                            <j-button
-                                :disabled="i.disabled"
-                                style="padding: 0"
-                                type="link"
-                                ><AIcon :type="i.icon"
-                            /></j-button>
-                        </j-popconfirm>
-                        <j-button
-                            style="padding: 0"
-                            type="link"
-                            v-else
-                            @click="i.onClick && i.onClick(slotProps)"
+                    <template
+                            v-for="i in getActions(slotProps)"
+                            :key="i.key"
                         >
-                            <j-button
-                                :disabled="i.disabled"
-                                style="padding: 0"
+                            <PermissionButton
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                @click="i.onClick"
                                 type="link"
-                                ><AIcon :type="i.icon"
-                            /></j-button>
-                        </j-button>
-                    </j-tooltip>
+                                style="padding: 0 5px"
+                            >
+                                <template #icon
+                                    ><AIcon :type="i.icon"
+                                /></template>
+                            </PermissionButton>
+                        </template>
                 </j-space>
             </template>
         </j-pro-table>
@@ -228,7 +218,7 @@ const columns = [
     },
 ];
 
-const descriptionsData = ref({
+const descriptionsData = ref<any>({
     url: '',
     httpMethod: '',
     action: '',
@@ -259,7 +249,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 title: '查看',
             },
             icon: 'EyeOutlined',
-            onClick: (data: AccessLogItem) => {
+            onClick: () => {
                 descriptionsData.value = data;
                 visible.value = true;
             },
@@ -282,7 +272,7 @@ const handleSearch = (e: any) => {
 </script>
 <style scoped lang="less">
 .userName{
-    color: #1d39c4;
+    color: #1677FF;
     background: #f0f5ff;
     border-color: #adc6ff;
     list-style: none;
diff --git a/src/views/Log/System/index.vue b/src/views/Log/System/index.vue
index 84c4adfb..6ba545b4 100644
--- a/src/views/Log/System/index.vue
+++ b/src/views/Log/System/index.vue
@@ -35,33 +35,23 @@
 
             <template #action="slotProps">
                 <j-space :size="16">
-                    <j-tooltip
-                        v-for="i in getActions(slotProps)"
-                        :key="i.key"
-                        v-bind="i.tooltip"
-                    >
-                        <j-popconfirm v-if="i.popConfirm" v-bind="i.popConfirm">
-                            <j-button
-                                :disabled="i.disabled"
-                                style="padding: 0"
-                                type="link"
-                                ><AIcon :type="i.icon"
-                            /></j-button>
-                        </j-popconfirm>
-                        <j-button
-                            style="padding: 0"
-                            type="link"
-                            v-else
-                            @click="i.onClick && i.onClick(slotProps)"
+                    <template
+                            v-for="i in getActions(slotProps)"
+                            :key="i.key"
                         >
-                            <j-button
-                                :disabled="i.disabled"
-                                style="padding: 0"
+                            <PermissionButton
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                @click="i.onClick"
                                 type="link"
-                                ><AIcon :type="i.icon"
-                            /></j-button>
-                        </j-button>
-                    </j-tooltip>
+                                style="padding: 0 5px"
+                            >
+                                <template #icon
+                                    ><AIcon :type="i.icon"
+                                /></template>
+                            </PermissionButton>
+                        </template>
                 </j-space>
             </template>
         </j-pro-table>
@@ -229,7 +219,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 title: '查看',
             },
             icon: 'EyeOutlined',
-            onClick: (data: SystemLogItem) => {
+            onClick: () => {
                 descriptionsData.value = data;
                 visible.value = true;
             },
diff --git a/src/views/Log/index.vue b/src/views/Log/index.vue
index 08adfd3e..f179128c 100644
--- a/src/views/Log/index.vue
+++ b/src/views/Log/index.vue
@@ -11,7 +11,6 @@
     </page-container>
 </template>
 <script lang="ts" setup name="LogPage">
-import { defineComponent, ref } from 'vue';
 import AccessLog from './Access/index.vue';
 import SystemLog from './System/index.vue';
 import { useRouterParams } from '@/utils/hooks/useParams';
diff --git a/src/views/Northbound/AliCloud/Detail/doc.vue b/src/views/Northbound/AliCloud/Detail/doc.vue
index 89b4f2a2..d2f83f1b 100644
--- a/src/views/Northbound/AliCloud/Detail/doc.vue
+++ b/src/views/Northbound/AliCloud/Detail/doc.vue
@@ -1,58 +1,66 @@
 <template>
     <div class="doc">
-      <div className="url">
-        阿里云物联网平台：
-        <a
-          :style="{ wordBreak: 'break-all' }"
-          href="https://help.aliyun.com/document_detail/87368.html"
-          target="_blank"
-          rel="noreferrer"
-        >
-          https://help.aliyun.com/document_detail/87368.html
-        </a>
-      </div>
-      <h1>1. 概述</h1>
-      <div>
-        在特定场景下，设备无法直接接入阿里云物联网平台时，您可先将设备接入物联网平台，再使用阿里云“云云对接SDK”，快速构建桥接服务，搭建物联网平台与阿里云物联网平台的双向数据通道。
-      </div>
-      <div class="image">
-        <j-image width="100%" :src="getImage('/northbound/aliyun2.png')" />
-      </div>
-      <h1>2.配置说明</h1>
-      <div>
-        <h2> 1、服务地址</h2>
-        <div>
-          阿里云内部给每台机器设置的唯一编号。请根据购买的阿里云服务器地址进行选择。
+        <div className="url">
+            阿里云物联网平台：
+            <a
+                :style="{ wordBreak: 'break-all' }"
+                href="https://help.aliyun.com/document_detail/87368.html"
+                target="_blank"
+                rel="noreferrer"
+            >
+                https://help.aliyun.com/document_detail/87368.html
+            </a>
         </div>
-        <div>获取路径：“阿里云物联网平台”--“服务地址”</div>
-        <div class="image">
-          <j-image width="100%" :src="getImage('/northbound/aliyun3.png')" />
-        </div>
-        <h2> 2、AccesskeyID/Secret</h2>
+        <h1>1. 概述</h1>
         <div>
-          用于程序通知方式调用云服务费API的用户标识和秘钥获取路径：“阿里云管理控制台”--“用户头像”--“”--“AccessKey管理”--“查看”
+            在特定场景下，设备无法直接接入阿里云物联网平台时，您可先将设备接入物联网平台，再使用阿里云“云云对接SDK”，快速构建桥接服务，搭建物联网平台与阿里云物联网平台的双向数据通道。
         </div>
         <div class="image">
-          <j-image width="100%" :src="getImage('/northbound/aliyun1.jpg')" />
+            <j-image width="100%" :src="getImage('/northbound/aliyun2.png')" />
         </div>
-        <h2> 3. 网桥产品</h2>
+        <h1>2.配置说明</h1>
         <div>
-          物联网平台对于阿里云物联网平台，是一个网关设备，需要映射到阿里云物联网平台的具体产品
+            <h2>1、服务地址</h2>
+            <div>
+                阿里云内部给每台机器设置的唯一编号。请根据购买的阿里云服务器地址进行选择。
+            </div>
+            <div>获取路径：“阿里云物联网平台”--“服务地址”</div>
+            <div class="image">
+                <j-image
+                    width="100%"
+                    :src="getImage('/northbound/aliyun3.png')"
+                />
+            </div>
+            <h2>2、AccesskeyID/Secret</h2>
+            <div>
+                用于程序通知方式调用云服务费API的用户标识和秘钥获取路径：“阿里云管理控制台”--“用户头像”--“”--“AccessKey管理”--“查看”
+            </div>
+            <div class="image">
+                <j-image
+                    width="100%"
+                    :src="getImage('/northbound/aliyun1.jpg')"
+                />
+            </div>
+            <h2>3. 网桥产品</h2>
+            <div>
+                物联网平台对于阿里云物联网平台，是一个网关设备，需要映射到阿里云物联网平台的具体产品
+            </div>
+            <h2>4. 产品映射</h2>
+            <div>
+                将阿里云物联网平台中的产品实例与物联网平台的产品实例进行关联。关联后需要进入该产品下的每一个设备的实例信息页，填入对应的阿里云物联网平台设备的DeviceName、DeviceSecret进行一对一绑定。
+            </div>
+            <div class="image">
+                <j-image
+                    width="100%"
+                    :src="getImage('/northbound/aliyun4.png')"
+                />
+            </div>
         </div>
-        <h2> 4. 产品映射</h2>
-        <div>
-          将阿里云物联网平台中的产品实例与物联网平台的产品实例进行关联。关联后需要进入该产品下的每一个设备的实例信息页，填入对应的阿里云物联网平台设备的DeviceName、DeviceSecret进行一对一绑定。
-        </div>
-        <div class="image">
-          <j-image width="100%" :src="getImage('/northbound/aliyun4.png')" />
-        </div>
-      </div>
     </div>
 </template>
 
 <script lang="ts" setup>
 import { getImage } from '@/utils/comm';
-
 </script>
 
 <style lang="less" scoped>
@@ -63,32 +71,40 @@ import { getImage } from '@/utils/comm';
     color: rgba(#000, 0.8);
     font-size: 14px;
     background-color: #fafafa;
+    &::-webkit-scrollbar {
+        width: 5px; /* 滚动条宽度 */
+        background-color: #edf5ff; /* 滚动条背景色 */
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+        border-radius: 4px; /* 滚动条拖动部分圆角 */
+    }
 
     .url {
-      padding: 8px 16px;
-      color: #2f54eb;
-      background-color: rgba(#a7bdf7, 0.2);
+        padding: 8px 16px;
+        color: #2f54eb;
+        background-color: rgba(#a7bdf7, 0.2);
     }
 
     h1 {
-      margin: 16px 0;
-      color: rgba(#000, 0.85);
-      font-weight: bold;
-      font-size: 14px;
+        margin: 16px 0;
+        color: rgba(#000, 0.85);
+        font-weight: bold;
+        font-size: 14px;
 
-      &:first-child {
-        margin-top: 0;
-      }
+        &:first-child {
+            margin-top: 0;
+        }
     }
 
     h2 {
-      margin: 6px 0;
-      color: rgba(0, 0, 0, 0.8);
-      font-size: 14px;
+        margin: 6px 0;
+        color: rgba(0, 0, 0, 0.8);
+        font-size: 14px;
     }
 
     .image {
-      margin: 16px 0;
+        margin: 16px 0;
     }
-  }
-</style>
\ No newline at end of file
+}
+</style>
diff --git a/src/views/Northbound/AliCloud/Tree/index.vue b/src/views/Northbound/AliCloud/Tree/index.vue
new file mode 100644
index 00000000..c66543d3
--- /dev/null
+++ b/src/views/Northbound/AliCloud/Tree/index.vue
@@ -0,0 +1,134 @@
+<template>
+    <PermissionButton
+        type="primary"
+        @click="handleAdd"
+        block
+        ghost
+        hasPermission="Northbound/DuerOS:add"
+    >
+        <template #icon><AIcon type="PlusOutlined" /></template>
+        新增
+    </PermissionButton>
+    <div class="listContainer">
+        <template v-if="treeData?.length">
+            <div
+                v-for="i in treeData"
+                class="listItem"
+                @click="() => selectItem(i)"
+                :class="{ selected: i.id === selectedId }"
+            >
+                <div class="itemText">
+                    <Ellipsis style="width: 100% ">
+                        {{ i.name }}
+                    </Ellipsis>
+                </div>
+                <div
+                    class="status"
+                    :style="{
+                        color:
+                            i.state?.value === 'disabled' ? 'red' : '#70b603',
+                    }"
+                >
+                    {{ i.state?.value === 'disabled' ? '禁用' : '启用' }}
+                </div>
+            </div>
+        </template>
+        <j-empty v-else style="margin-top: 200px"></j-empty>
+    </div>
+</template>
+
+<script setup>
+import { queryPaginateNot } from '@/api/northbound/alicloud';
+import { defineExpose } from 'vue';
+const props = defineProps({
+    params: {
+        type: Object,
+    },
+});
+const emit = defineEmits(['viewData']);
+const treeData = ref();
+const selectedId = ref();
+const queryList = async (changeSelect = false) => {
+    const queryParams = props.params
+        ? {
+              paging: false,
+              sorts: [{ name: 'createTime', order: 'desc' }],
+              ...props.params,
+          }
+        : {
+              paging: false,
+              sorts: [{ name: 'createTime', order: 'desc' }],
+          };
+    const res = await queryPaginateNot(queryParams);
+    if (res.success) {
+        treeData.value = res.result;
+        if (treeData.value.length) {
+            !changeSelect ?  selectItem(treeData.value[0]) : selectItem(treeData.value.find((i)=>{
+                return selectedId.value = i.id
+            }))
+        }else{
+            selectedId.value = '';
+            emit("viewData",{
+                type:'noData'
+            })
+        }
+    }
+};
+const selectItem = (data) => {
+    selectedId.value = data.id;
+    emit('viewData', data);
+};
+const handleAdd = () => {
+    selectedId.value = '';
+    emit('viewData', {
+        type:'add'
+    });
+};
+
+const refresh = (changeSelect) => {
+    queryList(changeSelect);
+};
+
+watch(
+    () => props.params,
+    () => {
+        queryList();
+    },
+    {
+        deep: true,
+        immediate: true,
+    },
+);
+
+defineExpose({
+    refresh,
+});
+</script>
+<style lang="less" scoped>
+.listContainer {
+    margin-top: 10px;
+    height: calc(100% - 50px);
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+        width: 5px; /* 滚动条宽度 */
+        background-color: #edf5ff; /* 滚动条背景色 */
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+        border-radius: 4px; /* 滚动条拖动部分圆角 */
+    }
+}
+.itemText{
+    width: calc(100% - 50px)
+}
+.listItem {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 5px;
+    cursor: pointer;
+    padding: 5px;
+}
+.selected {
+    background-color: #f2f2f2;
+}
+</style>
diff --git a/src/views/Northbound/AliCloud/index.vue b/src/views/Northbound/AliCloud/index.vue
index c9cd7d37..120f7716 100644
--- a/src/views/Northbound/AliCloud/index.vue
+++ b/src/views/Northbound/AliCloud/index.vue
@@ -6,146 +6,24 @@
             @search="handleSearch"
         />
         <FullPage>
-            <JProTable
-                ref="instanceRef"
-                :columns="columns"
-                :request="query"
-                :defaultParams="{
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :params="params"
-            >
-                <template #headerTitle>
-                    <j-space>
-                        <PermissionButton
-                            type="primary"
-                            @click="handleAdd"
-                            hasPermission="Northbound/AliCloud:add"
-                        >
-                            <template #icon
-                                ><AIcon type="PlusOutlined"
-                            /></template>
-                            新增
-                        </PermissionButton>
-                    </j-space>
-                </template>
-                <template #card="slotProps">
-                    <CardBox
-                        :value="slotProps"
-                        @click="handleView(slotProps.id)"
-                        :actions="getActions(slotProps, 'card')"
-                        :status="slotProps.state?.value"
-                        :statusText="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'processing',
-                            disabled: 'error',
-                        }"
-                    >
-                        <template #img>
-                            <img :src="getImage('/northbound/aliyun.png')" />
-                        </template>
-                        <template #content>
-                            <Ellipsis style="width: calc(100% - 100px)">
-                                <span style="font-size: 16px; font-weight: 600">
-                                    {{ slotProps.name }}
-                                </span>
-                            </Ellipsis>
-                            <j-row style="margin-top: 15px">
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        网桥产品
-                                    </div>
-                                    <Ellipsis>
-                                        <div>
-                                            {{ slotProps?.bridgeProductName }}
-                                        </div>
-                                    </Ellipsis>
-                                </j-col>
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        <label>说明</label>
-                                    </div>
-                                    <Ellipsis>
-                                        <div>{{ slotProps?.description }}</div>
-                                    </Ellipsis>
-                                </j-col>
-                            </j-row>
-                        </template>
-                        <template #actions="item">
-                            <PermissionButton
-                                :disabled="item.disabled"
-                                :popConfirm="item.popConfirm"
-                                :tooltip="item.tooltip"
-                                @click="item.onClick"
-                                :hasPermission="
-                                    'Northbound/AliCloud:' + item.key
-                                "
-                            >
-                                <AIcon
-                                    type="DeleteOutlined"
-                                    v-if="item.key === 'delete'"
-                                />
-                                <template v-else>
-                                    <AIcon :type="item.icon" />
-                                    <span>{{ item?.text }}</span>
-                                </template>
-                            </PermissionButton>
-                        </template>
-                    </CardBox>
-                </template>
-                <template #state="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.state?.value"
-                        :text="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'processing',
-                            disabled: 'error',
-                        }"
-                    />
-                </template>
-                <template #action="slotProps">
-                    <j-space>
-                        <template
-                            v-for="i in getActions(slotProps, 'table')"
-                            :key="i.key"
-                        >
-                            <PermissionButton
-                                :disabled="i.disabled"
-                                :popConfirm="i.popConfirm"
-                                :tooltip="i.tooltip"
-                                style="padding: 0 5px"
-                                @click="i.onClick"
-                                type="link"
-                                :danger="i.key === 'delete'"
-                                :hasPermission="
-                                    i.key === 'view'
-                                        ? true
-                                        : 'Northbound/AliCloud:' + i.key
-                                "
-                            >
-                                <template #icon
-                                    ><AIcon :type="i.icon"
-                                /></template>
-                            </PermissionButton>
-                        </template>
-                    </j-space>
-                </template>
-            </JProTable>
+            <div class="container">
+                <div class="list">
+                    <Tree ref="TreeRef" @viewData="viewData" :params="params" />
+                </div>
+                <div class="detail">
+                    <Detail :data="current" @refreshList="refreshList" />
+                </div>
+            </div>
         </FullPage>
     </page-container>
 </template>
 
-<script setup lang="ts">
-import { query, _undeploy, _deploy, _delete } from '@/api/northbound/alicloud';
-import type { ActionsType } from '@/views/device/Instance/typings';
-import { getImage, onlyMessage } from '@/utils/comm';
-import { useMenuStore } from 'store/menu';
-import BadgeStatus from '@/components/BadgeStatus/index.vue';
-
-const instanceRef = ref<Record<string, any>>({});
-const params = ref<Record<string, any>>({});
-
-const menuStory = useMenuStore();
+<script setup>
+import Tree from './Tree/index.vue';
+import Detail from './Detail/index.vue';
+const params = ref({});
+const current = ref();
+const TreeRef = ref();
 
 const columns = [
     {
@@ -186,122 +64,34 @@ const columns = [
             ],
         },
     },
-    {
-        title: '操作',
-        key: 'action',
-        fixed: 'right',
-        width: 160,
-        scopedSlots: true,
-    },
 ];
 
-/**
- * 新增
- */
-const handleAdd = () => {
-    menuStory.jumpPage('Northbound/AliCloud/Detail', { id: ':id' });
+const viewData = (data) => {
+    current.value = data;
 };
-
-/**
- * 查看
- */
-const handleView = (id: string) => {
-    menuStory.jumpPage('Northbound/AliCloud/Detail', { id }, { type: 'view' });
+const refreshList = (changeSelect = false) => {
+    TreeRef.value?.refresh(changeSelect);
 };
-
-const getActions = (
-    data: Partial<Record<string, any>>,
-    type: 'card' | 'table',
-): ActionsType[] => {
-    if (!data) return [];
-    const actions = [
-        {
-            key: 'view',
-            text: '查看',
-            tooltip: {
-                title: '查看',
-            },
-            icon: 'EyeOutlined',
-            onClick: () => {
-                handleView(data.id);
-            },
-        },
-        {
-            key: 'update',
-            text: '编辑',
-            tooltip: {
-                title: '编辑',
-            },
-            icon: 'EditOutlined',
-            onClick: () => {
-                menuStory.jumpPage(
-                    'Northbound/AliCloud/Detail',
-                    { id: data.id },
-                    { type: 'edit' },
-                );
-            },
-        },
-        {
-            key: 'action',
-            text: data.state?.value !== 'disabled' ? '禁用' : '启用',
-            tooltip: {
-                title: data.state?.value !== 'disabled' ? '禁用' : '启用',
-            },
-            icon:
-                data.state.value !== 'disabled'
-                    ? 'StopOutlined'
-                    : 'CheckCircleOutlined',
-            popConfirm: {
-                title: `确认${
-                    data.state.value !== 'disabled' ? '禁用' : '启用'
-                }?`,
-                onConfirm: async () => {
-                    let response = undefined;
-                    if (data.state.value !== 'disabled') {
-                        response = await _undeploy(data.id);
-                    } else {
-                        response = await _deploy(data.id);
-                    }
-                    if (response && response.status === 200) {
-                        onlyMessage('操作成功！');
-                        instanceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
-            },
-        },
-        {
-            key: 'delete',
-            text: '删除',
-            disabled: data.state?.value !== 'disabled',
-            tooltip: {
-                title:
-                    data.state.value !== 'disabled'
-                        ? '请先禁用该数据，再删除。'
-                        : '删除',
-            },
-            popConfirm: {
-                title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await _delete(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        instanceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
-            },
-            icon: 'DeleteOutlined',
-        },
-    ];
-    if (type === 'card')
-        return actions.filter((i: ActionsType) => i.key !== 'view');
-    return actions;
-};
-
-const handleSearch = (_params: any) => {
+const handleSearch = (_params) => {
     params.value = _params;
 };
 </script>
+<style scoped lang="less">
+.container {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    height: 100%;
+   
+    .list {
+        width: 15%;
+        background-color: #fff;
+        padding: 10px 15px;
+        height: 100%;
+        border-right: 1px solid #f0f0f0;
+    }
+    .detail {
+        width: 85%;
+    }
+}
+</style>
diff --git a/src/views/Northbound/DuerOS/Detail/command/EditTable.vue b/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
index 355aad62..9e28ba90 100644
--- a/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
+++ b/src/views/Northbound/DuerOS/Detail/command/EditTable.vue
@@ -25,7 +25,7 @@
                         >
                             <ValueItem
                                 v-model:modelValue="record.value"
-                                :itemType="record.type"
+                                :itemType="record.type || record.valueType"
                                 :options="
                                     record.type === 'enum'
                                         ? (
@@ -36,7 +36,7 @@
                                                   value: item.value,
                                               };
                                           })
-                                        : record.type === 'boolean'
+                                        : record.type === 'boolean' || record.valueType === 'boolean'
                                         ? [
                                               { label: '是', value: true },
                                               { label: '否', value: false },
diff --git a/src/views/Northbound/DuerOS/Detail/doc.vue b/src/views/Northbound/DuerOS/Detail/doc.vue
index 3c8b7578..716af4ed 100644
--- a/src/views/Northbound/DuerOS/Detail/doc.vue
+++ b/src/views/Northbound/DuerOS/Detail/doc.vue
@@ -68,7 +68,7 @@
             >
                 <j-descriptions-item label="参数">说明</j-descriptions-item>
                 <j-descriptions-item label="appId">
-                  第三方应用唯一标识，物联网平台的自动生成
+                    第三方应用唯一标识，物联网平台的自动生成
                 </j-descriptions-item>
                 <j-descriptions-item label="secureKey">
                     secureKey 第三方应用唯一标识匹配的秘钥，物联网平台的自动生成
@@ -110,7 +110,14 @@ import { getImage } from '@/utils/comm';
     color: rgba(#000, 0.8);
     font-size: 14px;
     background-color: #fafafa;
-
+    &::-webkit-scrollbar {
+        width: 5px; /* 滚动条宽度 */
+        background-color: #edf5ff; /* 滚动条背景色 */
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+        border-radius: 4px; /* 滚动条拖动部分圆角 */
+    }
     .url {
         padding: 8px 16px;
         color: #2f54eb;
@@ -139,11 +146,11 @@ import { getImage } from '@/utils/comm';
         margin: 16px 0;
 
         .desc {
-          width: 100%;
-          text-align: center;
-          color: rgb(138, 143, 141);
-          margin-top: 10px;
+            width: 100%;
+            text-align: center;
+            color: rgb(138, 143, 141);
+            margin-top: 10px;
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Northbound/DuerOS/Detail/index.vue b/src/views/Northbound/DuerOS/Detail/index.vue
index 8da55d93..fd6eb48a 100644
--- a/src/views/Northbound/DuerOS/Detail/index.vue
+++ b/src/views/Northbound/DuerOS/Detail/index.vue
@@ -1,540 +1,528 @@
 <template>
-    <page-container>
-        <FullPage>
-            <j-card>
-                <div class="box">
-                    <div class="left">
-                        <div class="left-content">
-                            <TitleComponent data="基本信息" />
-                            <j-alert
-                                v-if="_error && modelRef?.id"
-                                style="margin: 10px 0"
-                                type="warning"
+    <!-- <j-card> -->
+        <div class="box" v-if="!noData">
+            <div class="left">
+                <div class="left-content">
+                    <TitleComponent data="基本信息" />
+                    <j-alert
+                        v-if="_error && modelRef?.id"
+                        style="margin: 10px 0"
+                        type="warning"
+                    >
+                        <template #message>
+                            <div
+                                style="
+                                    display: flex;
+                                    justify-content: space-between;
+                                    align-items: center;
+                                "
                             >
-                                <template #message>
-                                    <div
-                                        style="
-                                            display: flex;
-                                            justify-content: space-between;
-                                            align-items: center;
-                                        "
-                                    >
-                                        <span
-                                            style="
-                                                width: calc(100% - 100px);
-                                                text-align: center;
-                                            "
-                                            >{{ _error }}</span
-                                        >
-                                        <PermissionButton
-                                            :popConfirm="{
-                                                title: '确认启用',
-                                                onConfirm: onActiveProduct,
-                                            }"
-                                            size="small"
-                                            :hasPermission="'device/Product:action'"
-                                        >
-                                            立即启用
-                                        </PermissionButton>
-                                    </div>
-                                </template>
-                            </j-alert>
-                            <j-form
-                                :layout="'vertical'"
-                                ref="formRef"
-                                :model="modelRef"
-                            >
-                                <j-row :gutter="24">
-                                    <j-col :span="24">
-                                        <j-form-item
-                                            label="名称"
-                                            name="name"
-                                            :rules="[
-                                                {
-                                                    required: true,
-                                                    message: '请输入名称',
-                                                },
-                                                {
-                                                    max: 64,
-                                                    message: '最多输入64个字符',
-                                                },
-                                            ]"
-                                        >
-                                            <j-input
-                                                placeholder="请输入名称"
-                                                v-model:value="modelRef.name"
-                                            />
-                                        </j-form-item>
-                                    </j-col>
-                                    <j-col :span="12">
-                                        <j-form-item
-                                            label="产品"
-                                            name="id"
-                                            :rules="[
-                                                {
-                                                    required: true,
-                                                    message: '请选择产品',
-                                                },
-                                                {
-                                                    validator: _validator,
-                                                    trigger: 'change',
-                                                },
-                                            ]"
-                                        >
-                                            <MSelect
-                                                v-model:value="modelRef.id"
-                                                :options="productList"
-                                                :disabled="
-                                                    type !== 'edit' &&
-                                                    modelRef.id &&
-                                                    modelRef.id !== ':id'
-                                                "
-                                                @change="productChange"
-                                            />
-                                        </j-form-item>
-                                    </j-col>
-                                    <j-col :span="12">
-                                        <j-form-item
-                                            name="applianceType"
-                                            :rules="{
-                                                required: true,
-                                                message: '请选择设备类型',
-                                            }"
-                                        >
-                                            <template #label>
-                                                <span>
-                                                    设备类型
-                                                    <j-tooltip
-                                                        title="DuerOS平台拟定的规范"
-                                                    >
-                                                        <AIcon
-                                                            type="QuestionCircleOutlined"
-                                                            style="
-                                                                margin-left: 2px;
-                                                            "
-                                                        />
-                                                    </j-tooltip>
-                                                </span>
-                                            </template>
-                                            <j-select
-                                                placeholder="请选择设备类型"
-                                                v-model:value="
-                                                    modelRef.applianceType
-                                                "
-                                                show-search
-                                                @change="typeChange"
-                                            >
-                                                <j-select-option
-                                                    v-for="item in typeList"
-                                                    :key="item.id"
-                                                    :value="item.id"
-                                                    :label="item.name"
-                                                    >{{
-                                                        item.name
-                                                    }}</j-select-option
-                                                >
-                                            </j-select>
-                                        </j-form-item>
-                                        <j-form-item
-                                            name="productName"
-                                            v-show="false"
-                                            label="产品名称"
-                                        >
-                                            <j-input
-                                                v-model:value="
-                                                    modelRef.productName
-                                                "
-                                            />
-                                        </j-form-item>
-                                    </j-col>
-                                    <j-col :span="24">
-                                        <p>动作映射</p>
-                                        <j-collapse
-                                            v-if="
-                                                modelRef.actionMappings.length
-                                            "
-                                            :activeKey="actionActiveKey"
-                                            @change="onActionCollChange"
-                                        >
-                                            <j-collapse-panel
-                                                v-for="(
-                                                    item, index
-                                                ) in modelRef.actionMappings"
-                                                :key="index"
-                                                :header="
-                                                    item.action
-                                                        ? getTypesActions(
-                                                              item.action,
-                                                          ).find(
-                                                              (i) =>
-                                                                  i.id ===
-                                                                  item.action,
-                                                          )?.name
-                                                        : `动作映射${index + 1}`
-                                                "
-                                            >
-                                                <template #extra>
-                                                    <div
-                                                        style="width: 20px"
-                                                        @click.stop
-                                                    >
-                                                        <j-popconfirm
-                                                            title="确认删除？"
-                                                            @confirm.prevent="
-                                                                delItem(index)
-                                                            "
-                                                        >
-                                                            <AIcon
-                                                                type="DeleteOutlined"
-                                                            />
-                                                        </j-popconfirm>
-                                                    </div>
-                                                </template>
-                                                <j-row :gutter="24">
-                                                    <j-col :span="12">
-                                                        <j-form-item
-                                                            :name="[
-                                                                'actionMappings',
-                                                                index,
-                                                                'action',
-                                                            ]"
-                                                            :rules="{
-                                                                required: true,
-                                                                message:
-                                                                    '请选择动作',
-                                                            }"
-                                                        >
-                                                            <template #label>
-                                                                <span>
-                                                                    动作
-                                                                    <j-tooltip
-                                                                        title="DuerOS平台拟定的设备类型具有的相关动作"
-                                                                    >
-                                                                        <AIcon
-                                                                            type="QuestionCircleOutlined"
-                                                                        />
-                                                                    </j-tooltip>
-                                                                </span>
-                                                            </template>
-                                                            <j-select
-                                                                placeholder="请选择动作"
-                                                                v-model:value="
-                                                                    item.action
-                                                                "
-                                                                show-search
-                                                            >
-                                                                <j-select-option
-                                                                    v-for="i in getTypesActions(
-                                                                        item.action ||
-                                                                            '',
-                                                                    )"
-                                                                    :key="i.id"
-                                                                    :value="
-                                                                        i.id
-                                                                    "
-                                                                    :label="
-                                                                        i.name
-                                                                    "
-                                                                    >{{
-                                                                        i.name
-                                                                    }}</j-select-option
-                                                                >
-                                                            </j-select>
-                                                        </j-form-item>
-                                                    </j-col>
-                                                    <j-col :span="12">
-                                                        <j-form-item
-                                                            :name="[
-                                                                'actionMappings',
-                                                                index,
-                                                                'actionType',
-                                                            ]"
-                                                            :rules="{
-                                                                required: true,
-                                                                message:
-                                                                    '请选择操作',
-                                                            }"
-                                                        >
-                                                            <template #label>
-                                                                <span>
-                                                                    操作
-                                                                    <j-tooltip
-                                                                        title="映射物联网平台中所选产品具备的动作"
-                                                                    >
-                                                                        <AIcon
-                                                                            type="QuestionCircleOutlined"
-                                                                        />
-                                                                    </j-tooltip>
-                                                                </span>
-                                                            </template>
-                                                            <j-select
-                                                                placeholder="请选择操作"
-                                                                v-model:value="
-                                                                    item.actionType
-                                                                "
-                                                                show-search
-                                                                @change="
-                                                                    () =>
-                                                                        onActionTypeChange(
-                                                                            index,
-                                                                        )
-                                                                "
-                                                            >
-                                                                <j-select-option
-                                                                    value="command"
-                                                                    >下发指令</j-select-option
-                                                                >
-                                                                <j-select-option
-                                                                    value="latestData"
-                                                                    >获取历史数据</j-select-option
-                                                                >
-                                                            </j-select>
-                                                        </j-form-item>
-                                                    </j-col>
-                                                    <j-col
-                                                        :span="24"
-                                                        v-if="item.actionType"
-                                                    >
-                                                        <j-form-item
-                                                            :name="[
-                                                                'actionMappings',
-                                                                index,
-                                                                'command',
-                                                            ]"
-                                                        >
-                                                            <Command
-                                                                ref="command"
-                                                                :metadata="
-                                                                    findProductMetadata
-                                                                "
-                                                                v-model:modelValue="
-                                                                    item.command
-                                                                "
-                                                                :actionType="
-                                                                    item.actionType
-                                                                "
-                                                            />
-                                                        </j-form-item>
-                                                    </j-col>
-                                                </j-row>
-                                            </j-collapse-panel>
-                                        </j-collapse>
-                                        <j-card v-else>
-                                            <j-empty />
-                                        </j-card>
-                                    </j-col>
-                                    <j-col :span="24">
-                                        <j-button
-                                            type="dashed"
-                                            style="
-                                                width: 100%;
-                                                margin-top: 10px;
-                                            "
-                                            @click="addItem"
-                                        >
-                                            <AIcon
-                                                type="PlusOutlined"
-                                                style="margin-left: 2px"
-                                            />新增动作
-                                        </j-button>
-                                    </j-col>
-                                    <j-col :span="24">
-                                        <p style="margin-top: 20px">属性映射</p>
-                                        <j-collapse
-                                            v-if="
-                                                modelRef.propertyMappings.length
-                                            "
-                                            :activeKey="propertyActiveKey"
-                                            @change="onPropertyCollChange"
-                                        >
-                                            <j-collapse-panel
-                                                v-for="(
-                                                    item, index
-                                                ) in modelRef.propertyMappings"
-                                                :key="index"
-                                                :header="
-                                                    item.source
-                                                        ? getDuerOSProperties(
-                                                              item.source,
-                                                          ).find(
-                                                              (i) =>
-                                                                  i.id ===
-                                                                  item.source,
-                                                          )?.name
-                                                        : `属性映射${index + 1}`
-                                                "
-                                            >
-                                                <template #extra>
-                                                    <div
-                                                        style="width: 20px"
-                                                        @click.stop
-                                                    >
-                                                        <j-popconfirm
-                                                            title="确认删除？"
-                                                            @confirm.prevent="
-                                                                delPropertyItem(
-                                                                    index,
-                                                                )
-                                                            "
-                                                        >
-                                                            <AIcon
-                                                                type="DeleteOutlined"
-                                                            />
-                                                        </j-popconfirm>
-                                                    </div>
-                                                </template>
-                                                <j-row :gutter="24">
-                                                    <j-col :span="12">
-                                                        <j-form-item
-                                                            label="DuerOS属性"
-                                                            :name="[
-                                                                'propertyMappings',
-                                                                index,
-                                                                'source',
-                                                            ]"
-                                                            :rules="{
-                                                                required: true,
-                                                                message:
-                                                                    '请选择DuerOS属性',
-                                                            }"
-                                                        >
-                                                            <j-select
-                                                                placeholder="请选择DuerOS属性"
-                                                                v-model:value="
-                                                                    item.source
-                                                                "
-                                                                show-search
-                                                            >
-                                                                <j-select-option
-                                                                    v-for="i in getDuerOSProperties(
-                                                                        item.source ||
-                                                                            '',
-                                                                    )"
-                                                                    :key="i.id"
-                                                                    :value="
-                                                                        i.id
-                                                                    "
-                                                                    >{{
-                                                                        i.name
-                                                                    }}</j-select-option
-                                                                >
-                                                            </j-select>
-                                                        </j-form-item>
-                                                    </j-col>
-                                                    <j-col :span="12">
-                                                        <j-form-item
-                                                            label="平台属性"
-                                                            :name="[
-                                                                'propertyMappings',
-                                                                index,
-                                                                'target',
-                                                            ]"
-                                                            :rules="[
-                                                                {
-                                                                    required: true,
-                                                                    message:
-                                                                        '请选择平台属性',
-                                                                },
-                                                            ]"
-                                                        >
-                                                            <!-- <j-select
-                                                                placeholder="请选择平台属性"
-                                                                v-model:value="
-                                                                    item.target
-                                                                "
-                                                                show-search
-                                                            >
-                                                                <j-select-option
-                                                                    v-for="i in getProductProperties(
-                                                                        item.target,
-                                                                    )"
-                                                                    :key="i.id"
-                                                                    :value="
-                                                                        i.id
-                                                                    "
-                                                                    >{{
-                                                                        i.name
-                                                                    }}</j-select-option
-                                                                >
-                                                            </j-select> -->
-                                                            <MSelect
-                                                                v-model:value="
-                                                                    item.target
-                                                                "
-                                                                type="target"
-                                                                :options="
-                                                                    getProductProperties(
-                                                                        item.target,
-                                                                    )
-                                                                "
-                                                            />
-                                                        </j-form-item>
-                                                    </j-col>
-                                                </j-row>
-                                            </j-collapse-panel>
-                                        </j-collapse>
-                                        <j-card v-else>
-                                            <j-empty />
-                                        </j-card>
-                                    </j-col>
-                                    <j-col :span="24">
-                                        <j-button
-                                            type="dashed"
-                                            style="
-                                                width: 100%;
-                                                margin-top: 10px;
-                                            "
-                                            @click="addPropertyItem"
-                                        >
-                                            <AIcon
-                                                type="PlusOutlined"
-                                                style="margin-left: 2px"
-                                            />新增属性
-                                        </j-button>
-                                    </j-col>
-                                    <j-col :span="24" style="margin-top: 20px">
-                                        <j-form-item
-                                            label="说明"
-                                            name="description"
-                                            :rules="{
-                                                max: 200,
-                                                message: '最多输入200个字符',
-                                            }"
-                                        >
-                                            <j-textarea
-                                                v-model:value="
-                                                    modelRef.description
-                                                "
-                                                placeholder="请输入说明"
-                                                showCount
-                                                :maxlength="200"
-                                            />
-                                        </j-form-item>
-                                    </j-col>
-                                </j-row>
-                            </j-form>
-                            <div v-if="type === 'edit'">
-                                <PermissionButton
-                                    type="primary"
-                                    :loading="loading"
-                                    @click="saveBtn"
-                                    :hasPermission="[
-                                        'Northbound/DuerOS:add',
-                                        'Northbound/DuerOS:update',
-                                    ]"
+                                <span
+                                    style="
+                                        width: calc(100% - 100px);
+                                        text-align: center;
+                                    "
+                                    >{{ _error }}</span
                                 >
-                                    保存
+                                <PermissionButton
+                                    :popConfirm="{
+                                        title: '确认启用',
+                                        onConfirm: onActiveProduct,
+                                    }"
+                                    size="small"
+                                    :hasPermission="'device/Product:action'"
+                                >
+                                    立即启用
                                 </PermissionButton>
                             </div>
-                        </div>
-                    </div>
-                    <div class="right">
-                        <Doc />
-                    </div>
+                        </template>
+                    </j-alert>
+                    <j-form
+                        :layout="'vertical'"
+                        ref="formRef"
+                        :model="modelRef"
+                    >
+                        <j-row :gutter="24">
+                            <j-col :span="24">
+                                <j-form-item
+                                    label="名称"
+                                    name="name"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入名称',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多输入64个字符',
+                                        },
+                                    ]"
+                                >
+                                    <j-input
+                                        placeholder="请输入名称"
+                                        v-model:value="modelRef.name"
+                                    />
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="12">
+                                <j-form-item
+                                    label="产品"
+                                    name="id"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请选择产品',
+                                        },
+                                        {
+                                            validator: _validator,
+                                            trigger: 'change',
+                                        },
+                                    ]"
+                                >
+                                    <MSelect
+                                        v-model:value="modelRef.id"
+                                        :options="productList"
+                                        @change="productChange"
+                                    />
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="12">
+                                <j-form-item
+                                    name="applianceType"
+                                    :rules="{
+                                        required: true,
+                                        message: '请选择设备类型',
+                                    }"
+                                >
+                                    <template #label>
+                                        <span>
+                                            设备类型
+                                            <j-tooltip
+                                                title="DuerOS平台拟定的规范"
+                                            >
+                                                <AIcon
+                                                    type="QuestionCircleOutlined"
+                                                    style="margin-left: 2px"
+                                                />
+                                            </j-tooltip>
+                                        </span>
+                                    </template>
+                                    <j-select
+                                        placeholder="请选择设备类型"
+                                        v-model:value="modelRef.applianceType"
+                                        show-search
+                                        @change="typeChange"
+                                    >
+                                        <j-select-option
+                                            v-for="item in typeList"
+                                            :key="item.id"
+                                            :value="item.id"
+                                            :label="item.name"
+                                            >{{ item.name }}</j-select-option
+                                        >
+                                    </j-select>
+                                </j-form-item>
+                                <j-form-item
+                                    name="productName"
+                                    v-show="false"
+                                    label="产品名称"
+                                >
+                                    <j-input
+                                        v-model:value="modelRef.productName"
+                                    />
+                                </j-form-item>
+                            </j-col>
+                            <j-col :span="24">
+                                <p>动作映射</p>
+                                <j-collapse
+                                    v-if="modelRef.actionMappings.length"
+                                    :activeKey="actionActiveKey"
+                                    @change="onActionCollChange"
+                                >
+                                    <j-collapse-panel
+                                        v-for="(
+                                            item, index
+                                        ) in modelRef.actionMappings"
+                                        :key="index"
+                                        :header="
+                                            item.action
+                                                ? getTypesActions(
+                                                      item.action,
+                                                  ).find(
+                                                      (i) =>
+                                                          i.id === item.action,
+                                                  )?.name
+                                                : `动作映射${index + 1}`
+                                        "
+                                    >
+                                        <template #extra>
+                                            <div
+                                                style="width: 20px"
+                                                @click.stop
+                                            >
+                                                <ConfirmModal
+                                                    title="确认删除？"
+                                                    :onConfirm="
+                                                        () => delItem(index)
+                                                    "
+                                                >
+                                                    <AIcon
+                                                        type="DeleteOutlined"
+                                                    />
+                                                </ConfirmModal>
+                                            </div>
+                                        </template>
+                                        <j-row :gutter="24">
+                                            <j-col :span="12">
+                                                <j-form-item
+                                                    :name="[
+                                                        'actionMappings',
+                                                        index,
+                                                        'action',
+                                                    ]"
+                                                    :rules="{
+                                                        required: true,
+                                                        message: '请选择动作',
+                                                    }"
+                                                >
+                                                    <template #label>
+                                                        <span>
+                                                            动作
+                                                            <j-tooltip
+                                                                title="DuerOS平台拟定的设备类型具有的相关动作"
+                                                            >
+                                                                <AIcon
+                                                                    type="QuestionCircleOutlined"
+                                                                />
+                                                            </j-tooltip>
+                                                        </span>
+                                                    </template>
+                                                    <j-select
+                                                        placeholder="请选择动作"
+                                                        v-model:value="
+                                                            item.action
+                                                        "
+                                                        show-search
+                                                    >
+                                                        <j-select-option
+                                                            v-for="i in getTypesActions(
+                                                                item.action ||
+                                                                    '',
+                                                            )"
+                                                            :key="i.id"
+                                                            :value="i.id"
+                                                            :label="i.name"
+                                                            >{{
+                                                                i.name
+                                                            }}</j-select-option
+                                                        >
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col :span="12">
+                                                <j-form-item
+                                                    :name="[
+                                                        'actionMappings',
+                                                        index,
+                                                        'actionType',
+                                                    ]"
+                                                    :rules="{
+                                                        required: true,
+                                                        message: '请选择操作',
+                                                    }"
+                                                >
+                                                    <template #label>
+                                                        <span>
+                                                            操作
+                                                            <j-tooltip
+                                                                title="映射物联网平台中所选产品具备的动作"
+                                                            >
+                                                                <AIcon
+                                                                    type="QuestionCircleOutlined"
+                                                                />
+                                                            </j-tooltip>
+                                                        </span>
+                                                    </template>
+                                                    <j-select
+                                                        placeholder="请选择操作"
+                                                        v-model:value="
+                                                            item.actionType
+                                                        "
+                                                        show-search
+                                                        @change="
+                                                            () =>
+                                                                onActionTypeChange(
+                                                                    index,
+                                                                )
+                                                        "
+                                                    >
+                                                        <j-select-option
+                                                            value="command"
+                                                            >下发指令</j-select-option
+                                                        >
+                                                        <j-select-option
+                                                            value="latestData"
+                                                            >获取历史数据</j-select-option
+                                                        >
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col
+                                                :span="24"
+                                                v-if="item.actionType"
+                                            >
+                                                <j-form-item
+                                                    :name="[
+                                                        'actionMappings',
+                                                        index,
+                                                        'command',
+                                                    ]"
+                                                >
+                                                    <Command
+                                                        ref="command"
+                                                        :metadata="
+                                                            findProductMetadata
+                                                        "
+                                                        v-model:modelValue="
+                                                            item.command
+                                                        "
+                                                        :actionType="
+                                                            item.actionType
+                                                        "
+                                                    />
+                                                </j-form-item>
+                                            </j-col>
+                                        </j-row>
+                                    </j-collapse-panel>
+                                </j-collapse>
+                                <j-card v-else>
+                                    <j-empty />
+                                </j-card>
+                            </j-col>
+                            <j-col :span="24">
+                                <j-button
+                                    type="dashed"
+                                    style="width: 100%; margin-top: 10px"
+                                    @click="addItem"
+                                >
+                                    <AIcon
+                                        type="PlusOutlined"
+                                        style="margin-left: 2px"
+                                    />新增动作
+                                </j-button>
+                            </j-col>
+                            <j-col :span="24">
+                                <p style="margin-top: 20px">属性映射</p>
+                                <j-collapse
+                                    v-if="modelRef.propertyMappings.length"
+                                    :activeKey="propertyActiveKey"
+                                    @change="onPropertyCollChange"
+                                >
+                                    <j-collapse-panel
+                                        v-for="(
+                                            item, index
+                                        ) in modelRef.propertyMappings"
+                                        :key="index"
+                                        :header="
+                                            item.source
+                                                ? getDuerOSProperties(
+                                                      item.source,
+                                                  ).find(
+                                                      (i) =>
+                                                          i.id === item.source,
+                                                  )?.name
+                                                : `属性映射${index + 1}`
+                                        "
+                                    >
+                                        <template #extra>
+                                            <div
+                                                style="width: 20px"
+                                                @click.stop
+                                            >
+                                                <ConfirmModal
+                                                    title="确认删除？"
+                                                    :onConfirm="
+                                                        () =>
+                                                            delPropertyItem(
+                                                                index,
+                                                            )
+                                                    "
+                                                >
+                                                    <AIcon
+                                                        type="DeleteOutlined"
+                                                    />
+                                                </ConfirmModal>
+                                            </div>
+                                        </template>
+                                        <j-row :gutter="24">
+                                            <j-col :span="12">
+                                                <j-form-item
+                                                    label="DuerOS属性"
+                                                    :name="[
+                                                        'propertyMappings',
+                                                        index,
+                                                        'source',
+                                                    ]"
+                                                    :rules="{
+                                                        required: true,
+                                                        message:
+                                                            '请选择DuerOS属性',
+                                                    }"
+                                                >
+                                                    <j-select
+                                                        placeholder="请选择DuerOS属性"
+                                                        v-model:value="
+                                                            item.source
+                                                        "
+                                                        show-search
+                                                    >
+                                                        <j-select-option
+                                                            v-for="i in getDuerOSProperties(
+                                                                item.source ||
+                                                                    '',
+                                                            )"
+                                                            :key="i.id"
+                                                            :value="i.id"
+                                                            >{{
+                                                                i.name
+                                                            }}</j-select-option
+                                                        >
+                                                    </j-select>
+                                                </j-form-item>
+                                            </j-col>
+                                            <j-col :span="12">
+                                                <j-form-item
+                                                    label="平台属性"
+                                                    :name="[
+                                                        'propertyMappings',
+                                                        index,
+                                                        'target',
+                                                    ]"
+                                                    :rules="[
+                                                        {
+                                                            required: true,
+                                                            message:
+                                                                '请选择平台属性',
+                                                        },
+                                                    ]"
+                                                >
+                                                    <MSelect
+                                                        v-model:value="
+                                                            item.target
+                                                        "
+                                                        type="target"
+                                                        :options="
+                                                            getProductProperties(
+                                                                item.target,
+                                                            )
+                                                        "
+                                                    />
+                                                </j-form-item>
+                                            </j-col>
+                                        </j-row>
+                                    </j-collapse-panel>
+                                </j-collapse>
+                                <j-card v-else>
+                                    <j-empty />
+                                </j-card>
+                            </j-col>
+                            <j-col :span="24">
+                                <j-button
+                                    type="dashed"
+                                    style="width: 100%; margin-top: 10px"
+                                    @click="addPropertyItem"
+                                >
+                                    <AIcon
+                                        type="PlusOutlined"
+                                        style="margin-left: 2px"
+                                    />新增属性
+                                </j-button>
+                            </j-col>
+                            <j-col :span="24" style="margin-top: 20px">
+                                <j-form-item
+                                    label="说明"
+                                    name="description"
+                                    :rules="{
+                                        max: 200,
+                                        message: '最多输入200个字符',
+                                    }"
+                                >
+                                    <j-textarea
+                                        v-model:value="modelRef.description"
+                                        placeholder="请输入说明"
+                                        showCount
+                                        :maxlength="200"
+                                    />
+                                </j-form-item>
+                            </j-col>
+                        </j-row>
+                    </j-form>
                 </div>
-            </j-card>
-        </FullPage>
-    </page-container>
+            </div>
+            <div class="right">
+                <Doc />
+            </div>
+            <div class="control">
+                <a-space>
+                    <PermissionButton
+                        v-if="data?.id"
+                        hasPermission="Northbound/DuerOS:delete"
+                        danger
+                        :disabled="data?.state?.value !== 'disabled'"
+                        :tooltip="{
+                            title:
+                                data?.state?.value !== 'disabled'
+                                    ? '请先禁用该数据，再删除。'
+                                    : '删除',
+                        }"
+                        :popConfirm="{
+                            title: `确认删除`,
+                            onConfirm: deleteData,
+                        }"
+                        >删除
+                    </PermissionButton>
+                    <PermissionButton
+                        v-if="data?.id"
+                        type="primary"
+                        ghost
+                        hasPermission="Northbound/DuerOS:action"
+                        :tooltip="{
+                            title:
+                                data?.state?.value !== 'disabled'
+                                    ? '禁用'
+                                    : '启用',
+                        }"
+                        :popConfirm="{
+                            title: `确认${
+                                data?.state?.value !== 'disabled'
+                                    ? '禁用'
+                                    : '启用'
+                            }?`,
+                            onConfirm: actionDuerOS,
+                        }"
+                        >{{
+                            data?.state?.value !== 'disabled' ? '禁用' : '启用'
+                        }}
+                    </PermissionButton>
+                    <PermissionButton
+                        type="primary"
+                        :loading="loading"
+                        @click="saveBtn"
+                        :hasPermission="[
+                            'Northbound/DuerOS:add',
+                            'Northbound/DuerOS:update',
+                        ]"
+                    >
+                        保存
+                    </PermissionButton>
+                </a-space>
+            </div>
+        </div>
+        <j-empty
+            v-else
+            style="height: calc(100vh - 300px); padding-top: 200px"
+        ></j-empty>
+    <!-- </j-card> -->
 </template>
 
 <script lang="ts" setup>
@@ -545,18 +533,24 @@ import {
     queryTypes,
     savePatch,
     detail,
+    _undeploy,
+    _deploy,
+    _delete,
 } from '@/api/northbound/dueros';
 import _, { cloneDeep } from 'lodash-es';
-import { useMenuStore } from '@/store/menu';
 import { onlyMessage } from '@/utils/comm';
 import MSelect from '../../components/MSelect/index.vue';
-import { _deploy } from '@/api/device/product';
+import { _deploy as deploy } from '@/api/device/product';
 
-const menuStory = useMenuStore();
-const route = useRoute();
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const emit = defineEmits(['refreshList']);
 
 const formRef = ref();
-
+const noData = ref(false);
 const modelRef = reactive({
     id: undefined,
     name: undefined,
@@ -589,7 +583,6 @@ const productList = ref<Record<string, any>[]>([]);
 const typeList = ref<Record<string, any>[]>([]);
 const command = ref([]);
 const loading = ref<boolean>(false);
-const type = ref<'edit' | 'view'>('edit');
 const actionActiveKey = ref<string[]>(['0']);
 const propertyActiveKey = ref<string[]>(['0']);
 
@@ -766,20 +759,22 @@ const getTypesActions = (val: string) => {
 
 const onActiveProduct = () => {
     if (modelRef.id) {
-        _deploy(modelRef.id).then((resp) => {
+        const response = deploy(modelRef.id);
+        response.then((resp) => {
             if (resp.status === 200) {
                 onlyMessage('操作成功！');
                 getProduct(modelRef.id);
                 _error.value = '';
             }
         });
+        return response;
     }
 };
 
 const _validator = (_rule: any, value: string): Promise<any> =>
     new Promise((resolve, reject) => {
         const _item = productList.value.find((item) => item.id === value);
-        if(!modelRef.id || modelRef.id === ':id') {
+        if (!modelRef.id) {
             return resolve('');
         } else if (!_item && value) {
             productChange(value);
@@ -825,8 +820,11 @@ const saveBtn = async () => {
                 });
                 if (resp.status === 200) {
                     onlyMessage('操作成功！');
-                    formRef.value.resetFields();
-                    menuStory.jumpPage('Northbound/DuerOS');
+                    if (props.data?.id) {
+                        emit('refreshList', true);
+                    } else {
+                        emit('refreshList');
+                    }
                 }
             }
         })
@@ -850,30 +848,82 @@ const saveBtn = async () => {
             });
         });
 };
+
+const actionDuerOS = () => {
+    let response = undefined;
+    if (props.data?.state?.value !== 'disabled') {
+        response = _undeploy(props.data?.id);
+    } else {
+        response = _deploy(props.data?.id);
+    }
+    response.then((res) => {
+        if (res && res.status === 200) {
+            onlyMessage('操作成功！');
+            emit('refreshList', true);
+        } else {
+            onlyMessage('操作失败！', 'error');
+        }
+    });
+    return response;
+};
+
+const deleteData = () => {
+    const response = _delete(props.data?.id);
+    response.then((resp) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功！');
+            emit('refreshList');
+        } else {
+            onlyMessage('操作失败！', 'error');
+        }
+    });
+    return response;
+};
 watch(
-    () => route.params?.id,
-    async (newId) => {
-        if (newId) {
-            await getProduct(newId as string);
+    () => props.data,
+    async () => {
+        noData.value = false
+        formRef.value?.resetFields();
+        if (props.data?.id) {
+            await getProduct(props.data?.id as string);
             getTypes();
-            if (newId === ':id') return;
-            const resp = await detail(newId as string);
+            const resp = await detail(props.data?.id as string);
             const _data: any = resp.result;
             const _obj = cloneDeep(_data);
             if (_data) {
                 _obj.applianceType = _obj?.applianceType?.value;
             }
             Object.assign(modelRef, _obj);
-        }
-    },
-    { immediate: true, deep: true },
-);
-
-watch(
-    () => route.query.type,
-    (newVal) => {
-        if (newVal) {
-            type.value = newVal as 'edit' | 'view';
+        } else {
+            if (props.data?.type === 'add') {
+                modelRef.id = undefined;
+                modelRef.name = undefined;
+                modelRef.applianceType = undefined;
+                modelRef.productName = undefined;
+                modelRef.actionMappings = [
+                    {
+                        actionType: undefined,
+                        action: undefined,
+                        command: {
+                            messageType: undefined,
+                            message: {
+                                properties: undefined,
+                                functionId: undefined,
+                                inputs: [],
+                            },
+                        },
+                    },
+                ];
+                modelRef.propertyMappings = [
+                    {
+                        source: undefined,
+                        target: undefined,
+                    },
+                ];
+                modelRef.description = undefined;
+            }else if(props.data?.type === 'noData'){
+                noData.value = true
+            }
         }
     },
     { immediate: true, deep: true },
@@ -883,18 +933,45 @@ watch(
 <style scoped lang="less">
 .box {
     position: relative;
+    height: 100%;
+    margin: 20px;
     .left {
+        overflow: hidden;
         .left-content {
             width: 66%;
+            padding: 0 20px;
+            height: calc(100vh - 300px);
+            overflow-y: auto;
+            &::-webkit-scrollbar {
+                width: 5px; /* 滚动条宽度 */
+                background-color: #edf5ff; /* 滚动条背景色 */
+            }
+            &::-webkit-scrollbar-thumb {
+                background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+                border-radius: 4px; /* 滚动条拖动部分圆角 */
+            }
         }
     }
     .right {
         width: 33%;
         position: absolute;
         right: 0;
-        top: 0;
+        top: 40px;
         overflow-y: auto;
-        height: 100%;
+        height: 90%;
+        &::-webkit-scrollbar {
+            width: 5px; /* 滚动条宽度 */
+            background-color: #edf5ff; /* 滚动条背景色 */
+        }
+        &::-webkit-scrollbar-thumb {
+            background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+            border-radius: 4px; /* 滚动条拖动部分圆角 */
+        }
+    }
+    .control {
+        position: absolute;
+        right: 0;
+        top: 0;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/Northbound/DuerOS/Tree/index.vue b/src/views/Northbound/DuerOS/Tree/index.vue
new file mode 100644
index 00000000..59669484
--- /dev/null
+++ b/src/views/Northbound/DuerOS/Tree/index.vue
@@ -0,0 +1,138 @@
+<template>
+    <PermissionButton
+        type="primary"
+        @click="handleAdd"
+        block
+        ghost
+        hasPermission="Northbound/DuerOS:add"
+    >
+        <template #icon><AIcon type="PlusOutlined" /></template>
+        新增
+    </PermissionButton>
+    <div class="listContainer">
+        <template v-if="treeData?.length">
+            <div
+                v-for="i in treeData"
+                class="listItem"
+                @click="() => selectItem(i)"
+                :class="{ selected: i.id === selectedId }"
+            >
+                <div class="itemText">
+                    <Ellipsis style="width: 100%;">
+                        {{ i.name }}
+                    </Ellipsis>
+                </div>
+                <div
+                    class="status"
+                    :style="{
+                        color:
+                            i.state?.value === 'disabled' ? 'red' : '#70b603',
+                    }"
+                >
+                    {{ i.state?.value === 'disabled' ? '禁用' : '启用' }}
+                </div>
+            </div>
+        </template>
+        <j-empty v-else style="margin-top: 200px"></j-empty>
+    </div>
+</template>
+
+<script setup>
+import { queryPaginateNot } from '@/api/northbound/dueros';
+import { defineExpose } from 'vue';
+const props = defineProps({
+    params: {
+        type: Object,
+    },
+});
+const emit = defineEmits(['viewData']);
+const treeData = ref();
+const selectedId = ref();
+const queryList = async (changeSelect = false) => {
+    const queryParams = props.params
+        ? {
+              paging: false,
+              sorts: [{ name: 'createTime', order: 'desc' }],
+              ...props.params,
+          }
+        : {
+              paging: false,
+              sorts: [{ name: 'createTime', order: 'desc' }],
+          };
+    const res = await queryPaginateNot(queryParams);
+    if (res.success) {
+        treeData.value = res.result;
+        if (treeData.value.length) {
+            !changeSelect
+                ? selectItem(treeData.value[0])
+                : selectItem(
+                      treeData.value.find((i) => {
+                          return (selectedId.value = i.id);
+                      }),
+                  );
+        } else {
+            selectedId.value = '';
+            emit('viewData', {
+                type: 'noData',
+            });
+        }
+    }
+};
+const selectItem = (data) => {
+    selectedId.value = data.id;
+    emit('viewData', data);
+};
+const handleAdd = () => {
+    selectedId.value = '';
+    emit('viewData', {
+        type: 'add',
+    });
+};
+
+const refresh = (changeSelect) => {
+    queryList(changeSelect);
+};
+
+watch(
+    () => props.params,
+    () => {
+        queryList();
+    },
+    {
+        deep: true,
+        immediate: true,
+    },
+);
+
+defineExpose({
+    refresh,
+});
+</script>
+<style lang="less" scoped>
+.listContainer {
+    margin-top: 10px;
+    height: calc(100% - 50px);
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+        width: 5px; /* 滚动条宽度 */
+        background-color: #edf5ff; /* 滚动条背景色 */
+    }
+    &::-webkit-scrollbar-thumb {
+        background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+        border-radius: 4px; /* 滚动条拖动部分圆角 */
+    }
+}
+.listItem {
+    display: flex;
+    justify-content: space-between;
+    margin-top: 5px;
+    cursor: pointer;
+    padding: 5px;
+}
+.itemText{
+    width: calc(100% - 50px);
+}
+.selected {
+    background-color: #f2f2f2;
+}
+</style>
diff --git a/src/views/Northbound/DuerOS/index.vue b/src/views/Northbound/DuerOS/index.vue
index fb8da131..f5578bfb 100644
--- a/src/views/Northbound/DuerOS/index.vue
+++ b/src/views/Northbound/DuerOS/index.vue
@@ -6,157 +6,26 @@
             @search="handleSearch"
         />
         <FullPage>
-            <JProTable
-                ref="instanceRef"
-                :columns="columns"
-                :request="query"
-                :defaultParams="{
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                }"
-                :params="params"
-            >
-                <template #headerTitle>
-                    <j-space>
-                        <PermissionButton
-                            type="primary"
-                            @click="handleAdd"
-                            hasPermission="Northbound/DuerOS:add"
-                        >
-                            <template #icon
-                                ><AIcon type="PlusOutlined"
-                            /></template>
-                            新增
-                        </PermissionButton>
-                    </j-space>
-                </template>
-                <template #card="slotProps">
-                    <CardBox
-                        :value="slotProps"
-                        @click="handleView(slotProps.id)"
-                        :actions="getActions(slotProps, 'card')"
-                        :status="slotProps.state?.value"
-                        :statusText="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'processing',
-                            disabled: 'error',
-                        }"
-                    >
-                        <template #img>
-                            <img :src="getImage('/cloud/dueros.png')" />
-                        </template>
-                        <template #content>
-                            <Ellipsis style="width: calc(100% - 100px)">
-                                <span style="font-size: 16px; font-weight: 600">
-                                    {{ slotProps.name }}
-                                </span>
-                            </Ellipsis>
-                            <j-row style="margin-top: 15px">
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        产品
-                                    </div>
-                                    <Ellipsis>
-                                        <div>{{ slotProps?.productName }}</div>
-                                    </Ellipsis>
-                                </j-col>
-                                <j-col :span="12">
-                                    <div class="card-item-content-text">
-                                        设备类型
-                                    </div>
-                                    <Ellipsis>
-                                        <div>
-                                            {{ slotProps?.applianceType?.text }}
-                                        </div>
-                                    </Ellipsis>
-                                </j-col>
-                            </j-row>
-                        </template>
-                        <template #actions="item">
-                            <PermissionButton
-                                :disabled="item.disabled"
-                                :popConfirm="item.popConfirm"
-                                :tooltip="{
-                                    ...item.tooltip,
-                                }"
-                                @click="item.onClick"
-                                :hasPermission="'Northbound/DuerOS:' + item.key"
-                            >
-                                <AIcon
-                                    type="DeleteOutlined"
-                                    v-if="item.key === 'delete'"
-                                />
-                                <template v-else>
-                                    <AIcon :type="item.icon" />
-                                    <span>{{ item?.text }}</span>
-                                </template>
-                            </PermissionButton>
-                        </template>
-                    </CardBox>
-                </template>
-                <template #state="slotProps">
-                    <BadgeStatus
-                        :status="slotProps.state?.value"
-                        :text="slotProps.state?.text"
-                        :statusNames="{
-                            enabled: 'processing',
-                            disabled: 'error',
-                        }"
-                    />
-                </template>
-                <template #applianceType="slotProps">
-                    {{ slotProps.applianceType.text }}
-                </template>
-                <template #action="slotProps">
-                    <j-space>
-                        <template
-                            v-for="i in getActions(slotProps, 'table')"
-                            :key="i.key"
-                        >
-                            <PermissionButton
-                                :disabled="i.disabled"
-                                :popConfirm="i.popConfirm"
-                                :tooltip="{
-                                    ...i.tooltip,
-                                }"
-                                style="padding: 0 5px"
-                                @click="i.onClick"
-                                type="link"
-                                :danger="i.key === 'delete'"
-                                :hasPermission="
-                                    i.key === 'view'
-                                        ? true
-                                        : 'Northbound/DuerOS:' + i.key
-                                "
-                            >
-                                <template #icon
-                                    ><AIcon :type="i.icon"
-                                /></template>
-                            </PermissionButton>
-                        </template>
-                    </j-space>
-                </template>
-            </JProTable>
+            <div class="container">
+                <div class="list">
+                    <Tree ref="TreeRef" @viewData="viewData" :params="params" />
+                </div>
+                <div class="detail">
+                    <Detail :data="current" @refreshList="refreshList" />
+                </div>
+            </div>
         </FullPage>
     </page-container>
 </template>
 
-<script setup lang="ts">
-import {
-    query,
-    _undeploy,
-    _deploy,
-    _delete,
-    queryTypes,
-} from '@/api/northbound/dueros';
-import type { ActionsType } from '@/views/device/Instance/typings';
-import { getImage, onlyMessage } from '@/utils/comm';
-import { useMenuStore } from 'store/menu';
-import BadgeStatus from '@/components/BadgeStatus/index.vue';
+<script setup>
+import Tree from './Tree/index.vue';
+import Detail from './Detail/index.vue';
+import { queryTypes } from '@/api/northbound/dueros';
 import { queryNoPagingPost } from '@/api/device/product';
-
-const instanceRef = ref<Record<string, any>>({});
-const params = ref<Record<string, any>>({});
-const menuStory = useMenuStore();
+const params = ref({});
+const current = ref();
+const TreeRef = ref();
 
 const columns = [
     {
@@ -177,9 +46,9 @@ const columns = [
             rename: 'id',
             options: () =>
                 new Promise((resolve) => {
-                    queryNoPagingPost({paging: false}).then((resp: any) => {
+                    queryNoPagingPost({ paging: false }).then((resp) => {
                         resolve(
-                            resp.result.map((item: any) => ({
+                            resp.result.map((item) => ({
                                 label: item.name,
                                 value: item.id,
                             })),
@@ -197,9 +66,9 @@ const columns = [
             type: 'select',
             options: () =>
                 new Promise((resolve) => {
-                    queryTypes().then((resp: any) => {
+                    queryTypes().then((resp) => {
                         resolve(
-                            resp.result.map((item: any) => ({
+                            resp.result.map((item) => ({
                                 label: item.name,
                                 value: item.id,
                             })),
@@ -236,113 +105,32 @@ const columns = [
     },
 ];
 
-/**
- * 新增
- */
-const handleAdd = () => {
-    menuStory.jumpPage('Northbound/DuerOS/Detail', { id: ':id' });
+const viewData = (data) => {
+    current.value = data;
 };
-
-/**
- * 查看
- */
-const handleView = (id: string) => {
-    menuStory.jumpPage('Northbound/DuerOS/Detail', { id }, { type: 'view' });
+const refreshList = (changeSelect = false) => {
+    TreeRef.value?.refresh(changeSelect);
 };
-
-const getActions = (
-    data: Partial<Record<string, any>>,
-    type: 'card' | 'table',
-): ActionsType[] => {
-    if (!data) return [];
-    const actions = [
-        {
-            key: 'view',
-            text: '查看',
-            tooltip: {
-                title: '查看',
-            },
-            icon: 'EyeOutlined',
-            onClick: () => {
-                handleView(data.id);
-            },
-        },
-        {
-            key: 'update',
-            text: '编辑',
-            tooltip: {
-                title: '编辑',
-            },
-            icon: 'EditOutlined',
-            onClick: () => {
-                menuStory.jumpPage(
-                    'Northbound/DuerOS/Detail',
-                    { id: data.id },
-                    { type: 'edit' },
-                );
-            },
-        },
-        {
-            key: 'action',
-            text: data.state?.value !== 'disabled' ? '禁用' : '启用',
-            tooltip: {
-                title: data.state?.value !== 'disabled' ? '禁用' : '启用',
-            },
-            icon:
-                data.state.value !== 'disabled'
-                    ? 'StopOutlined'
-                    : 'CheckCircleOutlined',
-            popConfirm: {
-                title: `确认${
-                    data.state.value !== 'disabled' ? '禁用' : '启用'
-                }?`,
-                onConfirm: async () => {
-                    let response = undefined;
-                    if (data.state.value !== 'disabled') {
-                        response = await _undeploy(data.id);
-                    } else {
-                        response = await _deploy(data.id);
-                    }
-                    if (response && response.status === 200) {
-                        onlyMessage('操作成功！');
-                        instanceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
-            },
-        },
-        {
-            key: 'delete',
-            text: '删除',
-            disabled: data.state?.value !== 'disabled',
-            tooltip: {
-                title:
-                    data.state.value !== 'disabled'
-                        ? '请先禁用该数据，再删除。'
-                        : '删除',
-            },
-            popConfirm: {
-                title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await _delete(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        instanceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
-            },
-            icon: 'DeleteOutlined',
-        },
-    ];
-    if (type === 'card')
-        return actions.filter((i: ActionsType) => i.key !== 'view');
-    return actions;
-};
-
-const handleSearch = (_params: any) => {
+const handleSearch = (_params) => {
     params.value = _params;
 };
 </script>
+<style scoped lang="less">
+.container {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+    height: 100%;
+    .list {
+        width: 15%;
+        background-color: #fff;
+        padding: 10px 15px;
+        height: 100%;
+        border-right: 1px solid #f0f0f0;
+    }
+    .detail {
+        width: 85%;
+        height: 100%
+    }
+}
+</style>
diff --git a/src/views/account/Center/components/BindThirdAccount/index.vue b/src/views/account/Center/components/BindThirdAccount/index.vue
index 8e07e584..04620de2 100644
--- a/src/views/account/Center/components/BindThirdAccount/index.vue
+++ b/src/views/account/Center/components/BindThirdAccount/index.vue
@@ -29,13 +29,10 @@
                         </div>
                     </div>
                     <div class="content-item-right">
-                        <j-popconfirm
-                            v-if="item.bound"
-                            title="确认解除绑定嘛?"
-                            @confirm="() => unBind(item.id)"
-                        >
-                            <j-button>解除绑定</j-button>
-                        </j-popconfirm>
+                        <PermissionButton  v-if="item.bound" :popConfirm="{
+                            title:'确认解除绑定嘛?',
+                            onConfirm:() => unBind(item.id)
+                        }">解除绑定</PermissionButton>
                         <j-button
                             v-else
                             ghost
@@ -66,12 +63,14 @@ const bindIcon = {
     'third-party': '/apply/third-party.png',
 };
 const unBind = (id: string) => {
-    unBind_api(id).then((resp) => {
+    const response =  unBind_api(id)
+    response.then((resp) => {
         if (resp.status === 200) {
             onlyMessage('解绑成功', 'success');
             getSsoBinds();
         }
     });
+    return response
 };
 const clickBind = (id: string) => {
     window.open(
diff --git a/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue b/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
index a31b86a9..577cd6ed 100644
--- a/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
+++ b/src/views/account/Center/components/StationMessage/components/NotificationRecord/components/ViewDialog.vue
@@ -1,29 +1,64 @@
 <template>
-    <j-modal visible title="详情" width="754px" @cancel="emits('update:visible', false)" class="view-dialog-container">
-        <template v-if="['device-transparent-codec', 'system-event'].includes(data?.topicProvider)">
+    <j-modal
+        visible
+        title="详情"
+        width="754px"
+        @cancel="emits('update:visible', false)"
+        class="view-dialog-container"
+    >
+        <template
+            v-if="
+                ['device-transparent-codec', 'system-event'].includes(
+                    data?.topicProvider,
+                )
+            "
+        >
             <div>
                 <div class="label">通知流水:</div>
-                <div style="padding: 10px; background-color: #fafafa">
-                    <j-scrollbar height="200px">
-                        <JsonViewer :value="data" />
-                    </j-scrollbar>
+                <div
+                    style="
+                        padding: 10px;
+                        background-color: #fafafa;
+                        overflow: auto;
+                        height: 200px;
+                    "
+                >
+                    <JsonViewer :value="data" :expandDepth="10" />
                 </div>
             </div>
         </template>
         <template
-            v-else-if="['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed','workflow-task-transfer-todo'].includes(data?.topicProvider)">
-            <j-descriptions :column="2" :contentStyle="{
-                color: '#333333',
-            }" :labelStyle="{
-    color: 'rgba(0, 0, 0, 0.6)',
-    width: '72px',
-}">
+            v-else-if="
+                [
+                    'workflow-task-cc',
+                    'workflow-task-todo',
+                    'workflow-task-reject',
+                    'workflow-process-finish',
+                    'workflow-process-repealed',
+                    'workflow-task-transfer-todo',
+                ].includes(data?.topicProvider)
+            "
+        >
+            <j-descriptions
+                :column="2"
+                :contentStyle="{
+                    color: '#333333',
+                }"
+                :labelStyle="{
+                    color: 'rgba(0, 0, 0, 0.6)',
+                    width: '72px',
+                }"
+            >
                 <j-descriptions-item label="发起人">
                     <j-ellipsis>{{ workFlowData?.creatorName }}</j-ellipsis>
                 </j-descriptions-item>
                 <j-descriptions-item label="发起时间">
                     <j-ellipsis>
-                        {{ dayjs(workFlowData?.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+                        {{
+                            dayjs(workFlowData?.createTime).format(
+                                'YYYY-MM-DD HH:mm:ss',
+                            )
+                        }}
                     </j-ellipsis>
                 </j-descriptions-item>
                 <j-descriptions-item label="流程分类">
@@ -31,12 +66,16 @@
                         {{ workFlowData?.classifiedName }}
                     </j-ellipsis>
                 </j-descriptions-item>
-                <j-descriptions-item label="流程名称"><j-ellipsis>
+                <j-descriptions-item label="流程名称"
+                    ><j-ellipsis>
                         {{ workFlowData?.modelName }}
-                    </j-ellipsis></j-descriptions-item>
-                <j-descriptions-item label="标题"><j-ellipsis>
+                    </j-ellipsis></j-descriptions-item
+                >
+                <j-descriptions-item label="标题"
+                    ><j-ellipsis>
                         {{ workFlowData?.name }}
-                    </j-ellipsis></j-descriptions-item>
+                    </j-ellipsis></j-descriptions-item
+                >
                 <j-descriptions-item label="摘要">
                     <j-ellipsis>
                         {{ workFlowData?.summary }}
@@ -45,12 +84,16 @@
             </j-descriptions>
         </template>
         <template v-else>
-            <j-descriptions :column="2" :contentStyle="{
-                color: '#333333',
-            }" :labelStyle="{
-    color: 'rgba(0, 0, 0, 0.6)',
-    width: '72px',
-}">
+            <j-descriptions
+                :column="2"
+                :contentStyle="{
+                    color: '#333333',
+                }"
+                :labelStyle="{
+                    color: 'rgba(0, 0, 0, 0.6)',
+                    width: '72px',
+                }"
+            >
                 <template v-if="data?.topicProvider === 'alarm-device'">
                     <j-descriptions-item label="告警设备">
                         <j-ellipsis>{{ _data?.targetName || '' }}</j-ellipsis>
@@ -80,15 +123,25 @@
             </j-descriptions>
             <div>
                 <div class="label">告警流水:</div>
-                <div style="padding: 10px; background-color: #fafafa">
-                    <j-scrollbar height="200px">
-                        <JsonViewer style="background-color: #fafafa" :value="JSON.parse(_data?.alarmInfo || '{}')" />
-                    </j-scrollbar>
+                <div
+                    style="
+                        padding: 10px;
+                        background-color: #fafafa;
+                        height: 200px;
+                        overflow: auto;
+                    "
+                >
+                    <JsonViewer
+                        style="background-color: #fafafa"
+                        :value="JSON.parse(_data?.alarmInfo || '{}')"
+                    />
                 </div>
             </div>
         </template>
         <template #footer>
-            <j-button type="primary" @click="emits('update:visible', false)">确定</j-button>
+            <j-button type="primary" @click="emits('update:visible', false)"
+                >确定</j-button
+            >
         </template>
     </j-modal>
 </template>
@@ -109,7 +162,7 @@ const props = defineProps<{
 
 const levelList = ref<any[]>([]);
 //工作流详情的值
-const workFlowData = ref()
+const workFlowData = ref();
 
 const _data = computed(() => {
     if (props.data.detailJson) return JSON.parse(props.data.detailJson);
@@ -127,23 +180,48 @@ const getLevelLabel = (id: number) => {
     return obj?.title;
 };
 onMounted(() => {
-    if (!['device-transparent-codec', 'system-event'].includes(props?.data?.topicProvider)) {
+    if (
+        !['device-transparent-codec', 'system-event'].includes(
+            props?.data?.topicProvider,
+        )
+    ) {
         getLevel();
     }
-    if (['workflow-task-cc', 'workflow-task-todo', 'workflow-task-reject', 'workflow-process-finish', 'workflow-process-repealed','workflow-task-transfer-todo'].includes(props?.data?.topicProvider)) {
+    if (
+        [
+            'workflow-task-cc',
+            'workflow-task-todo',
+            'workflow-task-reject',
+            'workflow-process-finish',
+            'workflow-process-repealed',
+            'workflow-task-transfer-todo',
+        ].includes(props?.data?.topicProvider)
+    ) {
         const params = {
-            terms: [{
-                type: "or",
-                value: ['workflow-process-finish', 'workflow-process-repealed'].includes(props?.data?.topicProvider) ? props?.data?.dataId : props?.data?.detailJson ? JSON.parse(props?.data?.detailJson)?.processId : props?.data?.detail?.processId,
-                termType: "eq",
-                column: "id"
-            }]
-        }
+            terms: [
+                {
+                    type: 'or',
+                    value: [
+                        'workflow-process-finish',
+                        'workflow-process-repealed',
+                    ].includes(props?.data?.topicProvider)
+                        ? props?.data?.dataId
+                        : props?.data?.detailJson
+                        ? JSON.parse(props?.data?.detailJson)?.processId
+                        : props?.data?.detail?.processId,
+                    termType: 'eq',
+                    column: 'id',
+                },
+            ],
+        };
         getWorkflowNotice(params).then((res) => {
-            workFlowData.value = { 'topicProvider': props?.data?.topicProvider, ...res?.result?.[0] }
-        })
+            workFlowData.value = {
+                topicProvider: props?.data?.topicProvider,
+                ...res?.result?.[0],
+            };
+        });
     }
-})
+});
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
index 83ad89eb..753b1e65 100644
--- a/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
+++ b/src/views/account/Center/components/StationMessage/components/NotificationRecord/index.vue
@@ -16,11 +16,6 @@
             :defaultParams="defaultParams"
             :scroll="{y:420}"
         >
-            <!-- <template #rightExtraRender>
-                <j-popconfirm title="确认全部已读？" @confirm="onAllRead">
-                    <j-button type="primary">全部已读</j-button>
-                </j-popconfirm>
-            </template> -->
             <template #topicProvider="slotProps">
                 {{ slotProps.topicName }}
             </template>
@@ -65,7 +60,7 @@
                         }"
                         @click="view(slotProps)"
                     >
-                        <AIcon type="SearchOutlined" />
+                        <AIcon type="EyeOutlined" />
                     </PermissionButton>
                 </j-space>
             </template>
@@ -231,13 +226,15 @@ const refresh = () => {
 
 const changeStatus = (row: any) => {
     const type = row.state.value === 'read' ? '_unread' : '_read';
-    changeStatus_api(type, [row.id]).then((resp: any) => {
+    const response =  changeStatus_api(type, [row.id])
+    response.then((resp: any) => {
         if (resp.status === 200) {
             onlyMessage('操作成功！');
             refresh();
             user.updateAlarm();
         }
     });
+    return response
 };
 
 watchEffect(() => {
diff --git a/src/views/device/Category/index.vue b/src/views/device/Category/index.vue
index e2a16fbb..d02f87d9 100644
--- a/src/views/device/Category/index.vue
+++ b/src/views/device/Category/index.vue
@@ -39,7 +39,7 @@
                     </PermissionButton>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <template
                             v-for="i in getActions(slotProps, 'table')"
                             :key="i.key"
@@ -90,7 +90,7 @@ const title = ref('');
 const isAdd = ref(0);
 const isChild = ref(0);
 const tableLoading = ref(false);
-const addSortId = ref()
+const addSortId = ref();
 // 筛选
 const query = reactive({
     columns: [
@@ -108,10 +108,10 @@ const query = reactive({
             key: 'sortIndex',
             search: {
                 type: 'number',
-                componentProps:{
-                    precision:0,
-                    min:1
-                }
+                componentProps: {
+                    precision: 0,
+                    min: 1,
+                },
             },
             scopedSlots: true,
         },
@@ -183,7 +183,7 @@ const getActions = (
                 }
                 nextTick(() => {
                     modifyRef.value.show(data);
-                    addSortId.value = data.id
+                    addSortId.value = data.id;
                 });
             },
         },
@@ -197,14 +197,17 @@ const getActions = (
                 title: '确认删除?',
                 okText: ' 确定',
                 cancelText: '取消',
-                onConfirm: async () => {
-                    const resp = await deleteTree(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        tableRef.value.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = deleteTree(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            tableRef.value.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
@@ -259,10 +262,10 @@ const table = reactive({
      * 刷新表格数据
      */
     refresh: () => {
-        if(isAdd.value === 0 && isChild.value !==3){
+        if (isAdd.value === 0 && isChild.value !== 3) {
             expandedRowKeys.value.push(addSortId.value);
         }
-        console.log(expandedRowKeys.value)
+        console.log(expandedRowKeys.value);
         tableRef.value.reload();
     },
 });
diff --git a/src/views/device/DashBoard/components/Amap.vue b/src/views/device/DashBoard/components/Amap.vue
index 2a21741d..677999a9 100644
--- a/src/views/device/DashBoard/components/Amap.vue
+++ b/src/views/device/DashBoard/components/Amap.vue
@@ -31,7 +31,7 @@
 </template>
 
 <script lang="ts" setup>
-import AmapComponent from '@/components/AMapComponent/index.vue';
+import AmapComponent from 'components/AMapComponent/AMap.vue';
 import { getGo } from '@/api/device/dashboard';
 import { getImage } from '@/utils/comm';
 let point = ref();
diff --git a/src/views/device/DashBoard/index.vue b/src/views/device/DashBoard/index.vue
index a341ea3f..dfb9419f 100644
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@@ -563,7 +563,7 @@ const getEcharts = (data: any) => {
     } else if (dt > days && dt < year) {
         limit = Math.abs(Math.ceil(dt / days)) + 1;
         _time = '1d';
-        format = 'M月dd日 HH:mm:ss';
+        format = 'M月dd日';
     } else if (dt >= year) {
         limit = Math.abs(Math.floor(dt / months));
         _time = '1M';
diff --git a/src/views/device/Firmware/Task/Detail/Save.vue b/src/views/device/Firmware/Task/Detail/Save.vue
deleted file mode 100644
index 5202ebb4..00000000
--- a/src/views/device/Firmware/Task/Detail/Save.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<template lang="">
-    <j-modal
-        title="查看"
-        ok-text="确认"
-        cancel-text="取消"
-        :visible="true"
-        width="500px"
-        @cancel="handleCancel"
-        @ok="handleOk"
-    >
-        <span>失败原因：{{ data }}</span>
-    </j-modal>
-</template>
-<script lang="ts" setup name="TaskDetailSavePage">
-const props = defineProps({
-    data: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['change']);
-
-const handleOk = () => {
-    handleCancel();
-};
-const handleCancel = () => {
-    emit('change', false);
-};
-</script>
-
-<style lang="less" scoped></style>
diff --git a/src/views/device/Firmware/Task/Detail/index.vue b/src/views/device/Firmware/Task/Detail/index.vue
index 7030ac6d..c7421916 100644
--- a/src/views/device/Firmware/Task/Detail/index.vue
+++ b/src/views/device/Firmware/Task/Detail/index.vue
@@ -1,449 +1,308 @@
 <template>
-    <page-container>
-        <div>
-            <div class="state-container">
-                <div
-                    class="state-body"
-                    v-for="item in stateList"
-                    :key="item.key"
+    <a-modal
+        visible
+        title="任务详情"
+        :width="1200"
+        :closable="false"
+        :maskClosable="false"
+    >
+        <div class="generalInfo">
+            <div class="allOperation">
+                <PermissionButton
+                    @click="stopAll"
+                    hasPermission="device/Firmware:update"
+                    ><template #icon><AIcon type="PauseOutlined" /> </template
+                    >全部暂停
+                </PermissionButton>
+                <PermissionButton
+                    style="margin-left: 20px"
+                    hasPermission="device/Firmware:update"
+                    @click="startAll"
+                    ><template #icon
+                        ><AIcon type="CaretRightOutlined" /> </template
+                    >全部开始</PermissionButton
                 >
-                    <div class="state-content">
-                        <div class="state-header">
-                            <div class="state-title">
-                                <j-badge
-                                    :text="item.name"
-                                    :color="colorMap.get(item.key)"
-                                />
-                            </div>
-
-                            <div class="state-title-right">
-                                <div class="state-button">
-                                    <PermissionButton
-                                        type="link"
-                                        v-if="
-                                            item.key === 'failed' &&
-                                            stateInfo?.mode?.value === 'push'
-                                        "
-                                        hasPermission="device/Firmware:update"
-                                        :popConfirm="{
-                                            title: `确定批量重试`,
-                                            onConfirm: confirm,
-                                        }"
-                                    >
-                                        批量重试
-                                    </PermissionButton>
-                                </div>
-
-                                <div class="img">
-                                    <img
-                                        :src="buttonImg"
-                                        @click="handleRefresh(item.key)"
-                                    />
-                                </div>
-                            </div>
+                <PermissionButton
+                    v-if="data?.mode?.value === 'push'"
+                    style="margin-left: 20px"
+                    hasPermission="device/Firmware:update"
+                    @click="batchRetry"
+                    ><template #icon><AIcon type="RedoOutlined" /> </template>
+                    批量重试
+                </PermissionButton>
+                <PermissionButton
+                    type="text"
+                    hasPermission="device/Firmware:update"
+                    style="float: right"
+                    @click="refreshState"
+                    ><template #icon><AIcon type="RedoOutlined" /> </template>
+                    刷新状态
+                </PermissionButton>
+            </div>
+            <div class="progress">
+                <div style="width: 90%">
+                    <span>当前进度</span>
+                    <a-progress
+                        style="width: 90%; margin-left: 20px"
+                        :strokeWidth="10"
+                        :percent="general.percent"
+                        :format="(percent) => `${percent}%`"
+                    ></a-progress>
+                </div>
+                <span class="total">共{{ general.total }}个任务</span>
+            </div>
+        </div>
+        <j-table
+            :columns="columns"
+            :data-source="historyList"
+            :pagination="false"
+            :rowClassName="rowClassName"
+            :scroll="{
+                y: 400,
+            }"
+        >
+            <template #bodyCell="{ column, text, record }">
+                <template
+                    v-if="
+                        column.dataIndex === 'deviceName' ||
+                        column.dataIndex === 'productName'
+                    "
+                >
+                    <Ellipsis style="width: 100%">{{ text }}</Ellipsis>
+                </template>
+                <template v-if="column.dataIndex === 'createTime'">
+                    <Ellipsis style="width: 100%">{{
+                        dayjs(text).format('YYYY-MM-DD HH:mm:ss')
+                    }}</Ellipsis></template
+                >
+                <template v-if="column.dataIndex === 'completeTime'"
+                    ><Ellipsis style="width: 100%">{{
+                        text ? dayjs(text).format('YYYY-MM-DD HH:mm:ss') : '--'
+                    }}</Ellipsis></template
+                >
+                <template v-if="column.dataIndex === 'state'">
+                    <div class="state">
+                        <a-progress
+                            type="circle"
+                            style="margin-right: 10px"
+                            :width="20"
+                            :showInfo="false"
+                            trailColor="#f0f0f0"
+                            :percent="
+                                text?.value === 'failed'
+                                    ? '100'
+                                    : record?.progress
+                            "
+                            :status="
+                                text?.value === 'failed' ? 'exception' : ''
+                            "
+                        />
+                        <div v-if="text?.value === 'processing' || text?.value === 'success'">
+                            {{ record?.progress + '%' }}
                         </div>
-                        <div class="state-box">
-                            <div
-                                class="state-left"
-                                :style="`color: ${colorMap.get(item.key)}`"
-                            >
-                                {{ state[item.key] }}
-                            </div>
-                            <img class="state-right" :src="item.img" />
+                        <div v-if="text?.value === 'failed'">
+                            {{ text?.text + '：' + record?.errorReason }}
+                        </div>
+                        <div
+                            v-if="
+                                text?.value === 'waiting' ||
+                                text?.value === 'canceled'
+                            "
+                        >
+                            {{ text?.text }}
                         </div>
                     </div>
-                </div>
-            </div>
-
-            <pro-search
-                :columns="columns"
-                target="search-task-detail"
-                @search="handleSearch"
-            />
-            <FullPage>
-                <j-pro-table
-                    ref="tableRef"
-                    model="TABLE"
-                    :columns="columns"
-                    :request="history"
-                    :scroll="{ x: 1500 }"
-                    :defaultParams="{
-                        sorts: [{ name: 'createTime', order: 'desc' }],
-                        terms: defaultParams,
-                    }"
-                    :params="params"
-                >
-                  <template #completeTime="slotProps">
-                        <span>{{
-                           slotProps?.completeTime ? moment(slotProps.completeTime).format(
-                              'YYYY-MM-DD HH:mm:ss') : ""
-                          }}</span>
-                  </template>
-                    <template #createTime="slotProps">
-                        <span>{{
-                            moment(slotProps.createTime).format(
-                                'YYYY-MM-DD HH:mm:ss',
-                            )
-                        }}</span>
-                    </template>
-                    <template #productId="slotProps">
-                        <span>{{ slotProps.productName }}</span>
-                    </template>
-                    <template #state="slotProps">
-                        <j-badge
-                            :text="slotProps.state.text"
-                            :color="colorMap.get(slotProps.state.value)"
-                        />
-                    </template>
-                    <template #progress="slotProps">
-                        <span>{{ slotProps.progress }}%</span>
-                    </template>
-                    <template #action="slotProps">
-                        <j-space>
-                            <template
-                                v-for="i in getActions(slotProps)"
-                                :key="i.key"
-                            >
-                                <PermissionButton
-                                    :disabled="i.disabled"
-                                    :popConfirm="i.popConfirm"
-                                    :tooltip="{
-                                        ...i.tooltip,
-                                    }"
-                                    style="padding: 0px"
-                                    @click="i.onClick"
-                                    type="link"
-                                    :hasPermission="'device/Firmware:' + i.key"
-                                >
-                                    <template #icon
-                                        ><AIcon :type="i.icon"
-                                    /></template>
-                                </PermissionButton>
-                            </template>
-                        </j-space>
-                    </template>
-                </j-pro-table>
-            </FullPage>
-
-            <Save :data="current" v-if="visible" @change="saveChange" />
-        </div>
-    </page-container>
+                </template>
+                <template v-if="column.dataIndex === 'version'">
+                    {{ text || '--' }}
+                </template>
+            </template>
+        </j-table>
+        <template #footer>
+            <span class="tip">关闭弹窗不会影响任务执行状态</span>
+            <a-button value="large" type="primary" @click="$emit('closeDetail')"
+                >关闭</a-button
+            >
+        </template>
+    </a-modal>
 </template>
-<script lang="ts" setup name="TaskDetailPage">
-import type { ActionsType } from '@/components/Table/index';
+
+<script setup name="TaskDetail">
 import {
-    taskById,
-    history,
-    historyCount,
+    historyPaginateNot,
+    stopTask,
     startTask,
     startOneTask,
+    stopOneTask,
 } from '@/api/device/firmware';
-import { getImage } from '@/utils/comm';
-import moment from 'moment';
-import { cloneDeep } from 'lodash-es';
-import Save from './Save.vue';
+import dayjs from 'dayjs';
 import { onlyMessage } from '@/utils/comm';
-
-const tableRef = ref<Record<string, any>>({});
-const route = useRoute();
-const params = ref<Record<string, any>>({});
-const taskId = route.params?.id as string;
-const visible = ref(false);
-const current = ref({});
-const productOptions = ref([]);
-
-const colorMap = new Map();
-colorMap.set('waiting', '#FF9000');
-colorMap.set('processing', '#4293FF');
-colorMap.set('failed', '#F76F5D');
-colorMap.set('success', '#24B276');
-colorMap.set('canceled', '#999');
-
-const stateList = [
-    {
-        key: 'waiting',
-        name: '等待升级',
-        img: getImage('/firmware/waiting.png'),
+const props = defineProps({
+    data: {
+        type: Object,
+        default: {},
     },
-    {
-        key: 'processing',
-        name: '升级中',
-        img: getImage('/firmware/loading.png'),
+    deviceId: {
+        type: String,
     },
-    {
-        key: 'success',
-        name: '升级完成',
-        img: getImage('/firmware/finish.png'),
-    },
-    {
-        key: 'failed',
-        name: '升级失败',
-        img: getImage('/firmware/error.png'),
-    },
-    {
-        key: 'canceled',
-        name: '已停止',
-        img: getImage('/firmware/cancel.png'),
-    },
-];
-
-const buttonImg = getImage('/firmware/button.png');
-const state = ref({
-    waiting: 0,
-    processing: 0,
-    success: 0,
-    failed: 0,
-    canceled: 0,
 });
-const stateInfo = ref();
-
+const emit = defineEmits(['closeDetail', 'refresh']);
 const columns = [
     {
         title: '设备名称',
         dataIndex: 'deviceName',
         key: 'deviceName',
-        fixed: 'left',
-        ellipsis: true,
-        search: {
-            type: 'string',
-        },
     },
     {
         title: '所属产品',
-        dataIndex: 'productId',
-        key: 'productId',
-        ellipsis: true,
-        scopedSlots: true,
-        // search: {
-        //     type: 'select',
-        //     options: productOptions,
-        // },
+        dataIndex: 'productName',
+        key: 'productName',
     },
     {
         title: '创建时间',
         key: 'createTime',
         dataIndex: 'createTime',
         width: 200,
-        scopedSlots: true,
     },
     {
         title: '完成时间',
         key: 'completeTime',
-        ellipsis: true,
         dataIndex: 'completeTime',
-        width: 200,
-        search: {
-            type: 'date',
-        },
-        scopedSlots: true,
     },
     {
-        title: '进度',
-        dataIndex: 'progress',
-        key: 'progress',
-        ellipsis: true,
-        scopedSlots: true,
-        search: {
-            type: 'number',
-        },
+        title: '设备版本',
+        key: 'version',
+        dataIndex: 'version',
+        width: 100,
     },
     {
         title: '状态',
         dataIndex: 'state',
+        width: 300,
         key: 'state',
-        ellipsis: true,
-        search: {
-            type: 'select',
-            options: stateList.map((item) => ({
-                value: item.key,
-                label: item.name,
-            })),
-        },
-        scopedSlots: true,
-        width: 120,
-    },
-
-    {
-        title: '操作',
-        key: 'action',
-        fixed: 'right',
-        width: 120,
-        scopedSlots: true,
     },
 ];
-
-const defaultParams = [
-    {
+//列表数据
+const historyList = ref();
+//总进度
+const general = reactive({
+    total: 0,
+    percent: 0,
+});
+const rowClassName = (record, index) => {
+    return record.deviceId === props.deviceId ? 'heightLightRow' : '';
+};
+//查询任务升级记录列表
+const queryHistoryList = async () => {
+    const params = {
+        paging: false,
+        sorts: [
+            { name: 'createTime', order: 'desc' },
+            { name: 'upgradeTime', order: 'desc' },
+        ],
         terms: [
             {
-                column: 'taskId',
-                value: taskId,
+                terms: [
+                    {
+                        column: 'taskId',
+                        value: props?.data?.id,
+                    },
+                ],
             },
         ],
-    },
-];
-
-const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
-    if (!data) {
-        return [];
-    }
-    const Actions: any = [
-        {
-            key: 'view',
-            text: '查看',
-            tooltip: {
-                title: '查看',
-            },
-            icon: 'EyeOutlined',
-            onClick: async () => {
-                handlEye(data.errorReason);
-            },
-        },
-    ];
-
-    const { state, mode } = data;
-    if (mode.value === 'push' && state.value === 'failed') {
-        Actions.push({
-            key: 'update',
-            text: '重试',
-            tooltip: {
-                title: '重试',
-            },
-            icon: 'RedoOutlined',
-            popConfirm: {
-                title: `确认重试?`,
-                onConfirm: async () => {
-                    handlTry(data.id);
-                },
-            },
+    };
+    const res = await historyPaginateNot(params);
+    if (res.status === 200) {
+        historyList.value = res.result;
+        general.total = res.result.length;
+        let progress = 0;
+        res.result.forEach((item) => {
+            item?.state?.value === 'success' ? (progress += 1) : '';
         });
+        general.percent = (progress / general.total).toFixed(2) * 100;
     }
-
-    return Actions;
 };
-
-const handlEye = (data: string) => {
-    current.value = data || '';
-    visible.value = true;
+const refreshState = async () => {
+    emit('refresh');
+    await queryHistoryList();
+    onlyMessage('操作成功');
 };
-
-const handlTry = async (id: string) => {
+//全部开始
+const startAll = async () => {
+    // const state =
+    //     props.data?.mode?.value === 'push'
+    //         ? ['canceled', 'failed']
+    //         : ['canceled'];
+    const res = await startTask(props.data.id,  ['canceled', 'failed']);
+    if (res.success) {
+        onlyMessage('操作成功', 'success');
+        queryHistoryList();
+        emit('refresh');
+    }
+};
+//全部重试
+const batchRetry = async () => {
+    const res = await startTask(props.data.id, ['failed']);
+    if (res.success) {
+        onlyMessage('操作成功', 'success');
+        queryHistoryList();
+        emit('refresh');
+    }
+};
+//全部停止
+const stopAll = async () => {
+    const res = await stopTask(props.data.id);
+    if (res.success) {
+        onlyMessage('操作成功', 'success');
+        queryHistoryList();
+        emit('refresh');
+    }
+};
+//升级某个记录
+const startUpgrades = async (id) => {
     const res = await startOneTask([id]);
     if (res.success) {
         onlyMessage('操作成功', 'success');
-        tableRef.value.reload();
+        queryHistoryList();
+        emit('refresh');
     }
 };
-const saveChange = (value: boolean) => {
-    visible.value = false;
-    current.value = {};
-};
-const confirm = async (e: MouseEvent) => {
-    const res = await startTask(taskId, ['failed']);
+//停止某个记录
+const stopUpgrades = async (id) => {
+    const res = await stopOneTask([id]);
     if (res.success) {
         onlyMessage('操作成功', 'success');
-        stateList.forEach((item) => {
-            handleRefresh(item.key);
-        });
-        tableRef.value.reload();
-    }
-};
-
-const handleRefresh = async (key: string) => {
-    const terms = cloneDeep(defaultParams);
-    terms[0].terms.push({ column: 'state', value: key });
-    const res = await historyCount({ terms });
-    if (res.success) {
-        state.value[key] = res?.result || 0;
+        queryHistoryList();
+        emit('refresh');
     }
 };
 
 onMounted(() => {
-    stateList.forEach((item) => {
-        handleRefresh(item.key);
-    });
-    taskById(taskId).then((res) => {
-        if (res.success) {
-            stateInfo.value = res?.result;
-        }
-    });
+    queryHistoryList();
 });
-
-/**
- * 搜索
- * @param params
- */
-const handleSearch = (e: any) => {
-    params.value = e;
-};
 </script>
-
 <style lang="less" scoped>
-.state-container {
-    width: 100%;
-    min-height: 148px;
-    background-color: #ffffff;
-    padding: 24px 12px;
-    margin-bottom: 24px;
-    display: flex;
-    flex-wrap: wrap;
-    .state-body {
-        background: linear-gradient(
-            135.62deg,
-            #f6f7fd 22.27%,
-            rgba(255, 255, 255, 0.86) 91.82%
-        );
-        min-width: 185px;
-        max-width: 580px;
-        flex: 1px;
-        margin: 0 12px;
-        .state-content {
-            width: 100% -15px;
-            height: 100%;
-            margin: 15px 0 0 15px;
-            align-content: center;
-
-            .state-header {
-                display: flex;
-                justify-content: space-between;
-                height: 22px;
-                .state-title-right {
-                    z-index: 1;
-                    display: flex;
-                    .img {
-                        width: 22px;
-                        margin: 0 10px;
-                        cursor: pointer;
-                        img {
-                            width: 22px;
-                            margin-top: -5px;
-                        }
-                    }
-                    .img:active {
-                        border: 1px #40a9ff solid;
-                    }
-                }
-            }
-            .state-box {
-                display: flex;
-                justify-content: space-between;
-                .state-left {
-                    flex: 1;
-                    font-size: 52px;
-                }
-                .state-right {
-                    height: 100%;
-                    flex: 1;
-                    margin-top: -31px;
-                    max-width: 120px;
-                    max-height: 94px;
-                }
-            }
-        }
+.generalInfo {
+    margin-bottom: 30px;
+    .progress {
+        width: 100%;
+        line-height: 32px;
+        display: flex;
+    }
+    .allOperation {
+        margin-bottom: 20px;
     }
 }
-.state-button {
-    margin-top: -5px;
-    margin-right: -12px;
+.tip {
+    color: rgb(170, 170, 170);
+    margin-right: 10px;
+}
+.state {
+    display: flex;
+}
+</style>
+<style>
+.heightLightRow {
+    background-color: #e6f4ff;
 }
 </style>
diff --git a/src/views/device/Firmware/Task/Save/SelectDevices.vue b/src/views/device/Firmware/Task/Save/SelectDevices.vue
index d080fdc1..4d401cc4 100644
--- a/src/views/device/Firmware/Task/Save/SelectDevices.vue
+++ b/src/views/device/Firmware/Task/Save/SelectDevices.vue
@@ -88,6 +88,10 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    productId: {
+        type: String,
+        default: '',
+    },
 });
 
 const route = useRoute();
@@ -115,7 +119,7 @@ const defaultParams = {
             terms: [
                 {
                     column: 'productId',
-                    value: route.query.productId,
+                    value: props.productId,
                 },
             ],
             type: 'and',
@@ -166,7 +170,7 @@ const columns = [
         dataIndex: 'registerTime',
         search: {
             type: 'date',
-            rename: 'registryTime'
+            rename: 'registryTime',
         },
         width: 200,
         scopedSlots: true,
@@ -291,19 +295,19 @@ watch(
  * @param params
  */
 const handleSearch = (e: any) => {
-  const newParams = (e?.terms as any[])?.map(item1 => {
-    item1.terms = item1.terms.map((item2: any) => {
-      if (item2.column === 'version') {
-        return {
-          column: 'id$dev-firmware',
-          value: [item2]
-        }
-      }
-      return item2
-    })
-    return item1
-  })
-    params.value = { terms: newParams || []}
+    const newParams = (e?.terms as any[])?.map((item1) => {
+        item1.terms = item1.terms.map((item2: any) => {
+            if (item2.column === 'version') {
+                return {
+                    column: 'id$dev-firmware',
+                    value: [item2],
+                };
+            }
+            return item2;
+        });
+        return item1;
+    });
+    params.value = { terms: newParams || [] };
 };
 </script>
 
diff --git a/src/views/device/Firmware/Task/Save/index.vue b/src/views/device/Firmware/Task/Save/index.vue
index 7dc8e622..e93526e1 100644
--- a/src/views/device/Firmware/Task/Save/index.vue
+++ b/src/views/device/Firmware/Task/Save/index.vue
@@ -6,6 +6,7 @@
         :visible="true"
         width="700px"
         :confirm-loading="loading"
+        :maskClosable="false"
         @cancel="handleCancel"
         @ok="handleOk"
     >
@@ -90,6 +91,7 @@
                         <SelectDevices
                             v-model:modelValue="formData.deviceId"
                             :data="data"
+                            :productId="productId"
                         ></SelectDevices> </j-form-item
                 ></j-col>
                 <j-col :span="24">
@@ -117,6 +119,14 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    firmwareId: {
+        type: String,
+        default: '',
+    },
+    productId: {
+        type: String,
+        default: '',
+    },
 });
 
 const formRef = ref<FormInstance>();
@@ -126,8 +136,8 @@ const loading = ref(false);
 const productOptions = ref([]);
 const emit = defineEmits(['change']);
 
-const firmwareId = route.query.id;
-const productId = route.query.productId;
+const firmwareId = props.firmwareId;
+const productId = props.productId;
 const view = props.data.view;
 
 const formData: any = ref({
@@ -166,7 +176,7 @@ const onSubmit = async () => {
         productId,
     }).finally(() => {
         loading.value = false;
-    })
+    });
     resp.success && emit('change', true);
 };
 
diff --git a/src/views/device/Firmware/Task/index.vue b/src/views/device/Firmware/Task/index.vue
index 7322f405..c2701eb7 100644
--- a/src/views/device/Firmware/Task/index.vue
+++ b/src/views/device/Firmware/Task/index.vue
@@ -1,242 +1,207 @@
 <template>
-    <page-container>
-        <pro-search :columns="columns" target="search-firmware-task" @search="handleSearch" />
-        <j-pro-table
-            ref="tableRef"
-            model="TABLE"
-            :columns="columns"
-            :request="task"
-            :defaultParams="{
-                sorts: [{ name: 'createTime', order: 'desc' }],
-            }"
-            :params="params"
-        >
-            <template #headerTitle>
-                <PermissionButton
-                    type="primary"
-                    @click="handlAdd"
-                    hasPermission="device/Firmware:add"
-                >
-                    <template #icon><AIcon type="PlusOutlined" /></template>
-                    新增
-                </PermissionButton>
-            </template>
-            <template #mode="slotProps">
-                <span>{{ slotProps.mode.text }}</span>
-            </template>
-            <template #progress="slotProps">
-                <span>{{ slotProps.progress }}%</span>
-            </template>
-            <template #action="slotProps">
-                <j-space>
-                    <template v-for="i in getActions(slotProps)" :key="i.key">
-                        <PermissionButton
-                            :disabled="i.disabled"
-                            :popConfirm="i.popConfirm"
-                            :tooltip="{
-                                ...i.tooltip,
+    <a-drawer
+        visible
+        title="升级任务"
+        placement="right"
+        :width="700"
+        :closable="false"
+        @close="$emit('closeDrawer')"
+    >
+        <template #extra>
+            <PermissionButton
+                v-if=!props?.showPosition
+                type="primary"
+                hasPermission="device/Firmware:add"
+                @click="handleAdd"
+            >
+                + 新增任务
+            </PermissionButton>
+        </template>
+        <div v-for="item in taskList" class="task">
+            <div class="taskTitle">
+                <div class="taskTitleLeft">
+                    <div class="upgradeMode">{{ item?.mode?.text }}</div>
+                    <div class="title">
+                        <Ellipsis>{{ item?.name }}</Ellipsis>
+                    </div>
+                </div>
+                <div class="taskTitleRight">
+                    <div>
+                        完成比例<span
+                            class="progress"
+                            :style="{
+                                color:
+                                    item?.progress === 100
+                                        ? '#52C41A'
+                                        : '#FF4D4F',
                             }"
-                            style="padding: 0px"
-                            @click="i.onClick"
-                            type="link"
-                            :hasPermission="'device/Firmware:' + i.key"
                         >
-                            <template #icon><AIcon :type="i.icon" /></template>
-                        </PermissionButton>
-                    </template>
-                </j-space>
-            </template>
-        </j-pro-table>
-        <Save v-if="visible" :data="current" @change="saveChange" />
-    </page-container>
+                            {{ (item?.progress || 0) + '%' }}
+                        </span>
+                    </div>
+                    <PermissionButton
+                        type="link"
+                        hasPermission="device/Firmware:view"
+                        @click="() => taskDetail(item)"
+                        >任务详情</PermissionButton
+                    >
+                </div>
+            </div>
+            <a-descriptions bordered :column="2">
+                <a-descriptions-item
+                    v-if="item?.mode?.value === 'push'"
+                    label="响应超时时间"
+                    >{{
+                        item?.responseTimeoutSeconds + 's'
+                    }}</a-descriptions-item
+                >
+                <a-descriptions-item label="升级超时时间">{{
+                    item?.timeoutSeconds + 's'
+                }}</a-descriptions-item>
+                <a-descriptions-item label="升级设备">{{
+                    item?.deviceId?.length ? '选择设备' : '所有设备'
+                }}</a-descriptions-item>
+                <a-descriptions-item label="说明"
+                    ><Ellipsis style="max-width: 200px;">
+                        {{ item?.description || '--' }}
+                    </Ellipsis></a-descriptions-item
+                >
+            </a-descriptions>
+        </div>
+        <JEmpty v-if="taskList.length === 0"></JEmpty>
+    </a-drawer>
+    <Save
+        v-if="visible"
+        :data="current"
+        :productId="productId"
+        :firmwareId="firmwareId"
+        @change="saveChange"
+    ></Save>
+    <TaskDetail
+        v-if="detailVisible"
+        @close-detail="closeDetail"
+        @refresh="queryTaskList"
+        :deviceId="props.deviceId"
+        :data="currentTask"
+    />
 </template>
-<script lang="ts" setup name="TaskPage">
-import type { ActionsType } from '@/components/Table/index';
-import { task, startTask, stopTask } from '@/api/device/firmware';
-import { onlyMessage } from '@/utils/comm';
+
+<script setup name="TaskDrawer">
+import { queryTaskPaginateNot } from '@/api/device/firmware';
 import Save from './Save/index.vue';
-import { useMenuStore } from 'store/menu';
-
-const menuStory = useMenuStore();
-const tableRef = ref<Record<string, any>>({});
-const route = useRoute();
-const params = ref<Record<string, any>>({});
-
+import TaskDetail from './Detail/index.vue';
+import { onlyMessage } from '@/utils/comm';
+const emit = defineEmits(['closeDrawer']);
+const props = defineProps({
+    firmwareId: {
+        type: String,
+        default: '',
+    },
+    productId: {
+        type: String,
+        default: '',
+    },
+    showPosition:{
+        type:String
+    },
+    deviceId:{
+        type:String
+    }
+});
+const taskList = ref([]);
 const visible = ref(false);
-const current = ref({});
-
-const columns = [
-    {
-        title: '任务名称',
-        dataIndex: 'name',
-        key: 'name',
-        fixed: 'left',
-        width: 200,
-        ellipsis: true,
-        search: {
-            type: 'string',
-        },
-    },
-    {
-        title: '推送方式',
-        dataIndex: 'mode',
-        key: 'mode',
-        ellipsis: true,
-        search: {
-            type: 'select',
-            options: [
-                {
-                    label: '设备拉取',
-                    value: 'pull',
-                },
-                {
-                    label: '平台推送',
-                    value: 'push',
-                },
-            ],
-        },
-        scopedSlots: true,
-        width: 200,
-    },
-
-    {
-        title: '说明',
-        dataIndex: 'description',
-        key: 'description',
-        ellipsis: true,
-        search: {
-            type: 'string',
-        },
-    },
-    {
-        title: '完成比例',
-        dataIndex: 'progress',
-        key: 'progress',
-        ellipsis: true,
-        scopedSlots: true,
-    },
-    {
-        title: '操作',
-        key: 'action',
-        fixed: 'right',
-        width: 200,
-        scopedSlots: true,
-    },
-];
-
-const defaultParams =
-    {
+const detailVisible = ref(false);
+const current = ref();
+//任务详情传参
+const currentTask = ref();
+const queryTaskList = async () => {
+    const param = {
+        paging: false,
+        sorts: [{ name: 'createTime', order: 'desc' }],
         terms: [
             {
-                column: 'firmwareId',
-                value: route.query.id,
+                terms: [
+                    {
+                        column: 'firmwareId',
+                        value: props.firmwareId,
+                    },
+                ],
             },
         ],
-}
-
-
-const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
-    if (!data) {
-        return [];
+    };
+    const res = await queryTaskPaginateNot(param);
+    if (res.status === 200) {
+        if(props?.deviceId){
+            console.log(props.deviceId)
+            taskList.value = res.result.filter((i)=>{
+                return !i?.deviceId ||  i.deviceId.includes(props.deviceId)
+            })
+        }else{
+            taskList.value = res.result;
+        }
+        if (currentTask.value?.id) {
+            currentTask.value = taskList.value.find(
+                (i) => i.id === currentTask.value.id,
+            );
+        }
     }
-
-    const stop = data.waiting > 0 && data?.state?.value === 'processing';
-    const pause = data?.state?.value === 'canceled';
-
-    const Actions = [
-        {
-            key: 'view',
-            text: '详情',
-            tooltip: {
-                title: '详情',
-            },
-            icon: 'icon-details',
-            onClick: async () => {
-                handlDetails(data.id);
-            },
-        },
-        {
-            key: 'view',
-            text: '查看',
-            tooltip: {
-                title: '查看',
-            },
-            icon: 'EyeOutlined',
-            onClick: async () => {
-                handlEye(data);
-            },
-        },
-    ];
-
-    if (stop) {
-        Actions.push({
-            key: 'update',
-            text: '停止',
-            tooltip: {
-                title: '停止',
-            },
-            onClick: async () => {
-                const res = await stopTask(data.id);
-                if (res.success) {
-                    onlyMessage('操作成功', 'success');
-                    tableRef.value.reload();
-                }
-            },
-            icon: 'StopOutlined',
-        });
-    } else if (pause) {
-        Actions.push({
-            key: 'update',
-            text: '继续升级',
-            tooltip: {
-                title: '继续升级',
-            },
-            onClick: async () => {
-                const res = await startTask(data.id, ['canceled']);
-                if (res.success) {
-                    onlyMessage('操作成功', 'success');
-                    tableRef.value.reload();
-                }
-            },
-            icon: 'ControlOutlined',
-        });
-    }
-
-    return Actions;
 };
-
-const handlAdd = () => {
+const handleAdd = () => {
+    visible.value = true;
     current.value = {};
-    visible.value = true;
 };
-
-const handlEye = (data: object) => {
-    current.value = toRaw({ ...data, view: true });
-    visible.value = true;
-};
-
-const handlDetails = (id: string) => {
-    menuStory.jumpPage('device/Firmware/Task/Detail', { id });
-};
-const saveChange = (value: boolean) => {
+const saveChange = (value) => {
     visible.value = false;
     current.value = {};
     if (value) {
         onlyMessage('操作成功', 'success');
-        tableRef.value.reload();
+        queryTaskList();
     }
 };
-
-/**
- * 搜索
- * @param params
- */
-const handleSearch = (e: any) => {
-      const query = {"terms":[
-        e,defaultParams
-      ]}
-      params.value = query
+const taskDetail = (data) => {
+    detailVisible.value = true;
+    currentTask.value = data;
 };
+const closeDetail = () => {
+    detailVisible.value = false;
+    queryTaskList();
+};
+onMounted(() => {
+    queryTaskList();
+});
 </script>
-
-<style lang="less" scoped></style>
+<style lang="less" scoped>
+.task {
+    margin-bottom: 20px;
+}
+.taskTitle {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 8px;
+    .taskTitleLeft,
+    .taskTitleRight {
+        display: flex;
+        line-height: 32px;
+    }
+    .progress {
+        margin-left: 10px;
+    }
+    .upgradeMode {
+        background: #e6f4ff;
+        border-radius: 4px;
+        border: 1px solid #91caff;
+        height: 22px;
+        padding: 0 8px;
+        color: #1677ff;
+        margin-top: 4px;
+        line-height: 22px;
+    }
+    .title {
+        font-size: 16px;
+        font-weight: 500;
+        margin-left: 12px;
+        color: #1a1a1a;
+        max-width: 300px;
+    }
+}
+</style>
diff --git a/src/views/device/Firmware/index.vue b/src/views/device/Firmware/index.vue
index ffb58577..713e546f 100644
--- a/src/views/device/Firmware/index.vue
+++ b/src/views/device/Firmware/index.vue
@@ -20,7 +20,7 @@
                     <template #headerTitle>
                         <PermissionButton
                             type="primary"
-                            @click="handlAdd"
+                            @click="handleAdd"
                             hasPermission="device/Firmware:add"
                         >
                             <template #icon
@@ -40,7 +40,7 @@
                         }}</span>
                     </template>
                     <template #action="slotProps">
-                        <j-space>
+                        <j-space :size="16">
                             <template
                                 v-for="i in getActions(slotProps)"
                                 :key="i.key"
@@ -67,27 +67,39 @@
                 </j-pro-table>
             </FullPage>
         </div>
-        <Save v-if="visible" :data="current" @change="saveChange" />
+        <Save
+            v-if="visible"
+            :data="current"
+            :productOptions="productOptions"
+            @change="saveChange"
+        />
+        <TaskDrawer
+            v-if="showTask"
+            :firmwareId="firmwareId"
+            :productId="productId"
+            @close-drawer="showTask = false"
+        />
     </page-container>
 </template>
 <script lang="ts" setup name="FirmwarePage">
 import type { ActionsType } from '@/components/Table/index';
 import { query, queryProduct, remove } from '@/api/device/firmware';
+import TaskDrawer from './Task/index.vue';
 import dayjs from 'dayjs';
 import _ from 'lodash-es';
 import Save from './Save/index.vue';
-import { useMenuStore } from 'store/menu';
 import type { FormDataType } from './type';
 import { onlyMessage } from '@/utils/comm';
 
-const menuStory = useMenuStore();
-
 const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 
 const productOptions = ref([]);
 const visible = ref(false);
 const current = ref({});
+const showTask = ref(false);
+const firmwareId = ref('');
+const productId = ref();
 
 const columns = [
     {
@@ -184,7 +196,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             icon: 'FileTextOutlined',
             onClick: async () => {
-                handlUpdate(data);
+                handleUpdate(data);
             },
         },
         {
@@ -195,7 +207,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             icon: 'EditOutlined',
             onClick: async () => {
-                handlEdit(data);
+                handleEdit(data);
             },
         },
         {
@@ -206,11 +218,8 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             popConfirm: {
                 title: '确认删除?',
-                okText: ' 确定',
-                placement: 'topLeft',
-                cancelText: '取消',
-                onConfirm: async () => {
-                    handlDelete(data.id);
+                onConfirm: () => {
+                   return handleDelete(data.id);
                 },
             },
             icon: 'DeleteOutlined',
@@ -218,22 +227,19 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
     ];
 };
 
-const handlUpdate = (data: Partial<Record<string, any>>) => {
-    menuStory.jumpPage(
-        'device/Firmware/Task',
-        {},
-        {
-            id: data.id,
-            productId: data.productId,
-        },
-    );
+const handleUpdate = (data: Partial<Record<string, any>>) => {
+
+    showTask.value = true;
+    firmwareId.value = data.id;
+    productId.value = data.productId;
+    console.log(data);
 };
 
-const handlAdd = () => {
+const handleAdd = () => {
     current.value = {};
     visible.value = true;
 };
-const handlEdit = (data: Partial<Record<string, any>>) => {
+const handleEdit = (data: Partial<Record<string, any>>) => {
     current.value = _.cloneDeep(data);
     visible.value = true;
 };
@@ -247,14 +253,17 @@ const saveChange = (value: FormDataType) => {
     }
 };
 
-const handlDelete = async (id: string) => {
-    const res = await remove(id);
-    if (res.status === 200) {
-        onlyMessage('操作成功', 'success');
-        tableRef.value.reload();
-    } else {
-        onlyMessage(res?.message, 'error');
-    }
+const handleDelete = (id: string) => {
+    const response = remove(id);
+    response.then((res:any) => {
+        if (res.status === 200) {
+            onlyMessage('操作成功', 'success');
+            tableRef.value.reload();
+        } else {
+            onlyMessage(res?.message, 'error');
+        }
+    });
+    return response
 };
 
 onMounted(() => {
diff --git a/src/views/device/Instance/Detail/AlarmRecord/Alarm/components/AlarmLog.vue b/src/views/device/Instance/Detail/AlarmRecord/Alarm/components/AlarmLog.vue
new file mode 100644
index 00000000..8e4c7e82
--- /dev/null
+++ b/src/views/device/Instance/Detail/AlarmRecord/Alarm/components/AlarmLog.vue
@@ -0,0 +1,83 @@
+<template>
+    <a-drawer
+        visible
+        :closable="false"
+        width="1000"
+        @close="closeDrawer"
+        :destroyInactiveTabPane="true"
+    >
+        <div class="alarmInfo">
+            <div class="title">告警日志</div>
+            <div class="alarmInfoRight">
+                <div>
+                    {{ levelMap?.[AlarmData?.level] || AlarmData?.level }}
+                </div>
+                <div>
+                    <BadgeStatus
+                        :status="AlarmData?.state.value"
+                        :statusNames="{
+                            warning: 'error',
+                            normal: 'default',
+                        }"
+                    >
+                    </BadgeStatus
+                    ><span>
+                        {{ AlarmData?.state.text }}
+                    </span>
+                    <a-button
+                        v-if="AlarmData?.state.value === 'warning'"
+                        type="link"
+                        @click="dealAlarm"
+                        >处理</a-button
+                    >
+                </div>
+            </div>
+        </div>
+        <Log :currentId="AlarmData.id" :configId="AlarmData.alarmConfigId" />
+    </a-drawer>
+    <SolveComponent
+        v-if="solveVisible"
+        @closeSolve="closeSolve"
+        @refresh="refresh"
+        :data="AlarmData"
+    />
+</template>
+
+<script setup>
+import { queryLevel } from '@/api/rule-engine/config';
+import Log from '@/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue';
+import SolveComponent from '@/views/rule-engine/Alarm/Log/SolveComponent/index.vue';
+import { useAlarmLevel } from '@/hook';
+const props = defineProps({
+    data: {
+        type: Object,
+        default: {},
+    },
+});
+const emit = defineEmits(['closeDrawer', 'refreshTable']);
+const { levelMap } = useAlarmLevel();
+const solveVisible = ref(false);
+const AlarmData = computed(()=>{
+    return props.data
+})
+const closeDrawer = () => {
+    emit('closeDrawer');
+};
+const closeSolve = () => {
+    solveVisible.value = false;
+};
+const refresh = () => {
+    solveVisible.value = false;
+    emit('refreshTable');
+};
+const dealAlarm = () => {
+    solveVisible.value = true;
+};
+
+</script>
+<style lang="less" scoped>
+.alarmInfo {
+    display: flex;
+    justify-content: space-between;
+}
+</style>
diff --git a/src/views/device/Instance/Detail/AlarmRecord/Alarm/index.vue b/src/views/device/Instance/Detail/AlarmRecord/Alarm/index.vue
new file mode 100644
index 00000000..b9e9b697
--- /dev/null
+++ b/src/views/device/Instance/Detail/AlarmRecord/Alarm/index.vue
@@ -0,0 +1,444 @@
+<template>
+    <pro-search
+        :columns="columns"
+        target="device-instance"
+        type="simple"
+        @search="handleSearch"
+    />
+    <JProTable
+        ref="deviceAlarm"
+        :columns="columns"
+        model="TABLE"
+        :request="queryAlarmRecord"
+        :defaultParams="defaultParams"
+        :params="params"
+    >
+        <template #alarmTime="slotProps">
+            {{ dayjs(slotProps.alarmTime).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+        <template #duration="slotProps">
+            <Duration :data="slotProps" />
+        </template>
+        <template #handleTime="slotProps">
+            {{
+                slotProps.handleTime
+                    ? dayjs(slotProps.handleTime).format('YYYY-MM-DD HH:mm:ss')
+                    : '--'
+            }}
+        </template>
+        <template #sourceId="slotProps">
+            <Ellipsis>
+                设备ID：
+                <span class="deviceId"  @click="() => gotoDevice(slotProps.sourceId)">{{ slotProps.sourceId }}</span></Ellipsis
+            >
+        </template>
+        <template #handleType="slotProps">
+            {{ slotProps?.handleType?.text || '--' }}
+        </template>
+        <template #state="slotProps">
+            {{ slotProps?.state?.value === 'normal' ? '已处理' : '告警中' }}
+        </template>
+        <template #actions="slotProps">
+            <j-space>
+                <template v-for="i in getActions(slotProps)" :key="i.key">
+                    <PermissionButton
+                        :popConfirm="i.popConfirm"
+                        :tooltip="{
+                            ...i.tooltip,
+                        }"
+                        @click="i.onClick"
+                        type="link"
+                        style="padding: 0 5px"
+                        :hasPermission="
+                            i.key == 'solve'
+                                ? 'rule-engine/Alarm/Log:action'
+                                : 'rule-engine/Alarm/Log:view'
+                        "
+                    >
+                        {{ i.text }}
+                    </PermissionButton>
+                </template>
+            </j-space>
+        </template>
+    </JProTable>
+    <Solve
+        v-if="solveVisible"
+        :data="currentAlarm"
+        :solveType="solveType"
+        :handleDes="handleDescription"
+        @closeSolve="closeSolve"
+        @refresh="solveRefresh"
+    />
+    <AlarmLog
+        v-if="visibleDrawer"
+        :data="currentAlarm"
+        @closeDrawer="visibleDrawer = false"
+        @refreshTable="refresh"
+    />
+</template>
+
+<script setup>
+import {
+    queryByDevice as queryAlarmRecord,
+    queryHandleHistory,
+} from '@/api/rule-engine/log';
+import { useInstanceStore } from '@/store/instance';
+import { useProductStore } from '@/store/product';
+import dayjs from 'dayjs';
+import Duration from '@/views/rule-engine/Alarm/Log/components/Duration.vue';
+import Solve from '@/views/rule-engine/Alarm/Log/SolveComponent/index.vue';
+import AlarmLog from './components/AlarmLog.vue';
+import { useMenuStore } from 'store/menu';
+const props = defineProps({
+    goal: {
+        type: String,
+        default: 'device',
+    },
+});
+const menuStory = useMenuStore();
+const { current } =
+    props.goal === 'device' ? useInstanceStore() : useProductStore();
+const columns =
+    props.goal === 'device'
+        ? [
+              {
+                  title: '告警时间',
+                  dataIndex: 'alarmTime',
+                  key: 'alarmTime',
+                  search: {
+                      type: 'date',
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '告警持续时长',
+                  dataIndex: 'duration',
+                  key: 'duration',
+                  scopedSlots: true,
+              },
+              {
+                  title: '触发条件',
+                  dataIndex: 'triggerDesc',
+                  key: 'triggerDesc',
+              },
+              {
+                  title: '告警原因',
+                  dataIndex: 'actualDesc',
+                  key: 'actualDesc',
+              },
+              {
+                  title: '处理时间',
+                  dataIndex: 'handleTime',
+                  key: 'handleTime',
+                  search: {
+                      type: 'date',
+                  },
+                  scopedSlots: true,
+              },
+
+              {
+                  title: '处理类型',
+                  dataIndex: 'handleType',
+                  key: 'handleType',
+                  search: {
+                      type: 'select',
+                      options: [
+                          {
+                              label: '人工',
+                              value: 'user',
+                          },
+                          {
+                              label: '系统',
+                              value: 'system',
+                          },
+                      ],
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '状态',
+                  dataIndex: 'state',
+                  key: 'state',
+                  search: {
+                      type: 'select',
+                      options: [
+                          {
+                              label: '已处理',
+                              value: 'normal',
+                          },
+                          {
+                              label: '告警中',
+                              value: 'warning',
+                          },
+                      ],
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '操作',
+                  dataIndex: 'actions',
+                  key: 'actions',
+                  scopedSlots: true,
+              },
+          ]
+        : [
+              {
+                  title: '告警时间',
+                  dataIndex: 'alarmTime',
+                  key: 'alarmTime',
+                  search: {
+                      type: 'date',
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '告警持续时长',
+                  dataIndex: 'duration',
+                  key: 'duration',
+                  scopedSlots: true,
+              },
+              {
+                  title: '触发条件',
+                  dataIndex: 'triggerDesc',
+                  key: 'triggerDesc',
+              },
+              {
+                  title: '告警源',
+                  dataIndex: 'sourceId',
+                  key: 'sourceId',
+                  scopedSlots: true,
+                  search: {
+                      type: 'string',
+                  },
+              },
+              {
+                  title: '告警原因',
+                  dataIndex: 'actualDesc',
+                  key: 'actualDesc',
+              },
+              {
+                  title: '处理时间',
+                  dataIndex: 'handleTime',
+                  key: 'handleTime',
+                  search: {
+                      type: 'date',
+                  },
+                  scopedSlots: true,
+              },
+
+              {
+                  title: '处理类型',
+                  dataIndex: 'handleType',
+                  key: 'handleType',
+                  search: {
+                      type: 'select',
+                      options: [
+                          {
+                              label: '人工',
+                              value: 'user',
+                          },
+                          {
+                              label: '系统',
+                              value: 'system',
+                          },
+                      ],
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '状态',
+                  dataIndex: 'state',
+                  key: 'state',
+                  search: {
+                      type: 'select',
+                      options: [
+                          {
+                              label: '已处理',
+                              value: 'normal',
+                          },
+                          {
+                              label: '告警中',
+                              value: 'warning',
+                          },
+                      ],
+                  },
+                  scopedSlots: true,
+              },
+              {
+                  title: '操作',
+                  dataIndex: 'actions',
+                  key: 'actions',
+                  scopedSlots: true,
+              },
+          ];
+const params = ref();
+const handleDescription = ref();
+const deviceAlarm = ref();
+const solveVisible = ref(false);
+const solveType = ref('handle');
+const currentAlarm = ref();
+const visibleDrawer = ref(false);
+const defaultParams =
+    props.goal === 'device'
+        ? {
+              sorts: [{ name: 'alarmTime', order: 'desc' }],
+              terms: [
+                  {
+                      terms: [
+                          {
+                              column: 'targetId',
+                              value: current.id,
+                              termType: 'eq',
+                          },
+                          {
+                              column: 'alarmConfigSource',
+                              value: 'device-property-preprocessor',
+                              termType: 'eq',
+                          },
+                      ],
+                      type: 'and',
+                  },
+              ],
+          }
+        : {
+              sorts: [{ name: 'alarmTime', order: 'desc' }],
+              terms: [
+                  {
+                      terms: [
+                          {
+                              column: 'targetId$dev-instance',
+                              value: [
+                                  {
+                                      column: 'product_id',
+                                      value: current.id,
+                                      termType: 'eq',
+                                  },
+                              ],
+                          },
+                          {
+                              column: 'alarmConfigSource',
+                              value: 'device-property-preprocessor',
+                              termType: 'eq',
+                          },
+                      ],
+                      type: 'and',
+                  },
+              ],
+          };
+const handleSearch = (e) => {
+    params.value = e;
+};
+const queryHandle = async (id) => {
+    const res = await queryHandleHistory({
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        terms: [
+            {
+                column: 'alarmRecordId',
+                termType: 'eq',
+                value: id,
+                type: 'and',
+            },
+        ],
+    });
+    if (res.status === 200 && res.result?.data.length) {
+        handleDescription.value = res.result.data?.[0]?.description;
+    }
+};
+const getActions = (data) => {
+    if (!data) return [];
+    const actions =
+        data.state.value === 'normal'
+            ? [
+                  {
+                      key: 'view',
+                      text: '查看详情',
+                      tooltip: {
+                          title: '查看详情',
+                      },
+                      onClick: async () => {
+                          solveType.value = 'view';
+                          await queryHandle(data.id);
+                          solveVisible.value = true;
+                      },
+                  },
+                  {
+                      key: 'log',
+                      text: '查看日志',
+                      tooltip: {
+                          title: '查看日志',
+                      },
+                      onClick: () => {
+                          visibleDrawer.value = true;
+                          currentAlarm.value = data;
+                      },
+                  },
+              ]
+            : [
+                  {
+                      key: 'solve',
+                      text: '处理',
+                      tooltip: {
+                          title: '处理',
+                      },
+                      onClick: () => {
+                          solveVisible.value = true;
+                          solveType.value = 'handle';
+                          currentAlarm.value = data;
+                      },
+                  },
+                  {
+                      key: 'log',
+                      text: '查看日志',
+                      tooltip: {
+                          title: '查看日志',
+                      },
+                      onClick: () => {
+                          visibleDrawer.value = true;
+                          currentAlarm.value = data;
+                      },
+                  },
+              ];
+    return actions;
+};
+const closeSolve = () => {
+    solveVisible.value = false;
+};
+
+const refreshCurrent = async () => {
+    const res = await queryAlarmRecord({
+        terms: [
+            {
+                column: 'id',
+                termType: 'eq',
+                value: currentAlarm.value.id,
+            },
+            {
+                column: 'alarmConfigSource',
+                value: 'device-property-preprocessor',
+                termType: 'eq',
+            },
+        ],
+    });
+    if (res.success && res.result?.data?.length) {
+        currentAlarm.value = res.result.data[0];
+    }
+};
+
+const gotoDevice = (id) => {
+    menuStory.jumpPage('device/Instance/Detail', { id, tab: 'Running' });
+};
+const refresh = () => {
+    deviceAlarm.value?.reload();
+    refreshCurrent();
+};
+const solveRefresh = () => {
+    solveVisible.value = false;
+    refresh();
+};
+</script>
+<style lang="less" scoped>
+.deviceId {
+    cursor: pointer;
+    color: #4096ff;
+}
+</style>
diff --git a/src/views/device/Instance/Detail/AlarmRecord/Invalid/index.vue b/src/views/device/Instance/Detail/AlarmRecord/Invalid/index.vue
new file mode 100644
index 00000000..6d28d280
--- /dev/null
+++ b/src/views/device/Instance/Detail/AlarmRecord/Invalid/index.vue
@@ -0,0 +1,128 @@
+<template>
+    <pro-search
+        :columns="columns"
+        target="device-instance"
+        @search="handleSearch"
+    ></pro-search>
+    <JProTable
+        ref="deviceAlarm"
+        :columns="columns"
+        model="TABLE"
+        :request="queryInvalidData"
+        :defaultParams="{
+            sorts: [{ name: 'createTime', order: 'desc' }],
+            terms: [
+                {
+                    terms: [
+                        {
+                            column:
+                                props.goal === 'device'
+                                    ? 'thingId'
+                                    : 'templateId',
+                            value: current.id,
+                            termType: 'eq',
+                        },
+                    ],
+                    type: 'and',
+                },
+            ],
+        }"
+        :params="params"
+        ><template #createTime="slotProps">
+            {{ dayjs(slotProps.createTime).format('YYYY-MM-DD HH:mm:ss') }}
+        </template>
+        <template #thingId="slotProps">
+            <Ellipsis>
+                设备ID：
+                <span
+                    class="deviceId"
+                    >{{ slotProps.thingId }}</span
+                ></Ellipsis
+            >
+        </template>
+    </JProTable>
+</template>
+
+<script setup>
+import { queryInvalidData } from '@/api/rule-engine/log';
+import { useInstanceStore } from '@/store/instance';
+import { useProductStore } from '@/store/product';
+import dayjs from 'dayjs';
+const props = defineProps({
+    goal: {
+        type: String,
+        default: 'device',
+    },
+});
+const { current } =
+    props.goal === 'device' ? useInstanceStore() : useProductStore();
+const columns = props.goal === 'device' ? [
+    {
+        title: '上报时间',
+        dataIndex: 'createTime',
+        key: 'createTime',
+        scopedSlots: true,
+        search: {
+            type: 'date',
+        },
+        scopedSlots: true,
+    },
+    {
+        title: '阈值限制',
+        dataIndex: 'description',
+        key: 'description',
+    },
+    {
+        title: '原始值',
+        dataIndex: 'value',
+        key: 'value',
+        search: {
+            type: 'string',
+        },
+    },
+] : [
+    {
+        title: '上报时间',
+        dataIndex: 'createTime',
+        key: 'createTime',
+        scopedSlots: true,
+        search: {
+            type: 'date',
+        },
+        scopedSlots: true,
+    },
+    {
+        title: '告警源',
+        dataIndex: 'thingId',
+        key: 'thingId',
+        scopedSlots: true,
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '阈值限制',
+        dataIndex: 'description',
+        key: 'description',
+    },
+    {
+        title: '原始值',
+        dataIndex: 'value',
+        key: 'value',
+        search: {
+            type: 'string',
+        },
+    },
+]
+const handleSearch = (e) => {
+    params.value = e;
+};
+const params = ref();
+</script>
+<style lang="less" scoped>
+.deviceId {
+    cursor: pointer;
+    color:#4096FF;
+}
+</style>
+
diff --git a/src/views/device/Instance/Detail/AlarmRecord/index.vue b/src/views/device/Instance/Detail/AlarmRecord/index.vue
new file mode 100644
index 00000000..32b8143c
--- /dev/null
+++ b/src/views/device/Instance/Detail/AlarmRecord/index.vue
@@ -0,0 +1,33 @@
+<template>
+    <div>
+        <a-tabs
+            tab-position="left"
+            v-model:activeKey="activeKey"
+            :tabBarStyle="{ width: '200px' }"
+        >
+            <a-tab-pane key="alarm" tab="告警数据">
+                <Alarm :goal="type" />
+            </a-tab-pane>
+            <a-tab-pane key="invalid" tab="无效数据">
+                <Invalid :goal="type" />
+            </a-tab-pane>
+        </a-tabs>
+    </div>
+</template>
+
+<script setup>
+import Alarm from './Alarm/index.vue';
+import Invalid from './Invalid/index.vue';
+const props = defineProps({
+    type: {
+        type: String,
+        default: 'device',
+    },
+});
+const activeKey = ref('alarm');
+</script>
+<style lang="less" scoped>
+:deep(.ant-tabs-tab-active){
+    background-color: #F1F7FF;
+}
+</style>
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
index 65185c46..4d155746 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/PatchMapping.vue
@@ -41,12 +41,11 @@
                                 <j-list-item>
                                     {{ item.title }}
                                     <template #actions>
-                                        <j-popconfirm
-                                            title="确定删除?"
-                                            @confirm="_delete(item.key)"
-                                        >
-                                            <AIcon type="DeleteOutlined" />
-                                        </j-popconfirm>
+                                        <ConfirmModal
+                                            title="确认删除？"
+                                            :onConfirm="() => _delete(item.key)"
+                                            ><AIcon type="DeleteOutlined"
+                                        /></ConfirmModal>
                                     </template>
                                 </j-list-item>
                             </template>
@@ -88,7 +87,7 @@ const _props = defineProps({
     },
     text: {
         type: String,
-    }
+    },
 });
 const _emits = defineEmits(['close', 'save']);
 
@@ -100,7 +99,7 @@ const rightList = ref<any[]>([]);
 const dataSource = ref<any[]>([]);
 const loading = ref<boolean>(false);
 
-const confirmLoading = ref(false)
+const confirmLoading = ref(false);
 const handleData = (data: any[], type: string) => {
     data.forEach((item) => {
         item.key = item.id;
@@ -185,14 +184,8 @@ const onLoadData: TreeProps['loadData'] = (treeNode) => {
         };
         const res =
             treeNode.type === 'channel'
-                ? await edgeCollector(
-                      <string>_props.edgeId,
-                      params,
-                  )
-                : await edgePoint(
-                      <string>_props.edgeId,
-                      params,
-                  );
+                ? await edgeCollector(<string>_props.edgeId, params)
+                : await edgePoint(<string>_props.edgeId, params);
         (<any>treeNode.dataRef).children = res.result?.[0].map((item: any) => ({
             ...item,
             title: item.name,
@@ -214,7 +207,7 @@ const _delete = (_key: string) => {
 };
 
 const handleClick = async () => {
-    confirmLoading.value = true
+    confirmLoading.value = true;
     if (!rightList.value.length) {
         onlyMessage('请选择采集器', 'warning');
     } else {
@@ -259,11 +252,13 @@ const handleClick = async () => {
                         requestList: filterParms,
                     });
                     const resp = await saveDeviceMapping(_props.edgeId, {
-                        info: [{
-                            deviceId: res.result?.id,
-                            deviceName: res.result?.name,
-                        }],
-                    })
+                        info: [
+                            {
+                                deviceId: res.result?.id,
+                                deviceName: res.result?.name,
+                            },
+                        ],
+                    });
                     if (res.status === 200) {
                         onlyMessage('操作成功');
                         _emits('save');
@@ -274,7 +269,7 @@ const handleClick = async () => {
             }
         }
     }
-    confirmLoading.value = false
+    confirmLoading.value = false;
 };
 const handleClose = () => {
     _emits('close');
diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
index 7ff0b929..c588b0b1 100644
--- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue
@@ -89,17 +89,18 @@
                             <j-badge v-else status="error" text="未绑定" />
                         </template>
                         <template v-if="column.key === 'action'">
-                            <j-tooltip title="解绑">
-                                <j-popconfirm
-                                    title="确认解绑"
-                                    :disabled="!record.id"
-                                    @confirm="unbind(record.id)"
-                                >
-                                    <j-button type="link" :disabled="!record.id"
-                                        ><AIcon type="icon-jiebang"
-                                    /></j-button>
-                                </j-popconfirm>
-                            </j-tooltip>
+                            <PermissionButton
+                                type="link"
+                                :tooltip="{
+                                    title: '解绑',
+                                }"
+                                :disabled="!record.id"
+                                :popConfirm="{
+                                    title: '确认解绑',
+                                    onConfirm: () => unbind(record.id),
+                                }"
+                                ><AIcon type="icon-jiebang"
+                            /></PermissionButton>
                         </template>
                     </template>
                 </j-table>
@@ -128,7 +129,7 @@ import {
     edgeChannel,
     addDevice,
     editDevice,
-    saveDeviceMapping
+    saveDeviceMapping,
 } from '@/api/device/instance';
 import MSelect from './MSelect.vue';
 import PatchMapping from './PatchMapping.vue';
@@ -177,13 +178,12 @@ const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
 const props = defineProps(['productList']);
-const _emit = defineEmits(['close','getEdgeMap']);
+const _emit = defineEmits(['close', 'getEdgeMap']);
 const instanceStore = useInstanceStore();
 let _metadata = ref();
 const loading = ref<boolean>(false);
 const channelList = ref([]);
 
-
 const modelRef = reactive({
     dataSource: [],
 });
@@ -216,19 +216,19 @@ const handleSearch = async () => {
  * 解绑映射
  * @param id 选择解绑id
  */
-const unbind = async (id: string) => {
+const unbind = (id: string) => {
     if (id) {
-        const resp = await removeEdgeMap(
-            instanceStore.current?.id || '',
-            {
-                deviceId: instanceStore.current.parentId,
-                idList: [id],
-            },
-        );
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            _emit('getEdgeMap');
-        }
+        const response = removeEdgeMap(instanceStore.current?.id || '', {
+            deviceId: instanceStore.current.parentId,
+            idList: [id],
+        });
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！');
+                _emit('getEdgeMap');
+            }
+        });
+        return response
     }
 };
 
@@ -276,12 +276,18 @@ const onSave = async () => {
                         (item: any) => item.channelId,
                     );
                     const params = {
-                      info: [
-                        { deviceId: resq.result?.id, deviceName: formData.name }
-                      ]
-                    }
-                    if(!instanceStore.current.parentId){
-                        const res = await saveDeviceMapping(instanceStore.current.id, params)
+                        info: [
+                            {
+                                deviceId: resq.result?.id,
+                                deviceName: formData.name,
+                            },
+                        ],
+                    };
+                    if (!instanceStore.current.parentId) {
+                        const res = await saveDeviceMapping(
+                            instanceStore.current.id,
+                            params,
+                        );
                     }
                     const submitData = {
                         deviceId: instanceStore.current.parentId
@@ -319,5 +325,4 @@ const showModal = async () => {
 };
 </script>
 
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/src/views/device/Instance/Detail/ChildDevice/index.vue b/src/views/device/Instance/Detail/ChildDevice/index.vue
index 8d95d3fa..f386ac6f 100644
--- a/src/views/device/Instance/Detail/ChildDevice/index.vue
+++ b/src/views/device/Instance/Detail/ChildDevice/index.vue
@@ -60,7 +60,7 @@
                         type="primary"
                         hasPermission="device/Instance:update"
                         :popConfirm="{
-                            title: '确定解绑吗？',
+                            title: '确认解绑吗？',
                             onConfirm: handleUnBind,
                         }"
                         >批量解除</PermissionButton
@@ -252,12 +252,8 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 title: '确认解绑吗？',
                 okText: '确定',
                 cancelText: '取消',
-                onConfirm: async () => {
-                    const resp = await unbindDevice(
-                        detail.value.id,
-                        data.id,
-                        {},
-                    );
+                onConfirm: async() => {
+                    const response = unbindDevice(detail.value.id, data.id, {});
                     if (
                         instanceStore.current.accessProvider ===
                         'official-edge-gateway'
@@ -266,16 +262,21 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                             ids: [data.id],
                         });
                     }
-                    if (resp.status === 200) {
-                        _selectedRowKeys.value.find((i:any,index:number)=>{
-                            if(i === data.id){
-                                _selectedRowKeys.value.splice(index,1)
-                            }
-                            return i === data.id 
-                        })
-                        childDeviceRef.value?.reload();
-                        onlyMessage('操作成功！');
-                    }
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            _selectedRowKeys.value.find(
+                                (i: any, index: number) => {
+                                    if (i === data.id) {
+                                        _selectedRowKeys.value.splice(index, 1);
+                                    }
+                                    return i === data.id;
+                                },
+                            );
+                            childDeviceRef.value?.reload();
+                            onlyMessage('操作成功！');
+                        }
+                    });
+                    return response
                 },
             },
         },
@@ -308,7 +309,7 @@ const cancelSelect = () => {
 
 const handleUnBind = async () => {
     if (_selectedRowKeys.value.length) {
-        const resp = await unbindBatchDevice(
+        const response = unbindBatchDevice(
             detail.value.id,
             _selectedRowKeys.value,
         );
@@ -317,11 +318,14 @@ const handleUnBind = async () => {
                 ids: [_selectedRowKeys.value],
             });
         }
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            cancelSelect();
-            childDeviceRef.value?.reload();
-        }
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！');
+                cancelSelect();
+                childDeviceRef.value?.reload();
+            }
+        });
+        return response;
     } else {
         onlyMessage('请勾选需要解绑的数据', 'warning');
     }
diff --git a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
index 9ef361c1..616447cd 100644
--- a/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
+++ b/src/views/device/Instance/Detail/Diagnose/Status/index.tsx
@@ -124,24 +124,27 @@ const Status = defineComponent({
                                                             hasPermission="link/Type:action"
                                                             popConfirm={{
                                                                 title: '确认启用',
-                                                                onConfirm: async () => {
-                                                                    const res = await startNetwork(
+                                                                onConfirm:  () => {
+                                                                    const response =  startNetwork(
                                                                         unref(gateway)?.channelId,
                                                                     );
-                                                                    if (res.status === 200) {
-                                                                        onlyMessage('操作成功！');
-                                                                        list.value = modifyArrayList(
-                                                                            list.value,
-                                                                            {
-                                                                                key: 'network',
-                                                                                name: '网络组件',
-                                                                                desc: '诊断网络组件配置是否正确，配置错误将导致设备连接失败',
-                                                                                status: 'success',
-                                                                                text: '正常',
-                                                                                info: null,
-                                                                            },
-                                                                        );
-                                                                    }
+                                                                    response.then((res)=>{
+                                                                        if (res.status === 200) {
+                                                                            onlyMessage('操作成功！');
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: 'network',
+                                                                                    name: '网络组件',
+                                                                                    desc: '诊断网络组件配置是否正确，配置错误将导致设备连接失败',
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
+                                                                    })
+                                                                  return response
                                                                 }
                                                             }}
                                                         >
@@ -240,24 +243,29 @@ const Status = defineComponent({
                                                                         });
                                                                     }
                                                                 }}>人工检查</Button>网关配置是否已填写正确，若您确定该项无需诊断可
-                                                                <Popconfirm
-                                                                    title="确认忽略？"
-                                                                    onConfirm={() => {
-                                                                        list.value = modifyArrayList(
-                                                                            list.value,
-                                                                            {
-                                                                                key: 'gateway',
-                                                                                name: '设备接入网关',
-                                                                                desc: desc,
-                                                                                status: 'success',
-                                                                                text: '正常',
-                                                                                info: null,
-                                                                            },
-                                                                        );
+                                                                <PermissionButton
+                                                                    
+                                                                    type="link"
+                                                                    style="padding: 0"
+                                                                    popConfirm={{
+                                                                        title:"确认忽略？",
+                                                                        onConfirm:() => {
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: 'gateway',
+                                                                                    name: '设备接入网关',
+                                                                                    desc: desc,
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
                                                                     }}
                                                                 >
-                                                                    <Button type="link" style="padding: 0">忽略</Button>
-                                                                </Popconfirm>
+                                                                    忽略
+                                                                </PermissionButton>
                                                             </span>
                                                         }
                                                     />
@@ -294,22 +302,25 @@ const Status = defineComponent({
                                                             style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
-                                                                onConfirm: async () => {
-                                                                    const resp = await startGateway(unref(device).accessId || '');
-                                                                    if (resp.status === 200) {
-                                                                        onlyMessage('操作成功！');
-                                                                        list.value = modifyArrayList(
-                                                                            list.value,
-                                                                            {
-                                                                                key: 'gateway',
-                                                                                name: '设备接入网关',
-                                                                                desc: desc,
-                                                                                status: 'success',
-                                                                                text: '正常',
-                                                                                info: null,
-                                                                            },
-                                                                        );
-                                                                    }
+                                                                onConfirm:  () => {
+                                                                    const response =  startGateway(unref(device).accessId || '');
+                                                                    response.then((resp)=>{
+                                                                        if (resp.status === 200) {
+                                                                            onlyMessage('操作成功！');
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: 'gateway',
+                                                                                    name: '设备接入网关',
+                                                                                    desc: desc,
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
+                                                                    })
+                                                                    return response
                                                                 }
                                                             }}
                                                         >
@@ -368,24 +379,28 @@ const Status = defineComponent({
                                                             }}
                                                         >人工检查</Button>
                                                         网关配置是否已填写正确，若您确定该项无需诊断可
-                                                        <Popconfirm
-                                                            title="确认忽略？"
-                                                            onConfirm={() => {
-                                                                list.value = modifyArrayList(
-                                                                    list.value,
-                                                                    {
-                                                                        key: 'gateway',
-                                                                        name: '设备接入网关',
-                                                                        desc: desc,
-                                                                        status: 'success',
-                                                                        text: '正常',
-                                                                        info: null,
-                                                                    },
-                                                                );
+                                                        <PermissionButton
+                                                            type="link"
+                                                            style="padding: 0"
+                                                            popConfirm={{
+                                                                title:"确认忽略？",
+                                                                onConfirm:() => {
+                                                                    list.value = modifyArrayList(
+                                                                        list.value,
+                                                                        {
+                                                                            key: 'gateway',
+                                                                            name: '设备接入网关',
+                                                                            desc: desc,
+                                                                            status: 'success',
+                                                                            text: '正常',
+                                                                            info: null,
+                                                                        },
+                                                                    );
+                                                                }
                                                             }}
                                                         >
-                                                            <Button type="link" style="padding: 0">忽略</Button>
-                                                        </Popconfirm>
+                                                            忽略
+                                                        </PermissionButton>
                                                     </span>
                                                 }
                                             />
@@ -424,22 +439,25 @@ const Status = defineComponent({
                                                         style="padding: 0"
                                                         popConfirm={{
                                                             title: '确认启用',
-                                                            onConfirm: async () => {
-                                                                const resp = await startGateway(unref(device).accessId || '');
-                                                                if (resp.status === 200) {
-                                                                    onlyMessage('操作成功！');
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: 'gateway',
-                                                                            name: '设备接入网关',
-                                                                            desc: desc,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
-                                                                }
+                                                            onConfirm:  () => {
+                                                                const response =  startGateway(unref(device).accessId || '');
+                                                                response.then((resp)=>{
+                                                                    if (resp.status === 200) {
+                                                                        onlyMessage('操作成功！');
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: 'gateway',
+                                                                                name: '设备接入网关',
+                                                                                desc: desc,
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
+                                                                })
+                                                                return response
                                                             }
                                                         }}
                                                     >
@@ -538,22 +556,25 @@ const Status = defineComponent({
                                                             style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
-                                                                onConfirm: async () => {
-                                                                    const resp = await _deploy(response?.result?.id || '');
-                                                                    if (resp.status === 200) {
-                                                                        onlyMessage('操作成功！');
-                                                                        list.value = modifyArrayList(
-                                                                            list.value,
-                                                                            {
-                                                                                key: 'parent-device',
-                                                                                name: '网关父设备',
-                                                                                desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
-                                                                                status: 'success',
-                                                                                text: '正常',
-                                                                                info: null,
-                                                                            },
-                                                                        );
-                                                                    }
+                                                                onConfirm: () => {
+                                                                    const response =  _deploy(response?.result?.id || '');
+                                                                    response.then((resp)=>{
+                                                                        if (resp.status === 200) {
+                                                                            onlyMessage('操作成功！');
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: 'parent-device',
+                                                                                    name: '网关父设备',
+                                                                                    desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
+                                                                    })
+                                                                   return response
                                                                 }
                                                             }}
                                                         >
@@ -648,22 +669,25 @@ const Status = defineComponent({
                                                             style="padding: 0"
                                                             popConfirm={{
                                                                 title: '确认启用',
-                                                                onConfirm: async () => {
-                                                                    const resp = await _deployProduct(unref(device).productId || '');
-                                                                    if (resp.status === 200) {
-                                                                        onlyMessage('操作成功！');
-                                                                        list.value = modifyArrayList(
-                                                                            list.value,
-                                                                            {
-                                                                                key: 'product',
-                                                                                name: '产品状态',
-                                                                                desc: '诊断产品状态是否正常，禁用状态将导致设备连接失败',
-                                                                                status: 'success',
-                                                                                text: '正常',
-                                                                                info: null,
-                                                                            },
-                                                                        );
-                                                                    }
+                                                                onConfirm:  () => {
+                                                                    const response =  _deployProduct(unref(device).productId || '');
+                                                                    response.then((resp)=>{
+                                                                        if (resp.status === 200) {
+                                                                            onlyMessage('操作成功！');
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: 'product',
+                                                                                    name: '产品状态',
+                                                                                    desc: '诊断产品状态是否正常，禁用状态将导致设备连接失败',
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
+                                                                    })
+                                                                   return response
                                                                 }
                                                             }}
                                                         >
@@ -726,23 +750,26 @@ const Status = defineComponent({
                                                     style="padding: 0"
                                                     popConfirm={{
                                                         title: '确认启用',
-                                                        onConfirm: async () => {
-                                                            const resp = await _deploy(unref(device)?.id || '');
-                                                            if (resp.status === 200) {
-                                                                instanceStore.current.state = { value: 'offline', text: '离线' }
-                                                                onlyMessage('操作成功！');
-                                                                list.value = modifyArrayList(
-                                                                    list.value,
-                                                                    {
-                                                                        key: 'device',
-                                                                        name: '设备状态',
-                                                                        desc: '诊断设备状态是否正常，禁用状态将导致设备连接失败',
-                                                                        status: 'success',
-                                                                        text: '正常',
-                                                                        info: null,
-                                                                    },
-                                                                );
-                                                            }
+                                                        onConfirm:  () => {
+                                                            const response =  _deploy(unref(device)?.id || '');
+                                                            response.then((resp)=>{
+                                                                if (resp.status === 200) {
+                                                                    instanceStore.current.state = { value: 'offline', text: '离线' }
+                                                                    onlyMessage('操作成功！');
+                                                                    list.value = modifyArrayList(
+                                                                        list.value,
+                                                                        {
+                                                                            key: 'device',
+                                                                            name: '设备状态',
+                                                                            desc: '诊断设备状态是否正常，禁用状态将导致设备连接失败',
+                                                                            status: 'success',
+                                                                            text: '正常',
+                                                                            info: null,
+                                                                        },
+                                                                    );
+                                                                }
+                                                            })
+                                                           return response
                                                         }
                                                     }}
                                                 >
@@ -841,24 +868,28 @@ const Status = defineComponent({
                                                                 填写
                                                             </Button>
                                                             ，若您确定该项无需诊断可
-                                                            <Popconfirm
-                                                                title="确认忽略？"
-                                                                onConfirm={() => {
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: `product-auth${i}`,
-                                                                            name: `产品-${item?.name}`,
-                                                                            desc: `诊断产品${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
+                                                            <PermissionButton
+                                                                type="link" 
+                                                                style="padding: 0"
+                                                                popConfirm={{
+                                                                     title:"确认忽略？",
+                                                                     onConfirm:() => {
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: `product-auth${i}`,
+                                                                                name: `产品-${item?.name}`,
+                                                                                desc: `诊断产品${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }
                                                                 }}
                                                             >
-                                                                <Button type="link" style="padding: 0">忽略</Button>
-                                                            </Popconfirm>
+                                                                忽略
+                                                            </PermissionButton>
                                                         </span>
                                                     }
                                                 />
@@ -901,24 +932,31 @@ const Status = defineComponent({
                                                             </Button>
                                                             产品{item.name}
                                                             配置是否已填写正确,若您确定该项无需诊断可
-                                                            <Popconfirm
-                                                                title="确认忽略？"
-                                                                onConfirm={() => {
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: `product-auth${i}`,
-                                                                            name: `产品-${item?.name}`,
-                                                                            desc: `诊断产品${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
-                                                                }}
+                                                            <PermissionButton      
+                                                                type="link" 
+                                                                style="padding: 0"
+                                                                popConfirm={
+                                                                    {
+                                                                        title:"确认忽略？",
+                                                                        onConfirm:() => {
+                                                                            list.value = modifyArrayList(
+                                                                                list.value,
+                                                                                {
+                                                                                    key: `product-auth${i}`,
+                                                                                    name: `产品-${item?.name}`,
+                                                                                    desc: `诊断产品${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
+                                                                                    status: 'success',
+                                                                                    text: '正常',
+                                                                                    info: null,
+                                                                                },
+                                                                            );
+                                                                        }
+                                                                    }
+                                                                }
+                                                                
                                                             >
-                                                                <Button type="link" style="padding: 0">忽略</Button>
-                                                            </Popconfirm>
+                                                               忽略
+                                                            </PermissionButton>
                                                         </span>
                                                     }
                                                 />
@@ -1002,24 +1040,28 @@ const Status = defineComponent({
                                                                 填写
                                                             </Button>
                                                             ，若您确定该项无需诊断可
-                                                            <Popconfirm
-                                                                title="确认忽略？"
-                                                                onConfirm={() => {
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: `device-auth${i}`,
-                                                                            name: `设备-${item?.name}`,
-                                                                            desc: `诊断设备${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
-                                                                }}
+                                                            <PermissionButton
+                                                                type="link"
+                                                                style="padding: 0"
+                                                                popConfirm={{
+                                                                     title:"确认忽略？",
+                                                                     onConfirm:() => {
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: `device-auth${i}`,
+                                                                                name: `设备-${item?.name}`,
+                                                                                desc: `诊断设备${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }}
+                                                                }
                                                             >
-                                                                <Button type="link" style="padding: 0">忽略</Button>
-                                                            </Popconfirm>
+                                                               忽略
+                                                            </PermissionButton>
                                                         </span>
                                                     }
                                                 />
@@ -1062,24 +1104,28 @@ const Status = defineComponent({
                                                             </Button>
                                                             设备{item.name}
                                                             配置是否已填写正确,若您确定该项无需诊断可
-                                                            <Popconfirm
-                                                                title="确认忽略？"
-                                                                onConfirm={() => {
-                                                                    list.value = modifyArrayList(
-                                                                        list.value,
-                                                                        {
-                                                                            key: `device-auth${i}`,
-                                                                            name: `设备-${item?.name}`,
-                                                                            desc: `诊断设备${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
-                                                                            status: 'success',
-                                                                            text: '正常',
-                                                                            info: null,
-                                                                        },
-                                                                    );
-                                                                }}
+                                                            <PermissionButton
+                                                                type="link" 
+                                                                style="padding: 0"
+                                                                popConfirm={{
+                                                                      title:"确认忽略？",
+                                                                      onConfirm:() => {
+                                                                        list.value = modifyArrayList(
+                                                                            list.value,
+                                                                            {
+                                                                                key: `device-auth${i}`,
+                                                                                name: `设备-${item?.name}`,
+                                                                                desc: `诊断设备${item?.name}认证配置是否正确，错误的配置将导致连接失败`,
+                                                                                status: 'success',
+                                                                                text: '正常',
+                                                                                info: null,
+                                                                            },
+                                                                        );
+                                                                    }}
+                                                                }
                                                             >
-                                                                <Button type="link" style="padding: 0">忽略</Button>
-                                                            </Popconfirm>
+                                                                忽略
+                                                            </PermissionButton>
                                                         </span>
                                                     }
                                                 />
@@ -1136,21 +1182,25 @@ const Status = defineComponent({
                                         人工检查
                                     </Button>
                                     设备-OneNet配置是否已填写正确,若您确定该项无需诊断可
-                                    <Popconfirm
-                                        title="确认忽略？"
-                                        onConfirm={() => {
-                                            list.value = modifyArrayList(list.value, {
-                                                key: `onenet`,
-                                                name: `设备-OneNet配置`,
-                                                desc: '诊断设备OneNet是否已配置，未配置将导致连接失败',
-                                                status: 'success',
-                                                text: '正常',
-                                                info: null,
-                                            });
-                                        }}
+                                    <PermissionButton
+                                        type="link" 
+                                        style="padding: 0"
+                                        popConfirm={{
+                                            title:"确认忽略？",
+                                            onConfirm:() => {
+                                                list.value = modifyArrayList(list.value, {
+                                                    key: `onenet`,
+                                                    name: `设备-OneNet配置`,
+                                                    desc: '诊断设备OneNet是否已配置，未配置将导致连接失败',
+                                                    status: 'success',
+                                                    text: '正常',
+                                                    info: null,
+                                                });
+                                            }}
+                                        }
                                     >
-                                        <Button type="link" style="padding: 0">忽略</Button>
-                                    </Popconfirm>
+                                        忽略
+                                    </PermissionButton>
                                 </div>
                             </div>
                         ),
@@ -1174,8 +1224,10 @@ const Status = defineComponent({
                                         填写
                                     </Button>
                                     ，若您确定该项无需诊断可
-                                    <Popconfirm
+                                    <PermissionButton
                                         title="确认忽略？"
+                                        type="link" 
+                                        style="padding: 0"
                                         onConfirm={() => {
                                             list.value = modifyArrayList(list.value, {
                                                 key: `onenet`,
@@ -1187,8 +1239,8 @@ const Status = defineComponent({
                                             });
                                         }}
                                     >
-                                        <Button type="link" style="padding: 0">忽略</Button>
-                                    </Popconfirm>
+                                        忽略
+                                    </PermissionButton>
                                 </div>
                             </div>
                         ),
@@ -1248,21 +1300,25 @@ const Status = defineComponent({
                                         人工检查
                                     </Button>
                                     设备-CTWing配置是否已填写正确,若您确定该项无需诊断可
-                                    <Popconfirm
-                                        title="确认忽略？"
-                                        onConfirm={() => {
-                                            list.value = modifyArrayList(list.value, {
-                                                key: `ctwing`,
-                                                name: `设备-CTWing配置`,
-                                                desc: '诊断设备CTWing是否已配置，未配置将导致连接失败',
-                                                status: 'success',
-                                                text: '正常',
-                                                info: null,
-                                            });
+                                    <PermissionButton
+                                        type="link" 
+                                        style="padding: 0"
+                                        popConfirm={{
+                                            title:"确认忽略？",
+                                            onConfirm:() => {
+                                                list.value = modifyArrayList(list.value, {
+                                                    key: `ctwing`,
+                                                    name: `设备-CTWing配置`,
+                                                    desc: '诊断设备CTWing是否已配置，未配置将导致连接失败',
+                                                    status: 'success',
+                                                    text: '正常',
+                                                    info: null,
+                                                });
+                                            }
                                         }}
                                     >
-                                        <Button type="link" style="padding: 0">忽略</Button>
-                                    </Popconfirm>
+                                        忽略
+                                    </PermissionButton>
                                 </div>
                             </div>
                         ),
@@ -1286,21 +1342,28 @@ const Status = defineComponent({
                                         填写
                                     </Button>
                                     ，若您确定该项无需诊断可
-                                    <Popconfirm
-                                        title="确认忽略？"
-                                        onConfirm={() => {
-                                            list.value = modifyArrayList(list.value, {
-                                                key: `ctwing`,
-                                                name: `设备-CTWing配置`,
-                                                desc: '诊断设备CTWing是否已配置，未配置将导致连接失败',
-                                                status: 'success',
-                                                text: '正常',
-                                                info: null,
-                                            });
-                                        }}
+                                    <PermissionButton
+                                        type="link" 
+                                        style="padding: 0"
+                                        popConfirm={
+                                            {
+                                                title:"确认忽略？",
+                                                onConfirm:() => {
+                                                    list.value = modifyArrayList(list.value, {
+                                                        key: `ctwing`,
+                                                        name: `设备-CTWing配置`,
+                                                        desc: '诊断设备CTWing是否已配置，未配置将导致连接失败',
+                                                        status: 'success',
+                                                        text: '正常',
+                                                        info: null,
+                                                    });
+                                                }
+                                            }
+                                        }
+                                        
                                     >
-                                        <Button type="link" style="padding: 0">忽略</Button>
-                                    </Popconfirm>
+                                        忽略
+                                    </PermissionButton>
                                 </div>
                             </div>
                         ),
@@ -1736,22 +1799,26 @@ const Status = defineComponent({
                                                                     style="padding: 0"
                                                                     popConfirm={{
                                                                         title: '确认启用',
-                                                                        onConfirm: async () => {
-                                                                            const resp = await _deploy(response?.result?.id || '');
-                                                                            if (resp.status === 200) {
-                                                                                onlyMessage('操作成功！');
-                                                                                list.value = modifyArrayList(
-                                                                                    list.value,
-                                                                                    {
-                                                                                        key: 'parent-device',
-                                                                                        name: '网关父设备',
-                                                                                        desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
-                                                                                        status: 'success',
-                                                                                        text: '正常',
-                                                                                        info: null,
-                                                                                    },
-                                                                                );
-                                                                            }
+                                                                        onConfirm:  () => {
+                                                                            const response =  _deploy(response?.result?.id || '');
+                                                                            response.then((resp)=>{
+                                                                                if (resp.status === 200) {
+                                                                                    onlyMessage('操作成功！');
+                                                                                    list.value = modifyArrayList(
+                                                                                        list.value,
+                                                                                        {
+                                                                                            key: 'parent-device',
+                                                                                            name: '网关父设备',
+                                                                                            desc: '诊断网关父设备状态是否正常，禁用或离线将导致连接失败',
+                                                                                            status: 'success',
+                                                                                            text: '正常',
+                                                                                            info: null,
+                                                                                        },
+                                                                                    );
+                                                                                }
+                                                                            })
+                                                                            return response
+                                                                           
                                                                         }
                                                                     }}
                                                                 >
diff --git a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
index 65250054..4e667a4e 100644
--- a/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/PatchMapping.vue
@@ -40,12 +40,11 @@
                                 <j-list-item>
                                     {{ item.title }}
                                     <template #actions>
-                                        <j-popconfirm
-                                            title="确定删除?"
-                                            @confirm="_delete(item.key)"
-                                        >
-                                            <AIcon type="DeleteOutlined" />
-                                        </j-popconfirm>
+                                        <ConfirmModal
+                                            title="确认删除？"
+                                            :onConfirm="() => _delete(item.key)"
+                                            ><AIcon type="DeleteOutlined"
+                                        /></ConfirmModal>
                                     </template>
                                 </j-list-item>
                             </template>
@@ -121,11 +120,10 @@ const handleSearch = async () => {
     }
 };
 
-
-const expandedKeys = ref<string[]>([])
+const expandedKeys = ref<string[]>([]);
 const onCheck = (keys: string[], e: any) => {
     // console.log(expandedKeys.push(e));
-    expandedKeys.value.push(e.node.id)
+    expandedKeys.value.push(e.node.id);
     checkedKeys.value = [...keys];
     leftList.value = e?.checkedNodes || [];
 };
@@ -155,7 +153,6 @@ const getChannel = async () => {
 };
 
 const onLoadData: TreeProps['loadData'] = (treeNode) => {
-
     return new Promise(async (resolve) => {
         if (treeNode.dataRef?.children) {
             resolve();
diff --git a/src/views/device/Instance/Detail/EdgeMap/index.vue b/src/views/device/Instance/Detail/EdgeMap/index.vue
index c3690030..be8caa67 100644
--- a/src/views/device/Instance/Detail/EdgeMap/index.vue
+++ b/src/views/device/Instance/Detail/EdgeMap/index.vue
@@ -106,68 +106,49 @@
                         </template>
                         <template v-if="column.key === 'action'">
                             <j-space>
-                                <j-tooltip
-                                    :title="
-                                        isPermission
-                                            ? '解绑'
-                                            : '暂无权限，请联系管理员'
-                                    "
+                                <PermissionButton
+                                    type="link"
+                                    :disabled="!record.id"
+                                    :tooltip="{
+                                        title: '解绑',
+                                    }"
+                                    :popConfirm="{
+                                        title: '确认解绑？',
+                                        onConfirm: () => unbind(record.id),
+                                    }"
+                                    hasPermission="device/Instance:update"
                                 >
-                                    <j-popconfirm
-                                        title="确认解绑？"
-                                        :disabled="!record.id || !isPermission"
-                                        @confirm="unbind(record.id)"
-                                    >
-                                        <j-button
-                                            type="link"
-                                            :disabled="
-                                                !record.id || !isPermission
-                                            "
-                                            style="padding: 0 5px"
-                                        >
-                                            <AIcon type="icon-jiebang" />
-                                        </j-button>
-                                    </j-popconfirm>
-                                </j-tooltip>
+                                    <AIcon type="icon-jiebang"
+                                /></PermissionButton>
                                 <template v-if="record.id">
-                                    <j-tooltip
-                                        :title="
-                                            isPermission
-                                                ? record.state.value ===
-                                                  'enabled'
+                                    <PermissionButton
+                                        type="link"
+                                        hasPermission="device/Instance:update"
+                                        :tooltip="{
+                                            title:
+                                                record.state.value === 'enabled'
                                                     ? '禁用'
-                                                    : '启用'
-                                                : '暂无权限，请联系管理员'
-                                        "
-                                    >
-                                        <j-popconfirm
-                                            :title="
+                                                    : '启用',
+                                        }"
+                                        :popConfirm="{
+                                            title:
                                                 record.state.value === 'enabled'
                                                     ? '确认禁用？'
-                                                    : '确认启用?'
+                                                    : '确认启用?',
+                                            onConfirm: () => onAction(record),
+                                        }"
+                                    >
+                                        <AIcon
+                                            v-if="
+                                                record.state.value === 'enabled'
                                             "
-                                            :disabled="!isPermission"
-                                            @confirm="onAction(record)"
-                                        >
-                                            <j-button
-                                                type="link"
-                                                style="padding: 0 5px"
-                                                :disabled="!isPermission"
-                                            >
-                                                <AIcon
-                                                    v-if="
-                                                        record.state.value ===
-                                                        'enabled'
-                                                    "
-                                                    type="StopOutlined"
-                                                />
-                                                <AIcon
-                                                    v-else
-                                                    type="PlayCircleOutlined"
-                                                />
-                                            </j-button>
-                                        </j-popconfirm>
-                                    </j-tooltip>
+                                            type="StopOutlined"
+                                        />
+                                        <AIcon
+                                            v-else
+                                            type="PlayCircleOutlined"
+                                        />
+                                    </PermissionButton>
                                 </template>
                             </j-space>
                         </template>
@@ -252,7 +233,7 @@ const columns = [
 const permissionStore = usePermissionStore();
 
 const data: any = ref([]);
-const isPermission = permissionStore.hasPermission('device/Instance:update');
+// const isPermission = permissionStore.hasPermission('device/Instance:update');
 
 const current = ref<number>(1);
 const pageSize = ref<number>(10);
@@ -348,20 +329,20 @@ const handleSearch = async () => {
     loading.value = false;
 };
 
-const unbind = async (id: string) => {
+const unbind = (id: string) => {
     const _deviceId = instanceStore.current.id;
     if (id && _deviceId) {
-        const resp = await removeEdgeMap(
-            instanceStore.current?.parentId || '',
-            {
-                deviceId: _deviceId,
-                idList: [id],
-            },
-        );
-        if (resp.status === 200) {
-            onlyMessage('操作成功！', 'success');
-            handleSearch();
-        }
+        const response = removeEdgeMap(instanceStore.current?.parentId || '', {
+            deviceId: _deviceId,
+            idList: [id],
+        });
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！', 'success');
+                handleSearch();
+            }
+        });
+        return response;
     }
 };
 
@@ -415,7 +396,7 @@ const onSave = () => {
         });
 };
 
-const onAction = async (record: any) => {
+const onAction = (record: any) => {
     const array = (modelRef.dataSource || [])?.filter(
         (item: any) => item.channelId,
     );
@@ -430,14 +411,17 @@ const onAction = async (record: any) => {
         provider: array[0]?.provider,
         requestList: [...filterArray, arr],
     };
-    const resp = await saveEdgeMap(
+    const response = saveEdgeMap(
         instanceStore.current.parentId || '',
         submitData,
     );
-    if (resp.status === 200) {
-        onlyMessage('操作成功！', 'success');
-        onRefresh();
-    }
+    response.then((resp) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功！', 'success');
+            onRefresh();
+        }
+    });
+    return response
 };
 
 const onRefresh = async () => {
diff --git a/src/views/device/Instance/Detail/Firmware/index.vue b/src/views/device/Instance/Detail/Firmware/index.vue
new file mode 100644
index 00000000..a35dfcae
--- /dev/null
+++ b/src/views/device/Instance/Detail/Firmware/index.vue
@@ -0,0 +1,193 @@
+<template>
+    <div class="firmwareContainer" v-if="firmwareList?.length">
+        <div v-for="i in firmwareList" class="firmwareBox">
+            <CardBox
+                :showStatus="false"
+                :value="i"
+                @click="() => showTask(i.id)"
+                v-bind="i"
+            >
+                <template #content>
+                    <div class="cardContent">
+                        <div class="firmwareHead">
+                            <Ellipsis style="width: 200px">
+                                {{ i.name }}
+                            </Ellipsis>
+                        </div>
+                        <div class="firmwareDes">
+                            <Ellipsis style="width: 200px">{{
+                                i.description
+                            }}</Ellipsis>
+                        </div>
+                        <div class="firmwareFoot">
+                            <div>
+                                <span class="firmwareFootTitle">签名方式：</span
+                                >{{ i.signMethod }}
+                            </div>
+                            <div>
+                                <span class="firmwareFootTitle">创建时间：</span
+                                >{{
+                                    dayjs(i.createTime).format(
+                                        'YYYY-MM-DD HH:mm:ss',
+                                    )
+                                }}
+                            </div>
+                        </div>
+                        <div class="version">V {{ i.version }}</div>
+                    </div>
+                    <!-- <div class="mask">查看升级任务</div> -->
+                </template>
+            </CardBox>
+        </div>
+    </div>
+    <JEmpty v-else></JEmpty>
+    <Task
+        v-if="visibleTask"
+        :firmwareId="firmwareId"
+        showPosition="detail"
+        :deviceId="props.type === 'device' ? current.id : ''"
+        @close-drawer="visibleTask = false"
+    />
+</template>
+
+<script setup>
+import { useInstanceStore } from '@/store/instance';
+import { useProductStore } from '@/store/product';
+import { queryPaginateNot, historyPaginateNot } from '@/api/device/firmware';
+import Task from '@/views/device/Firmware/Task/index.vue';
+import dayjs from 'dayjs';
+const props = defineProps({
+    type: {
+        type: String,
+        default: 'device',
+    },
+});
+const { current } =
+    props.type === 'device' ? useInstanceStore() : useProductStore();
+const firmwareList = ref();
+const firmwareId = ref();
+const visibleTask = ref(false);
+const queryFirmwareList = async () => {
+    const res = await queryPaginateNot({
+        paging: false,
+        sorts: [
+            {
+                name: 'createTime',
+                order: 'desc',
+            },
+        ],
+        terms: [
+            {
+                terms: [
+                    {
+                        type: 'or',
+                        value:
+                            props.type === 'device'
+                                ? current.productId
+                                : current.id,
+                        termType: 'eq',
+                        column: 'productId',
+                    },
+                ],
+            },
+        ],
+    });
+    if (res.success) {
+        firmwareList.value = res.result;
+    }
+    if (props.type === 'device') {
+        // 查看固件所属产品下所有的任务 过滤掉不包含该设备的升级任务的固件
+        const resp = await historyPaginateNot({
+            paging: false,
+            sorts: [{ name: 'createTime', order: 'desc' }],
+            terms: [
+                {
+                    terms: [
+                        {
+                            column: 'productId',
+                            value: current.productId,
+                        },
+                    ],
+                },
+            ],
+        });
+        if (resp.success) {
+            firmwareList.value = firmwareList.value.filter((i) => {
+                return resp.result.find((item) => {
+                    return (
+                        i.id === item.firmwareId && current.id === item.deviceId
+                    );
+                });
+            });
+        }
+    }
+};
+const showTask = (id) => {
+    firmwareId.value = id;
+    visibleTask.value = true;
+};
+onMounted(() => {
+    queryFirmwareList();
+});
+</script>
+<style lang="less" scoped>
+.firmwareContainer {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
+    .firmwareBox {
+        width: 33%;
+        position: relative;
+        margin-bottom: 20px;
+        .mask {
+            position: absolute;
+            top: 0;
+            left: 0;
+            z-index: 999;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            width: 100%;
+            font-size: 16px;
+            height: 100%;
+            color: transparent;
+            padding-top: 10px;
+            background-color: rgba(#000, 0);
+            cursor: pointer;
+            transition: background-color 0.3s;
+
+            &:hover {
+                background-color: rgba(#000, 0.4);
+                color: #fff;
+            }
+        }
+    }
+    .cardContent {
+        position: relative;
+        .version {
+            position: absolute;
+            top: -10px;
+            right: 5px;
+        }
+    }
+    .firmwareHead,
+    .firmwareFoot {
+        display: flex;
+    }
+    .firmwareHead {
+        font-size: 16px;
+        font-weight: 600;
+    }
+    .firmwareDes {
+        height: 22px;
+        color: #777777;
+        margin: 8px 0;
+    }
+    .firmwareFoot {
+        justify-content: space-between;
+        .firmwareFootTitle{
+            color:#A3A3A3
+        }
+    }
+}
+</style>
diff --git a/src/views/device/Instance/Detail/Function/components/Simple.vue b/src/views/device/Instance/Detail/Function/components/Simple.vue
index f336564f..b80f812d 100644
--- a/src/views/device/Instance/Detail/Function/components/Simple.vue
+++ b/src/views/device/Instance/Detail/Function/components/Simple.vue
@@ -76,6 +76,11 @@
                                                         value: item.value,
                                                     }))
                                                 "
+                                                :extra="{
+                                                      style: {
+                                                        zIndex: 1030
+                                                      }
+                                                }"
                                             />
                                         </j-form-item>
                                     </template>
@@ -245,6 +250,10 @@ const handleClear = (func: any) => {
 const onTabChange = (_key: string) => {
     executeResult.value = '';
 };
+
+const getPopupContainer = () => {
+  return document.body
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/device/Instance/Detail/Info/components/Config/index.vue b/src/views/device/Instance/Detail/Info/components/Config/index.vue
index 781d0777..27cb8b67 100644
--- a/src/views/device/Instance/Detail/Info/components/Config/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/Config/index.vue
@@ -91,15 +91,20 @@
                     <Ellipsis>{{
                         [
                             {
-                                label:  item?.type?.falseText,
+                                label: item?.type?.falseText,
                                 value: item?.type?.falseValue,
                             },
                             {
                                 label: item?.type?.trueText,
                                 value: item?.type?.trueValue,
-                            }
-                        ].find((i) => i.value ===
-                           instanceStore.current?.configuration?.[item.property] )?.label || ''
+                            },
+                        ].find(
+                            (i) =>
+                                i.value ===
+                                instanceStore.current?.configuration?.[
+                                    item.property
+                                ],
+                        )?.label || ''
                     }}</Ellipsis>
                 </span>
                 <span v-else>
@@ -143,15 +148,19 @@ const instanceStore = useInstanceStore();
 const visible = ref<boolean>(false);
 const config = ref<ConfigMetadata[]>([]);
 
-watch(()=>instanceStore.current.id,(val) => {
-    if (val) {
-        getConfigMetadata(val).then((resp) => {
-            if (resp.status === 200) {
-                config.value = resp?.result as ConfigMetadata[];
-            }
-        });
-    }
-},{ immediate: true });
+watch(
+    () => instanceStore.current.id,
+    (val) => {
+        if (val) {
+            getConfigMetadata(val).then((resp) => {
+                if (resp.status === 200) {
+                    config.value = resp?.result as ConfigMetadata[];
+                }
+            });
+        }
+    },
+    { immediate: true },
+);
 
 const isExit = (property: string) => {
     return (
@@ -163,23 +172,29 @@ const isExit = (property: string) => {
     );
 };
 
-const deployBtn = async () => {
+const deployBtn = () => {
     if (instanceStore.current.id) {
-        const resp = await _deploy(instanceStore.current.id);
-        if (resp.status === 200) {
-            onlyMessage('操作成功');
-            instanceStore.refresh(instanceStore.current.id);
-        }
+        const response = _deploy(instanceStore.current.id);
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功');
+                instanceStore.refresh(instanceStore.current.id);
+            }
+        });
+        return response;
     }
 };
 
-const resetBtn = async () => {
+const resetBtn = () => {
     if (instanceStore.current.id) {
-        const resp = await configurationReset(instanceStore.current.id);
-        if (resp.status === 200) {
-            onlyMessage('恢复默认配置成功');
-            instanceStore.refresh(instanceStore.current.id);
-        }
+        const response = configurationReset(instanceStore.current.id);
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('恢复默认配置成功');
+                instanceStore.refresh(instanceStore.current.id);
+            }
+        });
+        return response
     }
 };
 
diff --git a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
index c81c0704..45862242 100644
--- a/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
+++ b/src/views/device/Instance/Detail/Info/components/InklingModal/index.vue
@@ -10,8 +10,10 @@
   >
     <InklingDevice
       v-model:value='checkKey'
+      type="device"
       :accessId='accessId'
       :pluginId="pluginId"
+      :internalId="route.params.id"
     />
   </j-modal>
 </template>
@@ -19,7 +21,7 @@
 <script setup lang='ts' name='InklingModal'>
 import InklingDevice from '@/views/device/components/InklingDevice'
 import { onlyMessage } from '@/utils/comm'
-import { savePluginData } from '@/api/link/plugin'
+import { savePluginData, getPluginData } from '@/api/link/plugin'
 
 type Emit = {
   (e: 'cancel'): void
@@ -68,6 +70,18 @@ const handleCancel = () => {
   emit('cancel')
 }
 
+const getCheckedKeys = () => {
+  getPluginData( 'device', props.pluginId!, route.params.id as string,).then(res => {
+    if (res.success) {
+      checkKey.value = res.result?.externalId || ''
+    }
+  })
+}
+
+onMounted(() => {
+  getCheckedKeys()
+})
+
 </script>
 
 <style scoped>
diff --git a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
index e0ad45a6..e8ff918a 100644
--- a/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
+++ b/src/views/device/Instance/Detail/Info/components/Tags/Save.vue
@@ -1,8 +1,9 @@
 <template>
     <j-modal
+        title="编辑标签"
         :width="1000"
         :visible="true"
-        title="编辑标签"
+        :confirmLoading="loading"
         @ok="handleOk"
         @cancel="handleCancel"
     >
@@ -75,6 +76,7 @@ const columns = [
 const instanceStore = useInstanceStore();
 
 const dataSource = ref<Record<any, any>[]>([]);
+const loading = ref(false)
 
 watchEffect(() => {
     const arr = instanceStore.current?.tags || [];
@@ -83,6 +85,7 @@ watchEffect(() => {
 
 const handleOk = async () => {
     if (dataSource.value.length) {
+        loading.value = true
         const list = (dataSource.value || [])
             .filter((item: any) => item?.key && item?.value)
             .map((i: any) => {
@@ -105,7 +108,10 @@ const handleOk = async () => {
               }
             });
           }
-          emit('save');
+          setTimeout(() => {
+            loading.value = false
+            emit('save');
+          }, 1000)
     } else {
         emit('close');
     }
@@ -114,4 +120,4 @@ const handleOk = async () => {
 const handleCancel = () => {
     emit('close');
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/device/Instance/Detail/Log/index.vue b/src/views/device/Instance/Detail/Log/index.vue
index 16561171..85f5d2ed 100644
--- a/src/views/device/Instance/Detail/Log/index.vue
+++ b/src/views/device/Instance/Detail/Log/index.vue
@@ -25,7 +25,7 @@
             }}
         </template>
         <template #action="slotProps">
-            <j-space>
+            <j-space :size="16">
                 <template
                     v-for="i in getActions(slotProps, 'table')"
                     :key="i.key"
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
index ba77b4e9..b7b9310f 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Charts.vue
@@ -4,15 +4,11 @@
             <j-space>
                 <div>
                     统计周期：
-                    <j-select v-model:value="cycle" style="width: 120px">
-                        <j-select-option value="*" v-if="_type"
-                            >实际值</j-select-option
-                        >
-                        <j-select-option value="1m">按分钟统计</j-select-option>
-                        <j-select-option value="1h">按小时统计</j-select-option>
-                        <j-select-option value="1d">按天统计</j-select-option>
-                        <j-select-option value="1w">按周统计</j-select-option>
-                        <j-select-option value="1M">按月统计</j-select-option>
+                    <j-select
+                        v-model:value="cycle"
+                        style="width: 120px"
+                        :options="periodOptions"
+                    >
                     </j-select>
                 </div>
                 <div v-if="cycle !== '*' && _type">
@@ -38,8 +34,7 @@ import { getPropertiesInfo, getPropertiesList } from '@/api/device/instance';
 import { useInstanceStore } from '@/store/instance';
 import Chart from './Chart.vue';
 import * as echarts from 'echarts';
-
-const list = ['int', 'float', 'double', 'long'];
+import dayjs from 'dayjs';
 
 const prop = defineProps({
     data: {
@@ -52,16 +47,18 @@ const prop = defineProps({
     },
 });
 
-const cycle = ref<string>('*');
+const cycle = ref<string>();
 const agg = ref<string>('AVG');
 const loading = ref<boolean>(false);
 const chartsList = ref<any[]>([]);
 const instanceStore = useInstanceStore();
+const periodOptions = ref<any>([]);
 const options = ref({});
+const list = ['int', 'float', 'double', 'long'];
 
 const _type = computed(() => {
     const flag = list.includes(prop.data?.valueType?.type || '');
-    cycle.value = flag ? '*' : '1m';
+    // cycle.value = flag ? '*' : '1m';
     return flag;
 });
 
@@ -77,7 +74,7 @@ const queryChartsAggList = async () => {
         ],
         query: {
             interval: cycle.value,
-            format: 'yyyy-MM-dd HH:mm:ss',
+            format: cycle.value === '1d' ? 'yyyy-MM-dd' : 'yyyy-MM-dd HH:mm:ss',
             from: prop.time[0],
             to: prop.time[1],
         },
@@ -85,12 +82,17 @@ const queryChartsAggList = async () => {
         loading.value = false;
     });
     if (resp.status === 200) {
+        let beginTime;
+        let endTime;
+        if (cycle.value === '1d') {
+            beginTime = dayjs(prop.time[0]).format('YYYY-MM-DD');
+            endTime = dayjs(prop.time[1]).format('YYYY-MM-DD');
+        } else {
+            beginTime = dayjs(prop.time[0]).format('YYYY-MM-DD HH:mm:ss');
+            endTime = dayjs(prop.time[1]).format('YYYY-MM-DD HH:mm:ss');
+        }
+
         const dataList: any[] = [
-            {
-                year: prop.time[1],
-                value: undefined,
-                type: prop.data?.name || '',
-            },
         ];
         (resp.result as any[]).forEach((i: any) => {
             dataList.push({
@@ -100,12 +102,27 @@ const queryChartsAggList = async () => {
                 type: prop.data?.name || '',
             });
         });
-        dataList.push({
-            year: prop.time[0],
-            value: undefined,
-            type: prop.data?.name || '',
-        });
         chartsList.value = (dataList || []).reverse();
+        if (
+            !chartsList.value?.[0]?.year ||
+            chartsList.value[0].year !== beginTime
+        ) {
+            chartsList.value.unshift({
+                year: prop.time[0],
+                value: undefined,
+                type: prop.data?.name || '',
+            });
+        }
+        if (
+            !chartsList.value?.[chartsList.value.length - 1]?.year ||
+            chartsList.value[chartsList.value.length - 1].year !== endTime
+        ) {
+            chartsList.value.push({
+                year: prop.time[1],
+                value: undefined,
+                type: prop.data?.name || '',
+            });
+        }
     }
 };
 
@@ -171,7 +188,9 @@ const getOptions = (arr: any[]) => {
             type: 'category',
             data: arr.map((item) => {
                 return echarts.format.formatTime(
-                    'yyyy-MM-dd\nhh:mm:ss',
+                    cycle.value === '1d'
+                        ? 'yyyy-MM-dd'
+                        : 'yyyy-MM-dd\nhh:mm:ss',
                     item.year,
                     false,
                 );
@@ -186,11 +205,11 @@ const getOptions = (arr: any[]) => {
             {
                 type: 'inside',
                 start: 0,
-                end: 10,
+                end: 100,
             },
             {
                 start: 0,
-                end: 10,
+                end: 100,
             },
         ],
         tooltip: {
@@ -209,6 +228,69 @@ const getOptions = (arr: any[]) => {
         ],
     };
 };
+watch(
+    () => prop.time,
+    (val) => {
+        const diffInSeconds = dayjs(val[1]).diff(dayjs(val[0]), 'minute');
+        if (diffInSeconds < 60) {
+            periodOptions.value = [
+                {
+                    label: '实际值',
+                    value: '*',
+                },
+                {
+                    label: '按分钟统计',
+                    value: '1m',
+                },
+            ];
+            cycle.value = '*';
+        } else if (diffInSeconds < 1440) {
+            periodOptions.value = [
+                {
+                    label: '实际值',
+                    value: '*',
+                },
+                {
+                    label: '按分钟统计',
+                    value: '1m',
+                },
+                {
+                    label: '按小时统计',
+                    value: '1h',
+                },
+            ];
+            cycle.value = '*';
+        } else if (diffInSeconds < 43200) {
+            periodOptions.value = [
+                {
+                    label: '按小时统计',
+                    value: '1h',
+                },
+                {
+                    label: '按天统计',
+                    value: '1d',
+                },
+            ];
+            cycle.value = '1h';
+        } else {
+            periodOptions.value = [
+                {
+                    label: '按天统计',
+                    value: '1d',
+                },
+                {
+                    label: '按周统计',
+                    value: '1w',
+                },
+            ];
+            cycle.value = '1d';
+        }
+    },
+    {
+        deep: true,
+        immediate: true,
+    },
+);
 
 watch(
     () => [cycle.value, agg.value, prop.time],
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
index 71bf868a..9b53889e 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/Table.vue
@@ -10,9 +10,9 @@
                 current: (dataSource?.pageIndex || 0) + 1,
                 pageSize: dataSource?.pageSize || 12,
                 showSizeChanger: true,
-                showLessItems:true,
+                showLessItems: true,
                 total: dataSource?.total || 0,
-                pageSizeOptions: ['12', '24', '48', '96']
+                pageSizeOptions: ['12', '24', '48', '96'],
             }"
         >
             <template #bodyCell="{ column, record }">
@@ -95,11 +95,11 @@ const dataSource = ref({
     pageIndex: 0,
     pageSize: 12,
     data: [],
-    total: 0
+    total: 0,
 });
 const current = ref<any>({});
 const visible = ref<boolean>(false);
-
+console.log(_props.data);
 const columns = computed(() => {
     const arr: any[] = [
         {
@@ -122,6 +122,7 @@ const columns = computed(() => {
             key: 'action',
         });
     }
+
     return arr;
 });
 
@@ -153,7 +154,6 @@ const queryPropertyData = async (params: any) => {
         dataSource.value = resp.result as any;
     }
 };
-
 watch(
     () => [_props.data.id, _props.time],
     ([newVal]) => {
@@ -165,8 +165,9 @@ watch(
         }
     },
     {
-        deep: true, immediate: true
-    }
+        deep: true,
+        immediate: true,
+    },
 );
 
 const onChange = (page: any) => {
@@ -197,10 +198,10 @@ const _download = (record: any) => {
 :deep(.ant-pagination-item) {
     display: none !important;
 }
-:deep(.ant-pagination-jump-next){
+:deep(.ant-pagination-jump-next) {
     display: none !important;
 }
-:deep(.ant-pagination-jump-prev){
+:deep(.ant-pagination-jump-prev) {
     display: none !important;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/TimeComponent.vue b/src/views/device/Instance/Detail/Running/Property/Detail/TimeComponent.vue
index e5d3870f..f105b1a2 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/TimeComponent.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/TimeComponent.vue
@@ -24,12 +24,12 @@ import dayjs from 'dayjs';
 import type { Dayjs } from 'dayjs';
 import { PropType } from 'vue';
 
-type Props = [Dayjs, Dayjs] | undefined
+type Props = [Dayjs, Dayjs] | undefined;
 
 const props = defineProps({
     modelValue: {
         type: Object as PropType<Props>,
-        default: undefined
+        default: undefined,
     },
 });
 
@@ -38,14 +38,12 @@ type Emits = {
 };
 
 const emit = defineEmits<Emits>();
-
 const radioValue = ref<string>('today');
 const dateValue = ref<Props>();
-
 const onRangeChange = (value: Props) => {
     emit('update:modelValue', value);
     radioValue.value = '';
-}
+};
 
 const getTime = (type: string): Props => {
     let st: number = 0;
@@ -55,10 +53,10 @@ const getTime = (type: string): Props => {
     } else if (type === 'week') {
         st = dayjs().subtract(6, 'days').valueOf();
     } else if (type === 'month') {
-        st = dayjs().subtract(29, 'days').valueOf();
+        st = dayjs().subtract(30, 'days').valueOf();
     }
-    return [dayjs(st), dayjs(et)]
-}
+    return [dayjs(st), dayjs(et)];
+};
 
 const onRadioChange = (e: any) => {
     const value: string = e.target.value;
@@ -67,15 +65,15 @@ const onRadioChange = (e: any) => {
 };
 
 onMounted(() => {
-    radioValue.value = 'today'
+    radioValue.value = 'today';
     emit('update:modelValue', getTime('today'));
-})
+});
 
 watch(
     () => props.modelValue,
     (newVal: Props) => {
-        dateValue.value = newVal
+        dateValue.value = newVal;
     },
     { immediate: true, deep: true },
 );
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/device/Instance/Detail/Running/Property/Detail/index.vue b/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
index aff79dd5..b1adcd17 100644
--- a/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/Detail/index.vue
@@ -1,15 +1,32 @@
 <template>
-    <j-modal title="详情" visible width="50vw" @ok="onCancel" @cancel="onCancel">
-        <div style="margin-bottom: 10px"><TimeComponent v-model="dateValue" /></div>
+    <j-modal
+        title="详情"
+        visible
+        width="50vw"
+        :maskClosable="false"
+        @ok="onCancel"
+        @cancel="onCancel"
+    >
+        <div style="margin-bottom: 10px">
+            <TimeComponent v-model="dateValue" :data="props.data" />
+        </div>
         <div>
-            <j-tabs :destroyInactiveTabPane="true" v-model:activeKey="activeKey" style="max-height: 600px; overflow-y: auto">
+            <j-tabs
+                :destroyInactiveTabPane="true"
+                v-model:activeKey="activeKey"
+                style="max-height: 600px; overflow-y: auto"
+            >
                 <j-tab-pane key="table" tab="列表">
                     <Table :data="props.data" :time="_getTimes" />
                 </j-tab-pane>
                 <j-tab-pane key="charts" tab="图表">
                     <Charts :data="props.data" :time="_getTimes" />
                 </j-tab-pane>
-                <j-tab-pane key="geo" tab="轨迹" v-if="data?.valueType?.type === 'geoPoint'">
+                <j-tab-pane
+                    key="geo"
+                    tab="轨迹"
+                    v-if="data?.valueType?.type === 'geoPoint'"
+                >
                     <PropertyAMap :data="props.data" :time="_getTimes" />
                 </j-tab-pane>
             </j-tabs>
@@ -19,37 +36,33 @@
 
 <script lang="ts" setup>
 import type { Dayjs } from 'dayjs';
-import TimeComponent from './TimeComponent.vue'
-import Charts from './Charts.vue'
-import PropertyAMap from './PropertyAMap.vue'
-import Table from './Table.vue'
+import TimeComponent from './TimeComponent.vue';
+import Charts from './Charts.vue';
+import PropertyAMap from './PropertyAMap.vue';
+import Table from './Table.vue';
 
 const props = defineProps({
     data: {
         type: Object,
-        default: () => {}
-    }
-})
+        default: () => {},
+    },
+});
 
-const _emits = defineEmits(['close'])
-
-const activeKey = ref<'table' | 'charts' | 'geo'>('table')
+const _emits = defineEmits(['close']);
+const activeKey = ref<'table' | 'charts' | 'geo'>('table');
 
 const dateValue = ref<[Dayjs, Dayjs]>();
 
 const _getTimes = computed(() => {
-    if(dateValue.value){
-        return [dateValue.value[0].valueOf(), dateValue.value[1].valueOf()]
+    if (dateValue.value) {
+        return [dateValue.value[0].valueOf(), dateValue.value[1].valueOf()];
     }
-    return []
-})
+    return [];
+});
 
 const onCancel = () => {
-    _emits('close')
-}
+    _emits('close');
+};
 </script>
 
-<style lang="less" scoped>
-
-</style>
-
+<style lang="less" scoped></style>
diff --git a/src/views/device/Instance/Detail/Running/Property/index.vue b/src/views/device/Instance/Detail/Running/Property/index.vue
index 820b0d36..c4263192 100644
--- a/src/views/device/Instance/Detail/Running/Property/index.vue
+++ b/src/views/device/Instance/Detail/Running/Property/index.vue
@@ -1,6 +1,7 @@
 <template>
     <j-spin :spinning="loading">
         <JProTable
+            ref="tableRef"
             :columns="columns"
             :request="query"
             :params="_params"
@@ -136,7 +137,7 @@ const propertyValue = ref<Record<string, any>>({});
 const _params = reactive({
     name: '',
 });
-
+const tableRef = ref()
 const subRef = ref();
 
 // const list = ref<any[]>([]);
@@ -335,6 +336,8 @@ watch(
         if (newVal.length) {
             _dataSource.value = newVal as PropertyData[];
             _params.name = '';
+            console.log(tableRef.value,'ref')
+            tableRef.value?.reload()
         }
     },
     {
diff --git a/src/views/device/Instance/Detail/Running/index.vue b/src/views/device/Instance/Detail/Running/index.vue
index bdbb953a..06306d50 100644
--- a/src/views/device/Instance/Detail/Running/index.vue
+++ b/src/views/device/Instance/Detail/Running/index.vue
@@ -44,6 +44,7 @@ import { useInstanceStore } from '@/store/instance';
 import _ from 'lodash-es';
 import Event from './Event/index.vue';
 import Property from './Property/index.vue';
+import { storeToRefs } from 'pinia';
 
 const activeKey = ref<string>('property');
 const tabList = ref<{ key: string; tab: string; type: 'property' | 'event' }[]>(
@@ -59,15 +60,19 @@ const type = ref<string>('property');
 const data = ref<Record<string, any>>({});
 const value = ref<string>('');
 const instanceStore = useInstanceStore();
-const metadata = JSON.parse(instanceStore.current?.metadata || '{}');
-const properties = metadata.properties;
-const events = metadata.events;
+const { current } = storeToRefs(instanceStore);
+
+const properties: any = ref(undefined);
+const events: any = ref(undefined);
 
 watch(
-    () => events,
-    (newVal) => {
-        if (events && newVal.length) {
-            newVal.map((item: any) => {
+    () => current.value,
+    (value) => {
+        const metadata = JSON.parse(value?.metadata || '{}');
+        properties.value = metadata.properties;
+        events.value = metadata.events;
+        if (events.value && events.value.length) {
+            events.value.map((item: any) => {
                 tabList.value.push({
                     ...item,
                     key: item.id,
@@ -78,10 +83,30 @@ watch(
         }
     },
     {
-        deep: true,
         immediate: true,
+        deep: true,
     },
 );
+// watch(
+//     () => events.value,
+//     (newVal) => {
+//         console.log(events.value,'test')
+//         if (events.value && newVal.length) {
+//             newVal.map((item: any) => {
+//                 tabList.value.push({
+//                     ...item,
+//                     key: item.id,
+//                     tab: item.name,
+//                     type: 'event',
+//                 });
+//             });
+//         }
+//     },
+//     {
+//         deep: true,
+//         immediate: true,
+//     },
+// );
 
 const onSearch = () => {
     const arr = [
@@ -90,7 +115,7 @@ const onSearch = () => {
             tab: '属性',
             type: 'property',
         },
-        ...events.map((item: any) => {
+        ...events.value.map((item: any) => {
             return {
                 ...item,
                 key: item.id,
diff --git a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
index d190b4b0..788fa21c 100644
--- a/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/PatchMapping.vue
@@ -38,12 +38,11 @@
                                 <j-list-item>
                                     {{ item.title }}
                                     <template #actions>
-                                        <j-popconfirm
-                                            title="确定删除?"
-                                            @confirm="_delete(item.key)"
-                                        >
-                                            <AIcon type="DeleteOutlined" />
-                                        </j-popconfirm>
+                                        <ConfirmModal
+                                            title="确认删除？"
+                                            :onConfirm="() => _delete(item.key)"
+                                            ><AIcon type="DeleteOutlined"
+                                        /></ConfirmModal>
                                     </template>
                                 </j-list-item>
                             </template>
@@ -65,12 +64,12 @@ const _props = defineProps({
     },
     metaData: {
         type: Array,
-        default: () => []
+        default: () => [],
     },
     deviceId: {
         type: String,
         default: '',
-    }
+    },
 });
 const _emits = defineEmits(['close', 'save']);
 
@@ -82,18 +81,22 @@ const rightList = ref<any[]>([]);
 const dataSource = ref<any[]>([]);
 const loading = ref<boolean>(false);
 
-const handleData = (data: any[], type: string,provider?:string) => {
+const handleData = (data: any[], type: string, provider?: string) => {
     data.forEach((item) => {
         item.key = item.id;
         item.title = item.name;
         item.checkable = type === 'collectors';
-        provider ? item.provider = provider : ''
+        provider ? (item.provider = provider) : '';
         if (
             item.collectors &&
             Array.isArray(item.collectors) &&
             item.collectors.length
         ) {
-            item.children = handleData(item.collectors, 'collectors',item.provider);
+            item.children = handleData(
+                item.collectors,
+                'collectors',
+                item.provider,
+            );
         }
         if (item.points && Array.isArray(item.points) && item.points.length) {
             item.children = handleData(item.points, 'points');
@@ -135,7 +138,6 @@ const _delete = (_key: string) => {
 };
 
 const handleClick = async () => {
-   
     if (!rightList.value.length) {
         onlyMessage('请选择采集器', 'warning');
     } else {
@@ -146,16 +148,21 @@ const handleClick = async () => {
                 collectorId: element.collectorId,
                 pointId: element.id,
                 metadataType: 'property',
-                metadataId: (_props.metaData as any[]).find((i: any) => i.name === element.name)
-                    ?.metadataId,
-                provider: item.provider
+                metadataId: (_props.metaData as any[]).find(
+                    (i: any) => i.name === element.name,
+                )?.metadataId,
+                provider: item.provider,
             }));
             params.push(...array);
         });
-        
+
         const filterParms = params.filter((item) => !!item.metadataId);
         if (filterParms && filterParms.length !== 0) {
-            const res = await saveMapping(_props.deviceId, _props.type, filterParms);
+            const res = await saveMapping(
+                _props.deviceId,
+                _props.type,
+                filterParms,
+            );
             if (res.status === 200) {
                 onlyMessage('操作成功');
                 _emits('save');
@@ -192,4 +199,4 @@ watchEffect(() => {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/Detail/components/EditTable/index.vue b/src/views/device/Instance/Detail/components/EditTable/index.vue
index e2b886d6..6d817169 100644
--- a/src/views/device/Instance/Detail/components/EditTable/index.vue
+++ b/src/views/device/Instance/Detail/components/EditTable/index.vue
@@ -8,7 +8,11 @@
                 </j-space>
             </template>
             <j-form ref="formRef" :model="modelRef">
-                <j-table :columns="columns" :dataSource="modelRef.dataSource" @change="tableChange">
+                <j-table
+                    :columns="columns"
+                    :dataSource="modelRef.dataSource"
+                    @change="tableChange"
+                >
                     <template #headerCell="{ column }">
                         <template v-if="column.key === 'collectorId'">
                             采集器
@@ -20,24 +24,36 @@
                     <template #bodyCell="{ column, record, index }">
                         <template v-if="column.dataIndex === 'channelId'">
                             <j-form-item
-                                :name="['dataSource', myCurrent * 10 + index, 'channelId']"
+                                :name="[
+                                    'dataSource',
+                                    myCurrent * 10 + index,
+                                    'channelId',
+                                ]"
                             >
                                 <j-select
                                     style="width: 100%"
                                     v-model:value="record[column.dataIndex]"
                                     placeholder="请选择"
                                     allowClear
-                                    show-search 
+                                    show-search
                                     :filter-option="filterOption"
                                     :options="channelList"
-                                    @select="(_, option) => { record.provider = option.provider }"
+                                    @select="
+                                        (_, option) => {
+                                            record.provider = option.provider;
+                                        }
+                                    "
                                 >
                                 </j-select>
                             </j-form-item>
                         </template>
                         <template v-if="column.dataIndex === 'collectorId'">
                             <j-form-item
-                                :name="['dataSource', myCurrent * 10 + index, 'collectorId']"
+                                :name="[
+                                    'dataSource',
+                                    myCurrent * 10 + index,
+                                    'collectorId',
+                                ]"
                                 :rules="[
                                     {
                                         required: !!record.channelId,
@@ -54,7 +70,11 @@
                         </template>
                         <template v-if="column.dataIndex === 'pointId'">
                             <j-form-item
-                                :name="['dataSource', myCurrent * 10 + index, 'pointId']"
+                                :name="[
+                                    'dataSource',
+                                    myCurrent * 10 + index,
+                                    'pointId',
+                                ]"
                                 :rules="[
                                     {
                                         required: !!record.channelId,
@@ -78,17 +98,18 @@
                             <j-badge v-else status="error" text="未绑定" />
                         </template>
                         <template v-if="column.key === 'action'">
-                            <j-tooltip title="解绑">
-                                <j-popconfirm
-                                    title="确认解绑"
-                                    :disabled="!record.id"
-                                    @confirm="unbind(record.id)"
-                                >
-                                    <j-button type="link" :disabled="!record.id"
-                                        ><AIcon type="icon-jiebang"
-                                    /></j-button>
-                                </j-popconfirm>
-                            </j-tooltip>
+                            <PermissionButton
+                                type="link"
+                                :tooltip="{
+                                    title: '解绑',
+                                }"
+                                :popConfirm="{
+                                    title: '确认解绑',
+                                    onConfirm: () => unbind(record.id),
+                                }"
+                                :disabled="!record.id"
+                                ><AIcon type="icon-jiebang"
+                            /></PermissionButton>
                         </template>
                     </template>
                 </j-table>
@@ -104,7 +125,7 @@
         />
     </j-spin>
     <j-card v-else :bordered="false" borderStyle="padding: 0">
-        <JEmpty description='暂无数据，请配置物模型' style="margin: 10% 0" />
+        <JEmpty description="暂无数据，请配置物模型" style="margin: 10% 0" />
     </j-card>
 </template>
 
@@ -158,7 +179,7 @@ const columns = [
     },
 ];
 
-const myCurrent = ref(0)
+const myCurrent = ref(0);
 
 const filterOption = (input: string, option: any) => {
     return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
@@ -209,12 +230,13 @@ const getChannel = async () => {
 const handleSearch = async () => {
     loading.value = true;
     getChannel();
-    const _metadata = metadata.properties?.map?.((item: any) => ({
-        metadataId: item.id,
-        metadataName: `${item.name}(${item.id})`,
-        metadataType: 'property',
-        name: item.name,
-    })) || [];
+    const _metadata =
+        metadata.properties?.map?.((item: any) => ({
+            metadataId: item.id,
+            metadataName: `${item.name}(${item.id})`,
+            metadataType: 'property',
+            name: item.name,
+        })) || [];
     if (_metadata && _metadata.length) {
         const resp: any = await queryMapping(
             'device',
@@ -239,18 +261,21 @@ const handleSearch = async () => {
 };
 
 const tableChange = (pagination: { current: number }) => {
-  myCurrent.value = pagination.current - 1
-}
+    myCurrent.value = pagination.current - 1;
+};
 
-const unbind = async (id: string) => {
+const unbind = (id: string) => {
     if (id) {
-        const resp = await removeMapping('device', instanceStore.current.id, [
+        const response = removeMapping('device', instanceStore.current.id, [
             id,
         ]);
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            handleSearch();
-        }
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！');
+                handleSearch();
+            }
+        });
+        return response
     }
 };
 
@@ -271,7 +296,7 @@ const onSave = () => {
                 (i: any) => i.channelId,
             );
             if (arr && arr.length !== 0) {
-                console.log(arr)
+                console.log(arr);
                 const resp = await saveMapping(
                     instanceStore.current.id,
                     props.provider,
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 3756c161..07e0176f 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -98,7 +98,7 @@
             />
         </template>
         <FullPage>
-            <div style="padding: 24px;height: 100%">
+            <div style="padding: 24px; height: 100%">
                 <component
                     :is="tabs[instanceStore.tabActiveKey]"
                     v-bind="{ type: 'device' }"
@@ -122,14 +122,18 @@ import Modbus from './Modbus/index.vue';
 import OPCUA from './OPCUA/index.vue';
 import EdgeMap from './EdgeMap/index.vue';
 import Parsing from './Parsing/index.vue';
-import GateWay from './GateWay/index.vue'
+import GateWay from './GateWay/index.vue';
 import Log from './Log/index.vue';
+import AlarmRecord from './AlarmRecord/index.vue';
+import Firmware from './Firmware/index.vue';
+import CardManagement from '@/views/iot-card/CardManagement/Detail/index.vue';
 import { _deploy, _disconnect } from '@/api/device/instance';
 import { getImage, onlyMessage } from '@/utils/comm';
 import { getWebSocket } from '@/utils/websocket';
 import { useMenuStore } from '@/store/menu';
 import { useRouterParams } from '@/utils/hooks/useParams';
-import { EventEmitter } from '@/utils/utils'
+import { EventEmitter } from '@/utils/utils';
+import { usePermissionStore } from '@/store/permission';
 
 const menuStory = useMenuStore();
 
@@ -166,6 +170,14 @@ const initList = [
         key: 'Log',
         tab: '日志管理',
     },
+    {
+        key: 'CardManagement',
+        tab: '物联网卡',
+    },
+    {
+        key: 'Firmware',
+        tab: '远程升级',
+    },
 ];
 
 const list = ref([...initList]);
@@ -183,9 +195,13 @@ const tabs = {
     Parsing,
     Log,
     MetadataMap,
-  GateWay
+    GateWay,
+    AlarmRecord,
+    CardManagement,
+    Firmware,
 };
 
+const permissionStore = usePermissionStore();
 const getStatus = (id: string) => {
     statusRef.value = getWebSocket(
         `instance-editor-info-status-${id}`,
@@ -193,8 +209,10 @@ const getStatus = (id: string) => {
         {
             deviceId: id,
         },
-    ).subscribe((message:any) => {
-        if(message.payload?.value?.type !== instanceStore.current?.state.value){
+    ).subscribe((message: any) => {
+        if (
+            message.payload?.value?.type !== instanceStore.current?.state.value
+        ) {
             instanceStore.refresh(id);
         }
     });
@@ -202,6 +220,12 @@ const getStatus = (id: string) => {
 
 const getDetail = () => {
     const keys = list.value.map((i) => i.key);
+    if (permissionStore.hasPermission('rule-engine/Alarm/Log:view')) {
+        list.value.push({
+            key: 'AlarmRecord',
+            tab: '预处理数据',
+        });
+    }
     if (
         instanceStore.current?.protocol &&
         !['modbus-tcp', 'opc-ua'].includes(instanceStore.current?.protocol) &&
@@ -245,10 +269,10 @@ const getDetail = () => {
         instanceStore.current?.protocol === 'collector-gateway' &&
         !keys.includes('GateWay')
     ) {
-      list.value.push({
-        key: 'GateWay',
-        tab: '数采映射',
-      });
+        list.value.push({
+            key: 'GateWay',
+            tab: '数采映射',
+        });
     }
     if (
         instanceStore.current?.deviceType?.value === 'gateway' &&
@@ -277,24 +301,26 @@ const getDetail = () => {
         ) &&
         !keys.includes('MetadataMap')
     ) {
-        list.value.push({ key: 'MetadataMap', tab: '物模型映射'});
+        list.value.push({ key: 'MetadataMap', tab: '物模型映射' });
     }
 };
 
 const initPage = async (newId: any) => {
-  await instanceStore.refresh(String(newId));
-  getStatus(String(newId));
-  list.value = [...initList];
-  getDetail();
-  instanceStore.tabActiveKey = 'Info';
-}
+    await instanceStore.refresh(String(newId));
+    getStatus(String(newId));
+    list.value = [...initList];
+    getDetail();
+    instanceStore.tabActiveKey = 'Info';
+};
 
 onBeforeRouteUpdate((to: any) => {
-  if (to.params?.id!==instanceStore.current.id && to.name === 'device/Instance/Detail') {
-    initPage(to.params?.id)
-  }
-})
-
+    if (
+        to.params?.id !== instanceStore.current.id &&
+        to.name === 'device/Instance/Detail'
+    ) {
+        initPage(to.params?.id);
+    }
+});
 
 const getDetailFn = async () => {
     const _id = route.params?.id;
@@ -303,8 +329,11 @@ const getDetailFn = async () => {
         getStatus(String(_id));
         list.value = [...initList];
         getDetail();
+        instanceStore.tabActiveKey = routerParams.params.value.tab || 'Info';
+    }else{
+        instanceStore.tabActiveKey = routerParams.params.value.tab || 'Info';
     }
-    instanceStore.tabActiveKey = routerParams.params.value.tab || 'Info';
+    
 };
 
 onMounted(() => {
@@ -313,31 +342,37 @@ onMounted(() => {
 
 const onTabChange = (e: string) => {
     if (instanceStore.tabActiveKey === 'Metadata') {
-      EventEmitter.emit('MetadataTabs', () => {
-        instanceStore.tabActiveKey = e;
-      })
+        EventEmitter.emit('MetadataTabs', () => {
+            instanceStore.tabActiveKey = e;
+        });
     } else {
-      instanceStore.tabActiveKey = e;
+        instanceStore.tabActiveKey = e;
     }
 };
 
-const handleAction = async () => {
+const handleAction = () => {
     if (instanceStore.current?.id) {
-        const resp = await _deploy(instanceStore.current?.id);
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            instanceStore.refresh(instanceStore.current?.id);
-        }
+        const response = _deploy(instanceStore.current?.id);
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！');
+                instanceStore.refresh(instanceStore.current?.id);
+            }
+        });
+        return response;
     }
 };
 
-const handleDisconnect = async () => {
+const handleDisconnect = () => {
     if (instanceStore.current?.id) {
-        const resp = await _disconnect(instanceStore.current?.id);
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            instanceStore.refresh(instanceStore.current?.id);
-        }
+        const response = _disconnect(instanceStore.current?.id);
+        response.then((resp) => {
+            if (resp.status === 200) {
+                onlyMessage('操作成功！');
+                instanceStore.refresh(instanceStore.current?.id);
+            }
+        });
+        return response;
     }
 };
 
@@ -355,7 +390,7 @@ const jumpProduct = () => {
 };
 
 onUnmounted(() => {
-    instanceStore.current = {} as any
+    instanceStore.current = {} as any;
     statusRef.value && statusRef.value.unsubscribe();
 });
 </script>
@@ -368,4 +403,4 @@ onUnmounted(() => {
     overflow: hidden;
     text-overflow: ellipsis;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index e9fcfe4a..681d6395 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -42,112 +42,6 @@
                             :actions="batchActions"
                             @change="onCheckChange"
                         />
-                        <!-- <j-dropdown>
-                        <j-button
-                            >批量操作 <AIcon type="DownOutlined"
-                        /></j-button>
-                        <template #overlay>
-                            <j-menu>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        @click="exportVisible = true"
-                                        hasPermission="device/Instance:export"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="ExportOutlined"
-                                        /></template>
-                                        批量导出设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        @click="importVisible = true"
-                                        hasPermission="device/Instance:import"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="ImportOutlined"
-                                        /></template>
-                                        批量导入设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        ghost
-                                        type="primary"
-                                        :popConfirm="{
-                                            title: '确认激活全部设备？',
-                                            onConfirm: activeAllDevice,
-                                        }"
-                                        hasPermission="device/Instance:action"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="CheckCircleOutlined"
-                                        /></template>
-                                        激活全部设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item>
-                                    <PermissionButton
-                                        type="primary"
-                                        @click="syncDeviceStatus"
-                                        hasPermission="device/Instance:view"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="SyncOutlined"
-                                        /></template>
-                                        同步设备状态
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item v-if="_selectedRowKeys.length">
-                                    <PermissionButton
-                                        type="primary"
-                                        danger
-                                        :popConfirm="{
-                                            title: '已启用的设备无法删除，确认删除选中的禁用状态设备？',
-                                            onConfirm: delSelectedDevice,
-                                        }"
-                                        hasPermission="device/Instance:delete"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="DeleteOutlined"
-                                        /></template>
-                                        删除选中设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item v-if="_selectedRowKeys.length">
-                                    <PermissionButton
-                                        type="primary"
-                                        :popConfirm="{
-                                            title: '确认激活选中设备',
-                                            onConfirm: activeSelectedDevice,
-                                        }"
-                                        hasPermission="device/Instance:action"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="CheckOutlined"
-                                        /></template>
-                                        激活选中设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                                <j-menu-item v-if="_selectedRowKeys.length">
-                                    <PermissionButton
-                                        type="primary"
-                                        danger
-                                        :popConfirm="{
-                                            title: '确认禁用选中设备?',
-                                            onConfirm: disabledSelectedDevice,
-                                        }"
-                                        hasPermission="device/Instance:action"
-                                    >
-                                        <template #icon
-                                            ><AIcon type="StopOutlined"
-                                        /></template>
-                                        禁用选中设备
-                                    </PermissionButton>
-                                </j-menu-item>
-                            </j-menu>
-                        </template>
-                    </j-dropdown> -->
                     </j-space>
                 </template>
                 <template #card="slotProps">
@@ -245,7 +139,7 @@
                     }}</span>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <template
                             v-for="i in getActions(slotProps, 'table')"
                             :key="i.key"
@@ -312,6 +206,7 @@ import {
     batchUndeployDevice,
     batchDeployDevice,
     batchDeleteDevice,
+    detail,
 } from '@/api/device/instance';
 import { getImage, LocalStore, onlyMessage } from '@/utils/comm';
 import Import from './Import/modal.vue';
@@ -335,7 +230,7 @@ import { BatchActionsType } from '@/components/BatchDropdown/types';
 import { useRouterParams } from '@/utils/hooks/useParams';
 import { accessConfigTypeFilter } from '@/utils/setting';
 import TagSearch from './components/TagSearch.vue';
-
+import { Modal } from 'ant-design-vue';
 const instanceRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 const _selectedRowKeys = ref<string[]>([]);
@@ -349,7 +244,10 @@ const type = ref<string>('');
 const isCheck = ref<boolean>(false);
 const routerParams = useRouterParams();
 const menuStory = useMenuStore();
-
+const modalVisible = ref(false);
+const deleteDeviceId = ref('');
+const deleteState = ref(false);
+const deleteTip = ref('确认删除？');
 const transformData = (arr: any[]): any[] => {
     if (Array.isArray(arr) && arr.length) {
         return (arr || []).map((item: any) => {
@@ -697,12 +595,13 @@ const getActions = (
                 data.state.value !== 'notActive'
                     ? 'StopOutlined'
                     : 'CheckCircleOutlined',
+
             popConfirm: {
                 title: `确认${
                     data.state.value !== 'notActive' ? '禁用' : '启用'
                 }?`,
                 onConfirm: async () => {
-                    let response = undefined;
+                    let response;
                     if (data.state.value !== 'notActive') {
                         response = await _undeploy(data.id);
                     } else {
@@ -727,23 +626,30 @@ const getActions = (
                         ? '已启用的设备不能删除'
                         : '删除',
             },
-            popConfirm: {
-                title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await _delete(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        const index = _selectedRowKeys.value.findIndex(
-                            (id: any) => id === data.id,
-                        );
-                        if (index !== -1) {
-                            _selectedRowKeys.value.splice(index, 1);
-                        }
-                        instanceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
+            onClick: async () => {
+                if (deleteState.value) {
+                    return;
+                }
+                deleteState.value = true;
+                deleteDeviceId.value = data.id;
+                const res = await detail(data.id).finally(() => {
+                    modalVisible.value = true;
+                });
+                if (res.success) {
+                    deleteTip.value =
+                        res.result?.accessProvider === 'Ctwing'
+                            ? '该操作仅可删除物联网平台数据Ctwing平台数据需另行删除'
+                            : '确认删除？';
+                }
+                Modal.confirm({
+                    title: deleteTip.value,
+                    onOk() {
+                        return deleteDevice();
+                    },
+                    onCancel() {
+                        deleteState.value = false;
+                    },
+                });
             },
             icon: 'DeleteOutlined',
         },
@@ -831,17 +737,20 @@ const syncDeviceStatus = () => {
     operationVisible.value = true;
 };
 
-const delSelectedDevice = async () => {
+const delSelectedDevice = () => {
     if (!_selectedRowKeys.value.length) {
         onlyMessage('请选择设备', 'error');
         return;
     }
-    const resp = await batchDeleteDevice(_selectedRowKeys.value);
-    if (resp.status === 200) {
-        onlyMessage('操作成功！');
-        _selectedRowKeys.value = [];
-        instanceRef.value?.reload();
-    }
+    const response = batchDeleteDevice(_selectedRowKeys.value);
+    response.then((resp) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功！');
+            _selectedRowKeys.value = [];
+            instanceRef.value?.reload();
+        }
+    });
+    return response;
 };
 
 // const activeSelectedDevice = async () => {
@@ -857,17 +766,20 @@ const delSelectedDevice = async () => {
 //     }
 // };
 
-const disabledSelectedDevice = async () => {
+const disabledSelectedDevice = () => {
     if (!_selectedRowKeys.value.length) {
         onlyMessage('请选择设备', 'error');
         return;
     }
-    const resp = await batchUndeployDevice(_selectedRowKeys.value);
-    if (resp.status === 200) {
-        onlyMessage('操作成功！');
-        _selectedRowKeys.value = [];
-        instanceRef.value?.reload();
-    }
+    const response = batchUndeployDevice(_selectedRowKeys.value);
+    response.then((resp) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功！');
+            _selectedRowKeys.value = [];
+            instanceRef.value?.reload();
+        }
+    });
+    return response;
 };
 
 const batchActions: BatchActionsType[] = [
@@ -1009,4 +921,21 @@ const handleSearch = (_params: any) => {
 const onRefresh = () => {
     instanceRef.value?.reload();
 };
+
+const deleteDevice = async () => {
+    const resp = await _delete(deleteDeviceId.value);
+    if (resp.status === 200) {
+        onlyMessage('操作成功！');
+        const index = _selectedRowKeys.value.findIndex(
+            (id: any) => id === deleteDeviceId.value,
+        );
+        if (index !== -1) {
+            _selectedRowKeys.value.splice(index, 1);
+        }
+        instanceRef.value?.reload();
+    } else {
+        onlyMessage('操作失败！', 'error');
+    }
+    deleteState.value = false;
+};
 </script>
diff --git a/src/views/device/Product/Detail/DeviceAccess/index.vue b/src/views/device/Product/Detail/DeviceAccess/index.vue
index e4c1c6c7..4b75e8dc 100644
--- a/src/views/device/Product/Detail/DeviceAccess/index.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/index.vue
@@ -291,7 +291,7 @@ import {
   productGuide,
   productGuideSave,
   getStoragList,
-  saveDevice,
+  saveDevice,   
   updateDevice,
   detail,
   modify, getAccessConfig
@@ -309,6 +309,7 @@ import MetaDataModal from './metadataModal.vue'
 import { getPluginData, getProductByPluginId, savePluginData } from '@/api/link/plugin'
 import { detail as queryPluginAccessDetail } from '@/api/link/accessConfig'
 import { onlyMessage } from '@/utils/comm';
+import { pick } from 'lodash-es';
 
 const productStore = useProductStore();
 const tableRef = ref();
@@ -554,7 +555,8 @@ const queryAccessDetail = async (id: string) => {
         if (res.status === 200) {
             access.value = res.result.data[0];
           if (access.value?.transportDetail?.metadata) {
-            productData.metadata = JSON.parse(access.value?.transportDetail?.metadata)
+            const metadata = JSON.parse(access.value?.transportDetail?.metadata)
+            productData.metadata = pick(metadata,['functions','properties','events','tags'])
           }
         }
     });
@@ -672,13 +674,14 @@ const checkAccess = async (data: any) => {
     getGuide(!!data.metadata.length); //
 
     if (data.access?.transportDetail?.metadata) {
-      productData.metadata = JSON.parse(data.access?.transportDetail?.metadata)
+      const metadata = JSON.parse(data.access?.transportDetail?.metadata)
+      productData.metadata = pick(metadata,['functions','properties','events','tags'])
     }
   }
 }
 
 const productTypeChange = (id: string, items: any) => {
-  productData.metadata = items?.metadata || {}
+  productData.metadata = items?.metadata ?  pick(items.metadata,['functions','properties','events','tags']) : {}
 }
 
 /**
@@ -736,7 +739,7 @@ const getData = async (accessId?: string) => {
               productTypes.value = resp.result.map(item => {
                 if (pluginRes?.result?.externalId === item.id) {
                   productData.id = pluginRes?.result?.externalId
-                  productData.metadata = item.metadata
+                  productData.metadata = pick(item.metadata,['functions','properties','events','tags'])
                 }
                 return { ...item, label: item.name, value: item.id }
               })
@@ -774,7 +777,6 @@ const submitDevice = async () => {
     const id = productStore.current?.id;
     // 该产品是否有物模型，有则弹窗进行处理
     const _metadata = JSON.parse(productStore.current?.metadata || '{}')
-    console.log(_metadata.properties, productData.metadata)
     if (
       (_metadata.properties?.length ||
       _metadata.events?.length ||
@@ -801,8 +803,9 @@ const submitDevice = async () => {
 
 const updateAccessData = async (id: string, values: any) => {
   const result: any = {};
-  flatObj(values, result);
-  const { storePolicy, ...extra } = result;
+//   flatObj(values, result);
+//   const { storePolicy, ...extra } = result;
+    const { storePolicy, ...extra } = values
   // 产品有物模型，设备接入没有，取产品物模型；设备接入有物模型，产品没有，取设备接入的物模型；否则取空字符串；不能为undefined或者null
   let _metadata = ''
   if (productStore.current?.metadata) {
diff --git a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
index 029977a0..794b87c7 100644
--- a/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
+++ b/src/views/device/Product/Detail/DeviceAccess/metadataModal.vue
@@ -110,9 +110,10 @@ const flatObj = (obj: any, result: any) => {
 
 
 const updateAccessData = async (id: string, values: any, metadata: string) => {
-  const result: any = {};
-  flatObj(values, result);
-  const { storePolicy, ...extra } = result;
+  // const result: any = {};
+  // flatObj(values, result);
+  // const { storePolicy, ...extra } = result;
+  const { storePolicy, ...extra } = values;
   // 更新选择设备(设备接入)
   const accessObj = {
     ...productDetail.value,
diff --git a/src/views/device/Product/Detail/index.vue b/src/views/device/Product/Detail/index.vue
index e0049ca6..0c17eabc 100644
--- a/src/views/device/Product/Detail/index.vue
+++ b/src/views/device/Product/Detail/index.vue
@@ -16,60 +16,69 @@
                             {{ productStore.current.name }}
                         </div>
                     </j-tooltip>
-                    <div style="margin: -5px 0 0 20px" v-if="permissionStore.hasPermission('device/Product:action')">
-                            <j-popconfirm
-                                title="确认禁用"
-                                @confirm="handleUndeploy"
-                                v-if="productStore.current.state === 1"
-                                okText="确定"
-                                cancelText="取消"
-                                :disabled="!permissionStore.hasPermission('device/Product:action')"
-                            >
-                                <j-switch
-                                    :checked="productStore.current.state === 1"
-                                    checked-children="正常"
-                                    un-checked-children="禁用"
-                                    :disabled="!permissionStore.hasPermission('device/Product:action')"
-                                />
-                            </j-popconfirm>
-                            <j-popconfirm
-                                title="确认启用"
-                                @confirm="handleDeploy"
-                                v-if="productStore.current.state === 0"
-                                okText="确定"
-                                cancelText="取消"
-                                :disabled="!permissionStore.hasPermission('device/Product:action')"
-                            >
-                                <j-switch
-                                    :unCheckedValue="
-                                        productStore.current.state === 0
-                                    "
-                                    checked-children="正常"
-                                    un-checked-children="禁用"
-                                    :disabled="!permissionStore.hasPermission('device/Product:action')"
-                                />
-                            </j-popconfirm>
+                    <div
+                        style="margin: -5px 0 0 20px"
+                        v-if="
+                            permissionStore.hasPermission(
+                                'device/Product:action',
+                            )
+                        "
+                    >
+                        <PermissionButton
+                            style="padding: 0"
+                            type="text"
+                            hasPermission="device/Product:action"
+                            :popConfirm="{
+                                title:
+                                    productStore.current.state === 1
+                                        ? '确认禁用'
+                                        : '确认启用',
+                                onConfirm:
+                                    productStore.current.state === 1
+                                        ? handleUndeploy
+                                        : handleDeploy,
+                            }"
+                        >
+                            <j-switch
+                                :checked="productStore.current.state === 1"
+                                checked-children="正常"
+                                un-checked-children="禁用"
+                                :disabled="
+                                    !permissionStore.hasPermission(
+                                        'device/Product:action',
+                                    )
+                                "
+                            />
+                        </PermissionButton>
                     </div>
                     <div style="margin: -5px 0 0 20px" v-else>
                         <j-tooltip>
                             <template #title>暂无权限，请联系管理员</template>
-                                <j-switch
-                                    v-if="productStore.current.state === 1"
-                                    :checked="productStore.current.state === 1"
-                                    checked-children="正常"
-                                    un-checked-children="禁用"
-                                    :disabled="!permissionStore.hasPermission('device/Product:action')"
-                                />
-                                <j-switch
-                                    v-if="productStore.current.state === 0"
-                                    :unCheckedValue="
-                                        productStore.current.state === 0
-                                    "
-                                    checked-children="正常"
-                                    un-checked-children="禁用"
-                                    :disabled="!permissionStore.hasPermission('device/Product:action')"
-                                />
-                            </j-tooltip>
+                            <j-switch
+                                v-if="productStore.current.state === 1"
+                                :checked="productStore.current.state === 1"
+                                checked-children="正常"
+                                un-checked-children="禁用"
+                                :disabled="
+                                    !permissionStore.hasPermission(
+                                        'device/Product:action',
+                                    )
+                                "
+                            />
+                            <j-switch
+                                v-if="productStore.current.state === 0"
+                                :unCheckedValue="
+                                    productStore.current.state === 0
+                                "
+                                checked-children="正常"
+                                un-checked-children="禁用"
+                                :disabled="
+                                    !permissionStore.hasPermission(
+                                        'device/Product:action',
+                                    )
+                                "
+                            />
+                        </j-tooltip>
                     </div>
                 </div>
             </div>
@@ -101,8 +110,7 @@
             <PermissionButton
                 type="primary"
                 :popConfirm="{
-                    title: `确定应用配置?`,
-                    placement: 'bottomRight',
+                    title: `确认应用配置?`,
                     onConfirm: handleDeploy,
                 }"
                 :disabled="productStore.current?.state === 0"
@@ -117,7 +125,7 @@
             >
         </template>
         <FullPage>
-            <div style="height: 100%; padding: 24px;">
+            <div style="height: 100%; padding: 24px">
                 <component
                     :is="tabs[productStore.tabActiveKey]"
                     :class="
@@ -138,21 +146,22 @@ import Info from './BasicInfo/indev.vue';
 import Device from './DeviceAccess/index.vue';
 import Metadata from '../../../device/components/Metadata/index.vue';
 import DataAnalysis from './DataAnalysis/index.vue';
-import MetadataMap from './MetadataMap'
-// import Metadata from '../../../components/Metadata/index.vue';
+import MetadataMap from './MetadataMap';
+import AlarmRecord from '@/views/device/Instance/Detail/AlarmRecord/index.vue';
+import Firmware from '@/views/device/Instance/Detail/Firmware/index.vue';
 import {
     _deploy,
     _undeploy,
     getDeviceNumber,
     getProtocolDetail,
 } from '@/api/device/product';
-import { getImage, handleParamsToString, onlyMessage } from '@/utils/comm';
+import { handleParamsToString, onlyMessage } from '@/utils/comm';
 import { useMenuStore } from '@/store/menu';
 import { useRouterParams } from '@/utils/hooks/useParams';
-import {EventEmitter} from "@/utils/utils";
+import { EventEmitter } from '@/utils/utils';
 import { usePermissionStore } from '@/store/permission';
 
-const permissionStore = usePermissionStore()
+const permissionStore = usePermissionStore();
 const menuStory = useMenuStore();
 const route = useRoute();
 const checked = ref<boolean>(true);
@@ -184,6 +193,10 @@ const list = ref([
         key: 'Device',
         tab: '设备接入',
     },
+    {
+        key: 'Firmware',
+        tab: '远程升级',
+    },
 ]);
 
 const tabs = {
@@ -191,63 +204,54 @@ const tabs = {
     Metadata,
     Device,
     DataAnalysis,
-    MetadataMap
+    MetadataMap,
+    AlarmRecord,
+    Firmware,
 };
 
-watch(
-    () => route.params.id,
-    (newId) => {
-        if (newId && route.name === 'device/Product/Detail') {
-            productStore.reSet();
-            productStore.tabActiveKey = 'Info';
-            productStore.refresh(newId as string);
-        }
-    },
-    { immediate: true, deep: true },
-);
-watch(
-    () => productStore.current,
-    () => {
-        getProtocol();
-    },
-);
 const onBack = () => {
     history.back();
 };
 
 const onTabChange = (e: string) => {
-  if (productStore.tabActiveKey === 'Metadata') {
-    EventEmitter.emit('MetadataTabs', () => {
-      productStore.tabActiveKey = e;
-    })
-  } else {
-    productStore.tabActiveKey = e;
-  }
+    if (productStore.tabActiveKey === 'Metadata') {
+        EventEmitter.emit('MetadataTabs', () => {
+            productStore.tabActiveKey = e;
+        });
+    } else {
+        productStore.tabActiveKey = e;
+    }
 };
 
 /**
  * 启用产品
  */
-const handleDeploy = async () => {
+const handleDeploy = () => {
     if (productStore.current.id) {
-        const resp = await _deploy(productStore.current.id);
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            productStore.refresh(productStore.current.id);
-        }
+        const resp = _deploy(productStore.current.id);
+        resp.then((res) => {
+            if (res.status === 200) {
+                onlyMessage('操作成功！');
+                productStore.refresh(productStore.current.id);
+            }
+        });
+        return resp;
     }
 };
 
 /**
  * 禁用产品
  */
-const handleUndeploy = async () => {
+const handleUndeploy = () => {
     if (productStore.current.id) {
-        const resp = await _undeploy(productStore.current.id);
-        if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            productStore.refresh(productStore.current.id);
-        }
+        const resp = _undeploy(productStore.current.id);
+        resp.then((res) => {
+            if (res.status === 200) {
+                onlyMessage('操作成功！');
+                productStore.refresh(productStore.current.id);
+            }
+        });
+        return resp;
     }
 };
 
@@ -296,6 +300,10 @@ const getProtocol = async () => {
                         key: 'DataAnalysis',
                         tab: '数据解析',
                     },
+                    {
+                        key: 'Firmware',
+                        tab: '远程升级',
+                    },
                 ];
             } else {
                 list.value = [
@@ -312,13 +320,33 @@ const getProtocol = async () => {
                         key: 'Device',
                         tab: '设备接入',
                     },
+                    {
+                        key: 'Firmware',
+                        tab: '远程升级',
+                    },
                 ];
             }
         }
         //当前设备接入选择的协议
-        const protocol = res.result?.transports.find(item => item.id === productStore.current.transportProtocol);
-        if(protocol?.features.find(item => item.id === 'diffMetadataSameProduct')){
-          list.value.push({ key: 'MetadataMap', tab: '物模型映射'})
+        const protocol = res.result?.transports.find(
+            (item) => item.id === productStore.current.transportProtocol,
+        );
+        if (
+            protocol?.features.find(
+                (item) => item.id === 'diffMetadataSameProduct',
+            )
+        ) {
+            list.value.push({ key: 'MetadataMap', tab: '物模型映射' });
+        }
+        if (
+            permissionStore.hasPermission(
+                'rule-engine/Alarm/Configuration:view',
+            )
+        ) {
+            list.value.push({
+                key: 'AlarmRecord',
+                tab: '预处理数据',
+            });
         }
     }
 };
@@ -341,10 +369,30 @@ const jumpDevice = () => {
         },
     );
 };
+
+watch(
+    () => productStore.current,
+    () => {
+        getProtocol();
+    },
+);
+
+// watch(
+//   () => route.params.id,
+//   (newId) => {
+//     if (newId && route.name === 'device/Product/Detail') {
+//       productStore.reSet();
+//       productStore.tabActiveKey = 'Info';
+//       productStore.refresh(newId as string);
+//     }
+//   },
+//   { immediate: true, deep: true },
+// );
+
 onMounted(() => {
-    if (routerParams.params?.value.tab) {
-        productStore.tabActiveKey = routerParams.params?.value.tab;
-    }
+    productStore.reSet();
+    productStore.refresh(route.params.id as string);
+    productStore.tabActiveKey = routerParams.params?.value.tab || 'Info';
 });
 </script>
 <style scoped lang="less">
@@ -356,7 +404,6 @@ onMounted(() => {
     max-width: 300px;
     overflow: hidden;
     white-space: nowrap;
-    overflow: hidden;
     text-overflow: ellipsis;
 }
 </style>
diff --git a/src/views/device/Product/index.vue b/src/views/device/Product/index.vue
index 2799e608..f146a63e 100644
--- a/src/views/device/Product/index.vue
+++ b/src/views/device/Product/index.vue
@@ -177,7 +177,6 @@
 </template>
 
 <script setup lang="ts">
-import server from '@/utils/request';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage, onlyMessage } from '@/utils/comm';
 import {
@@ -189,17 +188,12 @@ import {
     _deploy,
     _undeploy,
     deleteProduct,
-    addProduct,
-    editProduct,
-    queryProductId,
     updateDevice,
 } from '@/api/device/product';
-import { isNoCommunity, downloadObject } from '@/utils/utils';
+import {  downloadObject } from '@/utils/utils';
 import { omit, cloneDeep } from 'lodash-es';
-import { typeOptions } from '@/components/Search/util';
 import Save from './Save/index.vue';
 import { useMenuStore } from 'store/menu';
-import { useRoute } from 'vue-router';
 import { useRouterParams } from '@/utils/hooks/useParams';
 import { accessConfigTypeFilter } from '@/utils/setting';
 import { usePermissionStore } from '@/store/permission';
@@ -332,19 +326,22 @@ const getActions = (
             icon: data.state !== 0 ? 'StopOutlined' : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${data.state !== 0 ? '禁用' : '启用'}?`,
-                onConfirm: async () => {
+                onConfirm: () => {
                     let response = undefined;
                     if (data.state !== 0) {
-                        response = await _undeploy(data.id);
+                        response = _undeploy(data.id);
                     } else {
-                        response = await _deploy(data.id);
-                    }
-                    if (response && response.status === 200) {
-                        onlyMessage('操作成功！');
-                        tableRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
+                        response = _deploy(data.id);
                     }
+                    response.then((res) => {
+                        if (res && res.status === 200) {
+                            onlyMessage('操作成功！');
+                            tableRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -357,14 +354,17 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await deleteProduct(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        tableRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = deleteProduct(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            tableRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
             icon: 'DeleteOutlined',
@@ -461,6 +461,7 @@ const query = reactive({
             key: 'id',
             search: {
                 type: 'string',
+                defaultTermType: 'eq',
             },
         },
         {
@@ -473,13 +474,16 @@ const query = reactive({
                     return new Promise((resolve) => {
                         getProviders().then((resp: any) => {
                             const data = resp.result || [];
-                            resolve(accessConfigTypeFilter(data).filter((i: any) => {
-                                    return (
-                                        i.id !== 'modbus-tcp' &&
-                                        i.id !== 'opc-ua'
-                                    );
-                                }));
-                            
+                            resolve(
+                                accessConfigTypeFilter(data).filter(
+                                    (i: any) => {
+                                        return (
+                                            i.id !== 'modbus-tcp' &&
+                                            i.id !== 'opc-ua'
+                                        );
+                                    },
+                                ),
+                            );
                         });
                     });
                 },
@@ -579,7 +583,7 @@ const query = reactive({
             search: {
                 first: true,
                 type: 'treeSelect',
-                termOptions:['eq'],
+                termOptions: ['eq'],
                 options: async () => {
                     return new Promise((res) => {
                         queryOrgThree({ paging: false }).then((resp: any) => {
@@ -643,12 +647,15 @@ const handleSearch = (e: any) => {
                         },
                     };
                 }
-                if(b.column === 'accessProvider'){
-                    if(b.value === 'collector-gateway'){
+                if (b.column === 'accessProvider') {
+                    if (b.value === 'collector-gateway') {
                         b.termType = b.termType === 'eq' ? 'in' : 'nin';
-                        b.value = ['opc-ua','modbus-tcp','collector-gateway'];
-                    }else if(Array.isArray(b.value) && b.value.includes('collector-gateway')){
-                        b.value = ['opc-ua','modbus-tcp',...b.value];
+                        b.value = ['opc-ua', 'modbus-tcp', 'collector-gateway'];
+                    } else if (
+                        Array.isArray(b.value) &&
+                        b.value.includes('collector-gateway')
+                    ) {
+                        b.value = ['opc-ua', 'modbus-tcp', ...b.value];
                     }
                 }
                 return b;
diff --git a/src/views/device/components/InklingDevice/index.vue b/src/views/device/components/InklingDevice/index.vue
index 401c4d93..515da7a1 100644
--- a/src/views/device/components/InklingDevice/index.vue
+++ b/src/views/device/components/InklingDevice/index.vue
@@ -120,8 +120,8 @@ import {
     getCommandsByAccess,
     getCommandsDevicesByAccessId,
 } from '@/api/link/accessConfig';
-import { getInkingDevices } from '@/api/device/instance';
 import { isArray } from 'lodash-es';
+import { getInkingDevices } from '@/api/device/instance';
 
 type Emit = {
     (e: 'update:value', data: string | string[]): void;
@@ -144,6 +144,14 @@ const props = defineProps({
         type: String,
         default: undefined,
     },
+    type: {
+      type: String,
+      default: 'device',
+    },
+    internalId: {
+      type: String,
+      default: undefined,
+    },
 });
 
 const emit = defineEmits<Emit>();
@@ -175,8 +183,9 @@ const queryInkingDevices = (data: string[]) => {
 
         const res = await getInkingDevices(data,props.accessId);
         if (res) {
-            disabledKeys.value = res.result?.map((item) => item.externalId);
+          disabledKeys.value = res.result?.map((item) => item.externalId) || [];
         }
+
         resolve(true);
     });
 };
diff --git a/src/views/device/components/Metadata/Base/DetailModal/EventModal.vue b/src/views/device/components/Metadata/Base/DetailModal/EventModal.vue
index 7a68f6a6..a4daed36 100644
--- a/src/views/device/components/Metadata/Base/DetailModal/EventModal.vue
+++ b/src/views/device/components/Metadata/Base/DetailModal/EventModal.vue
@@ -23,6 +23,7 @@
       <a-descriptions-item>
         <JsonView :value="dataTypeTable.dataSource"/>
       </a-descriptions-item>
+      <a-descriptions-item v-if="showSetting && data.expands?.storageType" label="存储方式">{{ settingData[data.expands?.storageType] }}</a-descriptions-item>
     </j-descriptions>
     <template #footer>
       <j-button type="primary" @click="ok">确认</j-button>
@@ -32,6 +33,7 @@
 
 <script setup lang="ts" name="EventModal">
 import JsonView from "./JsonView.vue";
+import {useStoreType} from "@/views/device/components/Metadata/Base/utils";
 
 const props = defineProps({
   data: {
@@ -41,6 +43,14 @@ const props = defineProps({
   getPopupContainer: {
     type: Function,
     default: undefined
+  },
+  unitOptions: {
+    type: Array,
+    default: () => []
+  },
+  type: {
+    type: String,
+    default: undefined
   }
 })
 
@@ -50,6 +60,12 @@ const EventLevel = {
   urgent: '紧急'
 }
 
+const { settingData } = useStoreType(props.type)
+
+const showSetting = computed(() => {
+
+})
+
 const dataTypeTable = reactive<{ dataSource: any }>({
   dataSource: props.data?.valueType?.properties || []
 })
@@ -69,4 +85,4 @@ const ok = () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/DetailModal/FunctionModal.vue b/src/views/device/components/Metadata/Base/DetailModal/FunctionModal.vue
index 2e037fea..4ab96917 100644
--- a/src/views/device/components/Metadata/Base/DetailModal/FunctionModal.vue
+++ b/src/views/device/components/Metadata/Base/DetailModal/FunctionModal.vue
@@ -27,6 +27,7 @@
       <a-descriptions-item>
         <JsonView :value="dataTypeTable.output"/>
       </a-descriptions-item>
+      <a-descriptions-item v-if="showSetting && data.expands?.storageType" label="存储方式">{{ settingData[data.expands?.storageType] }}</a-descriptions-item>
     </j-descriptions>
     <template #footer>
       <j-button type="primary" @click="ok">确认</j-button>
@@ -36,6 +37,7 @@
 
 <script setup lang="ts" name="FunctionModal">
 import JsonView from './JsonView.vue'
+import {useStoreType} from "@/views/device/components/Metadata/Base/utils";
 
 const props = defineProps({
   data: {
@@ -45,15 +47,26 @@ const props = defineProps({
   getPopupContainer: {
     type: Function,
     default: undefined
+  },
+  unitOptions: {
+    type: Array,
+    default: () => []
+  },
+  type: {
+    type: String,
+    default: undefined
   }
 })
 
+const emit = defineEmits(['cancel'])
+
+const { settingData } = useStoreType(props.type)
+
 const dataTypeTable = reactive<{ input: any[], output: any[] }>({
   input: props.data?.inputs || [],
   output: props.data?.output || []
 })
 
-const emit = defineEmits(['cancel'])
 const cancel = () => {
   emit('cancel')
 }
@@ -68,4 +81,4 @@ const ok = () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue b/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
index b0976ca0..ff2e5cac 100644
--- a/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
+++ b/src/views/device/components/Metadata/Base/DetailModal/PropertiesModal.vue
@@ -1,5 +1,5 @@
 <template>
-  <j-modal
+  <a-modal
       visible
       :maskClosable="false"
       title="属性详情"
@@ -19,21 +19,54 @@
       <a-descriptions-item label="属性名称">{{ data.name }}</a-descriptions-item>
       <a-descriptions-item label="属性类型">{{ TypeStringMap[data.valueType.type] }}</a-descriptions-item>
       <a-descriptions-item v-if="['int', 'long', 'float', 'double'].includes(data.valueType.type)" label="单位">{{ unitLabel }}</a-descriptions-item>
-      <a-descriptions-item v-if="['float', 'double'].includes(data.valueType.type)" label="精度">{{ data.valueType?.scale }}</a-descriptions-item>
+      <a-descriptions-item v-if="['float', 'double'].includes(data.valueType.type)" label="精度">{{ data.valueType?.scal || 0 }}</a-descriptions-item>
       <a-descriptions-item v-if="['string', 'password'].includes(data.valueType.type)" label="最大长度">{{ data.valueType?.maxLength }}</a-descriptions-item>
       <a-descriptions-item v-if="data.valueType.type === 'file'" label="文件类型">{{ data.valueType?.bodyType }}</a-descriptions-item>
       <a-descriptions-item v-if="data.valueType.type === 'date'" label="格式">{{ data.valueType?.format }}</a-descriptions-item>
       <a-descriptions-item
           v-if="
-          ['enum', 'object', 'boolean', 'array'].includes(data.valueType.type)"
+          ['boolean', 'array'].includes(data.valueType.type)"
       >
         <JsonView :value="dataTypeTable.dataSource"/>
       </a-descriptions-item>
+      <a-descriptions-item
+        v-if="
+          ['enum', 'object'].includes(data.valueType.type)"
+        :scroll="{
+            y: 130
+        }"
+      >
+        <j-table
+          :columns="data.valueType.type === 'object' ? objectColumns : enumColumns"
+          :dataSource="data.valueType.type === 'object' ? data.valueType.properties : data.valueType.elements"
+          :pagination="false"
+          size="small"
+        >
+          <template #bodyCell="{column, record, index}">
+            <j-ellipsis v-if="column.dataIndex === 'id'">
+              {{ record.id }}
+            </j-ellipsis>
+            <j-ellipsis v-if="column.dataIndex === 'name'">
+              {{ record.name }}
+            </j-ellipsis>
+            <j-ellipsis v-if="column.dataIndex === 'value'">
+              {{ record.value }}
+            </j-ellipsis>
+            <j-ellipsis v-if="column.dataIndex === 'text'">
+              {{ record.text }}
+            </j-ellipsis>
+            <j-ellipsis v-if="column.dataIndex === 'valueType'">
+              {{ findTypeItem(record.valueType?.type).label }}
+            </j-ellipsis>
+          </template>
+        </j-table>
+      </a-descriptions-item>
       <a-descriptions-item label="属性来源">
         {{ sourceMap[data.expands.source] }}
+        <a v-if="data.expands.source === 'rule'" type="link" style="padding: 0 12px" @click="showRuleDetail">查看</a>
       </a-descriptions-item>
       <a-descriptions-item label="读写类型">{{ readTypeText }}</a-descriptions-item>
-      <a-descriptions-item v-if="showSetting" label="存储方式">{{ data.id }}</a-descriptions-item>
+      <a-descriptions-item v-if="showSetting && data.expands?.storageType" label="存储方式">{{ settingData[data.expands?.storageType] }}</a-descriptions-item>
       <a-descriptions-item v-if="showMetrics" label="指标配置"></a-descriptions-item>
       <a-descriptions-item v-if="showMetrics">
         <j-table
@@ -42,7 +75,10 @@
             :pagination="false"
             size="small"
         >
-          <template #bodyCell="{column, record}">
+          <template #bodyCell="{column, record, index}">
+            <span v-if="column.dataIndex === 'serial' ">
+              {{ index + 1 }}
+            </span>
             <span v-if="column.dataIndex === 'value'">
               {{ record.range === true ? record.value?.join('-') : record.value }}
             </span>
@@ -53,16 +89,28 @@
     <template #footer>
       <j-button type="primary" @click="ok">确认</j-button>
     </template>
-  </j-modal>
+  </a-modal>
+  <RuleDetailModal
+    v-if="ruleRecord.visible"
+    :value="ruleRecord.value"
+    :getPopupContainer="getPopupContainer"
+    @cancel="onCloseRule"
+  />
 </template>
 
 <script setup lang="ts" name="PropertiesModal">
-import {OtherConfigInfo} from "@/views/device/components/Metadata/Base/components";
 import {omit} from "lodash-es";
 import {watch} from "vue";
 import JsonView from './JsonView.vue'
-import {getUnit} from "@/api/device/instance";
 import {TypeStringMap} from "@/views/device/components/Metadata/Base/columns";
+import {useStoreType} from "@/views/device/components/Metadata/Base/utils";
+import {enumColumns, objectColumns} from './utils'
+import { findTypeItem } from '@/components/Metadata/Table/components/Type/data'
+import RuleDetailModal from '../components/VirtualRule/DetailModal.vue'
+import { queryDeviceVirtualProperty } from '@/api/device/instance';
+import { queryProductVirtualProperty } from '@/api/device/product';
+import {useInstanceStore} from "store/instance";
+import {useProductStore} from "store/product";
 
 const props = defineProps({
   data: {
@@ -72,11 +120,24 @@ const props = defineProps({
   getPopupContainer: {
     type: Function,
     default: undefined
+  },
+  unitOptions: {
+    type: Array,
+    default: () => []
+  },
+  type: {
+    type: String,
+    default: undefined
   }
 })
 
 const emit = defineEmits(['cancel'])
 
+const route = useRoute()
+const instanceStore = useInstanceStore();
+const productStore = useProductStore();
+const { settingData } = useStoreType(props.type)
+
 const sourceMap = {
     'device': '设备',
     'manual': '手动',
@@ -93,7 +154,20 @@ const readTypeText = computed(() => {
   return props.data?.expands?.type?.map?.((key: string) => type[key]).join('、')
 })
 
-const unitLabel = ref('')
+const ruleRecord = reactive({
+  visible: false,
+  value: undefined
+})
+
+const unitLabel = computed(() => {
+  let label = props.data.valueType?.unit
+
+  const item = props.unitOptions?.find(item => item.value === label)
+  if (item) {
+    label = item.label
+  }
+  return label
+})
 
 const dataTypeTable = reactive<{ columns: any[], dataSource: any }>({
   columns: [],
@@ -102,6 +176,7 @@ const dataTypeTable = reactive<{ columns: any[], dataSource: any }>({
 
 const metrics = reactive<{ columns: any[], dataSource: any }>({
   columns: [
+    { title: '序号', dataIndex: 'serial', width: 60 },
     { title: '指标标识', dataIndex: 'id' },
     { title: '指标名称', dataIndex: 'name' },
     { title: '指标值', dataIndex: 'value' },
@@ -122,11 +197,6 @@ const showSetting = computed(() => {
   return Object.values(setting).length
 })
 
-const settingValue = computed(() => {
-  console.log(showSetting.value)
-  return ''
-})
-
 const handleDataTable = (type: string) => {
   switch (type) {
     case 'enum':
@@ -155,24 +225,6 @@ const handleDataTable = (type: string) => {
   }
 }
 
-
-watch(() => props.data.valueType.type, () => {
-  const type = props.data.valueType.type
-  handleDataTable(props.data.valueType.type)
-
-  if (['float', 'double', 'int', 'long'].includes(type)) {
-    getUnit().then((res) => {
-      if (res.success) {
-        res.result.map((item) => {
-          if (item.id === props.data.valueType?.unit) {
-            unitLabel.value = item.description
-          }
-        })
-      }
-    });
-  }
-}, { immediate: true })
-
 const cancel = () => {
   emit('cancel')
 }
@@ -181,8 +233,43 @@ const ok = () => {
   cancel()
 }
 
+const showRuleDetail = () => {
+  ruleRecord.visible = true
+}
+const onCloseRule = () => {
+  ruleRecord.visible = false
+  ruleRecord.value = undefined
+}
+
+const getRuleDetail = async () => {
+  if (props.data.expands.source === 'rule') {
+    let resp
+    if (props.type === 'product') {
+      resp = await queryProductVirtualProperty(
+        productStore.current?.id,
+        props.data.id,
+      );
+    } else {
+      resp = await queryDeviceVirtualProperty(
+        instanceStore.current?.productId,
+        instanceStore.current?.id,
+        props.data.id,
+      );
+    }
+
+    if (resp.success) {
+      ruleRecord.value = resp.result.rule?.script
+    }
+  }
+}
+
+watch(() => props.data.valueType.type, (val) => {
+  getRuleDetail()
+  handleDataTable(val)
+}, { immediate: true })
+
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/DetailModal/TagsModal.vue b/src/views/device/components/Metadata/Base/DetailModal/TagsModal.vue
index 66661098..84a57060 100644
--- a/src/views/device/components/Metadata/Base/DetailModal/TagsModal.vue
+++ b/src/views/device/components/Metadata/Base/DetailModal/TagsModal.vue
@@ -30,6 +30,7 @@
         <JsonView :value="dataTypeTable.dataSource"/>
       </a-descriptions-item>
       <a-descriptions-item label="读写类型">{{ readTypeText }}</a-descriptions-item>
+      <a-descriptions-item v-if="showSetting && data.expands?.storageType" label="存储方式">{{ settingData[data.expands?.storageType] }}</a-descriptions-item>
     </j-descriptions>
     <template #footer>
       <j-button type="primary" @click="ok">确认</j-button>
@@ -43,6 +44,7 @@ import {omit} from "lodash-es";
 import {watch} from "vue";
 import JsonView from './JsonView.vue'
 import {getUnit} from "@/api/device/instance";
+import {useStoreType} from "@/views/device/components/Metadata/Base/utils";
 
 const props = defineProps({
   data: {
@@ -52,6 +54,14 @@ const props = defineProps({
   getPopupContainer: {
     type: Function,
     default: undefined
+  },
+  unitOptions: {
+    type: Array,
+    default: () => []
+  },
+  type: {
+    type: String,
+    default: undefined
   }
 })
 
@@ -63,6 +73,8 @@ const sourceMap = {
   'rule': '规则',
 }
 
+const { settingData } = useStoreType(props.type)
+
 const readTypeText = computed(() => {
   const type = {
     "read": "读",
@@ -73,7 +85,14 @@ const readTypeText = computed(() => {
   return props.data?.expands?.type?.map?.((key: string) => type[key]).join('、')
 })
 
-const unitLabel = ref('')
+const unitLabel = computed(() => {
+  let label = props.data.valueType?.unit
+  const item = props.unitOptions?.find(item => item.value === label)
+  if (item) {
+    label = item.label
+  }
+  return label
+})
 
 const dataTypeTable = reactive<{ columns: any[], dataSource: any }>({
   columns: [],
@@ -128,17 +147,17 @@ watch(() => props.data.valueType.type, () => {
   const type = props.data.valueType.type
   handleDataTable(props.data.valueType.type)
 
-  if (['float', 'double', 'int', 'long'].includes(type)) {
-    getUnit().then((res) => {
-      if (res.success) {
-        res.result.map((item) => {
-          if (item.id === props.data.valueType?.unit) {
-            unitLabel.value = item.description
-          }
-        })
-      }
-    });
-  }
+  // if (['float', 'double', 'int', 'long'].includes(type)) {
+  //   getUnit().then((res) => {
+  //     if (res.success) {
+  //       res.result.map((item) => {
+  //         if (item.id === props.data.valueType?.unit) {
+  //           unitLabel.value = item.description
+  //         }
+  //       })
+  //     }
+  //   });
+  // }
 }, { immediate: true })
 
 const cancel = () => {
@@ -153,4 +172,4 @@ const ok = () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/DetailModal/utils.ts b/src/views/device/components/Metadata/Base/DetailModal/utils.ts
new file mode 100644
index 00000000..9a2e6a3d
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/DetailModal/utils.ts
@@ -0,0 +1,25 @@
+export const objectColumns = [
+    {
+        title: '参数标识',
+        dataIndex: 'id',
+    },
+    {
+        title: '参数名称',
+        dataIndex: 'name',
+    },
+    {
+        title: '参数类型',
+        dataIndex: 'valueType',
+    },
+]
+
+export const enumColumns = [
+    {
+        title: 'Value',
+        dataIndex: 'value',
+    },
+    {
+        title: 'Text',
+        dataIndex: 'text',
+    },
+]
diff --git a/src/views/device/components/Metadata/Base/Edit/index.vue b/src/views/device/components/Metadata/Base/Edit/index.vue
index 1bf5c3dc..b7a82790 100644
--- a/src/views/device/components/Metadata/Base/Edit/index.vue
+++ b/src/views/device/components/Metadata/Base/Edit/index.vue
@@ -74,7 +74,7 @@ const save = reactive({
     save.loading = true
     formRef.value?.validateFields().then(async (formValue) => {
       const type = metadataStore.model.type
-      const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.current
+      const _detail: ProductItem | DeviceInstance = props.type === 'device' ? instanceStore.detail : productStore.detail
       const _metadata = JSON.parse(_detail?.metadata || '{}')
       const list = (_metadata[type] as any[]) || []
       if (formValue.id) {
@@ -86,11 +86,11 @@ const save = reactive({
       }
       const updateStore = (metadata: string) => {
         if (props.type === 'device') {
-          const detail = instanceStore.current
+          const detail = instanceStore.detail
           detail.metadata = metadata
           instanceStore.setCurrent(detail)
         } else {
-          const detail = productStore.current || {} as ProductItem
+          const detail = productStore.detail || {} as ProductItem
           detail.metadata = metadata
           productStore.setCurrent(detail)
         }
@@ -188,4 +188,4 @@ const save = reactive({
 :deep(.ant-select) {
   font-size: 12px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Constraint.vue b/src/views/device/components/Metadata/Base/components/Constraint.vue
index adda8f29..e2c09414 100644
--- a/src/views/device/components/Metadata/Base/components/Constraint.vue
+++ b/src/views/device/components/Metadata/Base/components/Constraint.vue
@@ -2,6 +2,9 @@
   <j-select
     v-model:value="myValue"
     style="width: 100%;"
+    :dropdownMenuStyle="{
+                zIndex: 1072
+              }"
     :options="[
         { label: '不必填', value: 'false'},
         { label: '必填', value: 'true'},
@@ -13,18 +16,13 @@
 </template>
 
 <script setup name="ConstraintSelect">
-import { set, get } from 'lodash-es'
 import {FULL_CODE} from "jetlinks-ui-components/es/DataTable";
 
 const props = defineProps({
   value: {
-    type: Object,
-    default: () => ({})
+    type: Boolean,
+    default: true
   },
-  name: {
-    type: [String, Array],
-    default: ['expands','required']
-  }
 })
 
 const emit = defineEmits(['update:value'])
@@ -33,19 +31,15 @@ const fullRef = inject(FULL_CODE);
 const myValue = ref()
 
 const change = (e) => {
-  const newData = { ...props.value }
-  set(newData, props.name, myValue.value === 'true')
-  console.log(newData, e);
-  emit('update:value', newData)
+  emit('update:value', myValue.value === 'true')
 }
 
-watch(() => JSON.stringify(props.data), () => {
-  console.log(props.value, props.name);
-  myValue.value = get(props.value, props.name) === true ? 'true' : 'false'
+watch(() => props.value, () => {
+  myValue.value = props.value === true ? 'true' : 'false'
 }, { immediate: true })
 
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Import/Import.vue b/src/views/device/components/Metadata/Base/components/Import/Import.vue
new file mode 100644
index 00000000..e5005750
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Import/Import.vue
@@ -0,0 +1,230 @@
+<template>
+  <a-button type="primary" ghost @click="showImport">
+    <template #icon>
+      <AIcon type="DownloadOutlined"/>
+    </template>
+    导入
+  </a-button>
+  <a-modal
+    v-if="visible"
+    visible
+    :title="step === 1 ? '批量导入' : '导入结果'"
+    :width="600"
+    :keyboard="false"
+    :maskClosable="false"
+    :okButtonProps="{
+      disabled: step !== 3
+    }"
+    :getContainer="modalContainer"
+    @cancel="onCancel"
+    @ok="onOk"
+  >
+    <a-form v-if="step === 1" layout="vertical">
+      <a-form-item label="上传文件">
+        <a-upload-dragger
+          name="file"
+          :headers="{[TOKEN_KEY]: LocalStore.get(TOKEN_KEY)}"
+          :maxCount="1"
+          :showUploadList="false"
+          :accept="'.xlsx,.csv'"
+          :before-upload="beforeUpload"
+          @change="uploadChange"
+          @drop="handleDrop"
+        >
+          <div class="dragger-box">
+            <AIcon class="icon" type="PlusCircleFilled"/>
+            <span style="margin: 16px 0 8px 0">点击或拖拽上传文件</span>
+            <span>格式：.xlsx, .csv</span>
+          </div>
+        </a-upload-dragger>
+      </a-form-item>
+      <a-form-item label="下载模版">
+        <div class="file-download">
+          <j-button class="btn" @click="downFile('xlsx')">模板格式.xlsx</j-button>
+          <j-button class="btn" @click="downFile('csv')">模板格式.csv</j-button>
+        </div>
+      </a-form-item>
+    </a-form>
+    <div v-else-if="step === 2">
+      <span>
+        正在导入，请稍后...
+      </span>
+    </div>
+    <div v-else>
+      <div>
+        导入成功： {{ successCount }}条
+      </div>
+      <div>
+        导入失败： {{ errorCount }}条
+      </div>
+    </div>
+  </a-modal>
+</template>
+
+<script setup name="MetadataImport">
+import {TOKEN_KEY, TOKEN_KEY_URL} from '@/utils/variable';
+import {getToken, isFullScreen, LocalStore, onlyMessage} from '@/utils/comm';
+import {validate} from './util'
+import { getTemplate, uploadAnalyzeMetadata} from '@/api/device/instance'
+import {getTemplate as getProductTemplate} from '@/api/device/product'
+import {downloadFileByUrl} from "@/utils/utils";
+import {useGroupActive, useTableWrapper} from "@/components/Metadata/Table/context";
+
+const props = defineProps({
+  target: {
+    type: String,
+    default: undefined
+  },
+  metadata: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const emit = defineEmits(['ok'])
+
+const visible = ref(false);
+const successCount = ref(0);
+const errorCount = ref(0);
+const step = ref(1)
+const groupActive = useGroupActive()
+const tableWrapperRef = useTableWrapper()
+
+let submitMetadata = []
+
+const route = useRoute()
+
+const modalContainer = (e) => {
+  if (isFullScreen()) {
+    return tableWrapperRef.value || document.body
+  }
+  return document.body
+}
+
+const init = () => {
+  step.value = 1
+  successCount.value = 0
+  errorCount.value = 0
+}
+
+const showImport = () => {
+  init()
+  visible.value = true
+}
+
+const onCancel = () => {
+  visible.value = false
+}
+
+const submitData = async (metadataStr) => {
+  console.log(metadataStr)
+  if (metadataStr) {
+    const _metadataObject = JSON.parse(metadataStr || "{}")
+    const properties = _metadataObject.properties
+    const _metadata = props.metadata.filter(item => item.id && !item.expands?.isProduct)
+    const result = properties.map(item => {
+      if (item.expands) {
+        item.expands.groupId = groupActive.value
+        item.expands.groupName = groupActive.label
+      } else {
+        item.expands = {
+          groupId: groupActive.value,
+          groupName: groupActive.label,
+        }
+      }
+      return item
+    })
+
+    submitMetadata = validate(result, _metadata, (validate) => {
+      if (validate) {
+        successCount.value += 1
+      } else {
+        errorCount.value += 1
+      }
+    })
+    step.value = 3
+  } else {
+    onlyMessage('请先上传文件', 'error');
+  }
+};
+
+const onOk = () => {
+  emit('ok', submitMetadata)
+  visible.value = false
+}
+
+const downFile = (type) => {
+  const url = props.target === 'device' ? getTemplate(route.params.id, type) : getProductTemplate(route.params.id, type)
+
+  downloadFileByUrl(url + `?${TOKEN_KEY_URL}=${getToken()}`, '物模型模版', type)
+}
+
+const handleDrop = () => {
+};
+
+const beforeUpload = (file) => {
+  const isCsv = file.type === 'text/csv';
+  const isXlsx =
+    file.type ===
+    'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+  if (!isCsv && !isXlsx) {
+    onlyMessage('请上传.xlsx或.csv格式文件', 'warning');
+  }
+
+  const formData = new FormData()
+
+  formData.append('file', file)
+
+  step.value = 2
+  uploadAnalyzeMetadata(formData).then(res => {
+    if (res.success) {
+      submitData(res.result)
+    }
+  })
+
+  // return isCsv || isXlsx;
+
+  return false
+};
+
+
+const uploadChange = async (info) => {
+  console.log(info)
+  if (info.file.status === 'uploading') {
+    step.value = 2
+  }
+  if (info.file.status === 'done') {
+    const resp = info.file.response || {result: {}};
+    await submitData(resp?.result || '');
+  }
+  if (info.file.status === 'error') {
+    onlyMessage('上传失败', 'error');
+  }
+};
+</script>
+
+<style scoped lang="less">
+.dragger-box {
+  margin: 46px 0;
+  display: flex;
+  flex-direction: column;
+  color: #666666;
+
+  .icon {
+    font-size: 30px;
+    color: @primary-color;
+  }
+}
+
+.file-download {
+  display: flex;
+  gap: 16px;
+
+  .btn {
+    border: none;
+    background-color: #ECECF0;
+    width: 152px;
+    color: #666666;
+  }
+}
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Import/index.ts b/src/views/device/components/Metadata/Base/components/Import/index.ts
new file mode 100644
index 00000000..d7caadc6
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Import/index.ts
@@ -0,0 +1 @@
+export { default as Import } from './Import.vue'
diff --git a/src/views/device/components/Metadata/Base/components/Import/util.ts b/src/views/device/components/Metadata/Base/components/Import/util.ts
new file mode 100644
index 00000000..ea017c49
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Import/util.ts
@@ -0,0 +1,110 @@
+
+export const validateDate = (item: Record<string, any>) => {
+    if (!item.valueType.format) {
+        console.log('validateDate - error', item.valueType.format)
+        return false
+    }
+    return true
+}
+
+export const validateEnum = (item: Record<string, any>) => {
+    if (item.valueType.elements?.length) {
+        if (item.valueType.elements.every((item: {value: string, text: string}) => item.value && item.text)) {
+            return true
+        }
+        console.log('validateEnum - error', item.valueType)
+        return false
+    }
+    console.log('validateEnum - error', item.valueType)
+    return false
+}
+
+export const validateFile = (item: Record<string, any>) => {
+    if (!!item.valueType.bodyType) {
+        return true
+    }
+    console.log('validateFile - error', item.valueType.bodyType)
+    return false
+}
+
+export const validateArray = (item: Record<string, any>): boolean => {
+    const { valueType } = item
+
+    if (!valueType.elementType?.type) {
+        console.log('validateArray - error', valueType.elementType)
+        return false
+    }
+
+    return handleValidate(valueType.elementType.type, valueType.elementType)
+}
+
+export const validateObject = (item: Record<string, any>): boolean => {
+    const { valueType } = item
+    return valueType.properties?.length ? valueType.properties.every(item => {
+
+        if(!item.id || !item.name || !item.valueType.type) {
+            console.log('validateArray - error', item)
+            return false
+        }
+
+        return handleValidate(item.valueType.type, item)
+
+    }) : false
+}
+
+export const validateMap = {
+    enum: validateEnum,
+    date: validateDate,
+    file: validateFile,
+    array: validateArray,
+    object: validateObject,
+}
+
+export const handleValidate = (type: string, item: any) => {
+    const validateKeys = Object.keys(validateMap)
+
+    if (validateKeys.includes(type)) {
+        return validateMap[type](item)
+    }
+
+    return true
+}
+
+export const validateItem = (item: Record<string, any>): boolean => {
+
+    if (!item || !item.id || !item.name || !item.valueType?.type || !item.expands?.source || !item.expands?.type?.length) {
+        console.log('validateItem - error', item)
+        return false
+    }
+    console.log(item.valueType.type)
+
+    return handleValidate(item.valueType.type, item)
+
+}
+export const validate = (importMetadata: Array<Record<string, any>>, metadata: Array<Record<string, any>>, validateCallBack: (validate: boolean) => void):Array<Record<string, any>> => {
+    const metadataMap = new Map()
+    const copyMetadata = []
+
+    metadata.forEach((item, index) => {
+        metadataMap.set(item.id, index)
+    })
+
+    for (let i = importMetadata.length - 1; i >= 0;  i--) {
+        const item = importMetadata[i]
+        const isValidate = validateItem(item)
+
+        if (isValidate) {
+            // 与设备物模型属性id一致：覆盖
+            if (metadataMap.has(item.id)) {
+                metadata.splice(metadataMap.get(item.id), 1, item)
+                importMetadata.splice(i, 1)
+            } else {
+                copyMetadata.push(item)
+            }
+
+        }
+        validateCallBack?.(isValidate)
+    }
+
+    return [...metadata, ...copyMetadata]
+}
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/BooleanSelect.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/BooleanSelect.vue
index 74fc2d46..9292f591 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/BooleanSelect.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/BooleanSelect.vue
@@ -5,39 +5,39 @@
           { label: '固定值', value: 'false' },
           { label: '范围值', value: 'true' },
       ]"
-      :get-popup-container="(node) => fullRef || node"
+      :dropdownStyle="{
+        zIndex: 1071
+      }"
+      :getPopupContainer="(node) => tableWrapperRef || node"
       @select="select"
   />
 </template>
 
 <script name="BooleanSelect" setup>
-import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 
 const props = defineProps({
   value: {
-    type: Object,
-    default: () => ({})
+    type: String,
+    default: 'false'
   }
 })
 
-const emit = defineEmits(['update:value'])
+const emit = defineEmits(['update:value', 'select'])
 
-const fullRef = inject(FULL_CODE);
+const tableWrapperRef = useTableWrapper()
 const myValue = ref()
 const select = (e) => {
-  emit('update:value', {
-    ...props.value,
-    range: e === 'true',
-    value: e === 'true' ? [undefined, undefined] : undefined
-  })
+  emit('update:value', e === 'true')
+  emit('select', e === 'true')
 }
 
 watch(() => JSON.stringify(props.value), () => {
-  myValue.value = `${props.value?.range}`
+  myValue.value = props.value ? 'true' : 'false'
 }, { immediate: true })
 
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
index 370dedb6..075bdade 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/Metrics.vue
@@ -1,29 +1,44 @@
 <template>
   <div>
-    <j-data-table
+    <EditTable
+        ref="tableRef"
         :dataSource="dataSource"
         :columns="newColumns"
-        :showTool="false"
-        :serial="true"
-        ref="tableRef"
+        :height="200"
     >
-      <template #range="{data}">
-        {{ data.record.range === true ? '范围值' : '固定值'}}
+      <template #id="{ record, index }">
+        <EditTableFormItem :name="[index, 'id']">
+          <a-input v-model:value="record.id" placeholder="请输入标识"/>
+        </EditTableFormItem>
       </template>
-      <template #value="{data}">
-        <j-ellipsis>
-        {{ data.record.range === true ? data.record.value?.join('-') : showText(data.record.value) }}
-        </j-ellipsis>
+      <template #name="{ record, index }">
+        <EditTableFormItem :name="[index, 'name']">
+          <a-input v-model:value="record.name" placeholder="请输入名称"/>
+        </EditTableFormItem>
       </template>
-      <template #action="{data}">
+      <template #range="{record}">
+        <BooleanSelect
+          v-model:value="record.range"
+          @select="(e) => record.value = e ? [undefined, undefined]: undefined"/>
+      </template>
+      <template #value="{record, index}">
+        <EditTableFormItem :name="[index, 'value']">
+          <MetricValueItem
+            v-model:value="record.value"
+            :range="record.range"
+            :options="options"
+          />
+        </EditTableFormItem>
+      </template>
+      <template #action="{index}">
         <j-button
             type="link"
-            @click="() => deleteItem(data.index)"
+            @click="() => deleteItem(index)"
         >
           <AIcon type="DeleteOutlined" />
         </j-button>
       </template>
-    </j-data-table>
+    </EditTable>
     <j-button style="width: 100%;margin-top: 16px;" @click="addItem" >
       <template #icon><AIcon type="PlusOutlined" /></template>
       添加指标值
@@ -34,8 +49,8 @@
 <script setup name="Metrics" lang="ts">
 import { defineExpose, provide } from 'vue'
 import MetricValueItem from './ValueItem.vue'
-import {validatorConfig} from "@/views/device/components/Metadata/Base/columns";
 import BooleanSelect from "@/views/device/components/Metadata/Base/components/Properties/Metrics/BooleanSelect.vue";
+import { EditTable, EditTableFormItem } from '@/components/Metadata/Table'
 
 const props = defineProps({
   value: {
@@ -59,23 +74,6 @@ const tableRef = ref()
 
 provide('metricsType', props.type)
 
-const showText = (value: any) => {
-    switch (props.type) {
-      case 'date':
-        return value;
-      case 'boolean':
-        const item = props.options.find(item => item.value === value)
-          if (item) {
-            return item.label
-          }else if (value) {
-            return value === 'true' ? '是' : '否'
-          } else {
-             return ''
-          }
-      default:
-        return value
-    }
-}
 
 const columns: any = [
   {
@@ -86,20 +84,20 @@ const columns: any = [
     placement: 'Left',
     form: {
       required: true,
-      rules: [{
-        callback(rule:any,value: any, dataSource: any[]) {
-          if (value) {
-            const field = rule.field.split('.')
-            const fieldIndex = Number(field[1])
-            const hasId = dataSource.some((item, index) => item.id === value && fieldIndex !== index)
-            if (hasId) {
-              return Promise.reject('该标识已存在')
+      rules: [
+        {
+          asyncValidator(_: any, value: any, ...setting) {
+            if (value) {
+              const option = setting[2]
+
+              if (dataSource.value.filter((_, index) => index !== option.index).some(item => item.value === value)) {
+                return Promise.reject('该标识已存在')
+              }
+              return Promise.resolve()
             }
-            return Promise.resolve()
+            return Promise.reject('请输入标识')
           }
-          return Promise.reject('请输入标识')
         },
-      },
         { max: 64, message: '最多可输入64个字符' },
         {
           pattern: /^[a-zA-Z0-9_\-]+$/,
@@ -116,7 +114,7 @@ const columns: any = [
       required: true,
       rules: [
         {
-          callback(rule:any,value: any) {
+          asyncValidator(rule:any,value: any) {
             if (!value) {
               return Promise.reject('请输入指标名称')
             }
@@ -132,18 +130,10 @@ const columns: any = [
     title: '指标配置',
     dataIndex: 'value',
     width: 100,
-    type: 'components',
-    components: {
-      name: MetricValueItem,
-      props: {
-        options: props.options
-      }
-    },
     form: {
-      required: true,
       rules: [
         {
-          callback(rule:any,value: any) {
+          asyncValidator(rule:any,value: any) {
             if (!value || (Array.isArray(value) && value.some(item => !item))) {
               return Promise.reject('请配置指标')
             }
@@ -168,58 +158,43 @@ const newColumns = computed(() => {
         title: '指标值',
         dataIndex: 'range',
         width: 120,
-        type: 'components',
-        components: {
-          name: BooleanSelect
-        }
     })
     return data
   }
   return columns
 })
 
-const rules = []
-
 const addItem = () => {
-  const data = {
+  dataSource.value.push({
     id: undefined,
     name: undefined,
     range: false,
     value: undefined,
-  }
-
-  tableRef.value.addItem(data)
+  })
 }
 
 const deleteItem = (index: number) => {
-  tableRef.value.removeItem(index)
-}
-
-const cancel = () => {
-  dataSource.value = props.value || []
-}
-
-const confirm = () => {
-
+  dataSource.value.splice(index, 1)
 }
 
 const getData = () => {
   return new Promise((resolve, reject) =>  {
-    tableRef.value.getData().then((data: any) => {
+    tableRef.value.validate().then((data: any) => {
       resolve(data)
-    }).catch(() => {
+    }).catch((err) => {
       reject(false)
     })
   })
 }
 
 watch(() => props.value, () => {
-  dataSource.value = props.value || []
+  dataSource.value = JSON.parse(JSON.stringify(props.value)) || []
 }, { immediate: true, deep: true})
 
 defineExpose({ getData })
+
 </script>
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
index 9d247f56..26c4c0d0 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/ValueItem.vue
@@ -1,19 +1,14 @@
 <template>
   <div class="metrics-item-value">
-    <div class="metrics-item-text">
-      <j-ellipsis>
-        {{ showText }}
-      </j-ellipsis>
-    </div>
-    <j-popconfirm-modal
+    <PopoverModal
+        v-model:visible="visible"
         :show-cancel="false"
         body-style="width: 300px"
-        :get-popup-container="(node) => fullRef || node"
-        @confirm="confirm"
+        @ok="confirm"
     >
       <template #content>
         <j-form ref="formRef" :model="formData">
-          <j-form-item v-if="value.range === false" :rules="[{ validator: typeValidator}]" name="value">
+          <j-form-item v-if="range === false" :rules="[{ validator: typeValidator}]" name="value">
             <Item v-model:value="formData.value" :options="options" />
           </j-form-item>
           <div v-else class="data-table-boolean-item">
@@ -22,7 +17,7 @@
                 <Item v-model:value="formData.rangeValue[0]" />
               </j-form-item>
             </div>
-            <div>-</div>
+            <div style="line-height: 32px">-</div>
             <div class="data-table-boolean-item--value">
               <j-form-item :name="['rangeValue', 1]" :rules="[{ required: true, message: '请输入指标值'}, { validator: validator}]">
                 <Item v-model:value="formData.rangeValue[1]" />
@@ -31,8 +26,13 @@
           </div>
         </j-form>
       </template>
-      <j-button my-icon="EditOutlined" type="link" style="padding: 4px 8px"></j-button>
-    </j-popconfirm-modal>
+      <a-button type="link" style="padding: 0">
+        <template #icon>
+          <AIcon type="SettingOutlined"/>
+        </template>
+        配置
+      </a-button>
+    </PopoverModal>
   </div>
 </template>
 
@@ -42,8 +42,7 @@ import type { PropType } from 'vue';
 import Item from './item.vue'
 import {Form} from "jetlinks-ui-components";
 import { cloneDeep } from "lodash-es";
-import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
-import dayjs from "dayjs";
+import { PopoverModal } from '@/components/Metadata/Table'
 
 type ValueType = number | Array<number | undefined> | undefined;
 
@@ -59,14 +58,19 @@ const props = defineProps({
   options: {
     type: Array,
     default: () => []
+  },
+  range: {
+    type: Boolean,
+    default: false
   }
 });
 
 const emit = defineEmits<Emit>();
 const formItemContext = Form.useInjectFormItemContext();
-const fullRef = inject(FULL_CODE);
 const type = inject<string>('metricsType')
 
+const visible = ref(false)
+
 const formData = reactive<{
   value: ValueType;
   rangeValue: ValueType;
@@ -79,9 +83,8 @@ const formData = reactive<{
 
 const formRef = ref()
 
-
 const showText = computed(() => {
-  if (props.value.range === false) {
+  if (props.range === false) {
     switch (type) {
       case 'date':
         return props.value?.value;
@@ -113,7 +116,7 @@ const validatorTip = () =>{
 
 const validator = (_: any, value: any) => {
 
-  if (props.value.range && formData.rangeValue![0] >= formData.rangeValue![1]) {
+  if (props.range && formData.rangeValue![0] >= formData.rangeValue![1]) {
     return Promise.reject('需大于左侧数值')
   }
   return Promise.resolve()
@@ -147,17 +150,14 @@ const handleValueByType = (value: any, isRange: boolean = false) => {
 const confirm = () => {
   return new Promise((resolve, reject) => {
     formRef.value.validate().then((res) => {
-      let value = props.value.range === true ? formData.rangeValue : formData.value
+      let value = props.range === true ? formData.rangeValue : formData.value
 
       if (['int', 'long'].includes(type)) {
-        value = handleValueByType(value, props.value.range)
-        console.log('confirm',value, type)
+        value = handleValueByType(value, props.range)
       }
+      visible.value = false
 
-      emit('update:value', {
-        ...props.value,
-        value: value
-      });
+      emit('update:value', value);
       formItemContext.onFieldChange()
       resolve(true)
     }).catch(() => {
@@ -167,15 +167,11 @@ const confirm = () => {
 
 };
 
-watch(() => props.value.range,(value, oldValue) => {
+watch(() => props.range, (value, oldValue) => {
   if (value !== oldValue  ) {
-    if (value === false) {
-      formData.value = undefined
-    } else {
-      formData.rangeValue = [undefined, undefined]
-    }
+    formData.rangeValue = value ? [undefined, undefined] : undefined
   }
-})
+}, { immediate: true})
 </script>
 
 <style scoped lang="less">
@@ -189,4 +185,9 @@ watch(() => props.value.range,(value, oldValue) => {
     flex: 1;
   }
 }
+
+.data-table-boolean-item {
+  display: flex;
+  gap: 12px;
+}
 </style>
diff --git a/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue b/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue
index 65d6b8b7..2339d462 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/Metrics/item.vue
@@ -39,8 +39,11 @@
         placeholder="请选择"
         v-model:value="myValue"
         style="width: 100%"
+        :dropdownStyle="{
+          zIndex: 1071
+        }"
         :options="options"
-        :get-popup-container="(node) => fullRef || node"
+        :get-popup-container="(node) => tableWrapperRef || node"
         @change="change"
     />
     <j-date-picker
@@ -48,16 +51,17 @@
         v-model:value="myValue"
         show-time
         format="YYYY-MM-DD HH:mm:ss"
-        style="width: 100%"
+        style="width: 100%;z-index: 1071"
+        :popupStyle="{ zIndex: 1072}"
         placeholder="请选择"
-        :get-popup-container="(node) => fullRef || node"
+        :get-popup-container="(node) => tableWrapperRef || node"
         valueFormat="YYYY-MM-DD HH:mm:ss"
         @change="change"
     />
 </template>
 <script setup name="MetricValueItem">
-import { Form } from 'jetlinks-ui-components'
-import {FULL_CODE} from "jetlinks-ui-components/es/DataTable";
+import { Form } from 'ant-design-vue'
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 
 const props = defineProps({
     value: {
@@ -75,7 +79,7 @@ const formItemContext = Form.useInjectFormItemContext();
 
 const type = inject('metricsType')
 const myValue = ref(props.value)
-const fullRef = inject(FULL_CODE);
+const tableWrapperRef = useTableWrapper()
 
 const change = () => {
     emit('update:value', myValue.value)
@@ -86,4 +90,4 @@ watch(() => props.value, () => {
     myValue.value = props.value
 })
 
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/device/components/Metadata/Base/components/Properties/StorageSetting.vue b/src/views/device/components/Metadata/Base/components/Properties/StorageSetting.vue
index fadcee4b..1afddb60 100644
--- a/src/views/device/components/Metadata/Base/components/Properties/StorageSetting.vue
+++ b/src/views/device/components/Metadata/Base/components/Properties/StorageSetting.vue
@@ -16,6 +16,7 @@
                    label: a.text,
                    value: a.value,
             }))"
+            style="width: 100%;z-index: 1071"
             :get-popup-container="(node) => fullRef || node"
         />
       </template>
@@ -120,4 +121,4 @@ defineExpose({
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Properties/hooks.ts b/src/views/device/components/Metadata/Base/components/Properties/hooks.ts
new file mode 100644
index 00000000..3f1273eb
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/Properties/hooks.ts
@@ -0,0 +1,106 @@
+import { updateProductThreshold, updateDeviceThreshold ,queryDeviceThreshold, queryProductThreshold , deleteProductThreshold, deleteDeviceThreshold } from '@/api/device/instance'
+import { useRequest } from '@/hook'
+import {useProductStore} from "store/product";
+import {useInstanceStore} from "store/instance";
+export const useThreshold = (props: Record<string, any>) => {
+
+    const productStore = useProductStore();
+    const deviceStore = useInstanceStore();
+
+    const thresholdDetail = ref({
+
+    })
+
+    const { run: updateProductRun } = useRequest(updateProductThreshold, { immediate: false })
+
+    const { run: updateDeviceRun } = useRequest(updateDeviceThreshold,{ immediate: false})
+
+    const { run: deleteProductRun } = useRequest(deleteProductThreshold,{ immediate: false})
+    
+    const { run: deleteDeviceRun } = useRequest(deleteDeviceThreshold,{ immediate: false})
+
+    const { run: queryDevice } = useRequest(queryDeviceThreshold, {
+        immediate: false,
+        onSuccess(res) {
+            handleDetail(res.result)
+        }
+    })
+
+    const { run: queryProduct } = useRequest(queryProductThreshold, {
+        immediate: false,
+        onSuccess(res) {
+            handleDetail(res.result)
+        }
+    })
+
+
+    const handleDetail = (data: Record<string, any>) => {
+        thresholdDetail.value = {
+            type: data.configuration.matcher.provider,
+            limit:{
+                lower:  data.configuration.matcher.configuration.min,
+                upper:  data.configuration.matcher.configuration.max
+            },
+            // mode: data.configuration.processors.map((i:any)=>{
+            //     return i.provider
+            // })
+            mode: data.configuration.processors[0].provider
+        }
+    }
+
+    const thresholdUpdate = (data: Record<string, any>) => {
+        const params = {
+            thingType: 'device',
+            provider: 'simple',
+            configuration:{
+                matcher:{
+                    provider: data.type,
+                    configuration:{
+                        max: data.limit.upper,
+                        min: data.limit.lower,
+                        not: true
+                    }
+                },
+                processors: [{
+                    provider: data.mode,
+                    configuration:{}
+                }]
+                // data.mode.map((i:any)=>{
+                //     return  {
+                //         provider: i,
+                //         configuration:{}
+                //     }
+                // })
+            },
+            
+        }
+        if(props.target === 'product'){
+            updateProductRun(productStore.current.id,props.id,params)
+        }else{
+            updateDeviceRun(deviceStore.current.productId, deviceStore.current.id, props.id,params)
+        }
+    }
+
+    const thresholdDelete = ()=>{
+        if(props.target === 'product'){
+            deleteProductRun(productStore.current.id,props.id)
+        }else{
+            deleteDeviceRun(deviceStore.current.productId,deviceStore.current.id,props.id)
+        }
+    }
+    const thresholdDetailQuery = () => {
+        if (props.target === 'product') {
+            queryProduct(productStore.current.id, props.id)
+        } else {
+            queryDevice(deviceStore.current.productId, deviceStore.current.id, props.id)
+        }
+    }
+
+
+    return {
+        thresholdUpdate,
+        thresholdDelete,
+        thresholdDetailQuery,
+        thresholdDetail
+    }
+}
diff --git a/src/views/device/components/Metadata/Base/components/Source.vue b/src/views/device/components/Metadata/Base/components/Source.vue
index cec35277..59ef7c76 100644
--- a/src/views/device/components/Metadata/Base/components/Source.vue
+++ b/src/views/device/components/Metadata/Base/components/Source.vue
@@ -1,225 +1,221 @@
 <template>
-    <div class="metadata-source">
-        <j-select
-            v-model:value="myValue"
-            :options="PropertySource"
-            placeholder="请选择来源"
-            :disabled="disabled"
-            :get-popup-container="(node) => fullRef || node"
-            @change="onChange"
-        >
-        </j-select>
-        <j-popconfirm-modal
-            v-if="myValue != 'manual' && !showReset"
-            :bodyStyle="{
-                width: '450px',
-                height: myValue === 'rule' ? '300px' : '90px',
+  <div class="metadata-source">
+    <a-select
+      v-model:value="myValue"
+      placeholder="请选择来源"
+      style="flex: 1 1 0;min-width: 0"
+      :options="PropertySource"
+      :dropdownStyle="{
+              zIndex: 1071
             }"
-            :get-popup-container="(node) => fullRef || node"
-            placement="bottomRight"
-            @confirm="confirm"
-            @visibleChange="visibleChange"
-        >
-            <template #content>
-                <j-scrollbar v-if="myValue">
-                    <div style="padding: 0 10px">
-                        <VirtualRule
-                            v-if="visible"
-                            :value="value"
-                            :source="myValue"
-                            :dataSource="dataSource"
-                            ref="virtualRuleRef"
-                        />
-                    </div>
-                </j-scrollbar>
-            </template>
-            <j-button style="padding: 4px 8px" type="link">
-                <AIcon type="EditOutlined" />
-            </j-button>
-        </j-popconfirm-modal>
-        <j-dropdown v-if="myValue === 'rule' && target === 'device' && showReset" :getPopupContainer="(node) => fullRef || node" placement="bottom">
-            <span style="width: 20px;" @click.prevent>
-                <AIcon type="MoreOutlined" />
-            </span>
-            <template #overlay>
-                <j-menu>
-                    <j-menu-item>
-                        <j-popconfirm-modal
-                            :bodyStyle="{
+      :getPopupContainer="(node) => tableWrapperRef || node"
+      :disabled="disabled"
+      @change="onChange"
+    >
+    </a-select>
+    <PopoverModal
+      v-if="myValue != 'manual' && !showReset"
+      v-model:visible="modalVisible"
+      :bodyStyle="{
+                width: '450px',
+                height: myValue === 'rule' ? '300px' : '92px',
+            }"
+      placement="bottomRight"
+      @ok="confirm"
+    >
+      <template #content>
+        <j-scrollbar v-if="myValue">
+          <div style="padding: 0 10px">
+            <VirtualRule
+              v-if="modalVisible"
+              :source="myValue"
+              :value="record"
+              :isProduct="isProduct"
+              :dataSource="dataSource"
+              ref="virtualRuleRef"
+            />
+          </div>
+        </j-scrollbar>
+      </template>
+      <a-button style="padding: 0" type="link" :disabled="disabled" @click="handleSearch">
+        <template #icon>
+          <AIcon type="EditOutlined" :class="{'table-form-required-aicon': !value.type?.length}"/>
+        </template>
+      </a-button>
+    </PopoverModal>
+    <j-dropdown
+      v-if="myValue === 'rule' && target === 'device' && showReset"
+      placement="bottom"
+      trigger="click"
+      :getPopupContainer="(node) => tableWrapperRef || node"
+    >
+      <a-button style="padding: 0" type="link" @click="handleSearch">
+        <template #icon>
+          <AIcon type="MoreOutlined" />
+        </template>
+      </a-button>
+      <template #overlay>
+        <j-menu>
+          <j-menu-item>
+            <PopoverModal
+              v-model:visible="modalVisible"
+              :bodyStyle="{
                                 width: '450px',
                                 height: myValue === 'rule' ? '300px' : '80px',
                             }"
-                            :get-popup-container="(node) => fullRef || node"
-                            placement="bottomRight"
-                            @confirm="confirm"
-                            @visibleChange="visibleChange"
-                        >
-                            <template #content>
-                                <j-scrollbar v-if="myValue">
-                                    <div style="padding: 0 10px">
-                                        <VirtualRule
-                                            v-if="visible"
-                                            :value="value"
-                                            :source="myValue"
-                                            :dataSource="dataSource"
-                                            ref="virtualRuleRef"
-                                        />
-                                    </div>
-                                </j-scrollbar>
-                            </template>
-                            <j-button style="padding: 4px 8px" type="link">
-                                编辑
-                            </j-button>
-                        </j-popconfirm-modal>
-                    </j-menu-item>
-                    <j-menu-divider/>
-                    <j-menu-item>
-                       <div style="display: flex;">
-                            <j-button style="padding: 4px 8px" type="link" @click="resetRules">
-                                    重置
-                            </j-button>
-                            <j-tooltip>
-                                <template #title>重置为产品属性规则</template>
-                                <AIcon type="QuestionCircleOutlined" style="margin-top: 10px;"/>
-                            </j-tooltip>
-                       </div>
-                    </j-menu-item>
-                </j-menu>
-            </template>
-        </j-dropdown>
-    </div>
+              placement="bottomRight"
+              @ok="confirm"
+            >
+              <template #content>
+                <j-scrollbar v-if="myValue">
+                  <div style="padding: 0 10px">
+                    <VirtualRule
+                      :source="myValue"
+                      :value="record"
+                      :isProduct="isProduct"
+                      :dataSource="dataSource"
+                      ref="virtualRuleRef"
+                    />
+                  </div>
+                </j-scrollbar>
+              </template>
+              <j-button style="padding: 4px 8px" type="link">
+                编辑
+              </j-button>
+            </PopoverModal>
+          </j-menu-item>
+          <j-menu-divider/>
+          <j-menu-item>
+            <div style="display: flex;">
+              <j-button style="padding: 4px 8px" type="link" @click="resetRules">
+                重置
+              </j-button>
+              <j-tooltip>
+                <template #title>重置为产品属性规则</template>
+                <AIcon type="QuestionCircleOutlined" style="margin-top: 10px;"/>
+              </j-tooltip>
+            </div>
+          </j-menu-item>
+        </j-menu>
+      </template>
+    </j-dropdown>
+  </div>
 </template>
 
 <script setup lang="ts" name="MetadataSource">
-import { isNoCommunity } from '@/utils/utils';
+import {isNoCommunity} from '@/utils/utils';
 import VirtualRule from './VirtualRule/index.vue';
-import { Form } from 'jetlinks-ui-components';
-import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
-import { useInstanceStore } from '@/store/instance';
-import { resetRule } from '@/api/device/instance';
-import { updata } from '@/api/rule-engine/configuration';
-import { onlyMessage } from '@/utils/comm';
-import { provide } from 'vue';
-import { queryDeviceVirtualProperty } from '@/api/device/instance';
-import {
-    queryProductVirtualProperty
-} from '@/api/device/product';
-import { useProductStore } from '@/store/product';
+import {Form} from 'jetlinks-ui-components';
+import {useInstanceStore} from '@/store/instance';
+import {queryDeviceVirtualProperty, resetRule} from '@/api/device/instance';
+import {onlyMessage} from '@/utils/comm';
+import {provide, Ref} from 'vue';
+import {queryProductVirtualProperty} from '@/api/device/product';
+import {useProductStore} from '@/store/product';
+import {PopoverModal} from '@/components/Metadata/Table'
+import {useTableWrapper} from "@/components/Metadata/Table/context";
+import {sourceType} from "@/views/device/components/Metadata/Base/utils";
+
 const instanceStore = useInstanceStore();
 const productStore = useProductStore();
-const PropertySource: { label: string; value: string }[] = isNoCommunity
-    ? [
-          {
-              value: 'device',
-              label: '设备',
-          },
-          {
-              value: 'manual',
-              label: '手动',
-          },
-          {
-              value: 'rule',
-              label: '规则',
-          },
-      ]
-    : [
-          {
-              value: 'device',
-              label: '设备',
-          },
-          {
-              value: 'manual',
-              label: '手动',
-          },
-      ];
+const tableWrapperRef = useTableWrapper()
+
+const PropertySource = ref<Array<{ label: string; value: string }>>(sourceType.filter(item => isNoCommunity || (!isNoCommunity && item.value !== 'rule')))
 
 type SourceType = 'device' | 'manual' | 'rule' | '';
 
 type Emit = {
-    (e: 'update:value', data: Record<string, any>): void;
+  (e: 'update:value', data: Record<string, any>): void;
 };
 
 
-const fullRef = inject(FULL_CODE);
-const showReset = ref(false);
+const showReset = computed(() => {
+  return myValue.value === 'rule' && props.target === 'device' && props.isProduct
+})
+
 const props = defineProps({
-    value: {
-        type: Object,
-        default: () => {},
+  value: {
+    type: Object,
+    default: () => {
     },
-    dataSource: {
-        type: Array,
-        default: () => [],
-    },
-    noEdit: {
-        type: Array,
-        default: () => [],
-    },
-    target: {
-        type: String,
-        default: undefined,
-    },
-    productNoEdit:{
-        type:Array,
-        default: []
-    }
+  },
+  noEdit: {
+    type: Array,
+    default: () => [],
+  },
+  target: {
+    type: String,
+    default: undefined,
+  },
+  productNoEdit: {
+    type: Array,
+    default: []
+  },
+  record: {
+    type: Object,
+    default: () => ({})
+  },
+  disabled: {
+    type: Boolean,
+    default: false
+  },
+  isProduct: {
+    type: Boolean,
+    default: false
+  }
 });
-provide('target',props.target)
+provide('target', props.target)
+
 const emit = defineEmits<Emit>();
+
 const formItemContext = Form.useInjectFormItemContext();
 
 const myValue = ref<SourceType>('');
 const type = ref<string>('');
 const virtualRuleRef = ref<any>(null);
-const visible = ref(false)
+const modalVisible = ref(false)
+const expands = ref(props.value || {})
+const dataSource = inject<Ref<any[]>>('metadataSource')
 
-const visibleChange = (e: boolean) => {
-    visible.value = e
-}
-
-const disabled = computed(() => {
-    // if (props.target === 'device') {
-    //     return true;
-    // }
-    return props.noEdit?.length
-        ? props.noEdit.includes(props.value.id) && props?.target === 'device'
-        : false;
-});
+// const disabled = computed(() => {
+//     // if (props.target === 'device') {
+//     //     return true;
+//     // }
+//     return props.noEdit?.length
+//         ? props.noEdit.includes(props.record.id) && props?.target === 'device'
+//         : false;
+// });
 
 const updateValue = (data: any) => {
-    emit('update:value', {
-        ...props.value,
-        expands: {
-            ...(props.value?.expands || {}),
-            ...data,
-        },
-    });
-    formItemContext.onFieldChange();
+  console.log('updateValue',{
+    ...(props.value || {}),
+    ...data,
+  })
+  emit('update:value', {
+    ...(props.value || {}),
+    ...data,
+  });
+  formItemContext.onFieldChange();
 };
 
 const onChange = (keys: SourceType) => {
-    myValue.value = keys;
-    updateValue({
-        source: keys,
-        type: keys === 'manual' ? ['write'] : keys === 'rule' ? ['report'] : [],
-    });
+  myValue.value = keys;
+  updateValue({
+    source: keys,
+    type: keys === 'manual' ? ['write'] : keys === 'rule' ? ['report'] : [],
+  });
 };
 
 const confirm = async () => {
-    return new Promise(async (resolve, reject) => {
-        const data = await virtualRuleRef?.value.onSave().catch(() => {
-            reject();
-        });
-        if (data) {
-            updateValue({
-                source: myValue.value,
-                ...data,
-            });
-            resolve(true);
-        } else {
-            reject();
-        }
+  const data = await virtualRuleRef?.value.onSave()
+  if (data) {
+    updateValue({
+      ...expands.value,
+      source: myValue.value,
+      ...data,
     });
+    modalVisible.value = false
+  }
 };
 //重置规则
 // const resetRules = async() =>{
@@ -235,74 +231,64 @@ const confirm = async () => {
 //         })
 //     }
 // }
-const resetRules = async() =>{
-    let res:any = await resetRule(instanceStore.current?.productId,instanceStore.current?.id,[props.value?.id])
-    if(res.status === 200){
-        onlyMessage('操作成功！')
-    }
+const resetRules = async () => {
+  let res: any = await resetRule(instanceStore.current?.productId, instanceStore.current?.id, [props.record.id])
+  if (res.status === 200) {
+    onlyMessage('操作成功！')
+  }
 }
 const cancel = () => {
-    if (props.value.id && !props.value?.expands?.source) {
-        myValue.value = 'device';
-      } else {
-        myValue.value = props.value?.expands?.source || '';
-      }
-        type.value = props.value?.expands?.type || [];
+  myValue.value = props.value?.source || '';
+  type.value = props.value?.type || [];
 }
 
 const handleSearch = async () => {
+  if (isNoCommunity && myValue.value === 'rule') {
     let resp: any = undefined;
-      if (props.target === 'product') {
-        resp = await queryProductVirtualProperty(
-            productStore.current?.id,
-            props.value?.id,
-        );
-      } else {
-        resp = await queryDeviceVirtualProperty(
-            instanceStore.current?.productId,
-            instanceStore.current?.id,
-            props.value?.id,
-        );
-      }
-      if (resp && resp.status === 200 && resp.result) {
-        const _triggerProperties = props.value?.expands?.virtualRule?.triggerProperties?.length ? props.value?.expands?.virtualRule?.triggerProperties : resp.result.triggerProperties
-            updateValue({
-                    source: myValue.value,
-                    virtualRule:{
-                    triggerProperties: _triggerProperties?.length ? _triggerProperties : ['*'],
-                    ...resp.result.rule
-                }             
-        });
-      }
+    if (props.target === 'product') {
+      resp = await queryProductVirtualProperty(
+        productStore.current?.id,
+        props.record.id,
+      );
+    } else {
+      resp = await queryDeviceVirtualProperty(
+        instanceStore.current?.productId,
+        instanceStore.current?.id,
+        props.record.id,
+      );
+    }
+    if (resp && resp.status === 200 && resp.result) {
+      const _triggerProperties = props.value?.virtualRule?.triggerProperties?.length ? props.value?.virtualRule?.triggerProperties : resp.result.triggerProperties
+      updateValue({
+        source: myValue.value,
+        virtualRule: {
+          triggerProperties: _triggerProperties?.length ? _triggerProperties : ['*'],
+          ...resp.result.rule
+        }
+      });
+    }
+  }
 };
 
 watch(
-    () => props.value,
-    () => {
-      if (props.value.id && !props.value?.expands?.source) {
-        myValue.value = 'device';
-      } else {
-        myValue.value = props.value?.expands?.source || '';
-      }
-        type.value = props.value?.expands?.type || [];
-    },
-    { immediate: true },
+  () => JSON.stringify(props.value),
+  () => {
+    if (!props.value?.source) {
+      myValue.value = 'device';
+    } else {
+      myValue.value = props.value?.source || '';
+    }
+    expands.value = props.value
+    type.value = props.value?.type || [];
+  },
+  {immediate: true},
 );
-onMounted(()=>{
-    if(props.target === 'device'){
-        props.productNoEdit?.id?.forEach((item:any)=>{
-        item === props.value?.id ? showReset.value = true : ''
-    })
-    }
-    if(isNoCommunity && myValue.value === 'rule'){
-        handleSearch()
-    }
-})
+
 </script>
 
 <style scoped>
 .metadata-source {
-    display: flex;
-    align-items: center;
+  display: flex;
+  align-items: center;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/Tags/Type.vue b/src/views/device/components/Metadata/Base/components/Tags/Type.vue
index 97823be7..03a743e5 100644
--- a/src/views/device/components/Metadata/Base/components/Tags/Type.vue
+++ b/src/views/device/components/Metadata/Base/components/Tags/Type.vue
@@ -7,6 +7,9 @@
         { label: '写', value: 'write'},
         { label: '上报', value: 'report'},
       ]"
+      :dropdownStyle="{
+        zIndex: 1071
+      }"
       :get-popup-container="(node) => fullRef || node"
       placeholder="请选择读写类型"
       @change="onChange"
@@ -14,8 +17,6 @@
 </template>
 
 <script setup lang="ts">
-
-import type {PropType} from "vue";
 import { FULL_CODE } from 'jetlinks-ui-components/es/DataTable'
 
 type Emit = {
@@ -37,16 +38,15 @@ const onChange = () =>{
   const _data = {
     ...props.value
   }
-  console.log(props.value)
+
   _data.expands['type'] = myValue.value
-  console.log(_data, myValue.value)
+
   emit('update:value', {
     ..._data
   })
 }
 
 watch(() => props.value.expands, () => {
-  console.log(props.value)
   myValue.value = props.value?.expands?.type
 }, { immediate: true})
 
@@ -54,4 +54,4 @@ watch(() => props.value.expands, () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/DetailModal.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/DetailModal.vue
new file mode 100644
index 00000000..569170b7
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/DetailModal.vue
@@ -0,0 +1,52 @@
+<template>
+  <a-modal
+    visible
+    title="规则"
+    :maskClosable="false"
+    :width="1000"
+    :getContainer="getPopupContainer"
+    :footer="false"
+    @cancel="emit('cancel')"
+  >
+    <div class="rule-detail-warp">
+      <j-monaco-editor
+        :model-value="value" theme="vs" ref="editor" language="javascript" :readOnly="true"
+      />
+    </div>
+  </a-modal>
+</template>
+
+<script setup name="DetailModal">
+defineProps({
+  value: {
+    type: String,
+    default: undefined
+  },
+  getPopupContainer: {
+    type: Function,
+    default: undefined
+  },
+})
+
+const emit = defineEmits(['cancel'])
+
+</script>
+
+<style scoped lang="less">
+
+.rule-detail-warp {
+  position: relative;
+  height: 500px;
+
+  :deep(.monaco-editor-overlaymessage) {
+    display: none !important;
+  }
+  .rule-detail-mask {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+}
+</style>
diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
index 4f267ee5..82b4970e 100644
--- a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
+++ b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
@@ -1,6 +1,7 @@
 <template>
     <j-form ref="formRef" layout="vertical" :model="formData">
         <ReadType
+            v-if="source !== 'rule'"
             v-model:value="formData.type"
             :disabled="source !== 'device'"
             :options="typeOptions"
@@ -29,11 +30,16 @@
                     placeholder="请选择触发属性"
                     show-search
                     max-tag-count="responsive"
+                    :getPopupContainer="(node) => tableWrapperRef || node"
+                    :dropdownStyle="{
+                          zIndex: 1071
+                       }"
+                    :virtual="true"
                 >
                     <j-select-option
                         :disabled="
                             formData.virtualRule?.triggerProperties?.length &&
-                            !formData.virtualRule?.triggerProperties?.includes(
+                            !formData.virtualRule.triggerProperties?.includes(
                                 '*',
                             )
                         "
@@ -74,14 +80,18 @@
                 }]"
             >
                 <j-select
+                    show-search
+                    placeholder="请选择窗口类型"
                     v-model:value="formData.virtualRule.windowType"
                     :options="[
                         { label: '无', value: 'undefined' },
                         { label: '时间窗口', value: 'time' },
                         { label: '频次窗口', value: 'num' },
                     ]"
-                    show-search
-                    placeholder="请选择窗口类型"
+                    :getPopupContainer="(node) => tableWrapperRef || node"
+                    :dropdownStyle="{
+                        zIndex: 1071
+                     }"
                     @select="windowTypeChange"
                 />
             </j-form-item>
@@ -97,9 +107,13 @@
                     }]"
                 >
                     <j-select
+                        placeholder="请选择聚合函数"
                         v-model:value="formData.virtualRule.aggType"
                         :options="aggList"
-                        placeholder="请选择聚合函数"
+                        :getPopupContainer="(node) => tableWrapperRef || node"
+                        :dropdownStyle="{
+                          zIndex: 1071
+                       }"
                     />
                 </j-form-item>
                 <j-form-item
@@ -160,7 +174,7 @@
         </template>
     </j-form>
 </template>
-    
+
 <script setup lang="ts" name="VirtualRule">
 import Rule from './Rule.vue';
 import { queryDeviceVirtualProperty } from '@/api/device/instance';
@@ -172,6 +186,7 @@ import { useInstanceStore } from '@/store/instance';
 import { useProductStore } from '@/store/product';
 import {PropType, Ref} from 'vue';
 import { ReadType } from '@/components/Metadata/components';
+import {useTableWrapper} from "@/components/Metadata/Table/context";
 
 type SourceType = 'device' | 'manual' | 'rule';
 
@@ -188,6 +203,10 @@ const props = defineProps({
         type: String as PropType<SourceType>,
         default: 'device',
     },
+    record: {
+      type: Object,
+      default: () => ({})
+    }
 });
 
 const initData = {
@@ -205,6 +224,7 @@ const initData = {
 
 const instanceStore = useInstanceStore();
 const productStore = useProductStore();
+const tableWrapperRef = useTableWrapper()
 
 const aggList = ref<any[]>([]);
 
@@ -227,11 +247,11 @@ const formData = reactive<{
         };
     };
 }>({
-    type: [],
+    type: props.value?.expands.type || [],
     virtualRule: undefined,
 });
 
-const dataSource = inject<Ref<any[]>>('_dataSource')
+const dataSource = inject<Ref<any[]>>('metadataSource')
 
 const windowTypeChange = () => {
   formData.virtualRule!.window = {
@@ -255,7 +275,7 @@ const typeOptions = computed(() => {
 });
 
 const options = computed(() => {
-    return (dataSource?.value || []).filter((item: any) => item?.id !== props.value?.id);
+    return (dataSource?.value || []).filter((item: any) => (item?.id !== props.value?.id) && item.id);
 });
 
 const setInitVirtualRule = () => {
@@ -313,16 +333,16 @@ onMounted(() => {
 });
 
 watch(
-    () => props.value,
+    () => JSON.stringify(props.value),
     () => {
-        formData.type = props.value.expands?.type;
+        formData.type = props.value?.expands.type
     },
-    { immediate: true, deep: true },
+    { immediate: true, },
 );
 
 watch(
     () => props.source,
-    (newVal: SourceType) => {
+    (newVal) => {
         if (newVal === 'rule') {
             formData.virtualRule = initData;
 
@@ -334,7 +354,6 @@ watch(
     },
     {
         immediate: true,
-        deep: true
     },
 );
 
@@ -374,4 +393,4 @@ defineExpose({ onSave });
 </script>
 
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/Base/hooks/index.ts b/src/views/device/components/Metadata/Base/hooks/index.ts
index 8c8686ca..b05a9280 100644
--- a/src/views/device/components/Metadata/Base/hooks/index.ts
+++ b/src/views/device/components/Metadata/Base/hooks/index.ts
@@ -1,2 +1,3 @@
 export { default as useMetadata } from './useMatadata'
-export { default as useOperateLimits } from './useOperateLimits'
\ No newline at end of file
+export { default as useOperateLimits } from './useOperateLimits'
+export * from './useGroup'
diff --git a/src/views/device/components/Metadata/Base/hooks/useGroup.ts b/src/views/device/components/Metadata/Base/hooks/useGroup.ts
new file mode 100644
index 00000000..79341ced
--- /dev/null
+++ b/src/views/device/components/Metadata/Base/hooks/useGroup.ts
@@ -0,0 +1,36 @@
+import {provide} from "vue";
+
+type GroupOptionsItemType = { label: string, value: string}
+import { METADATA_GROUP_OPTIONS } from '@/components/Metadata/Table/consts'
+export const useGroup = () => {
+
+    const options = ref<GroupOptionsItemType[]>([])
+
+    const addOptions = (op: GroupOptionsItemType) => {
+        if (!options.value.some(item => op.label === item.label)) {
+            options.value.push(op)
+        }
+    }
+
+    const cleanOptions = () => {
+        options.value = []
+    }
+
+    const initOptions = (dataSource: any[]) => {
+        cleanOptions()
+        options.value = dataSource.filter(item => item.id && item.extends?.group).map(item => ({
+            label: item.group,
+            value: item.group
+        }))
+    }
+
+    provide(METADATA_GROUP_OPTIONS, {
+        options,
+        addOptions
+    })
+
+    return {
+        cleanOptions,
+        initOptions
+    }
+}
diff --git a/src/views/device/components/Metadata/Base/hooks/useMatadata.ts b/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
index 1c73210e..cb83e6ce 100644
--- a/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
+++ b/src/views/device/components/Metadata/Base/hooks/useMatadata.ts
@@ -6,21 +6,29 @@ import { storeToRefs } from 'pinia'
 
 const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
     data: Ref<MetadataItem[]>,
-    metadata: Ref<Partial<DeviceMetadata>>,
+    metadata: Ref<Partial<DeviceMetadata>[]>,
     noEdit: Ref<any>
     productNoEdit: Ref<any>
 } => {
     const instanceStore = useInstanceStore()
     const productStore = useProductStore()
-    const metadata = ref<Partial<DeviceMetadata>>({})
+    const metadata = ref<Partial<DeviceMetadata>[]>([])
     const noEdit = ref<any>({})
     const productNoEdit = ref<any>({})
     const data = ref<MetadataItem[]>([])
     const { current: instanceCurrent } = storeToRefs(instanceStore)
-    const { current: productCurrent } = storeToRefs(productStore)
+    const { detail: productCurrent } = storeToRefs(productStore)
+
+    const init = () => {
+        data.value = []
+        metadata.value = []
+        noEdit.value = {}
+        productNoEdit.value = {}
+    }
 
     const handleMetadata = (_metadataStr: string) => {
 
+
         if(!_metadataStr) return
 
         const fileTypeReg = new RegExp('"fileType":',"g")
@@ -29,7 +37,7 @@ const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
         const newMetadata = (key ? _metadata?.[key] || [] : []) as any[]
 
 
-        metadata.value = newMetadata as any
+        metadata.value = newMetadata as any[]
 
         const ids = newMetadata.map((item) => item.id)
         noEdit.value = {}
@@ -40,10 +48,17 @@ const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
             noEdit.value.source = ids
         }
 
+
         if (type === 'device' && instanceCurrent.value.productMetadata) {
             const productMetadata: any = JSON.parse(instanceCurrent.value.productMetadata)
+
             const metaArray = key ? productMetadata[key] : []
             const productIds = metaArray?.map((item:any) => item.id) || []
+            metadata.value.forEach((metaItem: any) => {
+                if (productIds.includes(metaItem.id)) {
+                    metaItem.expands = Object.assign(metaItem.expands || {}, { isProduct: true })
+                }
+            })
             // productNoEdit.value.ids = metaArray?.map((item: any) => item.id) || []
             productNoEdit.value.ids = productIds
             productNoEdit.value.id = productIds
@@ -78,6 +93,7 @@ const useMetadata = (type: 'device' | 'product', key?: MetadataType, ): {
     }
 
     watch(() => [instanceCurrent.value.metadata, productCurrent.value.metadata], () => {
+        init()
         if (type === 'device') {
             handleMetadata(instanceCurrent.value.metadata)
         } else {
diff --git a/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts b/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
index 1257ba70..5085c1a7 100644
--- a/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
+++ b/src/views/device/components/Metadata/Base/hooks/useOperateLimits.ts
@@ -3,9 +3,9 @@ import type {MetadataType} from "@/views/device/Product/typings";
 
 const limitsMap = new Map<string, any>();
 limitsMap.set('events-add', 'eventNotInsertable');
-limitsMap.set('events-updata', 'eventNotModifiable');
+limitsMap.set('events-update', 'eventNotModifiable');
 limitsMap.set('properties-add', 'propertyNotInsertable');
-limitsMap.set('properties-updata', 'propertyNotModifiable');
+limitsMap.set('properties-update', 'propertyNotModifiable');
 
 const useOperateLimits = (target: 'device' | 'product') => {
 
@@ -24,4 +24,4 @@ const useOperateLimits = (target: 'device' | 'product') => {
     }
 }
 
-export default useOperateLimits
\ No newline at end of file
+export default useOperateLimits
diff --git a/src/views/device/components/Metadata/Base/utils.ts b/src/views/device/components/Metadata/Base/utils.ts
index bd9700b4..dea716f3 100644
--- a/src/views/device/components/Metadata/Base/utils.ts
+++ b/src/views/device/components/Metadata/Base/utils.ts
@@ -1,21 +1,129 @@
-export const levelMap = ref({
-    ordinary: '普通',
-    warn: '警告',
-    urgent: '紧急',
-})
-export const sourceMap = ref({
-    device: '设备',
-    manual: '手动',
-    rule: '规则',
-});
-export const expandsType = ref({
-    read: '读',
-    write: '写',
-    report: '上报',
-});
+import {getMetadataConfig, getMetadataDeviceConfig} from "@/api/device/product";
+
+export const sourceType = [
+    {
+        value: 'device',
+        label: '设备',
+    },
+    {
+        value: 'manual',
+        label: '手动',
+    },
+    {
+        value: 'rule',
+        label: '规则',
+    },
+]
+
+export const getSourceMap = () => {
+    return sourceType.reduce((prev, next) => {
+        prev[next.value] = next.label
+        return prev
+    }, {})
+}
 
 export const limitsMap = new Map<string, any>();
 limitsMap.set('events-add', 'eventNotInsertable');
 limitsMap.set('events-updata', 'eventNotModifiable');
 limitsMap.set('properties-add', 'propertyNotInsertable');
-limitsMap.set('properties-updata', 'propertyNotModifiable');
\ No newline at end of file
+limitsMap.set('properties-updata', 'propertyNotModifiable');
+
+export const getMetadataItemByType = (type: string) => {
+    let item = {
+        id: undefined,
+        name: undefined,
+        expands: {}
+    }
+    if (type === 'properties') {
+        item = Object.assign(item, {
+            expands: {
+                source: 'device',
+                group: undefined
+            },
+            valueType: {
+                type: undefined,
+                expands: {}
+            }
+        })
+    } else if (type === 'functions') {
+        item = Object.assign(item, {
+            async: false,
+            inputs: [],
+            output: {
+                type: undefined
+            }
+        })
+    } else if (type === 'events') {
+        item = Object.assign(item, {
+            async: false,
+            valueType: {
+                type: 'object',
+                properties: []
+            },
+            expands: {
+                level: 'ordinary',
+                group: undefined
+            }
+        })
+    } else if (type === 'tags') {
+        item = Object.assign(item, {
+            valueType: {
+                type: undefined
+            },
+            expands: {
+                type: undefined,
+                group: undefined
+            }
+        })
+    }
+
+    return item
+}
+
+export const useStoreType = (type: string) => {
+    const route = useRoute()
+    const settingData = ref({})
+
+    const getData = async () => {
+        const id = route.params.id;
+
+        if (!id || !type) return;
+
+        const params: any = {
+            deviceId: id,
+            metadata: {
+                id: id,
+                type: 'property',
+                dataType: type,
+            },
+        };
+
+        const resp =
+            type === 'product'
+                ? await getMetadataConfig(params)
+                : await getMetadataDeviceConfig(params);
+        if (resp.success) {
+
+            if (resp.result.length) {
+                resp.result.forEach((a) => {
+                    if (a.properties) {
+                        a.properties.some(item => {
+                            if (item.property === 'storageType') {
+                                settingData.value = item.type.elements.reduce((prev, next) => {
+                                    prev[next.value] = next.text
+                                    return prev
+                                }, {})
+                            }
+                        })
+                    }
+                });
+            }
+        }
+    }
+
+    getData()
+
+    return {
+        settingData
+    }
+}
diff --git a/src/views/device/components/Metadata/Cat/index.vue b/src/views/device/components/Metadata/Cat/index.vue
index 980d26b3..54764ccd 100644
--- a/src/views/device/components/Metadata/Cat/index.vue
+++ b/src/views/device/components/Metadata/Cat/index.vue
@@ -64,7 +64,7 @@ const instanceStore = useInstanceStore()
 const productStore = useProductStore()
 const metadata = computed(() => {
   const metadataMap = {
-    product: productStore.current?.metadata as string,
+    product: productStore.detail?.metadata as string,
     device: instanceStore.current?.metadata as string,
   };
   return metadataMap[props.type];
diff --git a/src/views/device/components/Metadata/Import/index.vue b/src/views/device/components/Metadata/Import/index.vue
index 79fcbacc..eae7a91f 100644
--- a/src/views/device/components/Metadata/Import/index.vue
+++ b/src/views/device/components/Metadata/Import/index.vue
@@ -533,14 +533,14 @@ const requiredCheck = (data: any) => {
             } else {
                 testType(item?.valueType, index);
             }
-            if (!item?.expands?.type) {
-                onlyMessage(
-                    `标签定义第${index + 1}个数组中缺失expands.type属性`,
-                    'error',
-                );
-                check = true;
-                return;
-            }
+            // if (!item?.expands?.type) {
+            //     onlyMessage(
+            //         `标签定义第${index + 1}个数组中缺失expands.type属性`,
+            //         'error',
+            //     );
+            //     check = true;
+            //     return;
+            // }
         });
     }
     return check;
@@ -806,6 +806,7 @@ const handleImport = async () => {
             const { id } = route.params || {};
             if (data.metadata === 'alink') {
                 try {
+                    console.log(JSON.parse(data.import))
                     const _import = omit(JSON.parse(data.import), [
                         'schema',
                         'profile',
@@ -813,7 +814,7 @@ const handleImport = async () => {
                     Object.keys(_import).forEach((i: any) => {
                         const map = new Map();
                         _import[i].forEach((item: any) =>
-                            map.set(item.id, item),
+                            map.set(item.identifier, item),
                         );
                         _import[i] = [...map.values()];
                     });
@@ -936,6 +937,9 @@ const handleImport = async () => {
                     close();
                 } catch (e) {
                     loading.value = false;
+                    if(e?.name === 'AxiosError'){
+                        return
+                    }
                     onlyMessage(
                         e === 'error'
                             ? '物模型数据不正确'
diff --git a/src/views/device/components/Metadata/index.vue b/src/views/device/components/Metadata/index.vue
index 58c9046a..22ad220d 100644
--- a/src/views/device/components/Metadata/index.vue
+++ b/src/views/device/components/Metadata/index.vue
@@ -1,140 +1,183 @@
 <template>
-    <div class='device-detail-metadata' style="position: relative;">
-     <!-- <div class="tips">-->
-<!--        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'-->
-<!--        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
-<!--        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">-->
-<!--          <div class="ellipsis" style='color: #999;'>-->
-<!--            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />-->
-<!--            {{-->
-<!--              instanceStore.detail?.independentMetadata && type === 'device'-->
-<!--                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
-<!--                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'-->
-<!--            }}-->
-<!--          </div>-->
-<!--        </j-tooltip> -->
-     <!-- </div> -->
-      <j-tabs class="metadataNav" :activeKey="tabActiveKey" destroyInactiveTabPane type="card" @change="tabsChange">
-        <template #rightExtra>
-          <j-space>
-            <PermissionButton
-                v-if="showReset"
-              key="reload"
-                :hasPermission="`${permission}:update`"
-              :popConfirm="{ title: '确认重置？', onConfirm: resetMetadata, }"
-                :tooltip="{ title: '重置后将使用产品的物模型配置' }"
-            >
-              重置操作
-            </PermissionButton>
-            <PermissionButton :hasPermission="`${permission}:update`" @click="visible = true" key="import">快速导入</PermissionButton>
-            <PermissionButton :hasPermission="`${permission}:update`" @click="cat = true" key="tsl">物模型TSL</PermissionButton>
-          </j-space>
-        </template>
-        <template #centerExtra>
-          <span class="desc">设备会默认继承产品的物模型，继承的物模型不支持删改</span>
-        </template>
-        <j-tab-pane tab="属性定义" key="properties">
-          <BaseMetadata :target="type" type="properties" :permission="permission" />
-        </j-tab-pane>
-        <j-tab-pane tab="功能定义" key="functions">
-          <BaseMetadata :target="type" type="functions" :permission="permission" />
-        </j-tab-pane>
-        <j-tab-pane tab="事件定义" key="events">
-          <BaseMetadata :target="type" type="events" :permission="permission" />
-        </j-tab-pane>
-        <j-tab-pane tab="标签定义" key="tags">
-          <BaseMetadata :target="type" type="tags" :permission="permission" />
-        </j-tab-pane>
-      </j-tabs>
-      <Import v-if="visible" v-model:visible="visible" :type="type" @close="visible = false" />
-      <Cat v-model:visible="cat" @close="cat = false" :type="type" />
+    <div class="device-detail-metadata" style="position: relative">
+        <!-- <div class="tips">-->
+        <!--        <j-tooltip :title="instanceStore.detail?.independentMetadata && type === 'device'-->
+        <!--        ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
+        <!--        : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'">-->
+        <!--          <div class="ellipsis" style='color: #999;'>-->
+        <!--            <AIcon type="InfoCircleOutlined" style="margin-right: 3px" />-->
+        <!--            {{-->
+        <!--              instanceStore.detail?.independentMetadata && type === 'device'-->
+        <!--                ? '该设备已脱离产品物模型，修改产品物模型对该设备无影响'-->
+        <!--                : '设备会默认继承产品的物模型，修改设备物模型后将脱离产品物模型'-->
+        <!--            }}-->
+        <!--          </div>-->
+        <!--        </j-tooltip> -->
+        <!-- </div> -->
+        <j-tabs
+            class="metadataNav"
+            :activeKey="tabActiveKey"
+            destroyInactiveTabPane
+            type="card"
+            @change="tabsChange"
+        >
+            <template #rightExtra>
+                <j-space>
+                    <PermissionButton
+                        v-if="showReset"
+                        key="reload"
+                        :hasPermission="`${permission}:update`"
+                        :popConfirm="{
+                            title: '确认重置？',
+                            onConfirm: resetMetadata,
+                        }"
+                        :tooltip="{ title: '重置后将使用产品的物模型配置' }"
+                    >
+                        重置操作
+                    </PermissionButton>
+                    <PermissionButton
+                        :hasPermission="`${permission}:update`"
+                        @click="visible = true"
+                        key="import"
+                        >快速导入</PermissionButton
+                    >
+                    <PermissionButton
+                        :hasPermission="`${permission}:update`"
+                        @click="cat = true"
+                        key="tsl"
+                        >物模型TSL</PermissionButton
+                    >
+                </j-space>
+            </template>
+            <template #centerExtra>
+                <span class="desc"
+                    >设备会默认继承产品的物模型，继承的物模型不支持删改</span
+                >
+            </template>
+            <j-tab-pane tab="属性定义" key="properties">
+                <BaseMetadata
+                    :target="type"
+                    type="properties"
+                    :permission="permission"
+                />
+            </j-tab-pane>
+            <j-tab-pane tab="功能定义" key="functions">
+                <BaseMetadata
+                    :target="type"
+                    type="functions"
+                    :permission="permission"
+                />
+            </j-tab-pane>
+            <j-tab-pane tab="事件定义" key="events">
+                <BaseMetadata
+                    :target="type"
+                    type="events"
+                    :permission="permission"
+                />
+            </j-tab-pane>
+            <j-tab-pane tab="标签定义" key="tags">
+                <BaseMetadata
+                    :target="type"
+                    type="tags"
+                    :permission="permission"
+                />
+            </j-tab-pane>
+        </j-tabs>
+        <Import
+            v-if="visible"
+            v-model:visible="visible"
+            :type="type"
+            @close="visible = false"
+        />
+        <Cat v-model:visible="cat" @close="cat = false" :type="type" />
     </div>
 </template>
 <script setup lang="ts" name="Metadata">
-import PermissionButton from '@/components/PermissionButton/index.vue'
-import { deleteMetadata } from '@/api/device/instance.js'
+import PermissionButton from '@/components/PermissionButton/index.vue';
+import { deleteMetadata } from '@/api/device/instance.js';
 import { message } from 'jetlinks-ui-components';
-import { useInstanceStore } from '@/store/instance'
-import Import from './Import/index.vue'
-import Cat from './Cat/index.vue'
+import { useInstanceStore } from '@/store/instance';
+import Import from './Import/index.vue';
+import Cat from './Cat/index.vue';
 // import BaseMetadata from './Base/index.vue'
-import BaseMetadata from './Base/Base.vue'
-import { useMetadataStore } from '@/store/metadata'
-import {EventEmitter} from "@/utils/utils";
-import {isEqual} from "lodash-es";
+import BaseMetadata from './Base/Base.vue';
+import { useMetadataStore } from '@/store/metadata';
+import { EventEmitter } from '@/utils/utils';
+import { isEqual } from 'lodash-es';
 
-const route = useRoute()
-const instanceStore = useInstanceStore()
-const metadataStore = useMetadataStore()
+const route = useRoute();
+const instanceStore = useInstanceStore();
+const metadataStore = useMetadataStore();
 interface Props {
-  type: 'product' | 'device';
-  independentMetadata?: boolean;
+    type: 'product' | 'device';
+    independentMetadata?: boolean;
 }
-const props = defineProps<Props>()
+const props = defineProps<Props>();
 
-const permission = computed(() => props.type === 'device' ? 'device/Instance' : 'device/Product')
-const visible = ref(false)
-const cat = ref(false)
-const tabActiveKey = ref('properties')
+const permission = computed(() =>
+    props.type === 'device' ? 'device/Instance' : 'device/Product',
+);
+const visible = ref(false);
+const cat = ref(false);
+const tabActiveKey = ref('properties');
 
-provide('_metadataType', props.type)
+provide('_metadataType', props.type);
 
 const showReset = computed(() => {
-  if (props.type === 'device' && instanceStore.current.productMetadata) {
-    const proMetadata = JSON.parse(instanceStore.current.productMetadata || '{}')
-    const _metadata = JSON.parse(instanceStore.current.metadata || '{}')
-    return !isEqual(_metadata, proMetadata)
-  }
+    if (props.type === 'device' && instanceStore.current.productMetadata) {
+        const proMetadata = JSON.parse(
+            instanceStore.current.productMetadata || '{}',
+        );
+        const _metadata = JSON.parse(instanceStore.current.metadata || '{}');
+        return !isEqual(_metadata, proMetadata);
+    }
 
-  return false
-})
+    return false;
+});
 
 // 重置物模型
-const resetMetadata = async () => {
-  const { id } = route.params
-  const resp = await deleteMetadata(id as string)
-  if (resp.status === 200) {
-
-    message.info('操作成功')
-    instanceStore.refresh(id as string).then(() => {
-      metadataStore.set('importMetadata', true)
-    })
-    // Store.set(SystemConst.REFRESH_DEVICE, true)
-    // setTimeout(() => {
-    //   Store.set(SystemConst.REFRESH_METADATA_TABLE, true)
-    // }, 400)
-  }
-}
+const resetMetadata = () => {
+    const { id } = route.params;
+    const response = deleteMetadata(id as string);
+    response.then((resp) => {
+        if (resp.status === 200) {
+            message.info('操作成功');
+            instanceStore.refresh(id as string).then(() => {
+                metadataStore.set('importMetadata', true);
+            });
+        }
+    });
+    return response
+};
 
 const tabsChange = (e: string) => {
-  EventEmitter.emit('MetadataTabs', () => {
-    tabActiveKey.value = e;
-  })
-}
-
+    EventEmitter.emit('MetadataTabs', () => {
+        tabActiveKey.value = e;
+    });
+};
 </script>
 <style scoped lang="less">
 .device-detail-metadata {
-  .tips {
-    // width: calc(100% - 670px);
-    position: absolute;
-    top: 12px;
-    z-index: 1;
-    margin-left: 420px;
-    font-weight: 100;
-  }
-
-  .metadataNav {
-    :deep(.ant-card-body) {
-      padding: 0;
+    .tips {
+        // width: calc(100% - 670px);
+        position: absolute;
+        top: 12px;
+        z-index: 1;
+        margin-left: 420px;
+        font-weight: 100;
+    }
+
+    .metadataNav {
+        :deep(.ant-card-body) {
+            padding: 0;
+        }
+    }
+    .desc {
+        font-size: 13px;
+        color: rgba(0, 0, 0, 0.8);
+        display: inline-block;
+        margin-top: 12px;
+        margin-left: 5px;
     }
-  }
-  .desc{
-    font-size: 13px;
-    color: rgba(0,0,0,.8);
-    display: inline-block;
-    margin-top: 12px;
-    margin-left: 5px;
-  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/device/components/Metadata/metadata.ts b/src/views/device/components/Metadata/metadata.ts
index 5fa145ef..a63c3174 100644
--- a/src/views/device/components/Metadata/metadata.ts
+++ b/src/views/device/components/Metadata/metadata.ts
@@ -2,7 +2,7 @@ import { saveProductMetadata } from "@/api/device/product";
 import { saveMetadata } from "@/api/device/instance";
 import type { DeviceInstance } from "../../Instance/typings";
 import type { DeviceMetadata, MetadataItem, MetadataType, ProductItem } from "../../Product/typings";
-import { differenceBy , cloneDeep } from "lodash-es";
+import { omit } from "lodash-es";
 
 const filterProductMetadata = (data: any[], productMetaData: any[]) => {
   const ids = productMetaData.map((item: any) => item.id)
@@ -51,8 +51,10 @@ const filterProductMetadata = (data: any[], productMetaData: any[]) => {
   // }
   // console.log(metadata, type)
   metadata[type] = (item || []).sort((a, b) => b?.sortsIndex - a?.sortsIndex) as any[]
+
   data.metadata = JSON.stringify(metadata);
   onEvent?.(data.metadata)
+
   return data;
 };
 
@@ -70,11 +72,13 @@ export const asyncUpdateMetadata = (
       return saveProductMetadata(data);
     case 'device':
       const metadata = JSON.parse(data.metadata || '{}')
-      const dealMetadata = cloneDeep(metadata)
       const productMetaData = JSON.parse(data?.productMetadata || '{}')
+      const dealMetadata = JSON.parse(data.metadata || '{}')
       // 筛选出产品的物模型 剔除不传递给接口保存
       const productMetaDataMap = new Map()
+
       Object.keys(productMetaData).forEach((key:any)=>{
+      console.log('asyncUpdateMetadata',productMetaData, key)
         if(Array.isArray(productMetaData[key])){
            const ids = productMetaData[key].map((item:any)=>{
             return item.id
@@ -90,7 +94,17 @@ export const asyncUpdateMetadata = (
           })
         }
       })
-      return saveMetadata(data.id, dealMetadata);
+
+      const newMetadata = Object.keys(metadata).reduce((prev, key) => {
+        const productIds = new Set(productMetaData[key]?.map(item => item.id) || [])
+        console.log(metadata[key])
+        prev[key] = metadata[key].filter(item => !productIds.has(item.id))
+        return prev
+      }, { })
+
+      console.log(dealMetadata, newMetadata)
+
+      return saveMetadata(data.id, newMetadata);
   }
 };
 
@@ -114,4 +128,4 @@ export const removeMetadata = (
   onEvent?.('remove', item);
   data.metadata = JSON.stringify(metadata);
   return data;
-};
\ No newline at end of file
+};
diff --git a/src/views/device/data.ts b/src/views/device/data.ts
index 264d0f6b..56e455ce 100644
--- a/src/views/device/data.ts
+++ b/src/views/device/data.ts
@@ -1,4 +1,5 @@
 import { isNoCommunity } from '@/utils/utils';
+import type from "components/Metadata/Table/components/Type/data";
 
 export const DataTypeList: { label: string; value: string }[] = [
   {
@@ -111,6 +112,13 @@ export const EventLevel: { label: string; value: string }[] = [
   },
 ];
 
+export const getEventLevelMap = () => {
+  return EventLevel.reduce((prev, next) => {
+    prev[next.value] = next.label
+    return prev
+  }, {})
+}
+
 export const DateTypeList = [
   // {
   //   label: 'String类型的UTC时间戳 (毫秒)',
@@ -147,4 +155,4 @@ export const ExpandsTypeList = [
     label: '上报',
     value: 'report',
   },
-]
\ No newline at end of file
+]
diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue
index 1bb1d68d..1a89df76 100644
--- a/src/views/edge/Device/index.vue
+++ b/src/views/edge/Device/index.vue
@@ -62,9 +62,7 @@
                         </template>
                         <template #content>
                             <Ellipsis style="width: calc(100% - 100px)">
-                                <span
-                                    style="font-size: 16px; font-weight: 600"
-                                >
+                                <span style="font-size: 16px; font-weight: 600">
                                     {{ slotProps.name }}
                                 </span>
                             </Ellipsis>
@@ -101,7 +99,11 @@
                                             :key="i"
                                         >
                                             <PermissionButton
-                                                :disabled="o.disabled || slotProps.state.value !== 'online'"
+                                                :disabled="
+                                                    o.disabled ||
+                                                    slotProps.state.value !==
+                                                        'online'
+                                                "
                                                 :popConfirm="o.popConfirm"
                                                 :tooltip="{
                                                     ...o.tooltip,
@@ -154,13 +156,15 @@
                 </template>
                 <template #registryTime="slotProps">
                     <span>{{
-                       slotProps.registryTime ? dayjs(slotProps.registryTime).format(
-                            'YYYY-MM-DD HH:mm:ss',
-                        ) : ''
+                        slotProps.registryTime
+                            ? dayjs(slotProps.registryTime).format(
+                                  'YYYY-MM-DD HH:mm:ss',
+                              )
+                            : ''
                     }}</span>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <template
                             v-for="i in getActions(slotProps, 'table')"
                             :key="i.key"
@@ -204,7 +208,7 @@
         />
     </page-container>
 </template>
-  
+
 <script lang="ts" setup>
 import { queryGatewayList, queryNoPagingPost } from '@/api/device/product';
 import { queryTree } from '@/api/device/category';
@@ -269,7 +273,7 @@ const columns = [
             type: 'string',
             defaultTermType: 'eq',
         },
-        ellipsis:true
+        ellipsis: true,
     },
     {
         title: '设备名称',
@@ -279,7 +283,7 @@ const columns = [
             type: 'string',
             first: true,
         },
-        ellipsis:true
+        ellipsis: true,
     },
     {
         title: '产品名称',
@@ -300,7 +304,7 @@ const columns = [
                     });
                 }),
         },
-        ellipsis:true
+        ellipsis: true,
     },
     {
         title: '注册时间',
@@ -378,7 +382,7 @@ const columns = [
         title: '说明',
         dataIndex: 'describe',
         key: 'describe',
-        ellipsis:true,
+        ellipsis: true,
         search: {
             type: 'string',
         },
@@ -435,19 +439,22 @@ const getActions = (
                 title: `确认${
                     data.state.value !== 'notActive' ? '禁用' : '启用'
                 }?`,
-                onConfirm: async () => {
+                onConfirm: () => {
                     let response = undefined;
                     if (data.state.value !== 'notActive') {
-                        response = await _undeploy(data.id);
+                        response = _undeploy(data.id);
                     } else {
-                        response = await _deploy(data.id);
-                    }
-                    if (response && response.status === 200) {
-                        onlyMessage('操作成功！');
-                        edgeDeviceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
+                        response = _deploy(data.id);
                     }
+                    response.then((res) => {
+                        if (res && res.status === 200) {
+                            onlyMessage('操作成功！');
+                            edgeDeviceRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -475,13 +482,15 @@ const getActions = (
             icon: 'RedoOutlined',
             popConfirm: {
                 title: '确认重置密码为Jetlinks123？',
-                onConfirm: async () => {
-                    restPassword(data.id).then((resp: any) => {
+                onConfirm: () => {
+                    const response = restPassword(data.id);
+                    response.then((resp: any) => {
                         if (resp.status === 200) {
                             onlyMessage('操作成功！');
                             edgeDeviceRef.value?.reload();
                         }
                     });
+                    return response;
                 },
             },
         },
@@ -499,14 +508,17 @@ const getActions = (
         },
         popConfirm: {
             title: '确认删除?',
-            onConfirm: async () => {
-                const resp = await _delete(data.id);
-                if (resp.status === 200) {
-                    onlyMessage('操作成功！');
-                    edgeDeviceRef.value?.reload();
-                } else {
-                    onlyMessage('操作失败！', 'error');
-                }
+            onConfirm: () => {
+                const response = _delete(data.id);
+                response.then((resp) => {
+                    if (resp.status === 200) {
+                        onlyMessage('操作成功！');
+                        edgeDeviceRef.value?.reload();
+                    } else {
+                        onlyMessage('操作失败！', 'error');
+                    }
+                });
+                return response;
             },
         },
         icon: 'DeleteOutlined',
@@ -552,6 +564,5 @@ const onRefresh = () => {
     edgeDeviceRef.value?.reload();
 };
 </script>
-  
-  <style lang="less" scoped>
-</style>
\ No newline at end of file
+
+<style lang="less" scoped></style>
diff --git a/src/views/edge/Resource/index.vue b/src/views/edge/Resource/index.vue
index 09ef1737..bf6d3095 100644
--- a/src/views/edge/Resource/index.vue
+++ b/src/views/edge/Resource/index.vue
@@ -93,9 +93,7 @@
                     {{ slotProps.sourceName }}
                 </template>
                 <template #category="slotProps">
-                    {{
-                      slotProps.category
-                    }}
+                    {{ slotProps.category }}
                 </template>
                 <template #createTime="slotProps">
                     <span>{{
@@ -105,7 +103,7 @@
                     }}</span>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <template
                             v-for="i in getActions(slotProps, 'table')"
                             :key="i.key"
@@ -204,14 +202,14 @@ const columns = [
                         paging: false,
                         sorts: [{ name: 'createTime', order: 'desc' }],
                     }).then((resp: any) => {
-                      const arrMap = new Map()
-                      resp.result.data.forEach((item: any) => {
-                        arrMap.set(item.category, {
-                          label: item.category,
-                          value: item.category,
-                        })
-                      })
-                      resolve([...arrMap.values()]);
+                        const arrMap = new Map();
+                        resp.result.data.forEach((item: any) => {
+                            arrMap.set(item.category, {
+                                label: item.category,
+                                value: item.category,
+                            });
+                        });
+                        resolve([...arrMap.values()]);
                     });
                 }),
         },
@@ -225,7 +223,7 @@ const columns = [
             type: 'select',
             options: () =>
                 new Promise((resolve) => {
-                  query({
+                    query({
                         paging: false,
                         sorts: [
                             {
@@ -234,13 +232,13 @@ const columns = [
                             },
                         ],
                     }).then((resp: any) => {
-                        const arrMap = new Map()
+                        const arrMap = new Map();
                         resp.result.data.forEach((item: any) => {
-                          arrMap.set(item.sourceId, {
-                            label: item.sourceName,
-                            value: item.sourceId,
-                          })
-                        })
+                            arrMap.set(item.sourceId, {
+                                label: item.sourceName,
+                                value: item.sourceId,
+                            });
+                        });
                         resolve([...arrMap.values()]);
                     });
                 }),
@@ -336,19 +334,22 @@ const getActions = (
                 title: `确认${
                     data.state.value !== 'disabled' ? '禁用' : '启用'
                 }?`,
-                onConfirm: async () => {
+                onConfirm: () => {
                     let response = undefined;
                     if (data.state.value !== 'disabled') {
-                        response = await _stop([data.id]);
+                        response = _stop([data.id]);
                     } else {
-                        response = await _start([data.id]);
-                    }
-                    if (response && response.status === 200) {
-                        onlyMessage('操作成功！');
-                        edgeResourceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
+                        response = _start([data.id]);
                     }
+                    response.then((res) => {
+                        if (res && res.status === 200) {
+                            onlyMessage('操作成功！');
+                            edgeResourceRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -364,14 +365,17 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await _delete(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        edgeResourceRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = _delete(data.id);
+                    response.then((res) => {
+                        if (res.status === 200) {
+                            onlyMessage('操作成功！');
+                            edgeResourceRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/home/components/BasicCountCard.vue b/src/views/home/components/BasicCountCard.vue
index 6fb3c62e..2421aa47 100644
--- a/src/views/home/components/BasicCountCard.vue
+++ b/src/views/home/components/BasicCountCard.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="device-count-container">
-        <h5 class="title">基础统计</h5>
-        <span class="detail" @click="jumpPage('link/DashBoard')"> 详情 </span>
+        <h5 class="title">{{ $t('components.BasicCountCard.926510-0') }}</h5>
+        <span class="detail" @click="jumpPage('link/DashBoard')"> {{ $t('components.BasicCountCard.926510-1') }} </span>
 
         <div class="box-list">
             <div class="box-item">
-                <div class="label">CPU使用率</div>
+                <div class="label">{{ $t('components.BasicCountCard.926510-2') }}</div>
                 <div class="value">{{ cpu + '%' }}</div>
                 <Pie
                     class="chart"
@@ -16,7 +16,7 @@
                 />
             </div>
             <div class="box-item">
-                <div class="label">JVM内存</div>
+                <div class="label">{{ $t('components.BasicCountCard.926510-3') }}</div>
                 <div class="value">{{ jvm + '%' }}</div>
                 <Pie
                     class="chart"
@@ -35,7 +35,9 @@ import { getWebSocket } from '@/utils/websocket';
 import Pie from './Pie.vue';
 import { map } from 'rxjs/operators';
 import { useMenuStore } from '@/store/menu';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const cpu = ref(0);
 const jvm = ref(0);
 
diff --git a/src/views/home/components/BootCard.vue b/src/views/home/components/BootCard.vue
index 56514629..9a65085e 100644
--- a/src/views/home/components/BootCard.vue
+++ b/src/views/home/components/BootCard.vue
@@ -24,7 +24,9 @@
 import { bootConfig } from '../typing';
 import { useMenuStore } from '@/store/menu';
 import { onlyMessage } from '@/utils/comm';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const { jumpPage: _jumpPage } = useMenuStore();
 
 const props = defineProps({
@@ -37,7 +39,7 @@ const jumpPage = (item: bootConfig) => {
     if (item.auth === undefined || item.auth) {
         _jumpPage(item.link, item.params);
     } else {
-        onlyMessage('暂无权限，请联系管理员', 'warning');
+        onlyMessage($t('components.BootCard.926510-0'), 'warning');
     }
 };
 </script>
diff --git a/src/views/home/components/BootCardSmall.vue b/src/views/home/components/BootCardSmall.vue
index 52b6bc8f..ff0d6c27 100644
--- a/src/views/home/components/BootCardSmall.vue
+++ b/src/views/home/components/BootCardSmall.vue
@@ -28,7 +28,9 @@
 import { bootConfig } from '../typing';
 import { useMenuStore } from '@/store/menu';
 import { onlyMessage } from '@/utils/comm';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const props = defineProps({
     cardData: Array<bootConfig>,
     cardTitle: String,
@@ -40,7 +42,7 @@ const jumpPage = (item: bootConfig) => {
     if (item.auth === undefined || item.auth) {
         _jumpPage(item.link, item.params);
     } else {
-        onlyMessage('暂无权限，请联系管理员', 'warning');
+        onlyMessage($t('components.BootCardSmall.926510-0'), 'warning');
     }
 };
 </script>
diff --git a/src/views/home/components/ComprehensiveHome/index.vue b/src/views/home/components/ComprehensiveHome/index.vue
index 0cf23b9c..acfcff1c 100644
--- a/src/views/home/components/ComprehensiveHome/index.vue
+++ b/src/views/home/components/ComprehensiveHome/index.vue
@@ -4,10 +4,10 @@
             <j-col :span="6" class="left">
                 <BootCardSmall
                     :cardData="deviceBootConfig"
-                    cardTitle="物联网引导"
+                    :cardTitle="$t('ComprehensiveHome.index.926510-0')"
                 />
                 <div style="width: 100%; height: 24px"></div>
-                <BootCardSmall :cardData="opsBootConfig" cardTitle="运维引导" />
+                <BootCardSmall :cardData="opsBootConfig" :cardTitle="$t('ComprehensiveHome.index.926510-1')" />
             </j-col>
             <j-col :span="18" class="right">
                 <j-row :gutter="24">
@@ -21,14 +21,14 @@
         </j-row>
 
         <StepCard
-            cardTitle="设备接入推荐步骤"
-            tooltip="不同的设备因为通信协议的不同，存在接入步骤的差异"
+            :cardTitle="$t('ComprehensiveHome.index.926510-2')"
+            :tooltip="$t('ComprehensiveHome.index.926510-3')"
             :dataList="deviceStepDetails"
             style="margin-bottom: 24px"
         />
         <StepCard
-            cardTitle="运维管理推荐步骤"
-            tooltip="请根据业务需要对下述步骤进行选择性操作。"
+            :cardTitle="$t('ComprehensiveHome.index.926510-4')"
+            :tooltip="$t('ComprehensiveHome.index.926510-5')"
             :dataList="opsStepDetails"
         />
 
@@ -59,7 +59,9 @@ import StepCard from '../StepCard.vue';
 import { usePermissionStore } from '@/store/permission';
 import { recommendList, bootConfig } from '../../typing';
 import { useMenuStore } from '@/store/menu';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const { jumpPage } = useMenuStore();
 
 // 按钮权限控制
@@ -75,7 +77,7 @@ const rulePermission = (action: string) =>
 const deviceBootConfig: bootConfig[] = [
     {
         english: 'STEP1',
-        label: '创建产品',
+        label: $t('ComprehensiveHome.index.926510-6'),
         link: 'device/Product',
         auth: productPermission('add'),
         image: '/images/home/guide-home1.png',
@@ -85,7 +87,7 @@ const deviceBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP2',
-        label: '创建设备',
+        label: $t('ComprehensiveHome.index.926510-7'),
         link: 'device/Instance',
         auth: devicePermission('add'),
         image: '/images/home/guide-home1.png',
@@ -95,7 +97,7 @@ const deviceBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP3',
-        label: '规则引擎',
+        label: $t('ComprehensiveHome.index.926510-8'),
         link: 'rule-engine/Instance',
         auth: rulePermission('add'),
         image: '/images/home/guide-home3.png',
@@ -108,9 +110,9 @@ const deviceBootConfig: bootConfig[] = [
 // 设备接入推荐步骤-数据
 const deviceStepDetails: recommendList[] = [
     {
-        title: '创建产品',
+        title: $t('ComprehensiveHome.index.926510-6'),
         details:
-            '产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。',
+            $t('ComprehensiveHome.index.926510-9'),
         iconUrl: '/images/home/bottom-4.png',
         linkUrl: 'device/Product',
         auth: productPermission('add'),
@@ -119,9 +121,9 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '配置产品接入方式',
+        title: $t('ComprehensiveHome.index.926510-10'),
         details:
-            '通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。',
+            $t('ComprehensiveHome.index.926510-11'),
         iconUrl: '/images/home/bottom-1.png',
         linkUrl: 'device/Product/Detail',
         auth: productPermission('update'),
@@ -130,8 +132,8 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '添加测试设备',
-        details: '添加单个设备，用于验证产品模型是否配置正确。',
+        title: $t('ComprehensiveHome.index.926510-12'),
+        details: $t('ComprehensiveHome.index.926510-13'),
         iconUrl: '/images/home/bottom-5.png',
         linkUrl: 'device/Instance',
         auth: devicePermission('add'),
@@ -140,9 +142,9 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '功能调试',
+        title: $t('ComprehensiveHome.index.926510-14'),
         details:
-            '对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。',
+            $t('ComprehensiveHome.index.926510-15'),
         iconUrl: '/images/home/bottom-2.png',
         linkUrl: 'device/Instance/Detail',
         auth: devicePermission('update'),
@@ -151,8 +153,8 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '批量添加设备',
-        details: '批量添加同一产品下的设备',
+        title: $t('ComprehensiveHome.index.926510-16'),
+        details: $t('ComprehensiveHome.index.926510-17'),
         iconUrl: '/images/home/bottom-3.png',
         linkUrl: 'device/Instance',
         auth: devicePermission('import'),
@@ -166,13 +168,13 @@ const deviceStepDetails: recommendList[] = [
 const opsBootConfig: bootConfig[] = [
     {
         english: 'STEP1',
-        label: '设备接入配置',
+        label: $t('ComprehensiveHome.index.926510-18'),
         link: 'link/AccessConfig',
         image: '/images/home/guide-home4.png',
     },
     {
         english: 'STEP2',
-        label: '日志排查',
+        label: $t('ComprehensiveHome.index.926510-19'),
         link: 'Log',
         params: {
             tab: 'system',
@@ -181,7 +183,7 @@ const opsBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP3',
-        label: '实时监控',
+        label: $t('ComprehensiveHome.index.926510-20'),
         link: 'link/DashBoard',
         image: '/images/home/guide-home6.png',
     },
@@ -190,33 +192,33 @@ const opsBootConfig: bootConfig[] = [
 // 运维管理推荐步骤-数据
 const opsStepDetails: recommendList[] = [
     {
-        title: '协议管理',
+        title: $t('ComprehensiveHome.index.926510-21'),
         details:
-            '根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。',
+            $t('ComprehensiveHome.index.926510-22'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Protocol',
     },
     {
-        title: '证书管理',
-        details: '统一维护平台内的证书，用于数据通信加密。',
+        title: $t('ComprehensiveHome.index.926510-23'),
+        details: $t('ComprehensiveHome.index.926510-24'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Certificate',
     },
     {
-        title: '网络组件',
-        details: '根据不同的传输类型配置平台底层网络组件相关参数。',
+        title: $t('ComprehensiveHome.index.926510-25'),
+        details: $t('ComprehensiveHome.index.926510-26'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Type',
     },
     {
-        title: '设备接入网关',
-        details: '根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。',
+        title: $t('ComprehensiveHome.index.926510-27'),
+        details: $t('ComprehensiveHome.index.926510-28'),
         iconUrl: '/images/home/Frame4528(1).png',
         linkUrl: 'link/AccessConfig',
     },
     {
-        title: '日志管理',
-        details: '监控系统日志，及时处理系统异常。',
+        title: $t('ComprehensiveHome.index.926510-29'),
+        details: $t('ComprehensiveHome.index.926510-30'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'Log',
         params: {
diff --git a/src/views/home/components/DevOpsHome/index.vue b/src/views/home/components/DevOpsHome/index.vue
index 90371e91..f8959ac2 100644
--- a/src/views/home/components/DevOpsHome/index.vue
+++ b/src/views/home/components/DevOpsHome/index.vue
@@ -2,7 +2,7 @@
     <div class="device-home-container">
         <j-row :gutter="10">
             <j-col :span="14">
-                <BootCard :cardData="opsBootConfig" cardTitle="运维引导" />
+                <BootCard :cardData="opsBootConfig" :cardTitle="$t('DevOpsHome.index.926510-0')" />
             </j-col>
             <j-col :span="10">
                 <BasicCountCard />
@@ -13,8 +13,8 @@
         </j-row>
         <j-row>
             <StepCard
-                cardTitle="运维管理推荐步骤"
-                tooltip="请根据业务需要对下述步骤进行选择性操作。"
+                :cardTitle="$t('DevOpsHome.index.926510-1')"
+                :tooltip="$t('DevOpsHome.index.926510-2')"
                 :dataList="opsStepDetails"
             />
         </j-row>
@@ -28,15 +28,18 @@ import PlatformPicCard from '../PlatformPicCard.vue';
 import StepCard from '../StepCard.vue';
 
 import type { bootConfig, recommendList } from '../../typing';
+import { useI18n } from 'vue-i18n'
+
+const { t: $t } = useI18n()
 const opsBootConfig: bootConfig[] = [
     {
         english: 'STEP1',
-        label: '设备接入配置',
+        label: $t('DevOpsHome.index.926510-3'),
         link: 'link/AccessConfig',
     },
     {
         english: 'STEP2',
-        label: '日志排查',
+        label: $t('DevOpsHome.index.926510-4'),
         link: 'Log',
         params: {
             tab: 'system',
@@ -44,39 +47,39 @@ const opsBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP3',
-        label: '实时监控',
+        label: $t('DevOpsHome.index.926510-5'),
         link: 'link/DashBoard',
     },
 ];
 const opsStepDetails: recommendList[] = [
     {
-        title: '协议管理',
+        title: $t('DevOpsHome.index.926510-6'),
         details:
-            '根据业务需求自定义开发对应的产品（设备模型）接入协议，并上传到平台。',
+            $t('DevOpsHome.index.926510-7'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Protocol',
     },
     {
-        title: '证书管理',
-        details: '统一维护平台内的证书，用于数据通信加密。',
+        title: $t('DevOpsHome.index.926510-8'),
+        details: $t('DevOpsHome.index.926510-9'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Certificate',
     },
     {
-        title: '网络组件',
-        details: '根据不同的传输类型配置平台底层网络组件相关参数。',
+        title: $t('DevOpsHome.index.926510-10'),
+        details: $t('DevOpsHome.index.926510-11'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'link/Type',
     },
     {
-        title: '设备接入网关',
-        details: '根据不同的传输类型，关联消息协议，配置设备接入网关相关参数。',
+        title: $t('DevOpsHome.index.926510-12'),
+        details: $t('DevOpsHome.index.926510-13'),
         iconUrl: '/images/home/Frame4528(1).png',
         linkUrl: 'link/AccessConfig',
     },
     {
-        title: '日志管理',
-        details: '监控系统日志，及时处理系统异常。',
+        title: $t('DevOpsHome.index.926510-14'),
+        details: $t('DevOpsHome.index.926510-15'),
         iconUrl: '/images/home/Frame4528.png',
         linkUrl: 'Log',
         params: {
diff --git a/src/views/home/components/DeviceCountCard.vue b/src/views/home/components/DeviceCountCard.vue
index 88a2d8bc..4250b1f0 100644
--- a/src/views/home/components/DeviceCountCard.vue
+++ b/src/views/home/components/DeviceCountCard.vue
@@ -1,16 +1,16 @@
 <template>
     <div class="device-count-container">
-        <h5 class="title">设备统计</h5>
-        <span class="detail" @click="jumpPage('device/DashBoard')"> 详情 </span>
+        <h5 class="title">{{ $t('components.DeviceCountCard.926510-0') }}</h5>
+        <span class="detail" @click="jumpPage('device/DashBoard')"> {{ $t('components.DeviceCountCard.926510-1') }} </span>
 
         <div class="box-list">
             <div class="box-item">
-                <div class="label">产品数量</div>
+                <div class="label">{{ $t('components.DeviceCountCard.926510-2') }}</div>
                 <div class="value">{{ projectNum }}</div>
                 <img src="/images/home/product.png" alt="" />
             </div>
             <div class="box-item">
-                <div class="label">设备数量</div>
+                <div class="label">{{ $t('components.DeviceCountCard.926510-3') }}</div>
                 <div class="value">{{ deviceNum }}</div>
                 <img src="/images/home/top-1.png" alt="" />
             </div>
@@ -21,7 +21,9 @@
 <script setup lang="ts">
 import { getDeviceCount_api, getProductCount_api } from '@/api/home';
 import { useMenuStore } from '@/store/menu';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const { jumpPage } = useMenuStore();
 const projectNum = ref(0);
 const deviceNum = ref(0);
diff --git a/src/views/home/components/DeviceHome/index.vue b/src/views/home/components/DeviceHome/index.vue
index 79d14997..0f057190 100644
--- a/src/views/home/components/DeviceHome/index.vue
+++ b/src/views/home/components/DeviceHome/index.vue
@@ -2,7 +2,7 @@
     <div class="device-home-container">
         <j-row :gutter="24">
             <j-col :span="14">
-                <BootCard :cardData="deviceBootConfig" cardTitle="物联网引导" />
+                <BootCard :cardData="deviceBootConfig" :cardTitle="$t('DeviceHome.index.926510-0')" />
             </j-col>
             <j-col :span="10">
                 <DeviceCountCard />
@@ -13,8 +13,8 @@
         </j-row>
         <j-row>
             <StepCard
-                cardTitle="设备接入推荐步骤"
-                tooltip="不同的设备因为通信协议的不同，存在接入步骤的差异"
+                :cardTitle="$t('DeviceHome.index.926510-1')"
+                :tooltip="$t('DeviceHome.index.926510-2')"
                 :dataList="deviceStepDetails"
             />
         </j-row>
@@ -45,7 +45,9 @@ import StepCard from '../StepCard.vue';
 import { usePermissionStore } from '@/store/permission';
 import { bootConfig, recommendList } from '../../typing';
 import { useMenuStore } from '@/store/menu';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 // 按钮权限控制
 const hasPermission = usePermissionStore().hasPermission;
 const productPermission = (action: string) =>
@@ -63,7 +65,7 @@ const deviceDialogVisible = ref(false);
 const deviceBootConfig: bootConfig[] = [
     {
         english: 'STEP1',
-        label: '创建产品',
+        label: $t('DeviceHome.index.926510-3'),
         link: 'device/Product',
         auth: productPermission('add'),
         params: {
@@ -72,7 +74,7 @@ const deviceBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP2',
-        label: '创建设备',
+        label: $t('DeviceHome.index.926510-4'),
         link: 'device/Instance',
         auth: devicePermission('add'),
         params: {
@@ -81,7 +83,7 @@ const deviceBootConfig: bootConfig[] = [
     },
     {
         english: 'STEP3',
-        label: '规则引擎',
+        label: $t('DeviceHome.index.926510-5'),
         link: 'rule-engine/Instance',
         auth: rulePermission('add'),
         params: {
@@ -91,9 +93,9 @@ const deviceBootConfig: bootConfig[] = [
 ];
 const deviceStepDetails: recommendList[] = [
     {
-        title: '创建产品',
+        title: $t('DeviceHome.index.926510-3'),
         details:
-            '产品是设备的集合，通常指一组具有相同功能的设备。物联设备必须通过产品进行接入方式配置。',
+            $t('DeviceHome.index.926510-6'),
         iconUrl: '/images/home/bottom-4.png',
         linkUrl: 'device/Product',
         auth: productPermission('add'),
@@ -102,9 +104,9 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '配置产品接入方式',
+        title: $t('DeviceHome.index.926510-7'),
         details:
-            '通过产品对同一类型的设备进行统一的接入方式配置。请参照设备铭牌说明选择匹配的接入方式。',
+            $t('DeviceHome.index.926510-8'),
         iconUrl: '/images/home/bottom-1.png',
         linkUrl: 'device/Product/Detail',
         auth: productPermission('update'),
@@ -113,8 +115,8 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '添加测试设备',
-        details: '添加单个设备，用于验证产品模型是否配置正确。',
+        title: $t('DeviceHome.index.926510-9'),
+        details: $t('DeviceHome.index.926510-10'),
         iconUrl: '/images/home/bottom-5.png',
         linkUrl: 'device/Instance',
         auth: devicePermission('add'),
@@ -123,9 +125,9 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '功能调试',
+        title: $t('DeviceHome.index.926510-11'),
         details:
-            '对添加的测试设备进行功能调试，验证能否连接到平台，设备功能是否配置正确。',
+            $t('DeviceHome.index.926510-12'),
         iconUrl: '/images/home/bottom-2.png',
         linkUrl: 'device/Instance/Detail',
         onClick: () => {
@@ -133,8 +135,8 @@ const deviceStepDetails: recommendList[] = [
         },
     },
     {
-        title: '批量添加设备',
-        details: '批量添加同一产品下的设备',
+        title: $t('DeviceHome.index.926510-13'),
+        details: $t('DeviceHome.index.926510-14'),
         iconUrl: '/images/home/bottom-3.png',
         linkUrl: 'device/Instance',
         auth: devicePermission('import'),
diff --git a/src/views/home/components/InitHome/index.vue b/src/views/home/components/InitHome/index.vue
index 49323b98..58ae830f 100644
--- a/src/views/home/components/InitHome/index.vue
+++ b/src/views/home/components/InitHome/index.vue
@@ -1,11 +1,11 @@
 <template>
     <div class="init-home-container">
-        <div class="title">请选择首页视图</div>
+        <div class="title">{{ $t('InitHome.index.926510-0') }}</div>
 
         <div class="choose-view">
             <HomeView v-model:value="selectValue"/>
             <div class="btn">
-                <j-button type="primary" @click="confirm">保存修改</j-button>
+                <j-button type="primary" @click="confirm">{{ $t('InitHome.index.926510-1') }}</j-button>
             </div>
         </div>
     </div>
@@ -15,7 +15,9 @@
 import { setView_api } from '@/api/home';
 import { useUserInfo } from '@/store/userInfo';
 import HomeView from '@/components/HomeView/index.vue';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const user = useUserInfo();
 const emits = defineEmits(['refresh']);
 const selectValue = ref('device');
diff --git a/src/views/home/components/PlatformPicCard.vue b/src/views/home/components/PlatformPicCard.vue
index ae0590f2..a20d559c 100644
--- a/src/views/home/components/PlatformPicCard.vue
+++ b/src/views/home/components/PlatformPicCard.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="platform-pic-container">
         <div class="title">
-            <span>平台架构图</span>
+            <span>{{ $t('components.PlatformPicCard.926510-0') }}</span>
             <p>PLATFORM ARCHITECTURE DIAGRAM</p>
         </div>
       <div class='plaid'></div>
@@ -13,6 +13,9 @@
 </template>
 
 <script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+
+const { t: $t } = useI18n()
 const props = defineProps({
     image: String,
 });
diff --git a/src/views/home/components/StepCard.vue b/src/views/home/components/StepCard.vue
index b547c73e..f68246b2 100644
--- a/src/views/home/components/StepCard.vue
+++ b/src/views/home/components/StepCard.vue
@@ -29,7 +29,9 @@ import { PropType } from 'vue';
 import { recommendList } from '../typing';
 import { useMenuStore } from '@/store/menu';
 import { onlyMessage } from '@/utils/comm';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const { jumpPage: _jumpPage } = useMenuStore();
 
 const props = defineProps({
@@ -41,7 +43,7 @@ const props = defineProps({
 // 跳转页面
 const jumpPage = (row: recommendList) => {
     if (row.auth === false) {
-        return onlyMessage('暂无权限，请联系管理员', 'warning');
+        return onlyMessage($t('components.StepCard.926510-0'), 'warning');
     }
     row.onClick ? row.onClick(row) : _jumpPage(row.linkUrl, row.params);
 };
diff --git a/src/views/home/components/dialogs/DeviceChooseDialog.vue b/src/views/home/components/dialogs/DeviceChooseDialog.vue
index bf51ad71..1914757e 100644
--- a/src/views/home/components/dialogs/DeviceChooseDialog.vue
+++ b/src/views/home/components/dialogs/DeviceChooseDialog.vue
@@ -1,7 +1,7 @@
 <template>
     <j-modal
         visible
-        title="选择设备"
+        :title="$t('dialogs.DeviceChooseDialog.926510-0')"
         style="width: 1000px"
         @ok="confirm"
         @cancel="emits('update:visible', false)"
@@ -44,7 +44,9 @@ import StatusLabel from '../StatusLabel.vue';
 import { getDeviceList_api } from '@/api/home';
 import moment from 'moment';
 import { onlyMessage } from '@/utils/comm';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const emits = defineEmits(['confirm', 'update:visible']);
 const props = defineProps<{
     visible: boolean;
@@ -53,7 +55,7 @@ const props = defineProps<{
 // 弹窗控制
 const confirm = () => {
     if (selectedKeys.value.length < 1) {
-        return onlyMessage('请选择设备', 'warning');
+        return onlyMessage($t('dialogs.DeviceChooseDialog.926510-1'), 'warning');
     }
     emits('confirm', selectedKeys.value[0]);
     emits('update:visible', false);
@@ -61,7 +63,7 @@ const confirm = () => {
 
 const columns = [
     {
-        title: '设备ID',
+        title: $t('dialogs.DeviceChooseDialog.926510-2'),
         dataIndex: 'id',
         key: 'id',
         ellipsis: true,
@@ -70,7 +72,7 @@ const columns = [
         },
     },
     {
-        title: '设备名称',
+        title: $t('dialogs.DeviceChooseDialog.926510-3'),
         dataIndex: 'name',
         key: 'name',
         ellipsis: true,
@@ -79,7 +81,7 @@ const columns = [
         },
     },
     {
-        title: '产品名称',
+        title: $t('dialogs.DeviceChooseDialog.926510-4'),
         dataIndex: 'productName',
         key: 'productName',
         ellipsis: true,
@@ -88,7 +90,7 @@ const columns = [
         },
     },
     {
-        title: '注册时间',
+        title: $t('dialogs.DeviceChooseDialog.926510-5'),
         dataIndex: 'modifyTime',
         key: 'modifyTime',
         ellipsis: true,
@@ -98,7 +100,7 @@ const columns = [
         scopedSlots: true,
     },
     {
-        title: '状态',
+        title: $t('dialogs.DeviceChooseDialog.926510-6'),
         dataIndex: 'state',
         key: 'state',
         ellipsis: true,
@@ -107,11 +109,11 @@ const columns = [
             type: 'select',
             options: [
                 {
-                    label: '在线',
+                    label: $t('dialogs.DeviceChooseDialog.926510-7'),
                     value: 'online',
                 },
                 {
-                    label: '离线',
+                    label: $t('dialogs.DeviceChooseDialog.926510-8'),
                     value: 'offline',
                 },
             ],
diff --git a/src/views/home/components/dialogs/ProductChooseDialog.vue b/src/views/home/components/dialogs/ProductChooseDialog.vue
index 528d4a4a..5776923a 100644
--- a/src/views/home/components/dialogs/ProductChooseDialog.vue
+++ b/src/views/home/components/dialogs/ProductChooseDialog.vue
@@ -1,7 +1,7 @@
 <template>
     <j-modal
         visible
-        title="选择产品"
+        :title="$t('dialogs.ProductChooseDialog.926510-0')"
         width="700px"
         @ok="confirm"
         @cancel="emits('update:visible', false)"
@@ -10,16 +10,16 @@
     >
         <j-form :model="form" ref="formRef" layout="vertical">
             <j-form-item
-                label="产品"
+                :label="$t('dialogs.ProductChooseDialog.926510-1')"
                 name="productId"
-                :rules="[{ required: true, message: '请选择产品' }]"
+                :rules="[{ required: true, message: $t('dialogs.ProductChooseDialog.926510-2') }]"
             >
                 <j-select
                     v-model:value="form.productId"
                     style="width: 100%"
                     show-search
                     :options="productList"
-                    placeholder="请选择产品"
+                    :placeholder="$t('dialogs.ProductChooseDialog.926510-2')"
                 >
                 </j-select>
             </j-form-item>
@@ -30,7 +30,9 @@
 <script setup lang="ts">
 import { getProductList_api } from '@/api/home';
 import { productItem } from '../../typing';
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const emits = defineEmits(['confirm', 'update:visible']);
 const props = defineProps<{
     visible: boolean;
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 6751556b..1a68d553 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -15,7 +15,7 @@
             >
                 <template #top>
                     <div class="card">
-                        <h3 style="margin: 0 0 24px 0">基本信息</h3>
+                        <h3 style="margin: 0 0 24px 0">{{ $t('home.index.926510-0') }}</h3>
                         <p>
                             <span class="label">clientId: </span>
                             <span class="value">{{ clientId }}</span>
@@ -52,6 +52,9 @@ import { useUserInfo } from '@/store/userInfo';
 import { isNoCommunity } from '@/utils/utils';
 import { getMe_api, getView_api } from '@/api/home';
 import { getAppInfo_api } from '@/api/system/apply';
+import { useI18n } from 'vue-i18n'
+
+const { t: $t } = useI18n()
 
 const currentView = ref<string>('');
 const clientId = useUserInfo().$state.userInfos.id;
diff --git a/src/views/init-home/Basic/index.vue b/src/views/init-home/Basic/index.vue
index a1468b83..21f8421a 100644
--- a/src/views/init-home/Basic/index.vue
+++ b/src/views/init-home/Basic/index.vue
@@ -25,8 +25,10 @@
                 </j-form-item>
                 <j-form-item>
                     <template #label>
-                        <span>高德API Key</span>
-                        <j-tooltip title="配置后平台可调用高德地图GIS服务">
+                        <span>高德地图 web服务api</span>
+                        <j-tooltip
+                            title="开发者可通过接口使用各类型的地理数据服务,返回结果支持JSON和XML格式"
+                        >
                             <img
                                 class="img-style"
                                 :src="'/images/init-home/mark.png'"
@@ -34,21 +36,50 @@
                         </j-tooltip>
                     </template>
                     <j-input
-                        v-model:value="form.apikey"
+                        v-model:value="form.webKey"
+                        placeholder="请输入高德WebApi Key"
+                    />
+                </j-form-item>
+                <j-form-item>
+                    <template #label>
+                        <span>高德地图 JSapi</span>
+                        <j-tooltip title="提供浏览器精准定位">
+                            <img
+                                class="img-style"
+                                :src="'/images/init-home/mark.png'"
+                            />
+                        </j-tooltip>
+                    </template>
+                    <j-input
+                        v-model:value="form.apiKey"
                         placeholder="请输入高德API Key"
                     />
                 </j-form-item>
+                <j-form-item>
+                    <template #label>
+                        <span>高德地图 密钥</span>
+                        <j-tooltip title="降低明文传输被窃取的风险">
+                            <img
+                                class="img-style"
+                                :src="'/images/init-home/mark.png'"
+                            />
+                        </j-tooltip>
+                    </template>
+                    <j-input
+                        v-model:value="form.secretKey"
+                        placeholder="请输入高德API 密钥"
+                    />
+                </j-form-item>
                 <j-form-item name="basePath" v-bind="validateInfos.basePath">
                     <template #label>
                         <span>base-path</span>
                         <j-tooltip>
                             <template #title>
-                                <div style='word-break: break-all;'>
+                                <div style="word-break: break-all">
+                                    <div>系统后台访问的url。</div>
                                     <div>
-                                    系统后台访问的url。
-                                    </div>
-                                    <div>
-                                    格式：{http/https}: //{前端所在服务器IP地址}:{前端暴露的服务端口}/api
+                                        格式：{http/https}:
+                                        //{前端所在服务器IP地址}:{前端暴露的服务端口}/api
                                     </div>
                                 </div>
                             </template>
@@ -63,6 +94,23 @@
                         placeholder="格式：{http/https}: //{前端所在服务器IP地址}:{前端暴露的服务端口}/api"
                     />
                 </j-form-item>
+                <j-form-item
+                    name="showRecordNumber"
+                    label="展示备案号"
+                    :required="true"
+                >
+                    <a-switch
+                        v-model:checked="form.showRecordNumber"
+                    ></a-switch>
+                </j-form-item>
+                <j-form-item
+                    v-if="form.showRecordNumber"
+                    name="recordNumber"
+                    label="备案号内容"
+                    :required="true"
+                >
+                    <a-input v-model:value="form.recordNumber"></a-input>
+                </j-form-item>
                 <j-row :gutter="24" :span="24">
                     <j-col>
                         <j-form-item label="系统logo">
@@ -265,12 +313,11 @@
 import { modalState, formState, logoState } from '../data/interface';
 import { Form } from 'jetlinks-ui-components';
 import { FILE_UPLOAD } from '@/api/comm';
-import {
-    save,
-} from '@/api/initHome';
+import { save } from '@/api/initHome';
 import { LocalStore, getImage, onlyMessage } from '@/utils/comm';
 import { TOKEN_KEY } from '@/utils/variable';
 import { SystemConst } from '@/utils/consts';
+import { omit } from 'lodash-es';
 const formRef = ref();
 const menuRef = ref();
 const formBasicRef = ref();
@@ -287,7 +334,11 @@ const headers = ref({ [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) });
 const form = ref<formState>({
     title: '',
     headerTheme: 'light',
-    apikey: '',
+    showRecordNumber: true,
+    recordNumber: '',
+    apiKey: '',
+    webKey: '',
+    secretKey: '',
     basePath: `${window.location.origin}/api`,
     logo: '/logo.png',
     ico: '/favicon.ico',
@@ -324,22 +375,27 @@ const { resetFields, validate, validateInfos } = useForm(
  * 提交数据
  */
 const saveBasicInfo = () => {
-    return new Promise(async (resolve,reject) => {
+    return new Promise(async (resolve, reject) => {
         validate()
             .then(async () => {
                 const item = [
                     {
                         scope: 'front',
                         properties: {
-                            ...form.value,
-                            apikey: '',
-                            'base-path': '',
+                            ...omit(form.value, [
+                                'apiKey',
+                                'webKey',
+                                'secretKey',
+                                'base-path',
+                            ]),
                         },
                     },
                     {
                         scope: 'amap',
                         properties: {
-                            apiKey: form.value.apikey,
+                            apiKey: form.value.apiKey,
+                            webKey: form.value.webKey,
+                            secretKey: form.value.secretKey,
                         },
                     },
                     {
@@ -354,7 +410,7 @@ const saveBasicInfo = () => {
                     resolve(true);
                     localStorage.setItem(
                         SystemConst.AMAP_KEY,
-                        form.value.apikey,
+                        form.value.apiKey,
                     );
                     const ico: any = document.querySelector('link[rel="icon"]');
                     if (ico !== null) {
@@ -482,7 +538,7 @@ defineExpose({
                 left: 0;
                 width: 4px;
                 height: 100%;
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 0 3px 3px 0;
                 content: '';
             }
@@ -711,8 +767,8 @@ defineExpose({
                 .btn-style {
                     margin-top: 20px;
                     color: #fff;
-                    border-color: #1d39c4;
-                    background: #1d39c4;
+                    border-color: @primary-color;
+                    background: @primary-color;
                 }
             }
         }
diff --git a/src/views/init-home/Menu/index.vue b/src/views/init-home/Menu/index.vue
index 1c4be267..a4f334ed 100644
--- a/src/views/init-home/Menu/index.vue
+++ b/src/views/init-home/Menu/index.vue
@@ -121,7 +121,7 @@ const initMenu = async () => {
     return new Promise(async (resolve) => {
       //  用户中心
         dealMenu(menuDatas.current)
-        console.log([...menuDatas.current!, USER_CENTER_MENU_DATA]);
+        // console.log([...menuDatas.current!, USER_CENTER_MENU_DATA]);
         const res = await updateMenus([...menuDatas.current!, USER_CENTER_MENU_DATA]);
         if (res.status === 200) {
             resolve(true);
diff --git a/src/views/init-home/Role/index.vue b/src/views/init-home/Role/index.vue
index a1701027..e1a3efaf 100644
--- a/src/views/init-home/Role/index.vue
+++ b/src/views/init-home/Role/index.vue
@@ -299,7 +299,7 @@ defineExpose({
                     text-align: center;
                     height: 32px;
                     line-height: 32px;
-                    border-radius: 12%;
+                    border-radius: 2px;
                     padding: 0 10px;
                     position: relative;
 
@@ -376,4 +376,4 @@ defineExpose({
             text-align: center;
         }
     }
-}</style>
\ No newline at end of file
+}</style>
diff --git a/src/views/init-home/data/baseMenu.ts b/src/views/init-home/data/baseMenu.ts
index 6e2634fa..dba450f7 100644
--- a/src/views/init-home/data/baseMenu.ts
+++ b/src/views/init-home/data/baseMenu.ts
@@ -14,7 +14,7 @@ export const USER_CENTER_MENU_DATA = {
   granted: true,
   owner: 'iot',
   options: {
-    isShow: false,
+    show: true,
   },
   permissions: [
     {
@@ -23,6 +23,13 @@ export const USER_CENTER_MENU_DATA = {
     },
   ],
   buttons: [
+    {
+      id: 'view',
+      name: '查看',
+      permissions: [
+
+      ]
+    },
     {
       id: USER_CENTER_MENU_BUTTON_CODE,
       name: '修改密码',
@@ -3113,7 +3120,373 @@ export default [
       },
     ],
   },
-
+  {
+    path: '5Hpl',
+    id: '76d77b275aa60553e9ea1cb40677e9c2',
+    sortIndex: 3,
+    level: 1,
+    owner: 'iot',
+    name: '物联卡',
+    code: 'iot-card',
+    url: '/iot-card',
+    icon: 'icon-wulianka',
+    permissions: [],
+    children: [
+      {
+        path: '5Hpl-mghg',
+        sortIndex: 1,
+        level: 1,
+        id: '899d4880929c3a8fc02068351f55316b',
+        owner: 'iot',
+        name: '首页',
+        code: 'iot-card/Home',
+        url: '/iot-card/Home',
+        icon: 'icon-zhihuishequ',
+        status: 1,
+        showPage: ['network-flow', 'network-card'],
+        permissions: [
+          {
+            permission: 'network-flow',
+            actions: ['query'],
+          },
+          {
+            permission: 'network-card',
+            actions: ['query'],
+          },
+        ],
+        accessSupport: { text: "间接支持", value: "indirect" },
+        supportDataAccess: false,
+        indirectMenus: ['1deaa9efc0fc37a8e8e81fa9d6540bc3']
+      },
+      {
+        path: '5Hpl-4VFS',
+        sortIndex: 2,
+        level: 1,
+        id: 'f2ea1793896fa5ecc816e975e07d4edb',
+        owner: 'iot',
+        name: '仪表盘',
+        code: 'iot-card/Dashboard',
+        url: '/iot-card/Dashboard',
+        icon: 'icon-keshihua',
+        showPage: ['network-flow'],
+        permissions: [{ permission: 'network-flow', actions: ['query'] }],
+        accessSupport: { text: "间接支持", value: "indirect" },
+        supportDataAccess: false,
+        indirectMenus: ['1deaa9efc0fc37a8e8e81fa9d6540bc3']
+      },
+      {
+        path: '5Hpl-O2m8',
+        sortIndex: 3,
+        level: 2,
+        id: '1deaa9efc0fc37a8e8e81fa9d6540bc3',
+        owner: 'iot',
+        name: '物联卡管理',
+        code: 'iot-card/CardManagement',
+        url: '/iot-card/CardManagement',
+        icon: 'icon-wuliankaguanli',
+        status: 1,
+        showPage: ['network-card'],
+        permissions: [
+          {
+            permission: 'platform',
+            actions: ['query'],
+          },
+          {
+            permission: 'network-card',
+            actions: ['query'],
+          },
+          {
+            permission: 'network-flow',
+            actions: ['query'],
+          },
+        ],
+        buttons: [
+          {
+            id: 'sync',
+            name: '同步',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['sync'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'import',
+            name: '导入',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['import'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'export',
+            name: '导出',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['export'],
+              },
+            ],
+          },
+          {
+            id: 'delete',
+            name: '删除',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['delete'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['delete'],
+              },
+            ],
+          },
+          {
+            id: 'active',
+            name: '激活',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['active'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'bind',
+            name: '绑定',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['action'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+              {
+                permission: 'device-instance',
+                actions: ['query'],
+              },
+            ],
+          },
+          {
+            id: 'add',
+            name: '新增',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['save'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'action',
+            name: '启/禁用',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['save'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'update',
+            name: '编辑',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['save'],
+              },
+              {
+                permission: 'network-card',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'view',
+            name: '查看',
+            permissions: [
+              {
+                permission: 'IotCard-management',
+                actions: ['query'],
+              },
+            ],
+          },
+        ],
+        accessSupport: { text: "支持", value: "support" },
+        supportDataAccess: true,
+        assetType: 'networkCard'
+      },
+      {
+        path: '5Hpl-ZjAG',
+        sortIndex: 4,
+        level: 2,
+        id: 'e332ab7c3837fe08b86a6e4f16dd1dcc',
+        owner: 'iot',
+        name: '充值管理',
+        showPage: ['network-card'],
+        code: 'iot-card/Recharge',
+        url: '/iot-card/Recharge',
+        icon: 'icon-chongzhiguanli',
+        status: 1,
+        permissions: [
+          {
+            permission: 'network-card',
+            actions: ['query', 'save'],
+          },
+        ],
+        buttons: [
+          {
+            id: 'view',
+            name: '查看',
+            permissions: [
+              {
+                permission: 'network-card',
+                actions: ['query'],
+              },
+            ],
+          },
+          {
+            id: 'pay',
+            name: '充值',
+            permissions: [
+              {
+                permission: 'network-card',
+                actions: ['query', 'save'],
+              },
+              {
+                permission: 'platform',
+                actions: ['query'],
+              },
+            ],
+          },
+        ],
+        accessSupport: { text: "间接支持", value: "indirect" },
+        supportDataAccess: false,
+        indirectMenus: ['febd4c4b452ece6bb1d760c25b37b75f']
+      },
+      {
+        path: '5Hpl-eS9h',
+        sortIndex: 5,
+        level: 2,
+        id: 'febd4c4b452ece6bb1d760c25b37b75f',
+        owner: 'iot',
+        name: '平台接入',
+        code: 'iot-card/Platform',
+        url: '/iot-card/Platform',
+        icon: 'icon-pingtaiduijie',
+        status: 1,
+        showPage: ['platform'],
+        permissions: [
+          {
+            permission: 'platform',
+            actions: ['query'],
+          },
+        ],
+        buttons: [
+          {
+            id: 'action',
+            name: '启/禁用',
+            permissions: [
+              {
+                permission: 'platform',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'delete',
+            name: '删除',
+            permissions: [
+              {
+                permission: 'platform',
+                actions: ['delete'],
+              },
+            ],
+          },
+          {
+            id: 'update',
+            name: '编辑',
+            permissions: [
+              {
+                permission: 'platform',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'add',
+            name: '新增',
+            permissions: [
+              {
+                permission: 'platform',
+                actions: ['save'],
+              },
+            ],
+          },
+          {
+            id: 'view',
+            name: '查看',
+            permissions: [
+              {
+                permission: 'platform',
+                actions: ['query'],
+              },
+            ],
+          },
+        ],
+        accessSupport: { text: "支持", value: "support" },
+        supportDataAccess: true,
+        assetType: 'networkCardPlatform'
+      },
+      {
+        path: '5Hpl-cL34',
+        sortIndex: 6,
+        level: 1,
+        id: 'c4dfe00c4d7ecfd327eaeb278546502e',
+        owner: 'iot',
+        name: '操作记录',
+        code: 'iot-card/Record',
+        url: '/iot-card/Record',
+        icon: 'icon-tongzhijilu',
+        status: 1,
+        showPage: ['network-card'],
+        permissions: [
+          {
+            permission: 'network-card',
+            actions: ['query'],
+          },
+        ],
+        accessSupport: { text: "不支持", value: "unsupported" },
+        supportDataAccess: false
+      },
+    ],
+  },
   // 系统管理
   {
     code: 'system',
@@ -3122,7 +3495,7 @@ export default [
     id: 'fd1670b860ae58cc58bcd01d027ccd35',
     url: '/system',
     icon: 'icon-xitongguanli1',
-    sortIndex: 3,
+    sortIndex: 4,
     permissions: [],
     buttons: [],
     children: [
@@ -3738,7 +4111,7 @@ export default [
         owner: 'iot',
         //parentId: '3',
         id: '2fa02b8758fe82a6b9666f4ebb1bbd03',
-        sortIndex: 8,
+        sortIndex: 7,
         url: '/system/Relationship',
         icon: 'icon-shuxingpeizhi',
         showPage: ['relation'],
@@ -3794,7 +4167,7 @@ export default [
         owner: 'iot',
         //parentId: '3',
         id: 'c62a6bd5018763dae9fc0d869b6df3a2',
-        sortIndex: 9,
+        sortIndex: 8,
         url: '/system/DataSource',
         icon: 'icon-shebei',
         showPage: ['datasource-config'],
@@ -3879,7 +4252,7 @@ export default [
         owner: 'iot',
         //parentId: '3',
         id: '8750142230773cde42a4e28efa7f84d5',
-        sortIndex: 10,
+        sortIndex: 9,
         url: '/system/Api',
         icon: 'icon-chakanAPI',
         showPage: ['open-api'],
@@ -3928,7 +4301,7 @@ export default [
         owner: 'iot',
         //parentId: '3',
         id: 'e0640f9621c21078cad62d5646a5579d',
-        sortIndex: 11,
+        sortIndex: 10,
         url: '/system/Apply',
         icon: 'icon-yingyongguanli',
         showPage: ['application'],
@@ -4021,7 +4394,7 @@ export default [
         name: '订阅管理',
         owner: 'iot',
         id: '522f790d4422a608d491bc9e2fa12b4e',
-        sortIndex: 12,
+        sortIndex: 11,
         url: '/system/NoticeRule',
         icon: 'CopyOutlined',
         showPage: ['notify-channel'],
@@ -4211,9 +4584,9 @@ export default [
         name: '地区管理',
         owner: 'iot',
         id: 'b69782873cc24be8165c6ad29233333',
-        sortIndex: 12,
+        sortIndex: 13,
         url: '/system/region',
-        icon: 'FormOutlined',
+        icon: 'EnvironmentOutlined',
         showPage: ['area'],
         permissions: [],
         buttons: [
@@ -4257,420 +4630,68 @@ export default [
         accessSupport: { text: "不支持", value: "unsupported" },
         supportDataAccess: false
       },
-      // {
-      //   code: 'system/License',
-      //   name: 'License管理',
-      //   owner: 'iot',
-      //   //parentId: '3',
-      //   id: '3-12',
-      //   sortIndex: 12,
-      //   url: '/system/License',
-      //   icon: 'icon-zidingyiguize',
-      //   showPage: ['license'],
-      //   permissions: [
-      //     {
-      //       permission: 'license',
-      //       actions: ['query', 'save'],
-      //     },
-      //   ],
-      //   buttons: [
-      //     {
-      //       id: 'update',
-      //       name: '编辑',
-      //       description: null,
-      //       permissions: [
-      //         {
-      //           permission: 'license',
-      //           actions: ['query', 'save'],
-      //         },
-      //       ],
-      //       options: null,
-      //     },
-      //
-      //     {
-      //       id: 'view',
-      //       name: '查看',
-      //       description: null,
-      //       permissions: [
-      //         {
-      //           permission: 'license"',
-      //           actions: ['query'],
-      //         },
-      //       ],
-      //       options: null,
-      //     },
-      //   ],
-      // },
-    ],
-  },
-  //物联卡
-  {
-    path: '5Hpl',
-    id: '76d77b275aa60553e9ea1cb40677e9c2',
-    sortIndex: 4,
-    level: 1,
-    owner: 'iot',
-    name: '物联卡',
-    code: 'iot-card',
-    url: '/iot-card',
-    icon: 'icon-wulianka',
-    permissions: [],
-    children: [
       {
-        path: '5Hpl-mghg',
-        sortIndex: 1,
-        level: 1,
-        id: '899d4880929c3a8fc02068351f55316b',
+        code: 'system/Calendar',
+        name: '日历维护',
         owner: 'iot',
-        name: '首页',
-        code: 'iot-card/Home',
-        url: '/iot-card/Home',
-        icon: 'icon-zhihuishequ',
-        status: 1,
-        showPage: ['network-flow', 'network-card'],
+        id: '9d03fb403f3edb4ceb796dd81167562f',
+        showPage: ["calendar-manager"],
+        sortIndex: 14,
+        url: '/system/Calendar',
+        icon: 'icon-rili',
         permissions: [
           {
-            permission: 'network-flow',
-            actions: ['query'],
-          },
-          {
-            permission: 'network-card',
-            actions: ['query'],
-          },
-        ],
-        accessSupport: { text: "间接支持", value: "indirect" },
-        supportDataAccess: false,
-        indirectMenus: ['1deaa9efc0fc37a8e8e81fa9d6540bc3']
-      },
-      {
-        path: '5Hpl-4VFS',
-        sortIndex: 2,
-        level: 1,
-        id: 'f2ea1793896fa5ecc816e975e07d4edb',
-        owner: 'iot',
-        name: '仪表盘',
-        code: 'iot-card/Dashboard',
-        url: '/iot-card/Dashboard',
-        icon: 'icon-keshihua',
-        showPage: ['network-flow'],
-        permissions: [{ permission: 'network-flow', actions: ['query'] }],
-        accessSupport: { text: "间接支持", value: "indirect" },
-        supportDataAccess: false,
-        indirectMenus: ['1deaa9efc0fc37a8e8e81fa9d6540bc3']
-      },
-      {
-        path: '5Hpl-O2m8',
-        sortIndex: 3,
-        level: 2,
-        id: '1deaa9efc0fc37a8e8e81fa9d6540bc3',
-        owner: 'iot',
-        name: '物联卡管理',
-        code: 'iot-card/CardManagement',
-        url: '/iot-card/CardManagement',
-        icon: 'icon-wuliankaguanli',
-        status: 1,
-        showPage: ['network-card'],
-        permissions: [
-          {
-            permission: 'platform',
-            actions: ['query'],
-          },
-          {
-            permission: 'network-card',
-            actions: ['query'],
-          },
-          {
-            permission: 'network-flow',
-            actions: ['query'],
-          },
+            permission: "calendar-manager",
+            actions: [
+              "query",
+            ]
+          }
         ],
         buttons: [
           {
-            id: 'sync',
-            name: '同步',
+            id: "add",
+            name: "新增",
             permissions: [
               {
-                permission: 'IotCard-management',
-                actions: ['sync'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
+                permission: "calendar-manager",
+                actions: [
+                  "save"
+                ]
+              }
+            ]
           },
           {
-            id: 'import',
-            name: '导入',
+            id: "update",
+            name: "编辑",
             permissions: [
               {
-                permission: 'IotCard-management',
-                actions: ['import'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
+                permission: "calendar-manager",
+                actions: [
+                  "save"
+                ]
+              }
+            ]
           },
           {
-            id: 'export',
-            name: '导出',
+            id: "delete",
+            name: "删除",
             permissions: [
               {
-                permission: 'IotCard-management',
-                actions: ['export'],
-              },
-            ],
-          },
-          {
-            id: 'delete',
-            name: '删除',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['delete'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['delete'],
-              },
-            ],
-          },
-          {
-            id: 'active',
-            name: '激活',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['active'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'bind',
-            name: '绑定',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['action'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-              {
-                permission: 'device-instance',
-                actions: ['query'],
-              },
-            ],
-          },
-          {
-            id: 'add',
-            name: '新增',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['save'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'action',
-            name: '启/禁用',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['save'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'update',
-            name: '编辑',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['save'],
-              },
-              {
-                permission: 'network-card',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'view',
-            name: '查看',
-            permissions: [
-              {
-                permission: 'IotCard-management',
-                actions: ['query'],
-              },
-            ],
-          },
-        ],
-        accessSupport: { text: "支持", value: "support" },
-        supportDataAccess: true,
-        assetType: 'networkCard'
-      },
-      {
-        path: '5Hpl-ZjAG',
-        sortIndex: 4,
-        level: 2,
-        id: 'e332ab7c3837fe08b86a6e4f16dd1dcc',
-        owner: 'iot',
-        name: '充值管理',
-        showPage: ['network-card'],
-        code: 'iot-card/Recharge',
-        url: '/iot-card/Recharge',
-        icon: 'icon-chongzhiguanli',
-        status: 1,
-        permissions: [
-          {
-            permission: 'network-card',
-            actions: ['query', 'save'],
-          },
-        ],
-        buttons: [
-          {
-            id: 'view',
-            name: '查看',
-            permissions: [
-              {
-                permission: 'network-card',
-                actions: ['query'],
-              },
-            ],
-          },
-          {
-            id: 'pay',
-            name: '充值',
-            permissions: [
-              {
-                permission: 'network-card',
-                actions: ['query', 'save'],
-              },
-              {
-                permission: 'platform',
-                actions: ['query'],
-              },
-            ],
-          },
-        ],
-        accessSupport: { text: "间接支持", value: "indirect" },
-        supportDataAccess: false,
-        indirectMenus: ['febd4c4b452ece6bb1d760c25b37b75f']
-      },
-      {
-        path: '5Hpl-eS9h',
-        sortIndex: 5,
-        level: 2,
-        id: 'febd4c4b452ece6bb1d760c25b37b75f',
-        owner: 'iot',
-        name: '平台接入',
-        code: 'iot-card/Platform',
-        url: '/iot-card/Platform',
-        icon: 'icon-pingtaiduijie',
-        status: 1,
-        showPage: ['platform'],
-        permissions: [
-          {
-            permission: 'platform',
-            actions: ['query'],
-          },
-        ],
-        buttons: [
-          {
-            id: 'action',
-            name: '启/禁用',
-            permissions: [
-              {
-                permission: 'platform',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'delete',
-            name: '删除',
-            permissions: [
-              {
-                permission: 'platform',
-                actions: ['delete'],
-              },
-            ],
-          },
-          {
-            id: 'update',
-            name: '编辑',
-            permissions: [
-              {
-                permission: 'platform',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'add',
-            name: '新增',
-            permissions: [
-              {
-                permission: 'platform',
-                actions: ['save'],
-              },
-            ],
-          },
-          {
-            id: 'view',
-            name: '查看',
-            permissions: [
-              {
-                permission: 'platform',
-                actions: ['query'],
-              },
-            ],
-          },
-        ],
-        accessSupport: { text: "支持", value: "support" },
-        supportDataAccess: true,
-        assetType: 'networkCardPlatform'
-      },
-      {
-        path: '5Hpl-cL34',
-        sortIndex: 6,
-        level: 1,
-        id: 'c4dfe00c4d7ecfd327eaeb278546502e',
-        owner: 'iot',
-        name: '操作记录',
-        code: 'iot-card/Record',
-        url: '/iot-card/Record',
-        icon: 'icon-tongzhijilu',
-        status: 1,
-        showPage: ['network-card'],
-        permissions: [
-          {
-            permission: 'network-card',
-            actions: ['query'],
-          },
+                permission: "calendar-manager",
+                actions: [
+                  "delete"
+                ]
+              }
+            ]
+          }
         ],
         accessSupport: { text: "不支持", value: "unsupported" },
         supportDataAccess: false
       },
     ],
   },
+  //物联卡
+
   {
     "path": "3n23",
     "sortIndex": 5,
diff --git a/src/views/init-home/data/interface.ts b/src/views/init-home/data/interface.ts
index 7728eac5..85fb78e0 100644
--- a/src/views/init-home/data/interface.ts
+++ b/src/views/init-home/data/interface.ts
@@ -13,7 +13,11 @@ export interface modalState  {
 export interface formState  {
   title: string; // 系统名称
   headerTheme: string; // 主题色
-  apikey: string; // 高德 API key
+  showRecordNumber: boolean; //是否显示备案号
+  recordNumber: string; //备案号
+  apiKey: string; // 高德 API key
+  webKey: string; // 高德 WEB key
+  secretKey: string; //高德 API 密钥
   basePath: string; // 系统后台访问的URL
   logo: string; // 系统logo
   ico: string; // 浏览器页签
diff --git a/src/views/init-home/index.vue b/src/views/init-home/index.vue
index 3e48d85c..3243114d 100644
--- a/src/views/init-home/index.vue
+++ b/src/views/init-home/index.vue
@@ -170,7 +170,7 @@ onBeforeMount(() => {
                 left: 0;
                 width: 4px;
                 height: 100%;
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 0 3px 3px 0;
                 content: '';
             }
@@ -339,8 +339,8 @@ onBeforeMount(() => {
                 .btn-style {
                     margin-top: 20px;
                     color: #fff;
-                    border-color: #1d39c4;
-                    background: #1d39c4;
+                    border-color: @primary-color;
+                    background: @primary-color;
                 }
             }
         }
diff --git a/src/views/iot-card/CardManagement/Sync.vue b/src/views/iot-card/CardManagement/Sync.vue
index 10847c57..2b677988 100644
--- a/src/views/iot-card/CardManagement/Sync.vue
+++ b/src/views/iot-card/CardManagement/Sync.vue
@@ -12,8 +12,7 @@
         <j-progress :percent="_percent" />
       </div>
       <div v-else>
-        <p>同步成功：{{ syncData.count }}条</p>
-        <p>同步失败：{{ syncData.error }}条</p>
+        <p>{{ syncData.count }}张物联卡已同步至最新状态</p>
       </div>
     </div>
     <template #footer>
diff --git a/src/views/iot-card/Dashboard/index.vue b/src/views/iot-card/Dashboard/index.vue
index 1b4380e4..9bda5460 100644
--- a/src/views/iot-card/Dashboard/index.vue
+++ b/src/views/iot-card/Dashboard/index.vue
@@ -200,8 +200,8 @@ const getData = (
  */
 const getDataTotal = () => {
     const dTime = [
-      dayjs(new Date()).startOf('day').valueOf(),
-      dayjs(new Date()).endOf('day').valueOf(),
+      dayjs().subtract(1,'day').startOf('day').valueOf(),
+      dayjs().subtract(1,'day').endOf('day').valueOf(),
     ];
     const mTime = [
       dayjs().startOf('month').valueOf(),
diff --git a/src/views/iot-card/Platform/index.vue b/src/views/iot-card/Platform/index.vue
index 677ce44f..59453775 100644
--- a/src/views/iot-card/Platform/index.vue
+++ b/src/views/iot-card/Platform/index.vue
@@ -1,85 +1,139 @@
 <!-- 平台对接 -->
 <template>
     <page-container>
-        <pro-search :columns="columns" target="platform-search" @search="handleSearch" />
+        <pro-search
+            :columns="columns"
+            target="platform-search"
+            @search="handleSearch"
+        />
         <FullPage>
-          <j-pro-table ref="platformRef" :columns="columns" :request="queryList"
-              :defaultParams="{ sorts: [{ name: 'createTime', order: 'desc' }] }" :params="params" :gridColumn="3">
-              <template #headerTitle>
-                  <j-space>
-                  <!-- <j-button type="primary" @click="handleAdd">
+            <j-pro-table
+                ref="platformRef"
+                :columns="columns"
+                :request="queryList"
+                :defaultParams="{
+                    sorts: [{ name: 'createTime', order: 'desc' }],
+                }"
+                :params="params"
+                :gridColumn="3"
+            >
+                <template #headerTitle>
+                    <j-space>
+                        <!-- <j-button type="primary" @click="handleAdd">
                           <AIcon type="PlusOutlined" />新增
                           </j-button> -->
-                      <PermissionButton @click="handleAdd" :hasPermission="'iot-card/Platform:add'" type="primary">
-                          <AIcon type="PlusOutlined" />新增
-                      </PermissionButton>
-                  </j-space>
-              </template>
-              <template #card="slotProps">
-                  <CardBox :value="slotProps" :actions="getActions(slotProps, 'card')" v-bind="slotProps"
-                      :status="slotProps.state.value" :statusText="slotProps.state.text" :statusNames="{
-                          enabled: 'processing',
-                          disabled: 'error',
-                      }">
-                      <template #img>
-                          <slot name="img">
-                              <img :src="getImage('/iot-card/iot-card-bg.png')" />
-                          </slot>
-                      </template>
-                      <template #content>
-                          <h3  style='font-size: 16px;width: calc(100% - 90px); margin-bottom: 18px;'>
-                            <Ellipsis>
-                              {{ slotProps.name }}
-                            </Ellipsis>
-                          </h3>
-                          <j-row>
-                              <j-col :span="12">
-                                  <div class="card-item-content-text">
-                                      平台类型
-                                  </div>
-                                  <div>{{ slotProps.operatorName }}</div>
-                              </j-col>
-                              <j-col :span="12">
-                                  <div class="card-item-content-text">说明</div>
-                                  <Ellipsis>{{ slotProps.explain }}</Ellipsis>
-                              </j-col>
-                          </j-row>
-                      </template>
-                      <template #actions="item">
-                          <PermissionButton :disabled="item.disabled" :popConfirm="item.popConfirm" :tooltip="{
-                              ...item.tooltip,
-                          }" @click="item.onClick" :hasPermission="'iot-card/Platform:' + item.key">
-                              <AIcon type="DeleteOutlined" v-if="item.key === 'delete'" />
-                              <template v-else>
-                                  <AIcon :type="item.icon" />
-                                  <span>{{ item?.text }}</span>
-                              </template>
-                          </PermissionButton>
-                      </template>
-                  </CardBox>
-              </template>
-              <template #state="slotProps">
-                  <j-badge :text="slotProps.state.text" :status="
-                      slotProps.state.value === 'disabled'
-                          ? 'error'
-                          : 'success'
-                  " />
-              </template>
-              <template #action="slotProps">
-                  <j-space :size="16">
-                      <template v-for="i in getActions(slotProps, 'table')" :key="i.key">
-                          <PermissionButton :disabled="i.disabled" :popConfirm="i.popConfirm" :tooltip="{
-                              ...i.tooltip,
-                          }" @click="i.onClick" type="link" style="padding: 0px"
-                              :hasPermission="'iot-card/Platform:' + i.key">
-                              <template #icon>
-                                  <AIcon :type="i.icon" />
-                              </template>
-                          </PermissionButton>
-                      </template>
-                  </j-space>
-              </template>
-          </j-pro-table>
+                        <PermissionButton
+                            @click="handleAdd"
+                            :hasPermission="'iot-card/Platform:add'"
+                            type="primary"
+                        >
+                            <AIcon type="PlusOutlined" />新增
+                        </PermissionButton>
+                    </j-space>
+                </template>
+                <template #card="slotProps">
+                    <CardBox
+                        :value="slotProps"
+                        :actions="getActions(slotProps, 'card')"
+                        v-bind="slotProps"
+                        :status="slotProps.state.value"
+                        :statusText="slotProps.state.text"
+                        :statusNames="{
+                            enabled: 'processing',
+                            disabled: 'error',
+                        }"
+                    >
+                        <template #img>
+                            <slot name="img">
+                                <img
+                                    :src="getImage('/iot-card/iot-card-bg.png')"
+                                />
+                            </slot>
+                        </template>
+                        <template #content>
+                            <h3
+                                style="
+                                    font-size: 16px;
+                                    width: calc(100% - 90px);
+                                    margin-bottom: 18px;
+                                "
+                            >
+                                <Ellipsis>
+                                    {{ slotProps.name }}
+                                </Ellipsis>
+                            </h3>
+                            <j-row>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        平台类型
+                                    </div>
+                                    <div>{{ slotProps.operatorName }}</div>
+                                </j-col>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        说明
+                                    </div>
+                                    <Ellipsis>{{ slotProps.explain }}</Ellipsis>
+                                </j-col>
+                            </j-row>
+                        </template>
+                        <template #actions="item">
+                            <PermissionButton
+                                :disabled="item.disabled"
+                                :popConfirm="item.popConfirm"
+                                :tooltip="{
+                                    ...item.tooltip,
+                                }"
+                                @click="item.onClick"
+                                :hasPermission="'iot-card/Platform:' + item.key"
+                            >
+                                <AIcon
+                                    type="DeleteOutlined"
+                                    v-if="item.key === 'delete'"
+                                />
+                                <template v-else>
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item?.text }}</span>
+                                </template>
+                            </PermissionButton>
+                        </template>
+                    </CardBox>
+                </template>
+                <template #state="slotProps">
+                    <j-badge
+                        :text="slotProps.state.text"
+                        :status="
+                            slotProps.state.value === 'disabled'
+                                ? 'error'
+                                : 'success'
+                        "
+                    />
+                </template>
+                <template #action="slotProps">
+                    <j-space :size="16">
+                        <template
+                            v-for="i in getActions(slotProps, 'table')"
+                            :key="i.key"
+                        >
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                @click="i.onClick"
+                                type="link"
+                                style="padding: 0px"
+                                :hasPermission="'iot-card/Platform:' + i.key"
+                            >
+                                <template #icon>
+                                    <AIcon :type="i.icon" />
+                                </template>
+                            </PermissionButton>
+                        </template>
+                    </j-space>
+                </template>
+            </j-pro-table>
         </FullPage>
     </page-container>
 </template>
@@ -88,9 +142,9 @@
 import { getImage, onlyMessage } from '@/utils/comm';
 import type { ActionsType } from '@/components/Table';
 import { queryList, update, del } from '@/api/iot-card/platform';
-import { useMenuStore } from 'store/menu'
-const menuStory = useMenuStore()
-const router = useRouter()
+import { useMenuStore } from 'store/menu';
+const menuStory = useMenuStore();
+const router = useRouter();
 const platformRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
 
@@ -146,12 +200,15 @@ const columns = [
     },
 ];
 
-const statusUpdate = async (data: any) => {
-    const res = await update(data);
-    if (res.status === 200) {
-        onlyMessage('操作成功');
-        platformRef.value?.reload();
-    }
+const statusUpdate = (data: any) => {
+    const response = update(data);
+    response.then((res) => {
+        if (res.status === 200) {
+            onlyMessage('操作成功');
+            platformRef.value?.reload();
+        }
+    });
+    return response;
 };
 
 const getActions = (
@@ -183,20 +240,21 @@ const getActions = (
                     ? 'StopOutlined'
                     : 'PlayCircleOutlined',
             popConfirm: {
-                title: `确认${data.state.value === 'enabled' ? '禁用' : '启用'
-                    }？`,
+                title: `确认${
+                    data.state.value === 'enabled' ? '禁用' : '启用'
+                }？`,
                 okText: ' 确定',
                 cancelText: '取消',
                 onConfirm: () => {
                     if (data.state.value === 'enabled') {
-                        statusUpdate({
+                        return statusUpdate({
                             id: data.id,
                             config: { ...data.config },
                             state: 'disabled',
                             operatorName: data.operatorName,
                         });
                     } else {
-                        statusUpdate({
+                        return statusUpdate({
                             id: data.id,
                             config: { ...data.config },
                             state: 'enabled',
@@ -218,14 +276,17 @@ const getActions = (
                 title: '确认删除?',
                 okText: ' 确定',
                 cancelText: '取消',
-                onConfirm: async () => {
-                    const resp: any = await del(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        platformRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response: any = del(data.id);
+                    response.then((resp:any) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            platformRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
@@ -241,7 +302,7 @@ const handleSearch = (e: any) => {
  * 新增
  */
 const handleAdd = () => {
-    menuStory.jumpPage('iot-card/Platform/Detail', { id: ':id' })
+    menuStory.jumpPage('iot-card/Platform/Detail', { id: ':id' });
 };
 </script>
 
diff --git a/src/views/link/AccessConfig/Detail/index.vue b/src/views/link/AccessConfig/Detail/index.vue
index 043d5543..670e2571 100644
--- a/src/views/link/AccessConfig/Detail/index.vue
+++ b/src/views/link/AccessConfig/Detail/index.vue
@@ -107,7 +107,9 @@ const TypeMap = new Map([
     ['fixed-media', 'media'],
     ['gb28181-2016', 'media'],
     ['onvif', 'media'],
+    ['media-plugin', 'media'],
     ['OneNet', 'cloud'],
+    ['OneNet-platform','cloud'],
     ['Ctwing', 'cloud'],
     ['modbus-tcp', 'channel'],
     ['opc-ua', 'channel'],
@@ -120,7 +122,9 @@ const DataMap = new Map();
 DataMap.set('fixed-media', { type: 'media', title: '视频类设备接入' });
 DataMap.set('gb28181-2016', { type: 'media', title: '视频类设备接入' });
 DataMap.set('onvif',{ type: 'media' , title:'视频类设备接入'});
+DataMap.set('media-plugin', { type: 'media', title: '视频类设备接入' });
 DataMap.set('OneNet', { type: 'cloud', title: '云平台接入' });
+DataMap.set('OneNet-platform', { type: 'cloud', title: '云平台接入' });
 DataMap.set('Ctwing', { type: 'cloud', title: '云平台接入' });
 DataMap.set('modbus-tcp', { type: 'channel', title: '通道类设备接入' });
 DataMap.set('opc-ua', { type: 'channel', title: '通道类设备接入' });
@@ -136,10 +140,10 @@ const getTypeList = (result: Record<string, any>) => {
     const channel: any[] = [];
     const edge: any[] = [];
     result.map((item: any) => {
-        if (item.id === 'fixed-media' || item.id === 'gb28181-2016' || item.id ==='onvif') {
+        if (item.id === 'fixed-media' || item.id === 'gb28181-2016' || item.id ==='onvif' || item.id === 'media-plugin') {
             item.type = 'media';
             media.push(item);
-        } else if (item.id === 'OneNet' || item.id === 'Ctwing') {
+        } else if (item.id === 'OneNet' || item.id === 'Ctwing' || item.id === 'OneNet-platform') {
             item.type = 'cloud';
             cloud.push(item);
         } else if (item.id === 'modbus-tcp' || item.id === 'opc-ua' || item.id === 'collector-gateway') {
@@ -193,11 +197,6 @@ const queryProviders = async () => {
     if (resp.status === 200) {
         const _data = resp.result || [];
         dataSource.value = getTypeList(accessConfigTypeFilter(_data as any[]));
-        console.log(dataSource.value)
-        // dataSource.value = getTypeList(resp.result)[0].list.filter(
-        //     (item) => item.name !== '插件设备接入',
-        // );
-
         // 快速添加接入网关
         if (route.query.save && route.query?.type) {
             const type = route.query.type;
diff --git a/src/views/link/AccessConfig/Outline/components/FifthKind.vue b/src/views/link/AccessConfig/Outline/components/FifthKind.vue
new file mode 100644
index 00000000..daaf797e
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/FifthKind.vue
@@ -0,0 +1,100 @@
+<template>
+    <div v-if="data.provider === 'official-edge-gateway'">
+        <TitleComponent data="网络组件" v-if="network"></TitleComponent>
+        <AccessCard
+            v-if="network"
+            :data="{
+                ...network,
+                description: network.description
+                    ? network.description
+                    : descriptionList[data.provider],
+            }"
+        >
+            <template #other>
+                <div class="other">
+                    <j-tooltip
+                        placement="top"
+                        :title="addressesTip(network.addresses)"
+                    >
+                        <div
+                            v-for="i in (network.addresses || []).slice(0, 1)"
+                            :key="i.address"
+                            class="item"
+                        >
+                            <j-badge :status="getColor(i)" :text="i.address" />
+                            <span v-if="(network.addresses || []).length > 1"
+                                >等{{ item.addresses.length }}条</span
+                            >
+                        </div>
+                    </j-tooltip>
+                </div>
+            </template></AccessCard
+        >
+    </div>
+    <div v-else>
+        <TitleComponent data="消息协议" v-if="protocol"></TitleComponent>
+        <AccessCard
+            v-if="protocol"
+            :data="{ ...protocol, type: 'protocol' }"
+        ></AccessCard>
+    </div>
+</template>
+
+<script setup>
+import AccessCard from '../../components/AccessCard/index.vue';
+import {
+    descriptionList,
+    NetworkTypeMapping,
+    ProtocolMapping,
+} from '../../data';
+import { getNetworkList, getProtocolList } from '@/api/link/accessConfig';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const network = ref();
+const protocol = ref();
+const queryNetwork = async () => {
+    const res = await getNetworkList(
+        NetworkTypeMapping.get(props.data.provider),
+        '',
+        {},
+    );
+    if (res.success) {
+        network.value = res.result.find((i) => {
+            return i.id === props.data.channelId;
+        });
+    }
+};
+const queryProtocol = async () => {
+    const res = await getProtocolList(
+        ProtocolMapping.get(props.data.provider),
+        {
+            'sorts[0].name': 'createTime',
+            'sorts[0].order': 'desc',
+        },
+    );
+    if (res.success) {
+        protocol.value = res.result.find((i) => {
+            return i.id === props.data.protocol;
+        });
+    }
+};
+const getColor = (i) => (i.health === -1 ? 'error' : 'processing');
+const addressesTip = (data) => {
+    let tip = '';
+    data.forEach((item) => {
+        tip = tip + ' ' + item.address;
+    });
+    return tip;
+};
+onMounted(() => {
+    if (props.data.provider === 'child-device') {
+        queryProtocol();
+    } else {
+        queryNetwork();
+    }
+});
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/link/AccessConfig/Outline/components/FirstKind.vue b/src/views/link/AccessConfig/Outline/components/FirstKind.vue
new file mode 100644
index 00000000..e75d3e58
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/FirstKind.vue
@@ -0,0 +1,197 @@
+<template>
+    <div>
+        <TitleComponent data="网络组件"> </TitleComponent>
+        <AccessCard
+            v-if="network"
+            :data="{
+                ...network,
+                description: network?.description
+                    ? network.description
+                    : descriptionList[data?.provider],
+                type: 'network',
+            }"
+        >
+            <template #other>
+                <div class="other">
+                    <j-tooltip
+                        placement="top"
+                        :title="addressesTip(network.addresses)"
+                    >
+                        <div
+                            v-for="i in (network.addresses || []).slice(0, 1)"
+                            :key="i.address"
+                            class="item"
+                        >
+                            <j-badge :status="getColor(i)" :text="i.address" />
+                            <span v-if="(network.addresses || []).length > 1"
+                                >等{{ network.addresses.length }}条</span
+                            >
+                        </div>
+                    </j-tooltip>
+                </div>
+            </template>
+        </AccessCard>
+        <TitleComponent data="消息协议" style="margin-top: 20px">
+        </TitleComponent>
+        <AccessCard v-if="protocol" :data="{ ...protocol, type: 'protocol' }">
+        </AccessCard>
+        <TitleComponent
+            v-if="config?.routes && config.routes.length > 0"
+            :data="
+                data.provider === 'mqtt-server-gateway' ||
+                data.provider === 'mqtt-client-gateway'
+                    ? 'topic'
+                    : 'URL信息'
+            "
+            style="margin-top: 20px"
+        >
+        </TitleComponent>
+        <div v-if="config?.routes && config.routes.length > 0">
+            <j-scrollbar height="350">
+                <j-table
+                    :pagination="false"
+                    :rowKey="generateUUID()"
+                    :data-source="config.routes || []"
+                    bordered
+                    :columns="config.id === 'MQTT' ? columnsMQTT : columnsHTTP"
+                    :scroll="{ y: 400 }"
+                >
+                    <template #bodyCell="{ column, text, record }">
+                        <template v-if="column.dataIndex === 'stream'">
+                            {{ getStream(record) }}
+                        </template>
+                    </template>
+                </j-table>
+            </j-scrollbar>
+        </div>
+    </div>
+</template>
+
+<script setup>
+import {
+    getNetworkList,
+    getProtocolList,
+    getConfigView,
+} from '@/api/link/accessConfig';
+import {
+    NetworkTypeMapping,
+    descriptionList,
+    ProtocolMapping,
+    ColumnsMQTT,
+    ColumnsHTTP,
+} from '../../data';
+import AccessCard from '../../components/AccessCard/index.vue';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const network = ref();
+const protocol = ref();
+const config = ref();
+const columnsMQTT = ref([]);
+const columnsHTTP = ref([]);
+function generateUUID() {
+    var d = new Date().getTime();
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(
+        /[xy]/g,
+        function (c) {
+            var r = (d + Math.random() * 16) % 16 | 0;
+            d = Math.floor(d / 16);
+            return (c === 'x' ? r : (r & 0x3) | 0x8).toString(16);
+        },
+    );
+}
+const getStream = (record) => {
+    let stream = '';
+    if (record.upstream && record.downstream) stream = '上行、下行';
+    else if (record.upstream) stream = '上行';
+    else if (record.downstream) stream = '下行';
+    return stream;
+};
+const queryNetwork = async () => {
+    const resp = await getNetworkList(
+        NetworkTypeMapping.get(props.data?.provider),
+        props.data?.channelId,
+        {},
+    );
+    if (resp.status === 200) {
+        network.value = resp.result.find((i) => {
+            return i.id === props.data?.channelId;
+        });
+    }
+};
+const queryProcotol = async () => {
+    const resp = await getProtocolList(
+        ProtocolMapping.get(props.data?.provider),
+        {
+            'sorts[0].name': 'createTime',
+            'sorts[0].order': 'desc',
+        },
+    );
+    if (resp.status === 200) {
+        protocol.value = resp.result.find((i) => {
+            return i.id === props.data?.protocol;
+        });
+    }
+};
+const queryConfig = async () => {
+    const resp = await getConfigView(
+        props.data.protocol,
+        ProtocolMapping.get(props.data.provider),
+    );
+    if (resp.success) {
+        config.value = resp.result;
+        const Group = {
+            title: '分组',
+            dataIndex: 'group',
+            key: 'group',
+            ellipsis: true,
+            align: 'center',
+            width: 100,
+            customCell: (record, rowIndex) => {
+                const obj = {
+                    children: record,
+                    rowSpan: 0,
+                };
+                const list = config.value?.routes || [];
+                const arr = list.filter((res) => res.group === record.group);
+                const isRowIndex =
+                    rowIndex === 0 || list[rowIndex - 1].group !== record.group;
+                isRowIndex && (obj.rowSpan = arr.length);
+                return obj;
+            },
+        };
+        columnsMQTT.value = [Group, ...ColumnsMQTT];
+        columnsHTTP.value = [Group, ...ColumnsHTTP];
+    }
+};
+const getColor = (i) => (i.health === -1 ? 'error' : 'processing');
+const addressesTip = (data) => {
+    let tip = '';
+    data.forEach((item) => {
+        tip = tip + ' ' + item.address;
+    });
+    return tip;
+};
+onMounted(() => {
+    queryNetwork();
+    queryProcotol();
+    queryConfig();
+});
+</script>
+<style lang="less" scoped>
+.other {
+    width: 100%;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .item {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+}
+</style>
diff --git a/src/views/link/AccessConfig/Outline/components/FourthKind.vue b/src/views/link/AccessConfig/Outline/components/FourthKind.vue
new file mode 100644
index 00000000..928b7eb0
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/FourthKind.vue
@@ -0,0 +1,19 @@
+<template>
+    <div>
+        <a-descriptions bordered :column="1">
+            <a-descriptions-item label="消息协议">
+                {{ data?.provider }}
+            </a-descriptions-item>
+        </a-descriptions>
+    </div>
+</template>
+
+<script setup>
+
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/link/AccessConfig/Outline/components/SecondKind.vue b/src/views/link/AccessConfig/Outline/components/SecondKind.vue
new file mode 100644
index 00000000..d4b7c1b7
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/SecondKind.vue
@@ -0,0 +1,143 @@
+<template>
+    <div>
+        <TitleComponent data="插件" v-if="plugin"> </TitleComponent>
+        <AccessCard v-if="plugin" :data="{ ...plugin, type: 'plugin' }">
+            <template #other>
+                <div class="plugin-other">
+                    <div class="plugin-id">
+                        <div class="plugin-text">插件ID：</div>
+                        <div class="other-content">
+                            <j-ellipsis>
+                                {{ plugin.id }}
+                            </j-ellipsis>
+                        </div>
+                    </div>
+                    <div class="plugin-version">
+                        <div class="plugin-text">版本号：</div>
+                        <div class="other-content">
+                            <j-ellipsis>
+                                {{ plugin.version }}
+                            </j-ellipsis>
+                        </div>
+                    </div>
+                </div>
+            </template>
+        </AccessCard>
+        <TitleComponent data="通用配置" style="margin-top: 20px" v-if="configuration.length">
+        </TitleComponent>
+        <a-descriptions bordered :column="1" v-if="configuration.length">
+          <a-descriptions-item v-for="i in configuration" :label="i.name">{{ i.value }}</a-descriptions-item>
+        </a-descriptions>
+    </div>
+</template>
+
+<script setup>
+import {
+    getPluginList,
+    getPluginConfig,
+    detail,
+} from '@/api/link/accessConfig';
+import AccessCard from '../../components/AccessCard/index.vue';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const plugin = ref();
+const config = ref();
+const configuration = ref([]);
+const configurationMap = new Map();
+const queryPlugin = () => {
+    getPluginList({
+        terms: [
+            {
+                terms: [
+                    {
+                        column: 'type',
+                        value:
+                            props.data.provider === 'media-plugin'
+                                ? 'media'
+                                : 'deviceGateway',
+                        termType: 'eq',
+                    },
+                ],
+            },
+        ],
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        paging: false,
+    }).then((res) => {
+        if (res.success) {
+            plugin.value = res.result.find((i) => {
+                return i.id === props.data?.channelId;
+            });
+        }
+    });
+};
+
+const queryPluginConfig = async () => {
+    const res = await getPluginConfig(props.data.channelId);
+    if (res.success) {
+        const properties = res.result?.others?.configMetadata?.properties || [];
+        config.value = properties.forEach((item) => {
+            configurationMap.set(item.property, item.name);
+        });
+    }
+};
+const queryDetail = async () => {
+    const res = await detail(props.data.id);
+    if (res.success) {
+        Object.keys(res.result?.configuration || {}).forEach((i)=>{
+          if(configurationMap.has(i)){
+            configuration.value.push({
+              name: configurationMap.get(i),
+              value: res.result.configuration[i]
+            })
+          }
+        })
+    }
+};
+onMounted(() => {
+    queryPlugin();
+    queryPluginConfig();
+    queryDetail();
+});
+</script>
+<style lang="less" scoped>
+.other {
+    width: 100%;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .item {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
+}
+
+.plugin-other {
+    display: flex;
+    gap: 16px;
+    .plugin-id,
+    .plugin-version {
+        color: rgba(0, 0, 0, 0.85);
+        opacity: 0.45;
+        display: flex;
+
+        .plugin-text {
+            white-space: nowrap;
+        }
+    }
+
+    .plugin-id {
+        width: 50%;
+        // .other-content {
+        //   display: flex;
+        //   width: 0;
+        //   flex-grow: 1;
+        // }
+    }
+}
+</style>
diff --git a/src/views/link/AccessConfig/Outline/components/SixthKind.vue b/src/views/link/AccessConfig/Outline/components/SixthKind.vue
new file mode 100644
index 00000000..54a1bbd6
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/SixthKind.vue
@@ -0,0 +1,67 @@
+<template>
+    <div>
+        <a-descriptions bordered :column="1">
+            <a-descriptions-item :label="i.label" v-for="i in configuration">
+                {{ i.label==='集群'? i.value ?  '共享配置' : '独立配置' : i.value }}
+            </a-descriptions-item>
+        </a-descriptions>
+    </div>
+</template>
+
+<script setup>
+import { detail } from '@/api/link/accessConfig';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const configuration = ref([]);
+const configurationMap = new Map();
+configurationMap.set('domain', 'SIP 域');
+configurationMap.set('sipId', 'SIP ID');
+configurationMap.set('shareCluster', '集群');
+configurationMap.set('host', 'SIP 地址');
+configurationMap.set('publicHost', '公网 Host');
+const queryDetail = async () => {
+    const res = await detail(props.data.id);
+    if (res.success) {
+        Object.keys(res.result.configuration || {}).forEach((i) => {
+            if (configurationMap.has(i)) {
+                configuration.value.push({
+                    label: configurationMap.get(i),
+                    value: res.result.configuration[i],
+                });
+            }
+            if (i === 'hostPort') {
+                Object.keys(res.result.configuration[i] || {}).forEach(
+                    (item) => {
+                        if (item === 'host') {
+                            configuration.value.push({
+                                label: configurationMap.get(item),
+                                value:
+                                    res.result.configuration.hostPort.host +
+                                    ':' +
+                                    res.result.configuration.hostPort.port,
+                            });
+                        } else if (item === 'publicHost') {
+                            configuration.value.push({
+                                label: configurationMap.get(item),
+                                value:
+                                    res.result.configuration.hostPort
+                                        .publicHost +
+                                    ':' +
+                                    res.result.configuration.hostPort
+                                        .publicPort,
+                            });
+                        }
+                    },
+                );
+            }
+        });
+    }
+};
+onMounted(() => {
+    queryDetail();
+});
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/link/AccessConfig/Outline/components/ThirdKind.vue b/src/views/link/AccessConfig/Outline/components/ThirdKind.vue
new file mode 100644
index 00000000..188f1dab
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/components/ThirdKind.vue
@@ -0,0 +1,84 @@
+<template>
+    <div>
+        <TitleComponent
+            data="接入配置"
+            v-if="configuration.length"
+        ></TitleComponent>
+        <a-descriptions bordered :column="1" v-if="configuration.length">
+            <a-descriptions-item v-for="i in configuration" :label="i.label">{{
+                i.value
+            }}</a-descriptions-item>
+        </a-descriptions>
+        <TitleComponent
+            v-if="protocol"
+            data="消息协议"
+            style="margin-top: 20px"
+        ></TitleComponent>
+        <AccessCard v-if="protocol" :data="{ ...protocol, type: 'protocol' }">
+        </AccessCard>
+    </div>
+</template>
+
+<script setup>
+import { detail, getProtocolList } from '@/api/link/accessConfig';
+import { ProtocolMapping } from '../../data';
+import AccessCard from '../../components/AccessCard/index.vue';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const configuration = ref([]);
+const protocol = ref();
+const CtwingMap = new Map();
+CtwingMap.set('apiAddress', '接口地址');
+CtwingMap.set('appKey', 'appKey');
+CtwingMap.set('appSecret', 'appSecret');
+CtwingMap.set('description', '说明');
+const OneNetMap = new Map();
+OneNetMap.set('apiAddress', '接口地址');
+OneNetMap.set('apiKey', 'apiKey');
+OneNetMap.set('validateToken', '通知Token');
+OneNetMap.set('aesKey', 'aesKey');
+OneNetMap.set('description', '说明');
+const queryDetail = async () => {
+    const res = await detail(props.data.id);
+    if (res.success) {
+        if (props.data.channel === 'Ctwing') {
+            Object.keys(res.result?.configuration || {}).forEach((i) => {
+                if (CtwingMap.has(i)) {
+                    configuration.value.push({
+                        label: CtwingMap.get(i),
+                        value: res.result.configuration[i] || '--',
+                    });
+                }
+            });
+        } else if (props.data.channel === 'OneNet') {
+            Object.keys(res.result?.configuration || {}).forEach((i) => {
+                if (OneNetMap.has(i)) {
+                    configuration.value.push({
+                        label: OneNetMap.get(i),
+                        value: res.result.configuration[i] || '--',
+                    });
+                }
+            });
+        }
+    }
+};
+const queryProcotol = async () => {
+    const res = await getProtocolList(ProtocolMapping.get(props.data.channel), {
+        'sorts[0].name': 'createTime',
+        'sorts[0].order': 'desc',
+    });
+    if (res.success) {
+        protocol.value = res.result.find((i) => {
+            return i.id === props.data.protocol;
+        });
+    }
+};
+onMounted(() => {
+    queryDetail();
+    queryProcotol();
+});
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/link/AccessConfig/Outline/index.vue b/src/views/link/AccessConfig/Outline/index.vue
new file mode 100644
index 00000000..1164d156
--- /dev/null
+++ b/src/views/link/AccessConfig/Outline/index.vue
@@ -0,0 +1,85 @@
+<template>
+    <a-drawer
+        visible
+        :closable="false"
+        @close="$emit('closeDrawer')"
+        :width="700"
+    >
+        <template #title>
+            <div class="drawerTitle">
+                <Ellipsis style="height: 22px; width: calc(100% - 50px)"
+                    ><div>{{ data?.name }}</div></Ellipsis
+                >
+                <Ellipsis style="height: 22px; max-width: 650px"
+                    ><div class="description">
+                        {{ data?.description }}
+                    </div></Ellipsis
+                >
+            </div>
+        </template>
+        <FirstKind
+            v-if="
+                [
+                    'mqtt-server-gateway',
+                    'mqtt-client-gateway',
+                    'websocket-server',
+                    'http-server-gateway',
+                    'coap-server-gateway',
+                    'tcp-server-gateway',
+                    'udp-device-gateway',
+                ].includes(data.provider)
+            "
+            :data="data"
+        />
+        <SecondKind
+            v-if="['plugin_gateway', 'media-plugin'].includes(data.provider)"
+            :data="data"
+        />
+        <ThirdKind
+            v-if="['Ctwing', 'OneNet','OneNet-platform'].includes(data.provider)"
+            :data="data"
+        />
+        <FourthKind
+            v-if="
+                [
+                    'edge-child-device',
+                    'fixed-media',
+                    'opc-ua',
+                    'modbus-tcp',
+                    'collector-gateway',
+                    'onvif',
+                ].includes(data.channel)
+            "
+            :data="data"
+        />
+        <FifthKind
+            v-if="
+                ['official-edge-gateway', 'child-device'].includes(
+                    data.provider,
+                )
+            "
+            :data="data"
+        />
+        <SixthKind v-if="data.provider === 'gb28181-2016'" :data="data" />
+    </a-drawer>
+</template>
+
+<script setup>
+import FirstKind from './components/FirstKind.vue';
+import SecondKind from './components/SecondKind.vue';
+import ThirdKind from './components/ThirdKind.vue';
+import FourthKind from './components/FourthKind.vue';
+import FifthKind from './components/FifthKind.vue';
+import SixthKind from './components/SixthKind.vue';
+const props = defineProps({
+    data: {
+        type: Object,
+    },
+});
+const emit = defineEmits(['closeDrawer']);
+</script>
+<style lang="less" scoped>
+.description {
+    font-size: 12px;
+}
+</style>
diff --git a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
index 07d3eff7..0a8d4e70 100644
--- a/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
+++ b/src/views/link/AccessConfig/components/Cloud/Ctwing.vue
@@ -445,7 +445,7 @@ const saveData = async () => {
         },
         protocol: procotolCurrent.value,
         provider: props.provider.id,
-        transport: 'HTTP_SERVER',
+        transport: 'HTTP',
     };
     const resp =
         id === ':id'
diff --git a/src/views/link/AccessConfig/components/Cloud/OneNet.vue b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
index 476c810c..9a6c2a72 100644
--- a/src/views/link/AccessConfig/components/Cloud/OneNet.vue
+++ b/src/views/link/AccessConfig/components/Cloud/OneNet.vue
@@ -476,7 +476,7 @@ const formRef1 = ref<FormInstance>();
 const formRef2 = ref<FormInstance>();
 
 const formState = ref<FormState>({
-    apiAddress: 'http://api.zj.cmcconenet.com/',
+    apiAddress:   props.provider.id === 'OneNet' ? 'http://api.zj.cmcconenet.com/' : 'https://iot-api.heclouds.com',
     apiKey: '',
     validateToken: '',
     aesKey: '',
@@ -526,7 +526,7 @@ const saveData = async () => {
         },
         protocol: procotolCurrent.value,
         provider: props.provider.id,
-        transport: 'HTTP_SERVER',
+        transport: 'HTTP',
     };
     const resp =
         id === ':id'
diff --git a/src/views/link/AccessConfig/components/Media/Onvif.vue b/src/views/link/AccessConfig/components/Media/Onvif.vue
index 482d5875..6c171fa4 100644
--- a/src/views/link/AccessConfig/components/Media/Onvif.vue
+++ b/src/views/link/AccessConfig/components/Media/Onvif.vue
@@ -59,16 +59,13 @@
             </j-col>
             <j-col :span="12">
                 <div class="doc">
-                    <h1>接入方式</h1>
+                    <h1>Onvif视频接入</h1>
                     <p>
-                        {{ provider.name }}
-                    </p>
-                    <p>
-                        {{ provider.description }}
+                        适用于使用RSTP或RTMP固定地址接入的视频设备
                     </p>
                     <h1>消息协议</h1>
                     <p>
-                        {{ provider.id === 'fixed-media' ? 'URL' : 'SIP' }}
+                        内置Onvif协议
                     </p>
                 </div>
             </j-col>
diff --git a/src/views/link/AccessConfig/components/Media/index.vue b/src/views/link/AccessConfig/components/Media/index.vue
index 294a29a9..56277915 100644
--- a/src/views/link/AccessConfig/components/Media/index.vue
+++ b/src/views/link/AccessConfig/components/Media/index.vue
@@ -81,13 +81,21 @@
         <div v-else-if="channel === 'onvif'">
             <Onvif :provider="props.provider" :data="props.data"></Onvif>
         </div>
+        <div v-else-if="channel === 'plugin'">
+            <Plugin
+                :bindProduct="bindProduct"
+                :data="data"
+                :provider="provider"
+            />
+        </div>
     </div>
 </template>
 
 <script lang="ts" setup name="AccessMedia">
 import { onlyMessage } from '@/utils/comm';
 import GB28181 from './GB28181.vue';
-import Onvif from './Onvif.vue'
+import Onvif from './Onvif.vue';
+import Plugin from '../Plugin/index.vue';
 import { update, save } from '@/api/link/accessConfig';
 
 interface FormState {
@@ -107,6 +115,10 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    bindProduct: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const loading = ref(false);
@@ -117,7 +129,7 @@ const formState = ref<FormState>({
     description: '',
 });
 const onFinish = async (values: any) => {
-    loading.value = true
+    loading.value = true;
     const params = {
         ...values,
         provider: 'fixed-media',
@@ -131,7 +143,7 @@ const onFinish = async (values: any) => {
 
         if (route.query.save) {
             // @ts-ignore
-            if((window as any).onTabSaveSuccess){
+            if ((window as any).onTabSaveSuccess) {
                 (window as any).onTabSaveSuccess(resp.result);
                 setTimeout(() => window.close(), 300);
             }
@@ -139,7 +151,7 @@ const onFinish = async (values: any) => {
             history.back();
         }
     }
-    loading.value = false
+    loading.value = false;
 };
 
 onMounted(() => {
diff --git a/src/views/link/AccessConfig/components/Plugin/index.vue b/src/views/link/AccessConfig/components/Plugin/index.vue
index dcc74ba2..10937d1f 100644
--- a/src/views/link/AccessConfig/components/Plugin/index.vue
+++ b/src/views/link/AccessConfig/components/Plugin/index.vue
@@ -1,439 +1,480 @@
 <template>
-  <div>
-    <j-steps :current="current">
-      <j-step disabled :key="0" title="选择插件" />
-      <j-step disabled :key="1" title="完成" />
-    </j-steps>
-    <div class='steps-content'>
-      <div class="steps-box" v-if="current === 0">
-        <div class="search">
-          <j-input-search
-            allowClear
-            placeholder="请输入"
-            style="width: 300px"
-            @search="pluginSearch"
-          />
-          <PermissionButton
-            v-if='showAddBtn'
-            type="primary"
-            @click="addPlugin"
-            hasPermission="link/plugin:add"
-          >
-            <template #icon><AIcon type="PlusOutlined" /></template>
-            新增
-          </PermissionButton>
+    <div>
+        <j-steps :current="current">
+            <j-step disabled :key="0" title="选择插件" />
+            <j-step disabled :key="1" title="完成" />
+        </j-steps>
+        <div class="steps-content">
+            <div class="steps-box" v-if="current === 0">
+                <div class="search">
+                    <j-input-search
+                        allowClear
+                        placeholder="请输入"
+                        style="width: 300px"
+                        @search="pluginSearch"
+                    />
+                    <PermissionButton
+                        v-if="showAddBtn"
+                        type="primary"
+                        @click="addPlugin"
+                        hasPermission="link/plugin:add"
+                    >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
+                    </PermissionButton>
+                </div>
+                <j-scrollbar height="480">
+                    <j-row
+                        :gutter="[24, 24]"
+                        style="width: 100%"
+                        v-if="pluginList.length > 0"
+                    >
+                        <j-col
+                            :span="8"
+                            v-for="item in pluginList"
+                            :key="item.id"
+                        >
+                            <AccessCard
+                                @checkedChange="AccessChange"
+                                :checked="AccessCurrent"
+                                :disabled="!showAddBtn"
+                                :data="{ ...item, type: 'plugin' }"
+                            >
+                                <template #other>
+                                    <div class="plugin-other">
+                                        <div class="plugin-id">
+                                            <div class="plugin-text">
+                                                插件ID：
+                                            </div>
+                                            <div class="other-content">
+                                                <j-ellipsis>
+                                                    {{ item.id }}
+                                                </j-ellipsis>
+                                            </div>
+                                        </div>
+                                        <div class="plugin-version">
+                                            <div class="plugin-text">
+                                                版本号：
+                                            </div>
+                                            <div class="other-content">
+                                                <j-ellipsis>
+                                                    {{ item.version }}
+                                                </j-ellipsis>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </template>
+                            </AccessCard>
+                        </j-col>
+                    </j-row>
+                    <j-empty
+                        style="margin-top: 10%"
+                        v-else
+                        description="暂无数据"
+                    />
+                </j-scrollbar>
+            </div>
+            <div class="steps-box" v-else-if="current === 1">
+                <div
+                    class="card-last"
+                    :style="`max-height:${
+                        clientHeight > 900 ? 750 : clientHeight * 0.7
+                    }px`"
+                >
+                    <j-row :gutter="[24, 24]">
+                        <j-col :span="16">
+                            <title-component data="基本信息" />
+                            <j-form
+                                ref="formRef"
+                                :model="formData"
+                                layout="vertical"
+                            >
+                                <j-form-item
+                                    label="名称"
+                                    :rules="[
+                                        {
+                                            required: true,
+                                            message: '请输入名称',
+                                            trigger: 'blur',
+                                        },
+                                        {
+                                            max: 64,
+                                            message: '最多可输入64个字符',
+                                        },
+                                    ]"
+                                    name="name"
+                                >
+                                    <j-input
+                                        v-model:value="formData.name"
+                                        allowClear
+                                        placeholder="请输入名称"
+                                    />
+                                </j-form-item>
+                                <j-form-item
+                                    label="说明"
+                                    :rules="[
+                                        {
+                                            max: 200,
+                                            message: '最多可输入200个字符',
+                                        },
+                                    ]"
+                                    name="description"
+                                >
+                                    <j-textarea
+                                        placeholder="请输入说明"
+                                        :rows="4"
+                                        v-model:value="formData.description"
+                                        show-count
+                                        :maxlength="200"
+                                    />
+                                </j-form-item>
+                                <template v-if="config.length">
+                                    <title-component data="通用配置" />
+                                    <j-form-item
+                                        v-for="item in config"
+                                        :key="item.name"
+                                        :name="['configuration', item.name]"
+                                        :label="item.label"
+                                        :rules="item.rules"
+                                        :required="
+                                            !!item.type?.expands?.required
+                                        "
+                                    >
+                                        <ValueItem
+                                            v-model:modelValue="
+                                                formData.configuration[
+                                                    item.name
+                                                ]
+                                            "
+                                            :itemType="item.type"
+                                        />
+                                    </j-form-item>
+                                </template>
+                            </j-form>
+                        </j-col>
+                    </j-row>
+                </div>
+            </div>
         </div>
-        <j-scrollbar height="480">
-          <j-row
-            :gutter="[24, 24]"
-            style="width: 100%"
-            v-if="pluginList.length > 0"
-          >
-            <j-col
-              :span="8"
-              v-for="item in pluginList"
-              :key="item.id"
+        <div class="steps-action">
+            <j-button
+                v-if="current > 0"
+                @click="prev"
+                style="margin-right: 8px"
             >
-              <AccessCard
-                @checkedChange="AccessChange"
-                :checked="AccessCurrent"
-                :disabled='!showAddBtn'
-                :data="{ ...item, type: 'plugin' }"
-              >
-                <template #other>
-                  <div class='plugin-other'>
-                    <div class='plugin-id'>
-                      <div class="plugin-text">插件ID：</div>
-                      <div class='other-content'>
-                        <j-ellipsis>
-                          {{ item.id }}
-                        </j-ellipsis>
-                      </div>
-                    </div>
-                    <div class='plugin-version'>
-                     <div class="plugin-text"> 版本号：</div>
-                      <div class='other-content'>
-                        <j-ellipsis>
-                          {{ item.version }}
-                        </j-ellipsis>
-                      </div>
-                    </div>
-                  </div>
+                上一步
+            </j-button>
 
-                </template>
-              </AccessCard>
-            </j-col>
-          </j-row>
-          <j-empty
-            style="margin-top: 10%"
-            v-else
-            description="暂无数据"
-          />
-        </j-scrollbar>
-      </div>
-      <div class="steps-box" v-else-if="current === 1">
-        <div
-          class="card-last"
-          :style="`max-height:${ clientHeight > 900 ? 750 : clientHeight * 0.7 }px`"
-        >
-          <j-row :gutter="[24, 24]">
-            <j-col :span="16">
-              <title-component data="基本信息" />
-              <j-form
-                ref="formRef"
-                :model="formData"
-                layout="vertical"
-              >
-                <j-form-item
-                  label="名称"
-                  :rules="[
-                      { required: true, message: '请输入名称', trigger: 'blur' },
-                      {
-                          max: 64,
-                          message: '最多可输入64个字符',
-                      },
-                  ]"
-                  name='name'
-                >
-                  <j-input
-                    v-model:value="formData.name"
-                    allowClear
-                    placeholder="请输入名称"
-                  />
-                </j-form-item>
-                <j-form-item
-                  label="说明"
-                  :rules="[{ max: 200, message: '最多可输入200个字符' }]"
-                  name='description'
-                >
-                  <j-textarea
-                    placeholder="请输入说明"
-                    :rows="4"
-                    v-model:value="formData.description"
-                    show-count
-                    :maxlength="200"
-                  />
-                </j-form-item>
-                <template v-if='config.length' >
-                  <title-component data="通用配置" />
-                  <j-form-item
-                    v-for='item in config'
-                    :key='item.name'
-                    :name='["configuration", item.name]'
-                    :label='item.label'
-                    :rules='item.rules'
-                    :required='!!item.type?.expands?.required'
-                  >
-                    <ValueItem v-model:modelValue='formData.configuration[item.name]' :itemType='item.type' />
-                  </j-form-item>
-                </template>
-
-              </j-form>
-            </j-col>
-          </j-row>
-        </div>
-      </div>
-    </div>
-    <div class="steps-action">
-      <j-button
-        v-if="current > 0"
-        @click="prev"
-        style="margin-right: 8px"
-      >
-        上一步
-      </j-button>
-
-      <PermissionButton
-        v-if="current === 1 && view === 'false'"
-        type="primary"
-        style="margin-right: 8px"
-        @click="saveData"
-        :hasPermission="`link/AccessConfig:${
+            <PermissionButton
+                v-if="current === 1 && view === 'false'"
+                type="primary"
+                style="margin-right: 8px"
+                @click="saveData"
+                :hasPermission="`link/AccessConfig:${
                     id === ':id' ? 'add' : 'update'
                 }`"
-        :loading='loading'
-      >
-        保存
-      </PermissionButton>
-      <j-button
-        v-if="current === 0"
-        type="primary"
-
-        @click="next"
-      >
-        下一步
-      </j-button>
+                :loading="loading"
+            >
+                保存
+            </PermissionButton>
+            <j-button v-if="current === 0" type="primary" @click="next">
+                下一步
+            </j-button>
+        </div>
     </div>
-  </div>
 </template>
 
-<script lang='ts' setup name='AccessConfigPlugin'>
+<script lang="ts" setup name="AccessConfigPlugin">
 import {
-  save,
-  update,
-  getPluginList,
-  getPluginConfig } from '@/api/link/accessConfig'
+    save,
+    update,
+    getPluginList,
+    getPluginConfig,
+} from '@/api/link/accessConfig';
 import AccessCard from '../AccessCard/index.vue';
-import { useMenuStore } from 'store/menu'
+import { useMenuStore } from 'store/menu';
 import { onlyMessage } from '@/utils/comm';
-import { CreteRuleByType } from 'components/Form/rules'
+import { CreteRuleByType } from 'components/Form/rules';
+import { termType } from '@/components/Search/util';
 
 const props = defineProps({
-  provider: {
-    type: Object,
-    default: () => {},
-  },
-  data: {
-    type: Object,
-    default: () => {},
-  },
-  bindProduct: {
-    type: Boolean,
-    default: false
-  }
+    provider: {
+        type: Object,
+        default: () => {},
+    },
+    data: {
+        type: Object,
+        default: () => {},
+    },
+    bindProduct: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const route = useRoute();
 const menuStory = useMenuStore();
 
 const current = ref(0);
-const pluginList = ref([])
-const AccessCurrent = ref(props.data.channelId)
+const pluginList = ref([]);
+const AccessCurrent = ref(props.data.channelId);
 const paramsId = route.params.id as string;
 const view = route.query.view as string;
 const clientHeight = document.body.clientHeight;
-const loading = ref(false)
+const loading = ref(false);
 
 const formData = reactive({
-  name: undefined,
-  description: undefined,
-  configuration: {}
-})
+    name: undefined,
+    description: undefined,
+    configuration: {},
+});
 const formRef = ref();
 
-const config = ref<any>([])
+const config = ref<any>([]);
 
 const queryPlugin = (params = {}) => {
-  getPluginList({
-    ...params,
-    sorts: [{ name: 'createTime', order: 'desc' }],
-    paging: false
-  }).then(res => {
-    pluginList.value = []
-    if (res.success) {
-      pluginList.value = res.result || []
-    }
-  })
-}
+    getPluginList({
+        terms: [
+            {
+                terms: [
+                    {
+                        column: 'type',
+                        value: props.provider.id === 'media-plugin' ? 'media' : 'deviceGateway',
+                        termType: 'eq',
+                    },
+                ],
+            },
+            params,
+        ],
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        paging: false,
+    }).then((res) => {
+        pluginList.value = [];
+        if (res.success) {
+            pluginList.value = res.result || [];
+        }
+    });
+};
 
 const showAddBtn = computed(() => {
-  return route.query.view === 'false' && !props.bindProduct
-})
+    return route.query.view === 'false' && !props.bindProduct;
+});
 
 const getRules = (item: any) => {
-  let typeName = '输入'
-  let rules: any[] = []
+    let typeName = '输入';
+    let rules: any[] = [];
 
-  if (['select', 'date'].includes(item.type?.type || 'string')) {
-    typeName = '选择'
-  }
+    if (['select', 'date'].includes(item.type?.type || 'string')) {
+        typeName = '选择';
+    }
 
-  if (item.type?.expands?.required) {
-    rules.push(
-        {
-          required: true,
-          message: `请${typeName}${item.name}`
-        }
-    )
-  }
+    if (item.type?.expands?.required) {
+        rules.push({
+            required: true,
+            message: `请${typeName}${item.name}`,
+        });
+    }
 
-  const typeRules = CreteRuleByType(item.type?.type)
-  rules = [...rules, ...typeRules]
-  return rules
-}
+    const typeRules = CreteRuleByType(item.type?.type);
+    rules = [...rules, ...typeRules];
+    return rules;
+};
 
 const queryPluginConfig = (id: string, update: boolean = true) => {
-  getPluginConfig(id).then(res => {
-    if (res.success) {
-      const properties = res.result?.others?.configMetadata?.properties || []
-      config.value = properties.map((item: any) => {
-        if (update) {
-          formData.configuration[item.property] = undefined
+    getPluginConfig(id).then((res) => {
+        if (res.success) {
+            const properties =
+                res.result?.others?.configMetadata?.properties || [];
+            config.value = properties.map((item: any) => {
+                if (update) {
+                    formData.configuration[item.property] = undefined;
+                }
+                return {
+                    label: item.name,
+                    name: item.property,
+                    type: item.type?.type || 'string',
+                    rules: getRules(item),
+                };
+            });
         }
-        return {
-          label: item.name,
-          name: item.property,
-          type: item.type?.type || 'string',
-          rules: getRules(item)
-        }
-      })
-    }
-  })
-}
+    });
+};
 
 const pluginSearch = (val: string) => {
-  queryPlugin({
-    terms: [{
-      column: 'name',
-      termType: 'like',
-      value: `%${val}%`
-    }]
-  })
-}
+    queryPlugin({
+        terms: [
+            {
+                column: 'name',
+                termType: 'like',
+                value: `%${val}%`,
+            },
+        ],
+        type: 'and',
+    });
+};
 
 const AccessChange = (id: string) => {
-  AccessCurrent.value = id;
+    AccessCurrent.value = id;
 };
 
 const addPlugin = () => {
-  const url = menuStory.menus['link/plugin']?.path;
-  const wd: any =  window.open(
-    `${window.location.origin + window.location.pathname}#${url}?save=true`,
-  );
-  wd.onTabSaveSuccess = (value: any) => {
-    if (value.success) {
-      AccessCurrent.value = value.result?.id;
-      pluginList.value.unshift(value.result as any)
-    }
-  }
-}
+    const url = menuStory.menus['link/plugin']?.path;
+    const wd: any = window.open(
+        `${window.location.origin + window.location.pathname}#${url}?save=true`,
+    );
+    wd.onTabSaveSuccess = (value: any) => {
+        if (value.success) {
+            AccessCurrent.value = value.result?.id;
+            pluginList.value.unshift(value.result as any);
+        }
+    };
+};
 
 /**
  * 下一步
  */
 const next = () => {
-  if (!AccessCurrent.value) {
-    return onlyMessage('请选择插件！', 'error');
-  }
-  current.value += 1
-}
+    if (!AccessCurrent.value) {
+        return onlyMessage('请选择插件！', 'error');
+    }
+    current.value += 1;
+};
 
 /**
  * 上一步
  */
 const prev = () => {
-  current.value -= 1
-}
+    current.value -= 1;
+};
 
 /**
  * 保存
  */
 const saveData = () => {
-  formRef.value.validate().then(async (data: any) => {
-    if (data) {
-      const params = {
-        ...props.data,
-        ...data,
-        protocol: 'plugin',
-        channel: 'plugin', // 网络组件
-        channelId: AccessCurrent.value,
-        provider: props.provider.id,
-        transport: 'plugin'
-      };
+    formRef.value.validate().then(async (data: any) => {
+        if (data) {
+            const params = {
+                ...props.data,
+                ...data,
+                protocol:
+                    props.provider.id === 'media-plugin'
+                        ? props.provider.id
+                        : 'plugin',
+                channel: 'plugin', // 网络组件
+                channelId: AccessCurrent.value,
+                provider: props.provider.id,
+                transport: 'plugin',
+            };
 
-      loading.value = true
-      const resp =
-        paramsId === ':id'
-          ? await save(params).catch(() => { success: false})
-          : await update({ ...params, id: paramsId }).catch(() => { success: false});
-      loading.value = false
-      if (resp.success) {
-        onlyMessage('操作成功', 'success');
-        history.back();
-        if ((window as any).onTabSaveSuccess) {
-          if (resp.result?.id) {
-            (window as any).onTabSaveSuccess(resp);
-            setTimeout(() => window.close(), 300);
-          }
+            loading.value = true;
+            const resp =
+                paramsId === ':id'
+                    ? await save(params).catch(() => {
+                          success: false;
+                      })
+                    : await update({ ...params, id: paramsId }).catch(() => {
+                          success: false;
+                      });
+            loading.value = false;
+            if (resp.success) {
+                onlyMessage('操作成功', 'success');
+                history.back();
+                if ((window as any).onTabSaveSuccess) {
+                    if (resp.result?.id) {
+                        (window as any).onTabSaveSuccess(resp);
+                        setTimeout(() => window.close(), 300);
+                    }
+                }
+            }
         }
-      }
-    }
-  })
-}
+    });
+};
 
 watchEffect(() => {
-  if (current.value === 1 && AccessCurrent.value) {
-
-    queryPluginConfig(AccessCurrent.value, AccessCurrent.value !== props.data.channelId)
-  }
-})
+    if (current.value === 1 && AccessCurrent.value) {
+        queryPluginConfig(
+            AccessCurrent.value,
+            AccessCurrent.value !== props.data.channelId,
+        );
+    }
+});
 
 onMounted(() => {
- if (paramsId !== ':id') { // 编辑，回显表单值
-    formData.name = props.data.name
-   formData.description = props.data.description
-   formData.configuration = props.data.configuration
- }
-})
-
-queryPlugin()
+    if (paramsId !== ':id') {
+        // 编辑，回显表单值
+        formData.name = props.data.name;
+        formData.description = props.data.description;
+        formData.configuration = props.data.configuration;
+    }
+});
 
+queryPlugin();
 </script>
 
-<style scoped lang='less'>
+<style scoped lang="less">
 .steps-content {
-  margin-top: 20px;
+    margin-top: 20px;
 }
 .steps-box {
-  min-height: 400px;
-  .card-last {
-    padding-right: 5px;
-    overflow-y: auto;
-    overflow-x: hidden;
-  }
+    min-height: 400px;
+    .card-last {
+        padding-right: 5px;
+        overflow-y: auto;
+        overflow-x: hidden;
+    }
 }
 .steps-action {
-  width: 100%;
-  margin-top: 24px;
+    width: 100%;
+    margin-top: 24px;
 }
 .alert {
-  height: 40px;
-  padding-left: 10px;
-  color: rgba(0, 0, 0, 0.55);
-  line-height: 40px;
-  background-color: #f6f6f6;
+    height: 40px;
+    padding-left: 10px;
+    color: rgba(0, 0, 0, 0.55);
+    line-height: 40px;
+    background-color: #f6f6f6;
 }
 .search {
-  display: flex;
-  margin: 15px 0;
-  justify-content: space-between;
+    display: flex;
+    margin: 15px 0;
+    justify-content: space-between;
 }
 
 .other {
-  width: 100%;
-  height: 20px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  .item {
     width: 100%;
-    overflow: hidden;
-    white-space: nowrap;
-    text-overflow: ellipsis;
-  }
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .item {
+        width: 100%;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+    }
 }
 
 .plugin-other {
-  display: flex;
-  gap: 16px;
-  .plugin-id, .plugin-version {
-    color: rgba(0, 0, 0, 0.85);
-    opacity: .45;
     display: flex;
+    gap: 16px;
+    .plugin-id,
+    .plugin-version {
+        color: rgba(0, 0, 0, 0.85);
+        opacity: 0.45;
+        display: flex;
 
-    .plugin-text {
-      white-space: nowrap;
+        .plugin-text {
+            white-space: nowrap;
+        }
     }
-  }
 
-  .plugin-id {
-    width: 50%;
-    // .other-content {
-    //   display: flex;
-    //   width: 0;
-    //   flex-grow: 1;
-    // }
-  }
+    .plugin-id {
+        width: 50%;
+        // .other-content {
+        //   display: flex;
+        //   width: 0;
+        //   flex-grow: 1;
+        // }
+    }
 }
-
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/link/AccessConfig/data.ts b/src/views/link/AccessConfig/data.ts
index 891b18dc..2503bc4a 100644
--- a/src/views/link/AccessConfig/data.ts
+++ b/src/views/link/AccessConfig/data.ts
@@ -10,6 +10,7 @@ ProtocolMapping.set('mqtt-server-gateway', 'MQTT');
 ProtocolMapping.set('tcp-server-gateway', 'TCP');
 ProtocolMapping.set('child-device', '');
 ProtocolMapping.set('OneNet', 'HTTP');
+ProtocolMapping.set('OneNet-platform', 'HTTP');
 ProtocolMapping.set('Ctwing', 'HTTP');
 ProtocolMapping.set('modbus-tcp', 'MODBUS_TCP');
 ProtocolMapping.set('opc-ua', 'OPC_UA');
@@ -41,11 +42,14 @@ BackMap.set('http-server-gateway', getImage('/access/http.png'));
 BackMap.set('fixed-media', getImage('/access/video-device.png'));
 BackMap.set('udp-device-gateway', getImage('/access/udp.png'));
 BackMap.set('OneNet', getImage('/access/onenet.png'));
+BackMap.set('OneNet-platform', getImage('/access/onenet.png'));
 BackMap.set('gb28181-2016', getImage('/access/gb28181.png'));
 BackMap.set('mqtt-client-gateway', getImage('/access/mqtt-broke.png'));
 BackMap.set('edge-child-device', getImage('/access/child-device.png'));
 BackMap.set('official-edge-gateway', getImage('/access/edge.png'));
 BackMap.set('collector-gateway', getImage('/access/collector-gateway.png'));
+BackMap.set('onvif',getImage('/access/onvif.png'));
+BackMap.set('media-plugin',getImage('/access/media-plugin.png'))
 
 const descriptionList = {
     'udp-device-gateway':
diff --git a/src/views/link/AccessConfig/index.vue b/src/views/link/AccessConfig/index.vue
index 1b888329..fef27702 100644
--- a/src/views/link/AccessConfig/index.vue
+++ b/src/views/link/AccessConfig/index.vue
@@ -13,7 +13,7 @@
                     :columns="columns"
                     :request="list"
                     :defaultParams="{
-                        sorts: [{ name: 'createTime', order: 'desc' }]
+                        sorts: [{ name: 'createTime', order: 'desc' }],
                     }"
                     gridColumn="2"
                     :gridColumns="[1, 2]"
@@ -22,7 +22,7 @@
                     <template #headerTitle>
                         <PermissionButton
                             type="primary"
-                            @click="handlAdd"
+                            @click="handleAdd"
                             hasPermission="link/AccessConfig:add"
                         >
                             <template #icon
@@ -43,7 +43,7 @@
                                 enabled: 'processing',
                                 disabled: 'error',
                             }"
-                            @click="handlEye(slotProps.id)"
+                            @click="handleEye(slotProps)"
                         >
                             <template #img>
                                 <slot name="img">
@@ -54,11 +54,7 @@
                             </template>
                             <template #content>
                                 <div class="card-item-content">
-                                    <Ellipsis
-                                        style="
-                                            width: calc(100% - 100px);
-                                        "
-                                    >
+                                    <Ellipsis style="width: calc(100% - 100px)">
                                         <span class="card-title">
                                             {{ slotProps.name }}
                                         </span>
@@ -69,16 +65,19 @@
                                             v-if="slotProps.channelInfo"
                                             class="card-item-content-text"
                                         >
-                                        <Ellipsis
-                                        style="
-                                            width: calc(100% - 100px);
-                                        "
-                                    >
-                                            <div
-                                                class="card-item-content-text-title"
+                                            <Ellipsis
+                                                style="
+                                                    width: calc(100% - 100px);
+                                                "
                                             >
-                                                {{ slotProps.channelInfo.name }}
-                                            </div>
+                                                <div
+                                                    class="card-item-content-text-title"
+                                                >
+                                                    {{
+                                                        slotProps.channelInfo
+                                                            .name
+                                                    }}
+                                                </div>
                                             </Ellipsis>
                                             <Ellipsis
                                                 style="
@@ -116,9 +115,7 @@
                                                 协议
                                             </div>
                                             <Ellipsis
-                                                style="
-                                                    width: calc(100% - 10px);
-                                                "
+                                                style="width: calc(100% - 10px)"
                                                 :lineClamp="2"
                                             >
                                                 <div>
@@ -183,6 +180,7 @@
                 </j-pro-table>
             </FullPage>
         </div>
+        <Outline v-if="visibleOutline" :data="current" @closeDrawer="visibleOutline = false"></Outline>
     </page-container>
 </template>
 <script lang="ts" setup name="AccessConfigPage">
@@ -198,12 +196,14 @@ import {
 import { onlyMessage } from '@/utils/comm';
 import { useMenuStore } from 'store/menu';
 import { accessConfigTypeFilter } from '@/utils/setting';
-import {  cloneDeep } from 'lodash-es';
+import { cloneDeep } from 'lodash-es';
+import Outline from './Outline/index.vue'
 
 const menuStory = useMenuStore();
 const tableRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
-
+const visibleOutline = ref(false);
+const current = ref()
 let providersList = ref<Record<string, any>>([]);
 
 const statusMap = new Map();
@@ -226,12 +226,14 @@ const columns = [
         key: 'provider',
         search: {
             type: 'select',
-            options: async() =>{
+            options: async () => {
                 const res: any = await getProviders();
-               const providersOptions = accessConfigTypeFilter(res.result || []);
-                return providersOptions.filter((i:any)=>{
-                    return i.id !== 'modbus-tcp' && i.id !== 'opc-ua'
-                })
+                const providersOptions = accessConfigTypeFilter(
+                    res.result || [],
+                );
+                return providersOptions.filter((i: any) => {
+                    return i.id !== 'modbus-tcp' && i.id !== 'opc-ua';
+                });
             },
         },
     },
@@ -284,7 +286,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             icon: 'EditOutlined',
             onClick: async () => {
-                handlEdit(data.id);
+                handleEdit(data.id);
             },
         },
         {
@@ -296,16 +298,18 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             icon: state === 'enabled' ? 'StopOutlined' : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${stateText}?`,
-                onConfirm: async () => {
-                    let res =
+                onConfirm: () => {
+                    let response =
                         state === 'enabled'
-                            ? await undeploy(data.id)
-                            : await deploy(data.id);
-
-                    if (res.success) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value?.reload();
-                    }
+                            ? undeploy(data.id)
+                            : deploy(data.id);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value?.reload();
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -318,14 +322,17 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const res: any = await remove(data.id);
-                    if (res.status === 200) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value.reload();
-                    } else {
-                        onlyMessage(res?.message, 'error');
-                    }
+                onConfirm: () => {
+                    const response: any = remove(data.id);
+                    response.then((res: any) => {
+                        if (res.status === 200) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value.reload();
+                        } else {
+                            onlyMessage(res?.message, 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
@@ -339,18 +346,20 @@ const getProvidersList = async () => {
 };
 getProvidersList();
 
-const handlAdd = () => {
+const handleAdd = () => {
     menuStory.jumpPage(
         `link/AccessConfig/Detail`,
         { id: ':id' },
         { view: false },
     );
 };
-const handlEdit = (id: string) => {
+const handleEdit = (id: string) => {
     menuStory.jumpPage(`link/AccessConfig/Detail`, { id }, { view: false });
 };
-const handlEye = (id: string) => {
-    menuStory.jumpPage(`link/AccessConfig/Detail`, { id }, { view: true });
+const handleEye = (data: any) => {
+    visibleOutline.value = true;
+    current.value = data;
+    // menuStory.jumpPage(`link/AccessConfig/Detail`, { id }, { view: true });
 };
 
 const getDescription = (slotProps: Record<string, any>) =>
@@ -372,12 +381,15 @@ const handleSearch = (e: any) => {
     if (newTerms.terms?.length) {
         newTerms.terms.forEach((a: any) => {
             a.terms = a.terms.map((b: any) => {
-                if(b.column === 'provider'){
-                    if(b.value === 'collector-gateway'){
+                if (b.column === 'provider') {
+                    if (b.value === 'collector-gateway') {
                         b.termType = b.termType === 'eq' ? 'in' : 'nin';
-                        b.value = ['opc-ua','modbus-tcp','collector-gateway'];
-                    }else if(Array.isArray(b.value) && b.value.includes('collector-gateway')){
-                        b.value = ['opc-ua','modbus-tcp',...b.value];
+                        b.value = ['opc-ua', 'modbus-tcp', 'collector-gateway'];
+                    } else if (
+                        Array.isArray(b.value) &&
+                        b.value.includes('collector-gateway')
+                    ) {
+                        b.value = ['opc-ua', 'modbus-tcp', ...b.value];
                     }
                 }
                 return b;
diff --git a/src/views/link/Certificate/Detail/index.vue b/src/views/link/Certificate/Detail/index.vue
index 3f36325e..3a95ecf2 100644
--- a/src/views/link/Certificate/Detail/index.vue
+++ b/src/views/link/Certificate/Detail/index.vue
@@ -21,7 +21,7 @@
                                 <j-input placeholder="请输入证书名称" v-model:value="formData.name" />
                             </j-form-item>
                             <j-form-item label="证书文件" :name="['configs','cert']" :rules="[
-                                { required: true, message: '请输入或上传文件', trigger: 'blur' },
+                                { required: true, message: '请输入或上传文件', trigger: 'change' },
                             ]">
                                 <CertificateFile name="cert" v-model:modelValue="formData.configs.cert"
                                     placeholder="请输入证书文件" />
@@ -41,7 +41,7 @@
                                 </j-radio-group>
                             </j-form-item> -->
                             <j-form-item label="证书私钥" v-if="formData.mode !== 'client'" :name="['configs','key']" :rules="[
-                                { required: true, message: '请输入或上传文件', trigger: 'blur' },
+                                { required: true, message: '请输入或上传文件', trigger: 'change' },
                             ]">
                                 <CertificateFile name="key" v-model:modelValue="formData.configs.key"
                                     placeholder="请输入证书私钥" />
diff --git a/src/views/link/Certificate/index.vue b/src/views/link/Certificate/index.vue
index 7fa990a0..093cea52 100644
--- a/src/views/link/Certificate/index.vue
+++ b/src/views/link/Certificate/index.vue
@@ -33,7 +33,7 @@
                         <span>{{ slotProps.type.text }}</span>
                     </template>
                     <template #action="slotProps">
-                        <j-space>
+                        <j-space :size="16">
                             <template
                                 v-for="i in getActions(slotProps)"
                                 :key="i.key"
@@ -157,7 +157,7 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
                 okText: ' 确定',
                 cancelText: '取消',
                 onConfirm: async () => {
-                    handlDelete(data.id);
+                    return handleDelete(data.id);
                 },
             },
             icon: 'DeleteOutlined',
@@ -181,12 +181,15 @@ const handlEdit = (id: string) => {
     menuStory.jumpPage(`link/Certificate/Detail`, { id }, { view: false });
 };
 
-const handlDelete = async (id: string) => {
-    const res = await remove(id);
-    if (res.success) {
-        onlyMessage('操作成功', 'success');
-        tableRef.value.reload();
-    }
+const handleDelete = (id: string) => {
+    const response = remove(id);
+    response.then((res) => {
+        if (res.success) {
+            onlyMessage('操作成功', 'success');
+            tableRef.value.reload();
+        }
+    });
+    return response
 };
 
 /**
diff --git a/src/views/link/DashBoard/components/Network.vue b/src/views/link/DashBoard/components/Network.vue
index 9e5df5b7..766d33df 100644
--- a/src/views/link/DashBoard/components/Network.vue
+++ b/src/views/link/DashBoard/components/Network.vue
@@ -238,7 +238,6 @@ watch(
     () => data.value.time.type,
     (value) => {
         if (value === undefined) return;
-        console.log(value);
         const date = getTimeByType(value);
         data.value.time.time = [dayjs(date), dayjs(new Date())];
 
diff --git a/src/views/link/DashBoard/components/tool.ts b/src/views/link/DashBoard/components/tool.ts
index 83602698..756030cd 100644
--- a/src/views/link/DashBoard/components/tool.ts
+++ b/src/views/link/DashBoard/components/tool.ts
@@ -76,7 +76,7 @@ export const networkParams = (val: any) => {
     } else if (dt > days && dt <= months * 3) {
         _limit = Math.abs(Math.ceil(dt / days)) + 1;
         _time = '1d';
-        format = 'M月dd日 HH:mm:ss';
+        format = 'M月dd日';
     } else if (dt > months * 3 && dt < year) {
         _limit = Math.abs(Math.ceil(dt / months)) + 1;
         _time = '1M';
diff --git a/src/views/link/Protocol/index.vue b/src/views/link/Protocol/index.vue
index 21083d01..84d64b0c 100644
--- a/src/views/link/Protocol/index.vue
+++ b/src/views/link/Protocol/index.vue
@@ -42,9 +42,7 @@
                             </template>
                             <template #content>
                                 <div class="card-item-content">
-                                    <Ellipsis
-                                        style="margin-bottom: 18px;"
-                                    >
+                                    <Ellipsis style="margin-bottom: 18px">
                                         <span
                                             style="
                                                 font-size: 16px;
@@ -110,7 +108,7 @@
                         </CardBox>
                     </template>
                     <template #action="slotProps">
-                        <j-space>
+                        <j-space :size="16">
                             <template
                                 v-for="i in getActions(slotProps, 'table')"
                                 :key="i.key"
@@ -237,14 +235,17 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const res: any = await remove(data.id);
-                    if (res.status === 200) {
+                onConfirm:  () => {
+                    const response: any = remove(data.id);
+                    response.then((res)=>{
+                        if (res.status === 200) {
                         onlyMessage('操作成功', 'success');
                         tableRef.value.reload();
                     } else {
                         onlyMessage(res?.message, 'error');
                     }
+                    })
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/link/Type/Detail/index.vue b/src/views/link/Type/Detail/index.vue
index 84c66a62..41daacdf 100644
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@@ -66,7 +66,11 @@
                                             )
                                         "
                                     >
-                                        <j-radio-button :value="true" :disabled="formData.type ==='MQTT_CLIENT'"
+                                        <j-radio-button
+                                            :value="true"
+                                            :disabled="
+                                                formData.type === 'MQTT_CLIENT'
+                                            "
                                             >共享配置</j-radio-button
                                         >
                                         <j-radio-button :value="false"
@@ -129,15 +133,15 @@
                                             </div>
                                         </template>
                                         <template #extra v-if="!shareCluster">
-                                            <j-popconfirm
-                                                @confirm.prevent="
-                                                    removeCluster(cluster)
-                                                "
+                                            <PermissionButton
+                                                danger
+                                                :popConfirm="{
+                                                    title: '确认删除？',
+                                                    onConfirm: () =>
+                                                        removeCluster(cluster),
+                                                }"
+                                                >删除</PermissionButton
                                             >
-                                                <span class="delete-btn">
-                                                    删除
-                                                </span>
-                                            </j-popconfirm>
                                         </template>
                                         <j-row :gutter="[24, 0]">
                                             <j-col
@@ -238,12 +242,35 @@
                                                         "
                                                     >
                                                     </j-select> -->
-                                                    <LocalAddressSelect 
-                                                        v-model:value="cluster.configuration.host"
-                                                        :serverId="cluster.serverId"
-                                                        :shareCluster="shareCluster"
-                                                        @change="(value) => changeHost(cluster.serverId, value, index)"
-                                                        @valueChange="(value) => changeHost(cluster.serverId, value, index, true)"
+                                                    <LocalAddressSelect
+                                                        v-model:value="
+                                                            cluster
+                                                                .configuration
+                                                                .host
+                                                        "
+                                                        :serverId="
+                                                            cluster.serverId
+                                                        "
+                                                        :shareCluster="
+                                                            shareCluster
+                                                        "
+                                                        @change="
+                                                            (value) =>
+                                                                changeHost(
+                                                                    cluster.serverId,
+                                                                    value,
+                                                                    index,
+                                                                )
+                                                        "
+                                                        @valueChange="
+                                                            (value) =>
+                                                                changeHost(
+                                                                    cluster.serverId,
+                                                                    value,
+                                                                    index,
+                                                                    true,
+                                                                )
+                                                        "
                                                     />
                                                 </j-form-item>
                                             </j-col>
@@ -284,7 +311,7 @@
                                                                 .configuration
                                                                 .port
                                                         "
-                                                         :options="
+                                                        :options="
                                                             portOptionsIndex[
                                                                 index
                                                             ]
@@ -296,7 +323,7 @@
                                                             filterPortOption
                                                         "
                                                     >
-                                                      <!-- <j-select-option
+                                                        <!-- <j-select-option
                                                           v-for="i in getPortList( portOptionsIndex[
                                                                 index
                                                             ], cluster
@@ -908,8 +935,12 @@
                                                                         .script
                                                                 "
                                                                 language="javascript"
-                                                                :init="editorInit"
-                                                                :registrationTypescript="typescriptTip"
+                                                                :init="
+                                                                    editorInit
+                                                                "
+                                                                :registrationTypescript="
+                                                                    typescriptTip
+                                                                "
                                                             />
                                                         </div>
                                                     </j-form-item>
@@ -1134,7 +1165,7 @@ import {
     start,
     resourceClusters,
     resourceClustersById,
-    getTs
+    getTs,
 } from '@/api/link/type';
 import {
     ParserConfiguration,
@@ -1166,8 +1197,8 @@ const formRef1 = ref<FormInstance>();
 const formRef2 = ref<FormInstance>();
 const shareCluster = ref(true);
 
-const _typeStore = useTypeStore()
-const { configRef, resourcesClusters } = storeToRefs(_typeStore)
+const _typeStore = useTypeStore();
+const { configRef, resourcesClusters } = storeToRefs(_typeStore);
 
 const formData = ref<FormDataType>({
     ...FormStates,
@@ -1181,32 +1212,33 @@ const certIdOptions = ref([]);
 const configClustersList = ref<any[]>([]);
 
 const typescriptTip = reactive({
-  typescript: ''
-})
+    typescript: '',
+});
 
 const editorInit = (editor: any, monaco: any) => {
-  monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
-    noSemanticValidation: true,
-    noSyntaxValidation: false,
-  });
+    monaco.languages.typescript.javascriptDefaults.setDiagnosticsOptions({
+        noSemanticValidation: true,
+        noSyntaxValidation: false,
+    });
 
-  // compiler options
-  monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
-    allowJs: true,
-    checkJs: true,
-    allowNonTsExtensions: true,
-    target: monaco.languages.typescript.ScriptTarget.ESNext,
-    strictNullChecks: false,
-    strictPropertyInitialization: true,
-    strictFunctionTypes: true,
-    strictBindCallApply: true,
-    useDefineForClassFields: true,//permit class static fields with private name to have initializer
-    moduleResolution: monaco.languages.typescript.ModuleResolutionKind.NodeJs,
-    module: monaco.languages.typescript.ModuleKind.CommonJS,
-    typeRoots: ["types"],
-    lib: ["esnext"]
-  });
-}
+    // compiler options
+    monaco.languages.typescript.javascriptDefaults.setCompilerOptions({
+        allowJs: true,
+        checkJs: true,
+        allowNonTsExtensions: true,
+        target: monaco.languages.typescript.ScriptTarget.ESNext,
+        strictNullChecks: false,
+        strictPropertyInitialization: true,
+        strictFunctionTypes: true,
+        strictBindCallApply: true,
+        useDefineForClassFields: true, //permit class static fields with private name to have initializer
+        moduleResolution:
+            monaco.languages.typescript.ModuleResolutionKind.NodeJs,
+        module: monaco.languages.typescript.ModuleKind.CommonJS,
+        typeRoots: ['types'],
+        lib: ['esnext'],
+    });
+};
 
 const dynamicValidateForm = reactive<{ cluster: FormData2Type[] }>({
     cluster: [{ ...cloneDeep(FormStates2), id: '1' }],
@@ -1285,46 +1317,48 @@ const changeType = (value: string) => {
     if (value !== 'MQTT_CLIENT') {
         const { configuration } = dynamicValidateForm.cluster[0];
         value && (configuration.host = '0.0.0.0');
-    }else if(isNoCommunity){
-        formData.value.shareCluster  = false
-        changeShareCluster(formData.value.shareCluster)
+    } else if (isNoCommunity) {
+        formData.value.shareCluster = false;
+        changeShareCluster(formData.value.shareCluster);
     }
-    if(value ==='TCP_SERVER'){
-        getTs().then((res:any)=>{
-            if (res.status===200) {
-                typescriptTip.typescript = res.result
+    if (value === 'TCP_SERVER') {
+        getTs().then((res: any) => {
+            if (res.status === 200) {
+                typescriptTip.typescript = res.result;
             }
-        })
+        });
     }
 };
 
 const updateClustersListIndex = () => {
     const { cluster } = dynamicValidateForm;
     const filters = cluster?.map((item) => item.serverId);
-    const newConfigRef = shareCluster.value ? (configRef.value || [])?.filter(
-        (item: any) => !filters.includes(item.clusterNodeId),
-    ) : configClustersList.value?.filter(
-        (item: any) => !filters.includes(item.id),
-    )
+    const newConfigRef = shareCluster.value
+        ? (configRef.value || [])?.filter(
+              (item: any) => !filters.includes(item.clusterNodeId),
+          )
+        : configClustersList.value?.filter(
+              (item: any) => !filters.includes(item.id),
+          );
     cluster.forEach((item, index) => {
         clustersListIndex.value[index] = newConfigRef?.map((i: any) => {
-            if(shareCluster.value){
+            if (shareCluster.value) {
                 return {
                     value: i.clusterNodeId,
                     label: i.clusterNodeId,
-                }
+                };
             } else {
                 return {
                     value: i.id,
                     label: i.name,
-                }
+                };
             }
-        })
-        if(item.serverId) {
+        });
+        if (item.serverId) {
             clustersListIndex.value[index].push({
                 value: item.serverId,
-                label: item.serverId
-            })
+                label: item.serverId,
+            });
         }
     });
 };
@@ -1334,7 +1368,7 @@ const changeServerId = async (value: string | undefined, index: number) => {
     configuration.host = undefined;
     configuration.port = undefined;
     hostOptionsIndex.value[index] = [];
-    if(value){
+    if (value) {
         updateClustersListIndex();
     }
 };
@@ -1342,16 +1376,16 @@ const changeHost = (
     serverId: string | undefined,
     value: string | undefined,
     index: number,
-    flag?: boolean
+    flag?: boolean,
 ) => {
-    if(dynamicValidateForm.cluster?.[index]){
+    if (dynamicValidateForm.cluster?.[index]) {
         const { configuration } = dynamicValidateForm.cluster?.[index];
-        if(!flag){
+        if (!flag) {
             configuration.port = undefined;
         }
-        const checked = resourcesClusters.value?.[serverId || '']
-        if(checked){
-            getPortOptions(checked, index)
+        const checked = resourcesClusters.value?.[serverId || ''];
+        if (checked) {
+            getPortOptions(checked, index);
         }
     }
 };
@@ -1420,8 +1454,11 @@ const getSupports = async () => {
             label: item.name,
             value: item.id,
         }));
-        if (!typeOptions.value.every((item : any) => item.value === 'UDP') && !NetworkType) {
-          formData.value.type = typeOptions.value[0].value
+        if (
+            !typeOptions.value.every((item: any) => item.value === 'UDP') &&
+            !NetworkType
+        ) {
+            formData.value.type = typeOptions.value[0].value;
         }
     }
 };
@@ -1439,12 +1476,12 @@ const getCertificates = async () => {
 const getResourcesCurrent = () => {
     resourcesCurrent().then((resp: any) => {
         if (resp.status === 200) {
-            _typeStore.setConfigRef(resp.result || [])
+            _typeStore.setConfigRef(resp.result || []);
 
-            const clusterNodeId = resp.result?.[0]?.clusterNodeId
-            const _resourcesClusters = cloneDeep(resourcesClusters.value || {})
-            _resourcesClusters[clusterNodeId] = resp.result
-            _typeStore.setResourcesClusters(_resourcesClusters)
+            const clusterNodeId = resp.result?.[0]?.clusterNodeId;
+            const _resourcesClusters = cloneDeep(resourcesClusters.value || {});
+            _resourcesClusters[clusterNodeId] = resp.result;
+            _typeStore.setResourcesClusters(_resourcesClusters);
             getPortOptions(resp.result);
         }
     });
@@ -1453,7 +1490,7 @@ const getResourcesCurrent = () => {
 const getResourcesClusters = () => {
     resourceClusters().then((resp) => {
         if (resp.status === 200) {
-            configClustersList.value = resp.result as any[]
+            configClustersList.value = resp.result as any[];
         }
     });
 };
@@ -1502,7 +1539,7 @@ onMounted(() => {
     getSupports();
     getCertificates();
     getResourcesCurrent();
-    if(isNoCommunity){
+    if (isNoCommunity) {
         getResourcesClusters();
     }
     getDetail();
diff --git a/src/views/link/Type/data.ts b/src/views/link/Type/data.ts
index d2e89b52..a3e8ccee 100644
--- a/src/views/link/Type/data.ts
+++ b/src/views/link/Type/data.ts
@@ -141,7 +141,7 @@ const sizeValidator = (_rule:any, value: number):Promise<any> =>{
             return reject(_rule.message);
         }
     })
-} 
+}
 export const Rules = {
     name: [
         {
@@ -150,7 +150,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     type: [
@@ -230,7 +230,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     username: [
@@ -240,7 +240,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     password: [
@@ -250,13 +250,13 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     topicPrefix: [
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     maxMessageSize: [
@@ -283,7 +283,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     parserType: [
@@ -299,7 +299,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     lang: [
@@ -309,7 +309,7 @@ export const Rules = {
         },
         {
             max: 64,
-            message: '最大可输入64个字符',
+            message: '最多可输入64个字符',
         },
     ],
     script: [
diff --git a/src/views/link/Type/index.vue b/src/views/link/Type/index.vue
index 99afdc54..25541453 100644
--- a/src/views/link/Type/index.vue
+++ b/src/views/link/Type/index.vue
@@ -124,7 +124,7 @@
                         </CardBox>
                     </template>
                     <template #action="slotProps">
-                        <j-space>
+                        <j-space :size="16">
                             <template
                                 v-for="i in getActions(slotProps, 'table')"
                                 :key="i.key"
@@ -209,12 +209,12 @@ const columns = [
         width: 150,
         search: {
             type: 'select',
-            options: async() => {
+            options: async () => {
                 const res: any = await supports();
-              return  options.value = res.result.map((item: any) => ({
+                return (options.value = res.result.map((item: any) => ({
                     value: item.id,
                     label: item.name,
-                }));
+                })));
             },
         },
         scopedSlots: true,
@@ -269,7 +269,7 @@ const columns = [
         title: '操作',
         key: 'action',
         fixed: 'right',
-        width: 120,
+        width: 200,
         scopedSlots: true,
     },
 ];
@@ -309,19 +309,23 @@ const getActions = (
             text: stateText,
             tooltip: {
                 title: stateText,
+                placement: 'topRight',
             },
             icon: state === 'enabled' ? 'StopOutlined' : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${stateText}?`,
-                onConfirm: async () => {
-                    let res =
+                onConfirm: () => {
+                    let response =
                         state === 'enabled'
-                            ? await shutdown(data.id)
-                            : await start(data.id);
-                    if (res.success) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value?.reload();
-                    }
+                            ? shutdown(data.id)
+                            : start(data.id);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value?.reload();
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -335,14 +339,17 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const res: any = await remove(data.id);
-                    if (res.status === 200) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value.reload();
-                    } else {
-                        onlyMessage(res?.message, 'error');
-                    }
+                onConfirm: () => {
+                    const response: any = remove(data.id);
+                    response.then((res:any) => {
+                        if (res.status === 200) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value.reload();
+                        } else {
+                            onlyMessage(res?.message, 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/link/plugin/Save.vue b/src/views/link/plugin/Save.vue
index 7f1826ec..dcc05024 100644
--- a/src/views/link/plugin/Save.vue
+++ b/src/views/link/plugin/Save.vue
@@ -1,187 +1,200 @@
 <template>
-  <j-modal
-    :maskClosable='false'
-    :visible='true'
-    :title="!!data?.id ? '编辑' : '新增'"
-    :confirmLoading='loading'
-    @ok='handleSave'
-    @cancel='handleCancel'
-    width='650px'
-  >
-    <div>
-      <j-form :layout="'vertical'" ref='formRef' :model='modelRef'>
-        <j-form-item
-          name='id'
-          :rules='IdRules'
-        >
-          <template #label>
-            <span>
-                插件ID
-                <j-tooltip
-                  title='若不填写，系统将自动生成唯一ID'
-                >
-                    <AIcon
-                      type='QuestionCircleOutlined'
-                      style='margin-left: 2px'
+    <j-modal
+        :maskClosable="false"
+        :visible="true"
+        :title="!!data?.id ? '编辑' : '新增'"
+        :confirmLoading="loading"
+        @ok="handleSave"
+        @cancel="handleCancel"
+        width="650px"
+    >
+        <div>
+            <j-form :layout="'vertical'" ref="formRef" :model="modelRef">
+                <j-form-item name="id" :rules="IdRules">
+                    <template #label>
+                        <span>
+                            插件ID
+                            <j-tooltip title="若不填写，系统将自动生成唯一ID">
+                                <AIcon
+                                    type="QuestionCircleOutlined"
+                                    style="margin-left: 2px"
+                                />
+                            </j-tooltip>
+                        </span>
+                    </template>
+                    <j-input
+                        placeholder="请输入插件ID"
+                        v-model:value="modelRef.id"
+                        :disabled="!!data.id"
                     />
-                </j-tooltip>
-            </span>
-          </template>
-          <j-input placeholder="请输入插件ID" v-model:value='modelRef.id' :disabled='!!data.id' />
-        </j-form-item>
-        <j-form-item
-          label='插件名称'
-          name='name'
-          :rules="nameRules"
-        >
-          <j-input placeholder="请输入插件名称" v-model:value='modelRef.name' />
-        </j-form-item>
-        <j-form-item
-          label='文件'
-          name='version'
-          :rules='versionRule'
-        >
-          <UploadFile v-model:modelValue='modelRef.version' @change='uploadChange' :fileName='data.filename' />
-        </j-form-item>
-        <div v-if='modelRef.version' class='file-detail'>
-          <div>
-            <span>插件类型：</span>
-            <span class='file-detail-item'>{{ TypeMap[modelRef.type] }}</span>
-          </div>
-          <div>
-            <span>版本：</span>
-            <span class='file-detail-item'>{{ modelRef.version }}</span>
-          </div>
+                </j-form-item>
+                <j-form-item label="插件名称" name="name" :rules="nameRules">
+                    <j-input
+                        placeholder="请输入插件名称"
+                        v-model:value="modelRef.name"
+                    />
+                </j-form-item>
+                <j-form-item label="文件" name="version" :rules="versionRule">
+                    <UploadFile
+                        v-model:modelValue="modelRef.version"
+                        @change="uploadChange"
+                        :fileName="data.filename"
+                    />
+                </j-form-item>
+                <div v-if="modelRef.version" class="file-detail">
+                    <div>
+                        <span>插件类型：</span>
+                        <span class="file-detail-item">{{
+                            TypeMap[modelRef.type]
+                        }}</span>
+                    </div>
+                    <div>
+                        <span>版本：</span>
+                        <span class="file-detail-item">{{
+                            modelRef.version
+                        }}</span>
+                    </div>
+                </div>
+                <j-form-item
+                    label="描述"
+                    name="describe"
+                    :rules="Max_Length_200"
+                >
+                    <j-textarea
+                        v-model:value="modelRef.description"
+                        placeholder="请输入说明"
+                        showCount
+                        :maxlength="200"
+                    />
+                </j-form-item>
+            </j-form>
         </div>
-        <j-form-item
-          label='描述'
-          name='describe'
-          :rules='Max_Length_200'
-        >
-          <j-textarea
-            v-model:value='modelRef.description'
-            placeholder='请输入说明'
-            showCount
-            :maxlength='200'
-          />
-        </j-form-item>
-      </j-form>
-    </div>
-  </j-modal>
+    </j-modal>
 </template>
 
-<script setup lang='ts' name='PluginSave'>
-import { ID_Rule, Max_Length_64, Max_Length_200, RequiredStringFn } from '@/components/Form/rules'
-import UploadFile from './UploadFile.vue'
-import { FileUploadResult } from '@/views/link/plugin/typings'
-import { add, update, vailIdFn } from '@/api/link/plugin'
-import { TypeMap } from './util'
-import { onlyMessage } from '@/utils/comm'
+<script setup lang="ts" name="PluginSave">
+import {
+    ID_Rule,
+    Max_Length_64,
+    Max_Length_200,
+    RequiredStringFn,
+} from '@/components/Form/rules';
+import UploadFile from './UploadFile.vue';
+import { FileUploadResult } from '@/views/link/plugin/typings';
+import { add, update, vailIdFn } from '@/api/link/plugin';
+import { TypeMap } from './util';
+import { onlyMessage } from '@/utils/comm';
 
 const props = defineProps({
-  data: {
-    type: Object,
-    default: () => ({})
-  }
-})
+    data: {
+        type: Object,
+        default: () => ({}),
+    },
+});
 
-const emit = defineEmits(['cancel', 'ok'])
-const route = useRoute()
-const formRef = ref()
-const fileType = ref(props.data.type)
-const loading = ref(false)
+const emit = defineEmits(['cancel', 'ok']);
+const route = useRoute();
+const formRef = ref();
+const fileType = ref(props.data.type);
+const loading = ref(false);
 
 const vailId = async (_: any, value: string) => {
-  if (!props.data.id && value) { // 新增校验
-    const resp = await vailIdFn(value)
-    if (resp.success && resp.result && !resp.result.passed) {
-      return Promise.reject('ID重复');
+    if (!props.data.id && value) {
+        // 新增校验
+        const resp = await vailIdFn(value);
+        if (resp.success && resp.result && !resp.result.passed) {
+            return Promise.reject('ID重复');
+        }
     }
-  }
-  return Promise.resolve();
-}
+    return Promise.resolve();
+};
 
-const nameRules = [
-  RequiredStringFn('插件名称'),
-  ...Max_Length_64
-]
+const nameRules = [RequiredStringFn('插件名称'), ...Max_Length_64];
 
 const IdRules = [
-  ...ID_Rule,
-  {
-    validator: vailId,
-    trigger: 'blur',
-  },
-]
+    ...ID_Rule,
+    {
+        validator: vailId,
+        trigger: 'blur',
+    },
+];
 
 const versionRule = [
-  { required: true, message: "请上传文件" },
-  // {
-  //   validator(_: any, value: any) {
-  //     if (value) {
-  //       if (value?.err) {
-  //         return Promise.reject('文件上传失败，请重新上传')
-  //       }
-  //       return Promise.resolve()
-  //     }
-  //     return Promise.reject('请上传文件')
-  //   }
-  // }
-]
+    {
+        required: true,
+        message: '请上传文件',
+        trigger: 'blur',
+    },
+    // {
+    //   validator(_: any, value: any) {
+    //     if (value) {
+    //       if (value?.err) {
+    //         return Promise.reject('文件上传失败，请重新上传')
+    //       }
+    //       return Promise.resolve()
+    //     }
+    //     return Promise.reject('请上传文件')
+    //   }
+    // }
+];
 
 const modelRef = reactive<any>({
-  id: props.data.id,
-  name: props.data.name,
-  description: props.data.description,
-  type: props.data.type,
-  provider: props.data.provider || 'jar',
-  version: props.data.version,
-  filename: props.data.filename,
-  configuration: props.data.configuration || {}
-})
+    id: props.data.id,
+    name: props.data.name,
+    description: props.data.description,
+    type: props.data.type,
+    provider: props.data.provider || 'jar',
+    version: props.data.version,
+    filename: props.data.filename,
+    configuration: props.data.configuration || {},
+});
 
 const uploadChange = (data: FileUploadResult) => {
-  modelRef.type = data.type.value
-  modelRef.filename = data.filename
-  modelRef.configuration.location = data.accessUrl
-}
+    modelRef.type = data.type.value;
+    modelRef.filename = data.filename;
+    modelRef.configuration.location = data.accessUrl;
+};
 
 const handleSave = async () => {
-  const data = await formRef.value.validate()
-  if (data) {
-    loading.value = true
-    modelRef.id = modelRef.id ? modelRef.id : null;
-    const resp = props.data.id ? await update(modelRef).catch(() => { success: false }) : await add(modelRef).catch(() => { success: false })
-    loading.value = false
-    if (resp.success) {
-      onlyMessage('操作成功！');
-      if (route.query.save && (window as any).onTabSaveSuccess) {
-        (window as any).onTabSaveSuccess(resp);
-        setTimeout(() => window.close(), 300);
-        return
-      }
-      emit('ok');
-      formRef.value.resetFields();
+    const data = await formRef.value.validate();
+    if (data) {
+        loading.value = true;
+        modelRef.id = modelRef.id ? modelRef.id : null;
+        const resp = props.data.id
+            ? await update(modelRef).catch(() => {
+                  success: false;
+              })
+            : await add(modelRef).catch(() => {
+                  success: false;
+              });
+        loading.value = false;
+        if (resp.success) {
+            onlyMessage('操作成功！');
+            if (route.query.save && (window as any).onTabSaveSuccess) {
+                (window as any).onTabSaveSuccess(resp);
+                setTimeout(() => window.close(), 300);
+                return;
+            }
+            emit('ok');
+            formRef.value.resetFields();
+        }
     }
-  }
-}
+};
 
 const handleCancel = () => {
-  emit('cancel')
-}
-
+    emit('cancel');
+};
 </script>
 
-<style scoped lang='less'>
+<style scoped lang="less">
 .file-detail {
-  display: flex;
-  flex-direction: column;
-  gap: 16px;
-  margin-bottom: 16px;
-
-  .file-detail-item {
-    color: #4F4F4F;
-  }
+    display: flex;
+    flex-direction: column;
+    gap: 16px;
+    margin-bottom: 16px;
 
+    .file-detail-item {
+        color: #4f4f4f;
+    }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/link/plugin/UploadFile.vue b/src/views/link/plugin/UploadFile.vue
index 8b94860d..21cf8673 100644
--- a/src/views/link/plugin/UploadFile.vue
+++ b/src/views/link/plugin/UploadFile.vue
@@ -1,25 +1,28 @@
 <template>
-  <j-upload
-    name="file"
-    accept=".jar,.zip"
-    :action="uploadFile"
-    :headers="{
-                [TOKEN_KEY]: LocalStore.get(TOKEN_KEY),
-            }"
-    @change="handleChange"
-    class="upload-box"
-    :before-upload="beforeUpload"
-    :disabled='loading'
-    :maxCount='1'
-    :fileList='list'
-    @remove='remove'
-  >
-    <div>
-      <j-button>上传文件</j-button>
-      <span class='upload-tip'>格式要求：.jar .zip</span>
-    </div>
-  </j-upload>
-
+    <j-upload
+        name="file"
+        accept=".jar,.zip"
+        :action="uploadFile"
+        :headers="{
+            [TOKEN_KEY]: LocalStore.get(TOKEN_KEY),
+        }"
+        @change="handleChange"
+        class="upload-box"
+        :before-upload="beforeUpload"
+        :disabled="loading"
+        :maxCount="1"
+        :fileList="list"
+        @remove="remove"
+    >
+        <div>
+            <j-button>上传文件</j-button>
+            <span class="upload-tip">格式要求：.jar .zip</span>
+        </div>
+    </j-upload>
+    <template v-if="loading">
+        <a-spin size="small"/>
+        上传中
+    </template>
 </template>
 
 <script setup lang="ts" name="FileUpload">
@@ -30,85 +33,81 @@ import { onlyMessage } from '@/utils/comm';
 import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
 import { notification as Notification } from 'jetlinks-ui-components';
 import { useSystem } from '@/store/system';
-import {fileList} from "@/views/device/Instance/Detail/Running/Property/index";
+import { fileList } from '@/views/device/Instance/Detail/Running/Property/index';
 
 const emit = defineEmits(['update:modelValue', 'change']);
 
 const props = defineProps({
-  modelValue: {
-    type: String,
-    default: () => '',
-  },
-  disabled: {
-    type: Boolean,
-    default: false
-  },
-  fileName: {
-    type: String,
-    default: undefined
-  }
+    modelValue: {
+        type: String,
+        default: () => '',
+    },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    fileName: {
+        type: String,
+        default: undefined,
+    },
 });
 
 const paths: string = useSystem().$state.configInfo.paths?.[
-  'base-path'
-  ] as string;
+    'base-path'
+] as string;
 
 const value = ref(props.modelValue);
-const list = ref<any>(props.fileName ? [{ name: props.fileName}] : [])
+const list = ref<any>(props.fileName ? [{ name: props.fileName }] : []);
 const loading = ref(false);
-const fileCache = ref()
-
+const fileCache = ref();
 const remove = () => {
-  list.value = []
-  emit('update:modelValue', '');
-  emit('change', {});
-}
+    list.value = [];
+    emit('update:modelValue', '');
+    emit('change', {});
+};
 
 const beforeUpload: UploadProps['beforeUpload'] = (file, fl) => {
-
-  const arr = file.name.split('.');
-  const isFile = ['jar', 'zip'].includes(arr[arr.length - 1]); // file.type === 'application/zip' || file.type === 'application/javj-archive'
-  if (!isFile) {
-    onlyMessage('请上传.jar,.zip格式的文件', 'error');
-    loading.value = false;
-    return false
-  }
-  console.log(fl)
-  list.value = fl
-  return isFile;
+    const arr = file.name.split('.');
+    const isFile = ['jar', 'zip'].includes(arr[arr.length - 1]); // file.type === 'application/zip' || file.type === 'application/javj-archive'
+    if (!isFile) {
+        onlyMessage('请上传.jar,.zip格式的文件', 'error');
+        loading.value = false;
+        return false;
+    }
+    list.value = fl;
+    return isFile;
 };
 const handleChange = async (info: UploadChangeParam) => {
-  loading.value = true;
-  console.log(info)
-  if (info.file.status === 'done') {
-    loading.value = false;
-    const result = info.file.response?.result;
-    const f = result.accessUrl;
-    onlyMessage('上传成功！', 'success');
-    value.value = f;
-    fileCache.value = info.fileList
-    emit('update:modelValue', result.version);
-    emit('change', result);
-  } else {
-    if (info.file.error) {
-      list.value = fileCache.value
-      Notification.error({
-        // key: '403',
-        message: '系统提示',
-        description: info.file.response?.message,
-      });
-      // emit('update:modelValue', { err:'file_upload_error'});
-      loading.value = false;
-    } else if (info.file.response) {
-      loading.value = false;
+    loading.value = true;
+    if (info.file.status === 'done') {
+        loading.value = false;
+        const result = info.file.response?.result;
+        const f = result.accessUrl;
+        onlyMessage('上传成功！', 'success');
+        value.value = f;
+        fileCache.value = info.fileList;
+        emit('update:modelValue', result.version);
+        emit('change', result);
+    } else {
+        if (info.file.error) {
+            list.value = fileCache.value;
+            Notification.error({
+                // key: '403',
+                message: '系统提示',
+                description: info.file.response?.message,
+            });
+            // emit('update:modelValue', { err:'file_upload_error'});
+            loading.value = false;
+        } else if (info.file.response) {
+            loading.value = false;
+        }
     }
-  }
 };
 </script>
 
 <style lang="less" scoped>
 .upload-tip {
-  color: #999;
-  padding-left: 12px;
+    color: #999;
+    padding-left: 12px;
 }
 </style>
diff --git a/src/views/link/plugin/index.vue b/src/views/link/plugin/index.vue
index 04a5a882..07852e06 100644
--- a/src/views/link/plugin/index.vue
+++ b/src/views/link/plugin/index.vue
@@ -1,287 +1,304 @@
 <template>
-  <page-container>
-    <pro-search
-      :columns="columns"
-      target="link-plugin"
-      @search="handleSearch"
-    />
-    <FullPage>
-      <JProTable
-        ref="instanceRef"
-        :columns="columns"
-        :request="queryPage"
-        :defaultParams="{sorts: [{ name: 'createTime', order: 'desc' }]}"
-        :params='params'
-      >
-        <template #headerTitle>
-          <PermissionButton
-            type="primary"
-            @click="handleAdd"
-            hasPermission="link/plugin:add"
-          >
-            <template #icon><AIcon type="PlusOutlined" /></template>
-            新增
-          </PermissionButton>
-        </template>
+    <page-container>
+        <pro-search
+            :columns="columns"
+            target="link-plugin"
+            @search="handleSearch"
+        />
+        <FullPage>
+            <JProTable
+                ref="instanceRef"
+                :columns="columns"
+                :request="queryPage"
+                :defaultParams="{
+                    sorts: [{ name: 'createTime', order: 'desc' }],
+                }"
+                :params="params"
+            >
+                <template #headerTitle>
+                    <PermissionButton
+                        type="primary"
+                        @click="handleAdd"
+                        hasPermission="link/plugin:add"
+                    >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
+                    </PermissionButton>
+                </template>
 
-        <template #card="slotProps">
-          <CardBox
-            :value="slotProps"
-            :showStatus='false'
-            :actions='getActions(slotProps)'
-            :statusNames='{
-              processing: "processing"
-            }'
-            status='processing'
-          >
-
-            <template #img>
-              <img
-                :width="80"
-                :height="80"
-                :src="getImage('/plug.png')"
-              />
-            </template>
-            <template #content>
-              <div>
-                <div>
-                  <j-tag class='plugin-version'>{{ slotProps.version }}</j-tag>
-                </div>
-                <Ellipsis style="width: calc(100% - 100px); margin-bottom: 18px;">
-                                    <span style="font-size: 16px; font-weight: 600">
+                <template #card="slotProps">
+                    <CardBox
+                        :value="slotProps"
+                        :showStatus="false"
+                        :actions="getActions(slotProps)"
+                        :statusNames="{
+                            processing: 'processing',
+                        }"
+                        status="processing"
+                    >
+                        <template #img>
+                            <img
+                                :width="80"
+                                :height="80"
+                                :src="getImage('/plug.png')"
+                            />
+                        </template>
+                        <template #content>
+                            <div>
+                                <div>
+                                    <j-tag class="plugin-version">{{
+                                        slotProps.version
+                                    }}</j-tag>
+                                </div>
+                                <Ellipsis
+                                    style="
+                                        width: calc(100% - 100px);
+                                        margin-bottom: 18px;
+                                    "
+                                >
+                                    <span
+                                        style="
+                                            font-size: 16px;
+                                            font-weight: 600;
+                                        "
+                                    >
                                         {{ slotProps.name }}
                                     </span>
-                </Ellipsis>
-              </div>
-              <j-row>
-                <j-col :span="12">
-                  <div class="card-item-content-text">
-                    插件ID
-                  </div>
-                  <Ellipsis style="width: 100%">
-                    {{ slotProps.id }}
-                  </Ellipsis>
-                </j-col>
-                <j-col :span="12">
-                  <div class="card-item-content-text">
-                    插件类型
-                  </div>
-                  <Ellipsis style="width: 100%">
-                    {{ TypeMap[slotProps.type] }}
-                  </Ellipsis>
-                </j-col>
-              </j-row>
-            </template>
+                                </Ellipsis>
+                            </div>
+                            <j-row>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        插件ID
+                                    </div>
+                                    <Ellipsis style="width: 100%">
+                                        {{ slotProps.id }}
+                                    </Ellipsis>
+                                </j-col>
+                                <j-col :span="12">
+                                    <div class="card-item-content-text">
+                                        插件类型
+                                    </div>
+                                    <Ellipsis style="width: 100%">
+                                        {{ TypeMap[slotProps.type] }}
+                                    </Ellipsis>
+                                </j-col>
+                            </j-row>
+                        </template>
 
-            <template #actions="item">
-              <PermissionButton
-                :disabled="item.disabled"
-                :popConfirm="item.popConfirm"
-                :tooltip="{
-                                ...item.tooltip,
-                            }"
-                @click="item.onClick"
-                :hasPermission="'link/plugin:' + item.key"
-              >
-                <AIcon
-                  type="DeleteOutlined"
-                  v-if="item.key === 'delete'"
-                />
-                <template v-else>
-                  <AIcon :type="item.icon" />
-                  <span>{{ item?.text }}</span>
+                        <template #actions="item">
+                            <PermissionButton
+                                :disabled="item.disabled"
+                                :popConfirm="item.popConfirm"
+                                :tooltip="{
+                                    ...item.tooltip,
+                                }"
+                                @click="item.onClick"
+                                :hasPermission="'link/plugin:' + item.key"
+                            >
+                                <AIcon
+                                    type="DeleteOutlined"
+                                    v-if="item.key === 'delete'"
+                                />
+                                <template v-else>
+                                    <AIcon :type="item.icon" />
+                                    <span>{{ item?.text }}</span>
+                                </template>
+                            </PermissionButton>
+                        </template>
+                    </CardBox>
                 </template>
-              </PermissionButton>
-            </template>
-          </CardBox>
-        </template>
-        <template #type='slotProps'>
-          <span>{{ TypeMap[slotProps.type] }}</span>
-        </template>
-        <template #action="slotProps">
-          <j-space>
-            <template
-              v-for="i in getActions(slotProps)"
-              :key="i.key"
-            >
-              <PermissionButton
-                :disabled="i.disabled"
-                :popConfirm="i.popConfirm"
-                :tooltip="{
-                                ...i.tooltip,
-                            }"
-                @click="i.onClick"
-                type="link"
-                :danger="i.key === 'delete'"
-                style="padding: 0 5px"
-                :hasPermission="'link/plugin:' + i.key"
-              >
-                <template #icon><AIcon :type="i.icon" /></template>
-              </PermissionButton>
-            </template>
-          </j-space>
-        </template>
-      </JProTable>
-    </FullPage>
-  </page-container>
-  <SaveModal
-    v-if='visible'
-    :data='editData'
-    @cancel='cancel'
-    @ok='save'
-  />
+                <template #type="slotProps">
+                    <span>{{ TypeMap[slotProps.type] }}</span>
+                </template>
+                <template #action="slotProps">
+                    <j-space :size="16">
+                        <template
+                            v-for="i in getActions(slotProps)"
+                            :key="i.key"
+                        >
+                            <PermissionButton
+                                :disabled="i.disabled"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                @click="i.onClick"
+                                type="link"
+                                :danger="i.key === 'delete'"
+                                style="padding: 0 5px"
+                                :hasPermission="'link/plugin:' + i.key"
+                            >
+                                <template #icon
+                                    ><AIcon :type="i.icon"
+                                /></template>
+                            </PermissionButton>
+                        </template>
+                    </j-space>
+                </template>
+            </JProTable>
+        </FullPage>
+    </page-container>
+    <SaveModal v-if="visible" :data="editData" @cancel="cancel" @ok="save" />
 </template>
 
-<script setup lang='ts' name='PluginIndex'>
-import SaveModal from './Save.vue'
-import { getImage, onlyMessage } from '@/utils/comm'
-import { queryPage, removeFn, getTypes } from '@/api/link/plugin'
-import { TypeMap } from './util'
+<script setup lang="ts" name="PluginIndex">
+import SaveModal from './Save.vue';
+import { getImage, onlyMessage } from '@/utils/comm';
+import { queryPage, removeFn, getTypes } from '@/api/link/plugin';
+import { TypeMap } from './util';
 
-const route = useRoute()
-const visible = ref(false)
-const params = ref<any>()
-const editData = ref()
-const instanceRef = ref()
+const route = useRoute();
+const visible = ref(false);
+const params = ref<any>();
+const editData = ref();
+const instanceRef = ref();
 
 const columns = [
-  {
-    title: '插件ID',
-    dataIndex: 'id',
-    key: 'type',
-    fixed: 'left',
-    width: 200,
-    ellipsis: true,
-    search: {
-      type: 'input',
+    {
+        title: '插件ID',
+        dataIndex: 'id',
+        key: 'type',
+        fixed: 'left',
+        width: 200,
+        ellipsis: true,
+        search: {
+            type: 'input',
+        },
     },
-  },
-  {
-    title: '插件名称',
-    dataIndex: 'name',
-    key: 'type',
-    fixed: 'left',
-    width: 200,
-    ellipsis: true,
-    search: {
-      type: 'input',
+    {
+        title: '插件名称',
+        dataIndex: 'name',
+        key: 'type',
+        fixed: 'left',
+        width: 200,
+        ellipsis: true,
+        search: {
+            type: 'input',
+        },
     },
-  },
-  {
-    title:"版本",
-    dataIndex:"version",
-    key:"version",
-    ellipsis: true
-  },
-  {
-    title: '插件类型',
-    dataIndex: 'type',
-    key: 'type',
-    ellipsis: true,
-    scopedSlots: true,
-    search: {
-      type: 'select',
-      options: () => {
-        return new Promise(resolve => {
-          getTypes().then(res => {
-            resolve(res.result?.map(item => ({ ...item, label: item.text })))
-          })
-        })
-      }
+    {
+        title: '版本',
+        dataIndex: 'version',
+        key: 'version',
+        ellipsis: true,
     },
-  },
-  {
-    title:"文件",
-    dataIndex:"filename",
-    key:'filename',
-    ellipsis: true
-  },
-  {
-    title: '描述',
-    dataIndex: 'description',
-    key: 'description',
-    ellipsis: true,
-    search: {
-      type: 'string',
+    {
+        title: '插件类型',
+        dataIndex: 'type',
+        key: 'type',
+        ellipsis: true,
+        scopedSlots: true,
+        search: {
+            type: 'select',
+            options: () => {
+                return new Promise((resolve) => {
+                    getTypes().then((res) => {
+                        resolve(
+                            res.result?.map((item) => ({
+                                ...item,
+                                label: item.text,
+                            })),
+                        );
+                    });
+                });
+            },
+        },
     },
-  },
-  {
-    title: '操作',
-    key: 'action',
-    fixed: 'right',
-    width: 120,
-    scopedSlots: true,
-  },
-]
+    {
+        title: '文件',
+        dataIndex: 'filename',
+        key: 'filename',
+        ellipsis: true,
+    },
+    {
+        title: '描述',
+        dataIndex: 'description',
+        key: 'description',
+        ellipsis: true,
+        search: {
+            type: 'string',
+        },
+    },
+    {
+        title: '操作',
+        key: 'action',
+        fixed: 'right',
+        width: 120,
+        scopedSlots: true,
+    },
+];
 
 const handleAdd = () => {
-  editData.value = {}
-  visible.value = true
-}
+    editData.value = {};
+    visible.value = true;
+};
 
 const handleSearch = (p: any) => {
-  params.value = p
-}
+    params.value = p;
+};
 
 const save = () => {
-  if (instanceRef.value) {
-    instanceRef.value?.reload();
-  }
-  visible.value = false
-}
+    if (instanceRef.value) {
+        instanceRef.value?.reload();
+    }
+    visible.value = false;
+};
 
 const cancel = () => {
-  visible.value = false
-  editData.value = undefined
-}
+    visible.value = false;
+    editData.value = undefined;
+};
 
 const getActions = (data: any) => {
-  return [
-    {
-      key: 'update',
-      text: '编辑',
-      tooltip: {
-        title: '编辑',
-      },
-      icon: 'EditOutlined',
-      onClick: () => {
-        visible.value = true;
-        editData.value = data;
-      },
-    },
-    {
-      key: 'delete',
-      text: '删除',
-      tooltip: {
-        title: '删除',
-      },
-      popConfirm: {
-        title: '确认删除?',
-        onConfirm: async () => {
-          const resp = await removeFn(data.id);
-          if (resp.status === 200) {
-            onlyMessage('操作成功！');
-            instanceRef.value?.reload();
-          } else {
-            onlyMessage(resp?.message || '操作失败！', 'error');
-          }
+    return [
+        {
+            key: 'update',
+            text: '编辑',
+            tooltip: {
+                title: '编辑',
+            },
+            icon: 'EditOutlined',
+            onClick: () => {
+                visible.value = true;
+                editData.value = data;
+            },
         },
-      },
-      icon: 'DeleteOutlined',
-    },
-  ]
-}
+        {
+            key: 'delete',
+            text: '删除',
+            tooltip: {
+                title: '删除',
+            },
+            popConfirm: {
+                title: '确认删除?',
+                onConfirm: () => {
+                    const response = removeFn(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            instanceRef.value?.reload();
+                        } else {
+                            onlyMessage(resp?.message || '操作失败！', 'error');
+                        }
+                    });
+                    return response;
+                },
+            },
+            icon: 'DeleteOutlined',
+        },
+    ];
+};
 
 onMounted(() => {
-  if (route.query.save) {
-    visible.value = true
-  }
-})
-
+    if (route.query.save) {
+        visible.value = true;
+    }
+});
 </script>
 
-<style scoped lang='less'>
+<style scoped lang="less">
 .plugin-version {
-  border-radius: 4px;
+    border-radius: 4px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/media/Cascade/Channel/BindChannel/index.vue b/src/views/media/Cascade/Channel/BindChannel/index.vue
index 076c9aca..74223ccc 100644
--- a/src/views/media/Cascade/Channel/BindChannel/index.vue
+++ b/src/views/media/Cascade/Channel/BindChannel/index.vue
@@ -206,8 +206,9 @@ const handleSave = async () => {
     const resp = await CascadeApi.bindChannel(
         route.query.id as string,
         _selectedRowKeys.value,
-    );
-    loading.value = false;
+    ).finally(()=>{
+        loading.value = false;
+    })
     if (resp.success) {
         onlyMessage('操作成功！');
         _vis.value = false;
diff --git a/src/views/media/Cascade/Channel/index.vue b/src/views/media/Cascade/Channel/index.vue
index 1bc9921d..5e75d284 100644
--- a/src/views/media/Cascade/Channel/index.vue
+++ b/src/views/media/Cascade/Channel/index.vue
@@ -7,7 +7,9 @@
                 ref="listRef"
                 model="table"
                 :columns="columns"
-                :request="(e) => CascadeApi.queryBindChannel(route?.query.id, e)"
+                :request="
+                    (e) => CascadeApi.queryBindChannel(route?.query.id, e)
+                "
                 :defaultParams="{
                     sorts: [{ name: 'name', order: 'desc' }],
                 }"
@@ -27,12 +29,14 @@
                         <j-button type="primary" @click="bindVis = true">
                             绑定通道
                         </j-button>
-                        <j-popconfirm
-                            title="确认解绑?"
-                            @confirm="handleMultipleUnbind"
+                        <PermissionButton
+                            type="primary"
+                            :popConfirm="{
+                                title: '确认解绑？',
+                                onConfirm: handleMultipleUnbind,
+                            }"
+                            >批量解绑</PermissionButton
                         >
-                            <j-button> 批量解绑 </j-button>
-                        </j-popconfirm>
                     </j-space>
                 </template>
                 <template #gbChannelIdHeader="title">
@@ -46,7 +50,7 @@
                     </j-tooltip>
                 </template>
                 <template #gbChannelId="slotProps">
-                    <div style="display: flex; align-items: center;">
+                    <div style="display: flex; align-items: center">
                         <Ellipsis style="width: 150px">
                             {{ slotProps.gbChannelId }}
                         </Ellipsis>
@@ -110,37 +114,25 @@
                 </template>
                 <template #action="slotProps">
                     <j-space :size="16">
-                        <j-tooltip
+                        <template
                             v-for="i in getActions(slotProps, 'table')"
                             :key="i.key"
-                            v-bind="i.tooltip"
                         >
-                            <j-popconfirm
-                                v-if="i.popConfirm"
-                                v-bind="i.popConfirm"
+                            <PermissionButton
                                 :disabled="i.disabled"
-                            >
-                                <j-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
-                                    ><AIcon :type="i.icon"
-                                /></j-button>
-                            </j-popconfirm>
-                            <j-button
-                                style="padding: 0"
+                                :popConfirm="i.popConfirm"
+                                :tooltip="{
+                                    ...i.tooltip,
+                                }"
+                                @click="i.onClick"
                                 type="link"
-                                v-else
-                                @click="i.onClick && i.onClick(slotProps)"
+                                style="padding: 0 5px"
                             >
-                                <j-button
-                                    :disabled="i.disabled"
-                                    style="padding: 0"
-                                    type="link"
+                                <template #icon
                                     ><AIcon :type="i.icon"
-                                /></j-button>
-                            </j-button>
-                        </j-tooltip>
+                                /></template>
+                            </PermissionButton>
+                        </template>
                     </j-space>
                 </template>
             </JProTable>
@@ -241,40 +233,42 @@ const params = ref<Record<string, any>>({});
  * @param params
  */
 const handleSearch = (e: any) => {
-    if(e.terms[0]?.terms[0]?.column === "gbChannelId"){
-        params.value = {terms: [
-        {
-            column: "id$gb28181-cascade-channel",
-            value: [
-                {
-                    column: "gb_channel_id",
-                    termType : e.terms[0]?.terms[0]?.termType,
-                    value: e.terms[0]?.terms[0]?.value
-                }
-            ]
-        },
-        {
+    if (e.terms[0]?.terms[0]?.column === 'gbChannelId') {
+        params.value = {
             terms: [
                 {
-                    column: "id$gb28181-cascade-channel",
+                    column: 'id$gb28181-cascade-channel',
                     value: [
                         {
-                            column: "gb_channel_id",
-                            termType: "isnull",
-                            value: "1"
-                        }
-                    ]
+                            column: 'gb_channel_id',
+                            termType: e.terms[0]?.terms[0]?.termType,
+                            value: e.terms[0]?.terms[0]?.value,
+                        },
+                    ],
                 },
                 {
-                    column: "channelId",
-                    termType : e.terms[0]?.terms[0]?.termType,
-                    value: e.terms[0]?.terms[0]?.value
-                }
+                    terms: [
+                        {
+                            column: 'id$gb28181-cascade-channel',
+                            value: [
+                                {
+                                    column: 'gb_channel_id',
+                                    termType: 'isnull',
+                                    value: '1',
+                                },
+                            ],
+                        },
+                        {
+                            column: 'channelId',
+                            termType: e.terms[0]?.terms[0]?.termType,
+                            value: e.terms[0]?.terms[0]?.value,
+                        },
+                    ],
+                    type: 'or',
+                },
             ],
-            type: "or"
-        }
-    ]}
-    }else{
+        };
+    } else {
         params.value = e;
     }
 };
@@ -284,43 +278,43 @@ const _selectedRowKeys = ref<string[]>([]);
 const bindVis = ref(false);
 
 const channelIdMap = new Map();
-const onSelectChange = (row: any,selected:Boolean) => {
+const onSelectChange = (row: any, selected: Boolean) => {
     const arr = new Set(_selectedRowKeys.value);
-    if(selected){
-        arr.add(row.id)
-        channelIdMap.set(row.id,row.channelId)
-    }else{
-        arr.delete(row.id)
-        channelIdMap.delete(row.id)
+    if (selected) {
+        arr.add(row.id);
+        channelIdMap.set(row.id, row.channelId);
+    } else {
+        arr.delete(row.id);
+        channelIdMap.delete(row.id);
     }
     _selectedRowKeys.value = [...arr.values()];
 };
-const selectAll = (selected: Boolean, selectedRows: any,changeRows:any) => {
+const selectAll = (selected: Boolean, selectedRows: any, changeRows: any) => {
     if (selected) {
-            changeRows.map((i: any) => {
-                if (!_selectedRowKeys.value.includes(i.id)) {
-                    _selectedRowKeys.value.push(i.id)
-                    channelIdMap.set(i.id,i.channelId)
-                }
-            })
-        } else {
-            const arr = changeRows.map((item: any) => item.id)
-            const _ids: string[] = [];
-            _selectedRowKeys.value.map((i: any) => {
-                if (!arr.includes(i)) {   
-                    _ids.push(i)
-                }else{
-                    channelIdMap.delete(i)
-                }
-            })
-            _selectedRowKeys.value = _ids;
-        }     
-}
+        changeRows.map((i: any) => {
+            if (!_selectedRowKeys.value.includes(i.id)) {
+                _selectedRowKeys.value.push(i.id);
+                channelIdMap.set(i.id, i.channelId);
+            }
+        });
+    } else {
+        const arr = changeRows.map((item: any) => item.id);
+        const _ids: string[] = [];
+        _selectedRowKeys.value.map((i: any) => {
+            if (!arr.includes(i)) {
+                _ids.push(i);
+            } else {
+                channelIdMap.delete(i);
+            }
+        });
+        _selectedRowKeys.value = _ids;
+    }
+};
 
-const cancelSelectAll = () =>{
+const cancelSelectAll = () => {
     _selectedRowKeys.value = [];
     channelIdMap.clear();
-}
+};
 /**
  * 表格操作按钮
  * @param data 表格数据项
@@ -341,17 +335,20 @@ const getActions = (
             icon: 'DisconnectOutlined',
             popConfirm: {
                 title: '确认解绑?',
-                onConfirm: async () => {
-                    const resp = await CascadeApi.unbindChannel(
+                onConfirm: () => {
+                    const response = CascadeApi.unbindChannel(
                         route.query.id as string,
                         [data.channelId],
                     );
-                    if (resp.success) {
-                        onlyMessage('操作成功！');
-                        listRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                    response.then((resp) => {
+                        if (resp.success) {
+                            onlyMessage('操作成功！');
+                            listRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
         },
@@ -367,16 +364,13 @@ const handleMultipleUnbind = async () => {
         onlyMessage('请先选择需要解绑的通道列表', 'error');
         return;
     }
-    // const channelIds = listRef.value?._dataSource
-    //     .filter((f: any) => _selectedRowKeys.value.includes(f.id))
-    //     .map((m: any) => m.channelId);
-    const resp = await CascadeApi.unbindChannel(
-        route.query.id as string,
-       [...channelIdMap.values()]
-    );
+    const resp = await CascadeApi.unbindChannel(route.query.id as string, [
+        ...channelIdMap.values(),
+    ]);
     if (resp.success) {
         onlyMessage('操作成功！');
-        _selectedRowKeys.value = []
+        _selectedRowKeys.value = [];
+        channelIdMap.clear();
         listRef.value?.reload();
     } else {
         onlyMessage('操作失败！', 'error');
diff --git a/src/views/media/Cascade/index.vue b/src/views/media/Cascade/index.vue
index f90515d2..92e26da8 100644
--- a/src/views/media/Cascade/index.vue
+++ b/src/views/media/Cascade/index.vue
@@ -42,20 +42,14 @@
                     >
                         <template #img>
                             <slot name="img">
-                                <img
-                                    :src="
-                                        getImage(
-                                            '/cascade.png',
-                                        )
-                                    "
-                                />
+                                <img :src="getImage('/cascade.png')" />
                             </slot>
                         </template>
                         <template #content>
-                            <Ellipsis style="width: calc(100% - 100px);">
-                            <span style="font-size: 16px;font-weight: 700">
-                                {{ slotProps.name }}
-                            </span>
+                            <Ellipsis style="width: calc(100% - 100px)">
+                                <span style="font-size: 16px; font-weight: 700">
+                                    {{ slotProps.name }}
+                                </span>
                             </Ellipsis>
                             <p>通道数量：{{ slotProps.count || 0 }}</p>
                             <j-badge
@@ -64,11 +58,13 @@
                                         ? 'success'
                                         : 'error'
                                 "
-                                style="display: flex; align-items: center;"
+                                style="display: flex; align-items: center"
                             >
                                 <template #text>
                                     <j-ellipsis>
-                                        {{ `sip:${slotProps.sipConfigs[0]?.sipId}@${slotProps.sipConfigs[0]?.hostAndPort}` }}
+                                        {{
+                                            `sip:${slotProps.sipConfigs[0]?.sipId}@${slotProps.sipConfigs[0]?.hostAndPort}`
+                                        }}
                                     </j-ellipsis>
                                 </template>
                             </j-badge>
@@ -354,18 +350,20 @@ const getActions = (
                 title: `确认${
                     data.status?.value === 'enabled' ? '禁用' : '启用'
                 }?`,
-                onConfirm: async () => {
-                    let res =
+                onConfirm: () => {
+                    let response =
                         data.status.value === 'enabled'
-                            ? await CascadeApi.disabled(data.id)
-                            : await CascadeApi.enabled(data.id);
-
-                    if (res.success) {
-                        onlyMessage('操作成功！');
-                        listRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                            ? CascadeApi.disabled(data.id)
+                            : CascadeApi.enabled(data.id);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功！');
+                            listRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -381,14 +379,17 @@ const getActions = (
             disabled: data.status?.value === 'enabled',
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await CascadeApi.del(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        listRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = CascadeApi.del(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            listRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/media/DashBoard/index.vue b/src/views/media/DashBoard/index.vue
index 180fecfb..2dba7bac 100644
--- a/src/views/media/DashBoard/index.vue
+++ b/src/views/media/DashBoard/index.vue
@@ -161,14 +161,18 @@ const getPlayCount = async (params: any) => {
     const day = hour * 24;
     const month = day * 30;
     const year = 365 * day;
+    let format = ''
+
     if (dt <= day) {
         _limit = Math.abs(Math.ceil(dt / hour));
     } else if (dt > day && dt < year) {
         _limit = Math.abs(Math.ceil(dt / day));
         _time = '1d';
+        format = 'M月dd日'
     } else if (dt >= year) {
         _limit = Math.abs(Math.floor(dt / month));
         _time = '1M';
+      format = 'YYYY年-MM月'
     }
     dashboardApi
         .getPlayCount([
@@ -179,6 +183,7 @@ const getPlayCount = async (params: any) => {
                 dimension: 'agg',
                 group: 'playCount',
                 params: {
+                    format: format,
                     time: _time,
                     from: moment(Number(params.time.start)).format(
                         'YYYY-MM-DD HH:mm:ss',
diff --git a/src/views/media/Device/Channel/Live/Preset.vue b/src/views/media/Device/Channel/Live/Preset.vue
index 15d2ea94..55cb4bfe 100644
--- a/src/views/media/Device/Channel/Live/Preset.vue
+++ b/src/views/media/Device/Channel/Live/Preset.vue
@@ -11,7 +11,7 @@
                 <j-button
                     type="link"
                     style="padding: 0"
-                    v-if="!record.flag"
+                    v-if="!record.flag || props.share"
                     :disabled="loading"
                     @click="onSetting(record)"
                     >设置</j-button
@@ -38,7 +38,7 @@
             </template>
             <template v-else-if="column.dataIndex === 'name'">
                 <j-input
-                    :disabled="record.flag"
+                    :disabled="record.flag || props.share"
                     v-model:value="record[column.dataIndex]"
                 />
             </template>
@@ -98,7 +98,7 @@ const dataSource = ref<Item[]>(init);
 const loading = ref(false);
 const route = useRoute()
 
-const handleSearch = async (id: string, arr: Item[]) => {
+const handleSearch = async (id: string, arr: Item[] = []) => {
   const params: Record<string, string> = {}
   if (route.query.type === 'gb28181-2016') {
     params.channel = props.data.channelId
diff --git a/src/views/media/Device/Channel/Live/index.vue b/src/views/media/Device/Channel/Live/index.vue
index bb2c06fa..3fa6d016 100644
--- a/src/views/media/Device/Channel/Live/index.vue
+++ b/src/views/media/Device/Channel/Live/index.vue
@@ -3,14 +3,16 @@
     <j-modal
         v-model:visible="_vis"
         title="播放"
-        :width="type === 'share'? '100%' : _type ? 1200 : 900"
-        :class="{share: type === 'share'}"
+        :width="type === 'share' ? '100%' : _type ? 1200 : 900"
+        :class="{ share: type === 'share' }"
         :maskClosable="false"
         @ok="_vis = false"
         :destroyOnClose="true"
     >
         <template #closeIcon>
-          <j-button :disabled="type === 'share'" type="text"><AIcon type="CloseOutlined" /></j-button>
+            <j-button :disabled="type === 'share'" type="text"
+                ><AIcon type="CloseOutlined"
+            /></j-button>
         </template>
         <div class="media-live-tool">
             <j-radio-group
@@ -23,19 +25,23 @@
                 <j-radio-button value="m3u8">HLS</j-radio-button>
                 <!-- <j-radio-button value='rtc'>RTC</j-radio-button> -->
             </j-radio-group>
-            <div class="media-live-share" v-if="type !== 'share'">
-                <j-button type="link" @click="onShare"
-                    ><AIcon type="ShareAltOutlined" />分享视频</j-button
-                >
-            </div>
+            <!--            <div class="media-live-share" v-if="type !== 'share'">-->
+            <!--                <j-button type="link" @click="onShare"-->
+            <!--                    ><AIcon type="ShareAltOutlined" />分享视频</j-button-->
+            <!--                >-->
+            <!--            </div>-->
         </div>
         <div class="media-live">
-            <div class="media-live-video" @mouseenter="visibleChange"  @mouseleave="mouseleave">
-                <div
-                    :class="mediaToolClass"
-                    @mouseenter="showTool = true"
-                >
-                    <div class="tool-item" v-if="type !== 'share'">
+            <div
+                class="media-live-video"
+                @mouseenter="visibleChange"
+                @mouseleave="mouseleave"
+            >
+                <div :class="mediaToolClass" @mouseenter="showTool = true">
+                    <div
+                        class="tool-item"
+                        v-if="type !== 'share' && showRecord"
+                    >
                         <template v-if="isRecord === 0">
                             <j-dropdown
                                 trigger="click"
@@ -44,10 +50,7 @@
                                 <div>开始录像</div>
                                 <template #overlay>
                                     <j-menu @click="recordStart">
-                                        <j-menu-item
-                                            key="true"
-                                            v-if="_type"
-                                        >
+                                        <j-menu-item key="true" v-if="_type">
                                             <span style="padding-right: 12px"
                                                 >本地存储</span
                                             >
@@ -83,14 +86,11 @@
                     <div class="tool-item" @click.stop="handleRefresh">
                         刷新
                     </div>
-                    <div class="tool-item">
-                        <j-popconfirm
-                            title="重置将断开直播, 可能会影响其他播放者"
-                            @confirm="handleReset"
-                        >
+                    <ConfirmModal title="重置将断开直播, 可能会影响其他播放者" :onConfirm="handleReset">
+                        <div class="tool-item">
                             重置
-                        </j-popconfirm>
-                    </div>
+                        </div></ConfirmModal
+                    >
                 </div>
                 <LivePlayer
                     ref="player"
@@ -100,7 +100,7 @@
                     autoplay
                 />
             </div>
-            <div class="media-live-actions" v-if="_type">
+            <div class="media-live-actions" v-if="_type && showActions">
                 <div class="actions-tool">
                     <MediaTool
                         @onMouseDown="handleMouseDown"
@@ -128,14 +128,18 @@
                         </template>
                     </MediaTool>
                 </div>
-                <Preset  v-if='data.ptzType.value ===0 || data.ptzType.value === 1' :data="data" @refresh="onRefresh" />
+                <Preset
+                    v-if="data.ptzType.value === 0 || data.ptzType.value === 1"
+                    :data="data"
+                    @refresh="onRefresh"
+                />
             </div>
         </div>
         <template #footer>
-          <j-space v-if="type !== 'share'">
-            <j-button  @click="_vis = false">取消</j-button>
-            <j-button  @click="_vis = false" type="primary">确定</j-button>
-          </j-space>
+            <j-space v-if="type !== 'share'">
+                <j-button @click="_vis = false">取消</j-button>
+                <j-button @click="_vis = false" type="primary">确定</j-button>
+            </j-space>
         </template>
     </j-modal>
     <Share v-if="visible" :data="data" @close="visible = false" />
@@ -148,6 +152,9 @@ import MediaTool from '@/components/Player/mediaTool.vue';
 import channelApi from '@/api/media/channel';
 import Share from './Share.vue';
 import Preset from './Preset.vue';
+import { useSystem } from '@/store/system';
+import { mediaConfigMap } from '../data';
+import { onlyMessage } from '@/utils/comm';
 
 type Emits = {
     (e: 'update:visible', data: boolean): void;
@@ -168,7 +175,7 @@ const props = defineProps({
 });
 
 const route = useRoute();
-
+const system = useSystem();
 const _vis = computed({
     get: () => props.visible,
     set: (val) => emit('update:visible', val),
@@ -186,8 +193,18 @@ const showToolLock = ref(false);
 const visible = ref(false);
 
 const _type = computed(() => {
-  return route.query.type !== 'fixed-media'
-})
+    return route.query.type !== 'fixed-media';
+});
+
+const showRecord = computed(() => {
+    const key = mediaConfigMap.get(route.query.type + '-record');
+    return system.configInfo?.media?.[key] != 'false';
+});
+
+const showActions = computed(() => {
+    const key = mediaConfigMap.get(route.query.type + '-ptz');
+    return system.configInfo?.media?.[key] != 'false';
+});
 
 const speedList = [
     { label: '高', value: 180 },
@@ -195,7 +212,7 @@ const speedList = [
     { label: '低', value: 45 },
 ];
 const speed = ref(90);
-
+const local = ref();
 const _speed = computed(() => {
     return speedList.find((item) => item.value === speed.value)?.label;
 });
@@ -256,9 +273,11 @@ const recordStart = async ({ key }: { key: string }) => {
     showToolLock.value = false;
     showTool.value = false;
     isRecord.value = 1;
-    const local = key === 'true';
+    local.value = key === 'true';
     const res = await channelApi
-        .recordStart(props.data.deviceId, props.data.channelId, { local })
+        .recordStart(props.data.deviceId, props.data.channelId, {
+            local: local.value,
+        })
         .catch(() => ({ success: false }));
     if (res.success) {
         isRecord.value = 2;
@@ -274,6 +293,7 @@ const recordStop = async () => {
     const res = await channelApi.recordStop(
         props.data.deviceId,
         props.data.channelId,
+        { local: local.value },
     );
     if (res.success) {
         isRecord.value = 0;
@@ -294,8 +314,14 @@ const handleRefresh = () => {
 /**
  * 重置
  */
-const handleReset = async () => {
-    channelApi.mediaStop(props.data.deviceId, props.data.channelId);
+const handleReset =  () => {
+    const resp = channelApi.mediaStop(props.data.deviceId, props.data.channelId);
+    resp.then((res)=>{
+        if(res.success){
+            onlyMessage('操作成功！')
+        }
+    })
+    return resp
 };
 
 /**
@@ -303,7 +329,12 @@ const handleReset = async () => {
  * @param type 控制类型
  */
 const handleMouseDown = (type: string) => {
-    channelApi.ptzTool(props.data.deviceId, props.data.channelId, type, speed.value);
+    channelApi.ptzTool(
+        props.data.deviceId,
+        props.data.channelId,
+        type,
+        speed.value,
+    );
 };
 const handleMouseUp = () => {
     channelApi.ptzStop(props.data.deviceId, props.data.channelId);
@@ -317,8 +348,8 @@ const onShare = () => {
 };
 
 const onRefresh = () => {
-    emit('refresh')
-}
+    emit('refresh');
+};
 
 watch(
     () => _vis.value,
@@ -332,8 +363,8 @@ watch(
         }
     },
     {
-      immediate: true
-    }
+        immediate: true,
+    },
 );
 </script>
 <style lang="less" scoped>
diff --git a/src/views/media/Device/Channel/Live/shareLive.vue b/src/views/media/Device/Channel/Live/shareLive.vue
index ac0ec5f1..e5be7938 100644
--- a/src/views/media/Device/Channel/Live/shareLive.vue
+++ b/src/views/media/Device/Channel/Live/shareLive.vue
@@ -1,6 +1,6 @@
 <template>
-  <div style="width: 95%; margin: 0 auto;">
-    <div class="media-live-tool">
+    <div style="width: 95%; margin: 0 auto">
+        <div class="media-live-tool">
             <j-radio-group
                 v-model:value="mediaType"
                 button-style="solid"
@@ -11,9 +11,10 @@
                 <j-radio-button value="m3u8">HLS</j-radio-button>
             </j-radio-group>
             <div class="media-live-share" v-if="type !== 'share'">
-                <j-button type="link" @click="onShare"
-                    ><AIcon type="ShareAltOutlined" />分享视频</j-button
-                >
+                <j-button type="link" @click="onShare">
+                    <AIcon type="ShareAltOutlined" />
+                    分享视频
+                </j-button>
             </div>
         </div>
         <div class="media-live">
@@ -33,10 +34,7 @@
                                 <div>开始录像</div>
                                 <template #overlay>
                                     <j-menu @click="recordStart">
-                                        <j-menu-item
-                                            key="true"
-                                            v-if="_type"
-                                        >
+                                        <j-menu-item key="true" v-if="_type">
                                             <span style="padding-right: 12px"
                                                 >本地存储</span
                                             >
@@ -72,14 +70,12 @@
                     <div class="tool-item" @click.stop="handleRefresh">
                         刷新
                     </div>
-                    <div class="tool-item">
-                        <j-popconfirm
-                            title="重置将断开直播, 可能会影响其他播放者"
-                            @confirm="handleReset"
-                        >
-                            重置
-                        </j-popconfirm>
-                    </div>
+                    <ConfirmModal
+                        title="重置将断开直播, 可能会影响其他播放者"
+                        :onConfirm="handleReset"
+                    >
+                        <div class="tool-item">重置</div></ConfirmModal
+                    >
                 </div>
                 <LivePlayer
                     ref="player"
@@ -117,10 +113,12 @@
                         </template>
                     </MediaTool>
                 </div>
-                <Preset :data="data" @refresh="onRefresh" :share="true"/>
+                <div class="media-preset">
+                    <Preset :data="data" @refresh="onRefresh" :share="true" />
+                </div>
             </div>
         </div>
-  </div>
+    </div>
 </template>
 
 <script setup lang="ts">
@@ -128,8 +126,8 @@ import { PropType } from 'vue';
 import LivePlayer from '@/components/Player/index.vue';
 import MediaTool from '@/components/Player/mediaTool.vue';
 import channelApi from '@/api/media/channel';
-import Share from './Share.vue';
 import Preset from './Preset.vue';
+import { onlyMessage } from '@/utils/comm';
 
 type Emits = {
     (e: 'update:visible', data: boolean): void;
@@ -147,6 +145,10 @@ const props = defineProps({
         type: String as PropType<'share' | 'normal'>,
         default: 'normal',
     },
+    readOnly: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const route = useRoute();
@@ -168,8 +170,8 @@ const showToolLock = ref(false);
 const visible = ref(false);
 
 const _type = computed(() => {
-  return route.query.type !== 'fixed-media'
-})
+    return route.query.type !== 'fixed-media';
+});
 
 const speedList = [
     { label: '高', value: 180 },
@@ -276,8 +278,12 @@ const handleRefresh = () => {
 /**
  * 重置
  */
-const handleReset = async () => {
-    channelApi.mediaStop(props.data.deviceId, props.data.channelId);
+const handleReset =  () => {
+    const response = channelApi.mediaStop(props.data.deviceId, props.data.channelId);
+    response.then((res)=>{
+      onlyMessage('操作成功!')
+    })
+    return response
 };
 
 /**
@@ -285,7 +291,12 @@ const handleReset = async () => {
  * @param type 控制类型
  */
 const handleMouseDown = (type: string) => {
-    channelApi.ptzTool(props.data.deviceId, props.data.channelId, type, speed.value);
+    channelApi.ptzTool(
+        props.data.deviceId,
+        props.data.channelId,
+        type,
+        speed.value,
+    );
 };
 const handleMouseUp = () => {
     channelApi.ptzStop(props.data.deviceId, props.data.channelId);
@@ -299,8 +310,8 @@ const onShare = () => {
 };
 
 const onRefresh = () => {
-    emit('refresh')
-}
+    emit('refresh');
+};
 
 watch(
     () => _vis.value,
@@ -314,15 +325,17 @@ watch(
         }
     },
     {
-      immediate: true
-    }
+        immediate: true,
+    },
 );
 </script>
 <style lang="less" scoped>
 @import './index.less';
+
 :deep(.live-player-stretch-btn) {
     display: none;
 }
+
 :deep(.vjs-icon-spinner) {
     display: none;
 }
@@ -332,4 +345,10 @@ watch(
     flex-direction: column;
     align-items: center;
 }
-</style>
\ No newline at end of file
+
+.media-preset {
+    :deep(.ant-table-header) {
+        user-select: none;
+    }
+}
+</style>
diff --git a/src/views/media/Device/Channel/Save.vue b/src/views/media/Device/Channel/Save.vue
index d53d684a..3ee89a38 100644
--- a/src/views/media/Device/Channel/Save.vue
+++ b/src/views/media/Device/Channel/Save.vue
@@ -56,7 +56,10 @@
                         />
                     </j-form-item>
                 </j-col>
-                <j-col :span="24" v-if="route.query.type === 'gb28181-2016'">
+                <j-col
+                    :span="24"
+                    v-if="typeOne"
+                >
                     <j-form-item
                         label="厂商"
                         name="manufacturer"
@@ -71,7 +74,7 @@
                         />
                     </j-form-item>
                 </j-col>
-                <j-col :span="24" v-if="route.query.type === 'fixed-media'">
+                <j-col :span="24" v-if="typeTow">
                     <j-form-item
                         name="media_url"
                         :rules="[
@@ -99,7 +102,7 @@
                         />
                     </j-form-item>
                 </j-col>
-                <j-col :span="12">
+                <j-col :span="12" v-if="typeTow">
                     <j-form-item
                         name="media_username"
                         label="用户名"
@@ -111,7 +114,7 @@
                         />
                     </j-form-item>
                 </j-col>
-                <j-col :span="12">
+                <j-col :span="12" v-if="typeTow">
                     <j-form-item
                         name="media_password"
                         label="密码"
@@ -135,7 +138,7 @@
                         />
                     </j-form-item>
                 </j-col>
-                <j-col :span="24" v-if="route.query.type === 'gb28181-2016'">
+                <j-col :span="24" v-if="typeOne">
                     <j-form-item label="云台类型" name="ptzType">
                         <j-select
                             v-model:value="formData.ptzType"
@@ -193,6 +196,12 @@ const _vis = computed({
     set: (val) => emit('update:visible', val),
 });
 
+const typeOne = computed(()=>{
+    return ['gb28181-2016', 'onvif'].includes(route.query.type)
+})
+const typeTow = computed(()=>{
+    return ['fixed-media'].includes(route.query.type)
+})
 const formRef = ref();
 const formData = ref({
     id: undefined,
@@ -209,11 +218,10 @@ const formData = ref({
     media_username: '',
 });
 
-const loading = ref<boolean>(false)
+const loading = ref<boolean>(false);
 watch(
     () => props.channelData,
     (val: any) => {
-        console.log('val: ', val);
         const {
             id,
             address,
@@ -250,7 +258,7 @@ const validateChannelId = async (_rule: Rule, value: string) => {
     // ID非必填, 没有输入ID时, 不校验ID是否存在
     if (!value) return;
     // 编辑时不校验唯一性
-    if(!!formData.value?.id) return;
+    if (!!formData.value?.id) return;
     const { result } = await ChannelApi.validateField({
         deviceId: route.query.id,
         channelId: value,
@@ -290,20 +298,27 @@ const handleSubmit = () => {
                 media_url,
                 media_password,
                 media_username,
-                manufacturer,
+                // manufacturer,
                 // ptzType,
                 ...extraFormData
             } = formData.value;
-            if (media_url || media_password || media_username) {
-                extraFormData.others = {
-                    media_url,
-                    media_password,
-                    media_username,
-                };
-            }
+
+            extraFormData.others = {
+                media_url,
+                media_password,
+                media_username,
+            };
+
             const res = formData.value.id
-                ? await ChannelApi.update(formData.value.id, extraFormData).finally(() => {loading.value = false;})
-                : await ChannelApi.save(extraFormData).finally(() => {loading.value = false;});
+                ? await ChannelApi.update(
+                      formData.value.id,
+                      extraFormData,
+                  ).finally(() => {
+                      loading.value = false;
+                  })
+                : await ChannelApi.save(extraFormData).finally(() => {
+                      loading.value = false;
+                  });
             if (res.success) {
                 onlyMessage('操作成功');
                 _vis.value = false;
diff --git a/src/views/media/Device/Channel/Share/index.vue b/src/views/media/Device/Channel/Share/index.vue
index c77b76c2..07ea4d39 100644
--- a/src/views/media/Device/Channel/Share/index.vue
+++ b/src/views/media/Device/Channel/Share/index.vue
@@ -1,5 +1,5 @@
 <template>
-    <ShareLive :visible="true" type="share" :data="playData"/>
+    <ShareLive :visible="true" type="share" :data="playData" :readOnly="true"/>
 </template>
 
 <script lang="ts" setup>
@@ -32,4 +32,4 @@ watchEffect(() => {
         LocalStore.set(TOKEN_KEY, obj?.[TOKEN_KEY]);
     }
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/media/Device/Channel/Tree/index.vue b/src/views/media/Device/Channel/Tree/index.vue
index b73a6bd2..a22b8590 100644
--- a/src/views/media/Device/Channel/Tree/index.vue
+++ b/src/views/media/Device/Channel/Tree/index.vue
@@ -1,29 +1,42 @@
 <template>
-    <div class="channel-tree">
-        <div class="channel-tree-query">
-            <j-input @change="queryTree" placeholder="请输入目录名称">
-                <template #suffix>
-                    <AIcon type="SearchOutlined" />
-                </template>
-            </j-input>
+    <div class="left-warp" v-if="showWarp">
+        <div class="left-content" :class="{ active: show }">
+            <div class="channel-tree">
+                <div class="channel-tree-query">
+                    <j-input @change="queryTree" placeholder="请输入目录名称">
+                        <template #suffix>
+                            <AIcon type="SearchOutlined" />
+                        </template>
+                    </j-input>
+                </div>
+                <div class="channel-tree-content">
+                    <j-tree
+                        v-if="showWarp"
+                        defaultExpandAll
+                        :height="500"
+                        :selectedKeys="selectedKeys"
+                        :treeData="treeData"
+                        :onSelect="(keys:any) => {
+                      if (keys.length) {
+                      selectedKeys = keys
+                      if (props.onSelect) {
+                          props.onSelect(keys[0]);
+                      }
+                      }
+                  }"
+                        :fieldNames="{ key: 'id', title: 'name' }"
+                        :showLine="{ showLeafIcon: false }"
+                        :show-icon="true"
+                    />
+                </div>
+            </div>
         </div>
-        <div class="channel-tree-content">
-            <j-tree
-                :height="500"
-                :selectedKeys="selectedKeys"
-                :treeData="treeData"
-                :onSelect="(keys:any) => {
-                    if (keys.length) {
-                    selectedKeys = keys
-                    if (props.onSelect) {
-                        props.onSelect(keys[0]);
-                    }
-                    }
-                }"
-                :fieldNames="{ key: 'id', title: 'name' }"
-                :showLine="{ showLeafIcon: false }"
-                :show-icon="true"
-            />
+        <div
+            class="left-warp--btn"
+            :class="{ active: !show }"
+            @click="show = !show"
+        >
+            <AIcon type="LeftOutlined" />
         </div>
     </div>
 </template>
@@ -31,59 +44,107 @@
 <script setup lang="ts">
 import { debounce } from 'lodash-es';
 import ChannelApi from '@/api/media/channel';
-import DeviceApi from '@/api/media/device';
 
 interface TreeProps {
-    deviceId: string;
     onSelect: (id: string) => void;
     onTreeLoad: (type: boolean) => void;
+    deviceData: any;
 }
 
 const props = defineProps<TreeProps>();
-
+const route: any = useRoute();
 const treeData = ref<any[]>([]);
 const selectedKeys = ref<string[]>([]);
+const show = ref(false);
+
+const showWarp = computed(() => {
+    return (
+        route.query.type === 'gb28181-2016' &&
+        treeData.value[0]?.children.length
+    );
+});
 
 const getTreeData = async (id: string, data?: any) => {
     const { result } = await ChannelApi.queryTree(id, data);
-    treeData.value[0].children = result || [];
-    props.onTreeLoad(treeData.value[0].children.length > 10);
-    treeData.value = treeData.value;
-};
+    treeData.value = [
+        {
+            id: props.deviceData.id,
+            name: props.deviceData.name,
+            children: result || [],
+        },
+    ];
 
-/**
- * 获取设备详情
- * @param id
- */
-const getDeviceDetail = async (id: string) => {
-    const deviceResp = await DeviceApi.detail(id);
-    if (deviceResp.status === 200) {
-        treeData.value = [
-            {
-                id,
-                name: deviceResp.result.name,
-                children: [],
-            },
-        ];
-        selectedKeys.value = [id];
-        getTreeData(props.deviceId, {});
-    }
+    show.value = treeData.value[0].children.length > 10;
 };
 
 const queryTree = debounce((e: any) => {
-    getTreeData(props.deviceId, {
+    getTreeData(props.deviceData.id, {
         terms: [
             { column: 'name', termType: 'like', value: `%${e.target.value}%` },
         ],
     });
 }, 300);
 
-watchEffect(() => {
-    getDeviceDetail(props.deviceId);
-});
+watch(
+    () => props.deviceData,
+    () => {
+        treeData.value = [
+            {
+                id: props.deviceData.id,
+                name: props.deviceData.name,
+                children: [],
+            },
+        ];
+        selectedKeys.value = [props.deviceData.id];
+        getTreeData(props.deviceData.id, {});
+    },
+    {
+        deep: true,
+    },
+);
 </script>
 
 <style lang="less" scoped>
+.left-warp {
+    position: relative;
+    margin-right: 16px;
+    padding: 20px;
+    background-color: #fff;
+    border-radius: 2px;
+
+    .left-content {
+        width: 0;
+        height: 100%;
+        overflow: hidden;
+
+        &.active {
+            width: 260px;
+        }
+    }
+
+    .left-warp--btn {
+        position: absolute;
+        top: 50%;
+        right: 0;
+        padding: 20px 4px;
+        color: rgba(#000, 0.3);
+        background-color: rgba(#f0f0f0, 6);
+        border-radius: ~'100% 0 0 100% / 50% 0 0 50%';
+        cursor: pointer;
+
+        &:hover {
+            color: rgba(#000, 0.5);
+            background-color: rgba(#f0f0f0, 8);
+        }
+
+        &.active {
+            right: 50%;
+            background-color: transparent;
+            border-radius: 0;
+            transform: translateX(50%) rotate(180deg);
+        }
+    }
+}
 .channel-tree {
     height: 100%;
 
diff --git a/src/views/media/Device/Channel/data.ts b/src/views/media/Device/Channel/data.ts
new file mode 100644
index 00000000..271af9ee
--- /dev/null
+++ b/src/views/media/Device/Channel/data.ts
@@ -0,0 +1,10 @@
+export const  mediaConfigMap = new Map()
+mediaConfigMap.set('onvif-record','onvif-record')
+mediaConfigMap.set('onvif-ptz','onvif-ptz')
+mediaConfigMap.set('fixed-media-record','fix-record')
+mediaConfigMap.set('fixed-media-ptz','fix-ptz')
+mediaConfigMap.set('gb28181-2016-ptz','gb-ptz')
+mediaConfigMap.set('gb28181-2016-record','gb-record')
+mediaConfigMap.set('media-plugin-ptz','plugin-ptz')
+mediaConfigMap.set('media-plugin-record','plugin-record')
+
diff --git a/src/views/media/Device/Channel/index.less b/src/views/media/Device/Channel/index.less
index ee596623..37b55741 100644
--- a/src/views/media/Device/Channel/index.less
+++ b/src/views/media/Device/Channel/index.less
@@ -1,48 +1,7 @@
 .device-channel-warp {
     display: flex;
-
-    .left-warp {
-        position: relative;
-        margin-right: 16px;
-        padding: 20px;
-        background-color: #fff;
-        border-radius: 2px;
-
-        .left-content {
-            width: 0;
-            height: 100%;
-            overflow: hidden;
-
-            &.active {
-                width: 260px;
-            }
-        }
-
-        .left-warp--btn {
-            position: absolute;
-            top: 50%;
-            right: 0;
-            padding: 20px 4px;
-            color: rgba(#000, 0.3);
-            background-color: rgba(#f0f0f0, 6);
-            border-radius: ~'100% 0 0 100% / 50% 0 0 50%';
-            cursor: pointer;
-
-            &:hover {
-                color: rgba(#000, 0.5);
-                background-color: rgba(#f0f0f0, 8);
-            }
-
-            &.active {
-                right: 50%;
-                background-color: transparent;
-                border-radius: 0;
-                transform: translateX(50%) rotate(180deg);
-            }
-        }
-    }
-
     .right {
-        flex: 1;
+        flex: 1 1 0;
+        min-width: 0;
     }
 }
diff --git a/src/views/media/Device/Channel/index.vue b/src/views/media/Device/Channel/index.vue
index 06666e25..23260cb9 100644
--- a/src/views/media/Device/Channel/index.vue
+++ b/src/views/media/Device/Channel/index.vue
@@ -2,22 +2,11 @@
 <template>
     <page-container>
         <div class="device-channel-warp">
-            <div class="left-warp" v-if="route.query.type === 'gb28181-2016'">
-                <div class="left-content" :class="{ active: show }">
-                    <Tree
-                        :deviceId="deviceId"
-                        :on-tree-load="(e) => (show = e)"
-                        :on-select="handleSelect"
-                    />
-                </div>
-                <div
-                    class="left-warp--btn"
-                    :class="{ active: !show }"
-                    @click="show = !show"
-                >
-                    <AIcon type="LeftOutlined" />
-                </div>
-            </div>
+            <Tree
+                :deviceData="deviceData"
+                :on-tree-load="(e) => (show = e)"
+                :on-select="handleSelect"
+            />
             <div class="right">
                 <pro-search
                     :columns="columns"
@@ -37,8 +26,16 @@
                     >
                         <template #headerTitle>
                             <j-tooltip
-                                v-if="route?.query.type === 'gb28181-2016'"
-                                title="接入方式为GB/T28281时，不支持新增"
+                                v-if="
+                                    ['gb28181-2016', 'onvif'].includes(
+                                        route.query.type,
+                                    )
+                                "
+                                :title="`接入方式为${
+                                    route.query.type === 'onvif'
+                                        ? 'Onvif'
+                                        : 'GB/T28181'
+                                }时，不支持新增`"
                             >
                                 <j-button type="primary" disabled>
                                     新增
@@ -55,6 +52,35 @@
                                 >
                             </PermissionButton>
                         </template>
+                        <template #rightExtraRender>
+                            <PermissionButton
+                                type="text"
+                                :tooltip="{
+                                    title:
+                                        route?.query?.type === 'fixed-media'
+                                            ? '固定地址无法更新通道'
+                                            : deviceData?.state?.value ===
+                                              'offline'
+                                            ? '设备已离线'
+                                            : deviceData?.state?.value ===
+                                              'notActive'
+                                            ? '设备已禁用'
+                                            : '更新通道',
+                                }"
+                                :disabled="
+                                    deviceData?.state?.value === 'offline' ||
+                                    deviceData?.state?.value === 'notActive' ||
+                                    route?.query?.type === 'fixed-media'
+                                "
+                                @click="refreshChanel"
+                            >
+                                <template #icon
+                                    ><AIcon
+                                        type="SyncOutlined"
+                                    />更新通道</template
+                                ></PermissionButton
+                            >
+                        </template>
                         <template #status="slotProps">
                             <j-space>
                                 <j-badge
@@ -68,7 +94,7 @@
                             </j-space>
                         </template>
                         <template #action="slotProps">
-                            <j-space>
+                            <j-space :size="16">
                                 <template
                                     v-for="i in getActions(slotProps, 'table')"
                                     :key="i.key"
@@ -130,7 +156,11 @@
             :channelData="channelData"
             @submit="listRef.reload()"
         />
-        <Live v-model:visible="playerVis" :data="playData" @refresh="listRef.reload()" />
+        <Live
+            v-model:visible="playerVis"
+            :data="playData"
+            @refresh="listRef.reload()"
+        />
     </page-container>
 </template>
 
@@ -142,11 +172,11 @@ import Save from './Save.vue';
 import Live from './Live/index.vue';
 import Tree from './Tree/index.vue';
 import { cloneDeep } from 'lodash-es';
-import { useElementSize } from '@vueuse/core';
 import { onlyMessage } from '@/utils/comm';
+import DeviceApi from '@/api/media/device';
 
 const menuStory = useMenuStore();
-const route = useRoute();
+const route: any = useRoute();
 
 const columns = [
     {
@@ -173,9 +203,6 @@ const columns = [
         dataIndex: 'manufacturer',
         key: 'manufacturer',
         ellipsis: true,
-        search: {
-            type: 'string',
-        },
     },
     {
         title: '安装地址',
@@ -212,6 +239,7 @@ const columns = [
 ];
 
 const params = ref<Record<string, any>>({});
+const deviceData = ref<any>();
 
 /**
  * 搜索
@@ -223,7 +251,7 @@ const handleSearch = (e: any) => {
 
 const saveVis = ref(false);
 const handleAdd = () => {
-    channelData.value = undefined
+    channelData.value = undefined;
     saveVis.value = true;
 };
 
@@ -294,14 +322,17 @@ const getActions = (
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await ChannelApi.del(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        listRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = ChannelApi.del(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            listRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response;
                 },
             },
             icon: 'DeleteOutlined',
@@ -313,7 +344,7 @@ const getActions = (
 };
 
 // 左侧树
-const show = ref(false);
+
 const deviceId = computed(() => route.query.id as string);
 const handleSelect = (key: string) => {
     if (key === deviceId.value && listRef.value?.reload) {
@@ -329,6 +360,19 @@ const handleSelect = (key: string) => {
         };
     }
 };
+const refreshChanel = async () => {
+    const res = await DeviceApi.updateChannels(deviceData.value.id);
+    if (res.success) {
+        onlyMessage('通道更新成功');
+        listRef.value?.reload();
+    }
+};
+onMounted(async () => {
+    const deviceResp = await DeviceApi.detail(route.query.id);
+    if (deviceResp.success) {
+        deviceData.value = deviceResp.result;
+    }
+});
 </script>
 <style lang="less" scoped>
 @import './index.less';
diff --git a/src/views/media/Device/Playback/iconNode.vue b/src/views/media/Device/Playback/iconNode.vue
index 727647c9..fcc6f8c7 100644
--- a/src/views/media/Device/Playback/iconNode.vue
+++ b/src/views/media/Device/Playback/iconNode.vue
@@ -1,8 +1,19 @@
 <!-- 视频图标组件 -->
 <template>
-    <a @click="handleClick">
-        <AIcon :type="iconType" />
-    </a>
+    <j-tooltip
+        key="download"
+        :title="
+            type !== 'local'
+                ? '下载录像文件'
+                : item.isServer || status === 2
+                ? '查看'
+                : '下载到云端'
+        "
+    >
+        <a @click="handleClick">
+            <AIcon :type="iconType" />
+        </a>
+    </j-tooltip>
 </template>
 
 <script setup lang="ts">
@@ -70,4 +81,8 @@ const handleClick = () => {
         props.onDownLoad();
     }
 };
+
+watch(()=>props.item,()=>{
+    status.value = props.item?.isServer ? 2 : 0
+})
 </script>
diff --git a/src/views/media/Device/Playback/index.vue b/src/views/media/Device/Playback/index.vue
index 53ab3432..d44de1a6 100644
--- a/src/views/media/Device/Playback/index.vue
+++ b/src/views/media/Device/Playback/index.vue
@@ -22,15 +22,7 @@
                                 playStatus = 2;
                             }
                         "
-                        :on-ended="
-                            () => {
-                                playStatus = 0;
-                                if (playTimeNode && isEnded) {
-                                    isEnded = true;
-                                    playTimeNode.onNextPlay();
-                                }
-                            }
-                        "
+                        :on-ended="onEnded"
                         :on-error="
                             () => {
                                 playStatus = 0;
@@ -38,7 +30,7 @@
                         "
                         :on-time-update="
                             (e) => {
-                                playTime = e;
+                                playTime = e.currentTime;
                             }
                         "
                     />
@@ -140,26 +132,14 @@
                                                     />
                                                 </a>
                                             </j-tooltip>
-                                            <j-tooltip
-                                                key="download"
-                                                :title="
-                                                    type !== 'local'
-                                                        ? '下载录像文件'
-                                                        : item.isServer
-                                                        ? '查看'
-                                                        : '下载到云端'
+                                            <IconNode
+                                                :type="type"
+                                                :item="item"
+                                                :on-cloud-view="cloudView"
+                                                :on-down-load="
+                                                    () => downloadClick(item)
                                                 "
-                                            >
-                                                <IconNode
-                                                    :type="type"
-                                                    :item="item"
-                                                    :on-cloud-view="cloudView"
-                                                    :on-down-load="
-                                                        () =>
-                                                            downloadClick(item)
-                                                    "
-                                                />
-                                            </j-tooltip>
+                                            />
                                         </template>
 
                                         <div>
@@ -179,7 +159,6 @@
                                         </div>
                                     </j-list-item>
                                 </template>
-                                <div></div>
                             </j-list>
                         </div>
                     </j-spin>
@@ -233,13 +212,11 @@ const queryLocalRecords = async (date: Dayjs) => {
             startTime: date.format('YYYY-MM-DD 00:00:00'),
             endTime: date.format('YYYY-MM-DD 23:59:59'),
         };
-        const localResp = await playBackApi.queryRecordLocal(
-            deviceId.value,
-            channelId.value,
-            params,
-        ).finally(()=>{
-            loading.value = false;
-        })
+        const localResp = await playBackApi
+            .queryRecordLocal(deviceId.value, channelId.value, params)
+            .finally(() => {
+                loading.value = false;
+            });
         if (localResp.status === 200 && localResp.result.length) {
             const serviceResp = await playBackApi.recordsInServer(
                 deviceId.value,
@@ -327,6 +304,15 @@ const downloadClick = async (item: recordsItemType) => {
     document.body.removeChild(downNode);
 };
 
+const onEnded = () => {
+  playStatus.value = 0;
+  if (playTimeNode && !isEnded.value) {
+    isEnded.value = true;
+    playTimeNode.value.onNextPlay();
+  }
+}
+
+
 onMounted(() => {
     const _type = route.query.type as string;
     if (_type) {
diff --git a/src/views/media/Device/Playback/timeLine.vue b/src/views/media/Device/Playback/timeLine.vue
index 51bcd277..513a3a40 100644
--- a/src/views/media/Device/Playback/timeLine.vue
+++ b/src/views/media/Device/Playback/timeLine.vue
@@ -24,8 +24,8 @@
                     "
                 ></div>
             </div>
-            <div id="btn" v-show="timePosition" class="time-line-btn" :style="{left: timePosition + 'px' }"></div>
-            <div id="time" v-show="timePosition" class="time-line" :style="{left: (timePosition - 15) + 'px' }">
+            <div id="btn" v-show="playTime " class="time-line-btn" :style="{left: timePosition + 'px' }"></div>
+            <div id="time" v-show="playTime " class="time-line" :style="{left: (timePosition - 15) + 'px' }">
                 {{ dayjs(playTime || 0).format('HH:mm:ss') }}
             </div>
         </div>
@@ -216,7 +216,6 @@ const getLineItemStyle = (
     const start = startTime - startT.value > 0 ? startTime - startT.value : 0;
     const _width = LineContentSize.width.value!;
     const itemWidth = ((endTime - startTime) / (24 * 3600000)) * _width;
-  console.log()
     return {
         left: `${(start / (24 * 3600000)) * _width}px`,
         width: `${itemWidth < 1 ? 1 : itemWidth}px`,
@@ -224,9 +223,8 @@ const getLineItemStyle = (
 };
 
 const timePosition = computed(() => {
-  console.log(props.playTime, startT.value, LineContentSize.width.value)
-  console.log(((props.playTime - startT.value) / 3600000 / 24) * LineContentSize.width.value)
-  return ((props.playTime - startT.value) / 3600000 / 24) * LineContentSize.width.value
+  const time = ((props.playTime - startT.value) / 3600000 / 24) * LineContentSize.width.value
+  return props.playTime > startT.value ? time : 0
 })
 
 // const playTimeChange = () => {
diff --git a/src/views/media/Device/Save/SaveProduct.vue b/src/views/media/Device/Save/SaveProduct.vue
index 3a573fd5..63c2d4d7 100644
--- a/src/views/media/Device/Save/SaveProduct.vue
+++ b/src/views/media/Device/Save/SaveProduct.vue
@@ -10,6 +10,25 @@
         width="660px"
     >
         <j-form ref="formRef" :model="formData" layout="vertical">
+            <j-form
+                ref="pluginFormRef"
+                :model="productData"
+                layout="vertical"
+                v-if="productTypes.length"
+            >
+                <j-form-item
+                    name="id"
+                    label="产品类型"
+                    :rules="[{ required: true, message: '请选择产品类型' }]"
+                >
+                    <j-select
+                        v-model:value="productData.id"
+                        :options="productTypes"
+                        @change="productTypeChange"
+                        placeholder="请选择产品类型"
+                    />
+                </j-form-item>
+            </j-form>
             <j-form-item
                 label="产品名称"
                 name="name"
@@ -115,10 +134,26 @@
                                 </slot>
                             </template>
                             <template #content>
-                                <h3 class="card-item-content-title">
+                                <Ellipsis
+                                    style="
+                                        cursor: pointer;
+                                        font-size: 16px;
+                                        font-weight: 700;
+                                        color: #1d39c4;
+                                        width: calc(100% - 100px);
+                                    "
+                                >
                                     {{ item.name }}
-                                </h3>
-                                <div class="desc">{{ item.description }}</div>
+                                </Ellipsis>
+                                <Ellipsis
+                                    style="
+                                        margin-top: 10px;
+                                        color: #666;
+                                        font-weight: 400;
+                                        font-size: 12px;
+                                    "
+                                    >{{ item.description }}</Ellipsis
+                                >
                                 <j-row v-if="props.channel === 'gb28181-2016'">
                                     <j-col :span="12">
                                         {{ item.channelInfo?.name }}
@@ -169,9 +204,12 @@
 <script setup lang="ts">
 import DeviceApi from '@/api/media/device';
 import { getImage, onlyMessage } from '@/utils/comm';
+import { getProductsById, savePluginData } from '@/api/link/plugin';
 import { gatewayType } from '@/views/media/Device/typings';
 import { providerType } from '../const';
 import { usePermissionStore } from '@/store/permission';
+import { pick } from 'lodash-es';
+import { getAccessConfig } from '@/api/device/product';
 
 const isPermission = usePermissionStore().hasPermission(
     'link/AccessConfig:add',
@@ -182,7 +220,7 @@ type Emits = {
     (e: 'update:productId', data: string): void;
     (e: 'close'): void;
     (e: 'save', data: Record<string, any>): void;
-    (e: 'update:password',data:string):void
+    (e: 'update:password', data: string): void;
 };
 const emit = defineEmits<Emits>();
 
@@ -202,6 +240,33 @@ const _vis = computed({
  * 获取接入网关
  */
 const gatewayList = ref<gatewayType[]>([]);
+
+//插件类型 插件产品映射
+const productData = reactive({
+    id: undefined,
+    metadata: {}, // 物模型
+});
+//插件类型 插件产品选择项
+const productTypes = ref([]);
+const pluginFormRef = ref();
+
+// 表单数据
+const formRef = ref();
+const formData = ref({
+    accessId: '',
+    accessName: '',
+    accessProvider: '',
+    configuration: {
+        access_pwd: '',
+        stream_mode: 'UDP',
+    },
+    deviceType: props.deviceType,
+    messageProtocol: '',
+    name: '',
+    protocolName: '',
+    transportProtocol: '',
+    metadata: '',
+});
 const getGatewayList = async () => {
     const params = {
         pageSize: 100,
@@ -226,33 +291,72 @@ const handleClick = async (e: any) => {
     formData.value.messageProtocol = e.protocolDetail.id;
     formData.value.protocolName = e.protocolDetail.name;
     formData.value.transportProtocol = e.transport;
-
-    const { result } = await DeviceApi.getConfiguration(
-        e.protocol,
-        e.transport,
-    );
-    if(e.protocol === 'onvif' && !result.scopes.find((i)=>{
-      return  i === 'product'
-    })){
-        return ''
+    if (props.channel === 'media-plugin') {
+        const res = await getProductsById(e.channelId);
+        if (res.success) {
+            productTypes.value = res.result?.map((item) => ({
+                ...item,
+                label: item.name,
+                value: item.id,
+            }));
+        }
+        const resp = await getAccessConfig('empty', e.id);
+        if (resp.success) {
+            const result = resp.result;
+            extendFormItem.value = result?.[0]?.properties?.map(
+                (item: any) => ({
+                    name: ['configuration', item.property],
+                    label: item.name,
+                    type: item.type?.type,
+                    value: item.type.expands?.defaultValue,
+                    options: item.type.elements?.map((e: any) => ({
+                        label: e.text,
+                        value: e.value,
+                    })),
+                    required: !!item.type.expands?.required,
+                    message:
+                        item.type?.type === 'enum'
+                            ? `请选择${item.name}`
+                            : `请输入${item.name}`,
+                }),
+            );
+        }
+    } else {
+        const res = await DeviceApi.getConfiguration(e.protocol, e.transport);
+        if (res.success) {
+            const result = res.result;
+            if (
+                e.protocol === 'onvif' &&
+                !result.scopes.find((i) => {
+                    return i === 'product';
+                })
+            ) {
+                return '';
+            }
+            extendFormItem.value = result?.properties?.map((item: any) => ({
+                name: ['configuration', item.property],
+                label: item.name,
+                type: item.type?.type,
+                value: item.type.expands?.defaultValue,
+                options: item.type.elements?.map((e: any) => ({
+                    label: e.text,
+                    value: e.value,
+                })),
+                required: !!item.type.expands?.required,
+                message:
+                    item.type?.type === 'enum'
+                        ? `请选择${item.name}`
+                        : `请输入${item.name}`,
+            }));
+        }
     }
-    extendFormItem.value = result?.properties?.map((item: any) => ({
-        name: ['configuration', item.property],
-        label: item.name,
-        type: item.type?.type,
-        value: item.type.expands?.defaultValue,
-        options: item.type.elements?.map((e: any) => ({
-            label: e.text,
-            value: e.value,
-        })),
-        required: !!item.type.expands?.required,
-        message:
-            item.type?.type === 'enum'
-                ? `请选择${item.name}`
-                : `请输入${item.name}`,
-    }));
 };
 
+const productTypeChange = (id: string, items: any) => {
+    productData.metadata = items?.metadata
+        ? pick(items.metadata, ['functions', 'properties', 'events', 'tags'])
+        : {};
+};
 watch(
     () => _vis.value,
     (val) => {
@@ -266,37 +370,38 @@ watch(
     },
 );
 
-// 表单数据
-const formRef = ref();
-const formData = ref({
-    accessId: '',
-    accessName: '',
-    accessProvider: '',
-    configuration: {
-        access_pwd: '',
-        stream_mode: 'UDP',
-    },
-    deviceType: props.deviceType,
-    messageProtocol: '',
-    name: '',
-    protocolName: '',
-    transportProtocol: '',
-});
-
 /**
  * 提交
  */
 const btnLoading = ref(false);
-const handleOk = () => {
+const handleOk = async () => {
+    if (pluginFormRef.value) {
+        // 插件
+        const pluginRef = await pluginFormRef.value.validate();
+        if (!pluginRef) return;
+    }
     formRef.value
         ?.validate()
         .then(async () => {
             btnLoading.value = true;
+            if (
+                productData.metadata &&
+                Object.keys(productData.metadata).length
+            ) {
+                formData.value.metadata = JSON.stringify(productData.metadata);
+            }
             const res = await DeviceApi.saveProduct(formData.value);
-            console.log(res)
             if (res.success) {
                 emit('update:productId', res.result.id);
-                emit('update:password', res.result.configuration.access_pwd)
+                emit('update:password', res.result.configuration.access_pwd);
+                if (props.channel === 'media-plugin' && productData.id) {
+                    await savePluginData(
+                        'product',
+                        formData.value.accessId,
+                        res.result.id,
+                        productData.id,
+                    ).catch(() => ({}));
+                }
                 const deployResp = await DeviceApi.deployProductById(
                     res.result.id,
                 );
@@ -340,14 +445,11 @@ const handleAdd = () => {
     .gateway-item {
         padding: 16px;
         text-align: left;
-        .card-item-content-title,
-        .desc,
         .subtitle {
             overflow: hidden;
             white-space: nowrap;
             text-overflow: ellipsis;
         }
-        .desc,
         .subtitle {
             margin-top: 10px;
             color: #666;
diff --git a/src/views/media/Device/Summary/index.vue b/src/views/media/Device/Summary/index.vue
new file mode 100644
index 00000000..1ea60f0b
--- /dev/null
+++ b/src/views/media/Device/Summary/index.vue
@@ -0,0 +1,148 @@
+<template>
+    <a-drawer
+        visible
+        placement="right"
+        :width="600"
+        :closable="false"
+        @close="$emit('closeDrawer')"
+    >
+        <template #title>
+            <div class="deviceName">
+                <Ellipsis style="max-width: 400px">{{
+                    deviceData?.name
+                }}</Ellipsis>
+            </div>
+            <div class="deviceId">
+                <span> 设备ID： </span>
+                <a @click="jumpDetail">{{ deviceData?.id }}</a>
+            </div>
+        </template>
+        <div>
+            <a-descriptions bordered :column="1">
+                <a-descriptions-item label="接入方式">{{
+                    PROVIDER_OPTIONS.find(
+                        (i) => i.value === deviceData?.provider,
+                    )?.label
+                }}</a-descriptions-item>
+                <a-descriptions-item label="所属产品">{{
+                    deviceData?.productName
+                }}</a-descriptions-item>
+                <a-descriptions-item
+                    v-if="deviceData?.provider === 'onvif'"
+                    label="接入地址"
+                    >{{ deviceData?.others?.onvifUrl }}</a-descriptions-item
+                >
+                <a-descriptions-item
+                    v-if="deviceData?.provider === 'onvif'"
+                    label="接入账户"
+                    >{{
+                        deviceData?.others?.onvifUsername
+                    }}</a-descriptions-item
+                >
+                <a-descriptions-item
+                    v-if="
+                        ['onvif', 'gb28181-2016'].includes(deviceData?.provider)
+                    "
+                    label="接入密码"
+                    ><div class="password">
+                        <span>{{ showPassword }}</span>
+                        <AIcon
+                            :type="
+                                visiblePassword
+                                    ? 'EyeInvisibleOutlined'
+                                    : 'EyeOutlined'
+                            "
+                            @click="visiblePassword = !visiblePassword"
+                            class="passwordIcon"
+                        ></AIcon></div
+                ></a-descriptions-item>
+                <a-descriptions-item label="说明">{{
+                    deviceData?.description || '--'
+                }}</a-descriptions-item>
+            </a-descriptions>
+        </div>
+    </a-drawer>
+</template>
+
+<script setup>
+import { useMenuStore } from 'store/menu';
+import DeviceApi from '@/api/media/device';
+import { PROVIDER_OPTIONS } from '../const';
+const props = defineProps({
+    deviceId: {
+        type: Object,
+    },
+});
+const menuStory = useMenuStore();
+const deviceData = ref();
+
+const visiblePassword = ref(false);
+const showPassword = computed(() => {
+    let password =
+        deviceData.value?.provider === 'onvif'
+            ? deviceData.value?.others?.onvifPassword
+            : deviceData.value?.others?.access_pwd;
+    if (!visiblePassword.value) {
+        let hiddenPassword  = ''
+        for (let i = 0; i < password.length; i++) {
+            hiddenPassword += '*'
+        }
+        return hiddenPassword
+    }else{
+        return password
+    }
+});
+const jumpDetail = (data) => {
+    menuStory.jumpPage('device/Instance/Detail', { id: props.deviceId });
+};
+const getProductList = async () => {
+    const params = {
+        paging: false,
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        terms: [{ column: 'id', value: deviceData.value?.productId }],
+    };
+    const res = await DeviceApi.queryProductList(params);
+    if (res.success) {
+        deviceData.value.productName = res.result?.[0]?.name;
+        if (deviceData.value.provider !== 'media-plugin') {
+            deviceData.value.others.access_pwd = deviceData.value.others
+                .access_pwd
+                ? deviceData.value.others.access_pwd
+                : res.result?.[0]?.configuration?.access_pwd;
+        }
+    }
+};
+/**
+ * 获取详情
+ */
+const getDetail = async () => {
+    const res = await DeviceApi.detail(props.deviceId);
+    if (res.success) {
+        deviceData.value = res.result;
+        await getProductList();
+    }
+};
+onMounted(() => {
+    getDetail();
+});
+</script>
+<style lang="less" scoped>
+.deviceId {
+    font-size: 13px;
+    span {
+        color: #777777;
+    }
+}
+.deviceName {
+    font-size: 16px;
+    font-weight: 600;
+}
+.password {
+    position: relative;
+    .passwordIcon {
+        position: absolute;
+        right: 0;
+        top: 5px;
+    }
+}
+</style>
diff --git a/src/views/media/Device/const.ts b/src/views/media/Device/const.ts
index b700107a..98d69be4 100644
--- a/src/views/media/Device/const.ts
+++ b/src/views/media/Device/const.ts
@@ -1,7 +1,8 @@
 export const PROVIDER_OPTIONS = [
     { label: 'GB/T28181', value: 'gb28181-2016' },
     { label: '固定地址', value: 'fixed-media' },
-    { label: 'Onvif', value: 'onvif'}
+    { label: 'Onvif', value: 'onvif'},
+    { label: '插件', value: 'media-plugin'}
 ]
 export const streamMode = [
     { label: 'UDP', value: 'UDP' },
@@ -11,5 +12,6 @@ export const streamMode = [
 export const providerType = {
     'gb28181-2016': 'GB/T28181',
     'fixed-media': '固定地址',
-    'onvif': 'Onvif'
+    'onvif': 'Onvif',
+    'media-plugin': '插件'
 };
\ No newline at end of file
diff --git a/src/views/media/Device/index.vue b/src/views/media/Device/index.vue
index 8e33741e..d61e9b5b 100644
--- a/src/views/media/Device/index.vue
+++ b/src/views/media/Device/index.vue
@@ -14,7 +14,6 @@
                     sorts: [{ name: 'createTime', order: 'desc' }],
                 }"
                 :params="params"
-                :gridColumn="4"
             >
                 <template #headerTitle>
                     <PermissionButton
@@ -22,14 +21,13 @@
                         @click="handleAdd"
                         hasPermission="media/Device:add"
                     >
-                        <template #icon
-                            ><AIcon type="PlusOutlined" />新增</template
-                        >
+                        <template #icon><AIcon type="PlusOutlined" /></template>
+                        新增
                     </PermissionButton>
                 </template>
                 <template #card="slotProps">
                     <CardBox
-                        @click="()=>jumpDetail(slotProps)"
+                        @click="() => showSummary(slotProps)"
                         :value="slotProps"
                         :actions="getActions(slotProps, 'card')"
                         v-bind="slotProps"
@@ -47,17 +45,17 @@
                             </slot>
                         </template>
                         <template #content>
-                            <Ellipsis style="width: calc(100% - 100px);">
-                            <span style="font-size: 16px;font-weight: 700">
-                                {{ slotProps.name }}
-                            </span>
+                            <Ellipsis style="width: calc(100% - 100px)">
+                                <span style="font-size: 16px; font-weight: 700">
+                                    {{ slotProps.name }}
+                                </span>
                             </Ellipsis>
                             <j-row>
                                 <j-col :span="12">
                                     <div class="card-item-content-text">
                                         厂商
                                     </div>
-                                    <Ellipsis style="width: calc(100% - 20px);">
+                                    <Ellipsis style="width: calc(100% - 20px)">
                                         <div>{{ slotProps.manufacturer }}</div>
                                     </Ellipsis>
                                 </j-col>
@@ -71,7 +69,10 @@
                                     <div class="card-item-content-text">
                                         型号
                                     </div>
-                                    <Ellipsis style="width: calc(100% - 20px);">{{ slotProps.model }}</Ellipsis>
+                                    <Ellipsis
+                                        style="width: calc(100% - 20px)"
+                                        >{{ slotProps.model }}</Ellipsis
+                                    >
                                 </j-col>
                                 <j-col :span="12">
                                     <div class="card-item-content-text">
@@ -163,6 +164,7 @@
                 </template>
             </JProTable>
         </FullPage>
+        <Summary v-if="visibleSummary" :deviceId="deviceId" @closeDrawer="visibleSummary = false"></Summary>
     </page-container>
 </template>
 
@@ -173,14 +175,15 @@ import { getImage, onlyMessage } from '@/utils/comm';
 import { PROVIDER_OPTIONS } from '@/views/media/Device/const';
 import { providerType } from './const';
 import encodeQuery from '@/utils/encodeQuery';
-
 import { useMenuStore } from 'store/menu';
+import Summary from './Summary/index.vue';
 
 const menuStory = useMenuStore();
 
 const listRef = ref<Record<string, any>>({});
 const params = ref<Record<string, any>>({});
-
+const visibleSummary = ref(false);
+const deviceId = ref();
 const columns = [
     {
         title: 'ID',
@@ -208,7 +211,7 @@ const columns = [
         dataIndex: 'provider',
         key: 'provider',
         scopedSlots: true,
-        width:120,
+        width: 120,
         search: {
             type: 'select',
             options: PROVIDER_OPTIONS,
@@ -228,9 +231,6 @@ const columns = [
         title: '厂商',
         dataIndex: 'manufacturer',
         key: 'manufacturer',
-        search: {
-            type: 'string',
-        },
         ellipsis: true,
     },
     {
@@ -241,27 +241,9 @@ const columns = [
         ellipsis: true,
         search: {
             type: 'select',
-            options: () =>
-                new Promise((resolve) => {
-                    DeviceApi.getProductList(
-                        encodeQuery({
-                            terms: {
-                                messageProtocol$in: [
-                                    'gb28181-2016',
-                                    'fixed-media',
-                                    'onvif',
-                                ],
-                            },
-                        }),
-                    ).then((resp: any) => {
-                        resolve(
-                            resp.result.map((pItem: any) => ({
-                                label: pItem.name,
-                                value: pItem.id,
-                            })),
-                        );
-                    });
-                }),
+            options: async () => {
+                return productList.value;
+            },
             handleValue: (v: any) => {
                 return v;
             },
@@ -364,32 +346,6 @@ const getActions = (
                 menuStory.jumpPage('device/Instance/Detail', { id: data.id });
             },
         },
-        {
-            key: 'updateChannel',
-            text: '更新通道',
-            tooltip: {
-                title:
-                    data.provider === 'fixed-media'
-                        ? '固定地址无法更新通道'
-                        : data.state.value === 'offline'
-                        ? '设备已离线'
-                        : data.state.value === 'notActive'
-                        ? '设备已禁用'
-                        : '更新通道',
-            },
-            disabled:
-                data.state.value === 'offline' ||
-                data.state.value === 'notActive' ||
-                data.provider === 'fixed-media',
-            icon: 'SyncOutlined',
-            onClick: async () => {
-                const res = await DeviceApi.updateChannels(data.id);
-                if (res.success) {
-                    onlyMessage('通道更新成功');
-                    listRef.value?.reload();
-                }
-            },
-        },
         {
             key: 'delete',
             text: '删除',
@@ -400,14 +356,17 @@ const getActions = (
             disabled: data.state.value === 'online',
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await DeviceApi.del(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        listRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
+                onConfirm: () => {
+                    const response = DeviceApi.del(data.id);
+                    response.then((resp) => {
+                        if (resp.status === 200) {
+                            onlyMessage('操作成功！');
+                            listRef.value?.reload();
+                        } else {
+                            onlyMessage('操作失败！', 'error');
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
@@ -436,7 +395,12 @@ const getProductList = () => {
     DeviceApi.getProductList(
         encodeQuery({
             terms: {
-                messageProtocol$in: ['gb28181-2016', 'fixed-media'],
+                messageProtocol$in: [
+                    'gb28181-2016',
+                    'fixed-media',
+                    'onvif',
+                    'media-plugin',
+                ],
             },
         }),
     ).then((resp: any) => {
@@ -452,7 +416,10 @@ const getProductName = (pid: string) => {
     return productList.value.find((f: any) => f.value === pid)?.label;
 };
 
-const jumpDetail =  (data:any) =>{
-    menuStory.jumpPage('device/Instance/Detail', { id: data.id });
-}
+
+
+const showSummary = (data: any) => {
+    visibleSummary.value = true;
+    deviceId.value = data.id;
+};
 </script>
diff --git a/src/views/media/Stream/Detail/index.vue b/src/views/media/Stream/Detail/index.vue
index ba2e5517..78c8fe48 100644
--- a/src/views/media/Stream/Detail/index.vue
+++ b/src/views/media/Stream/Detail/index.vue
@@ -22,7 +22,7 @@
                                     },
                                     {
                                         max: 64,
-                                        message: '最大可输入64个字符',
+                                        message: '最多可输入64个字符',
                                     },
                                 ]"
                             >
@@ -58,7 +58,7 @@
                                 :rules="[
                                     {
                                         max: 64,
-                                        message: '最大可输入64个字符',
+                                        message: '最多可输入64个字符',
                                     },
                                 ]"
                             >
diff --git a/src/views/media/Stream/index.vue b/src/views/media/Stream/index.vue
index 899a3bb4..a6150dfc 100644
--- a/src/views/media/Stream/index.vue
+++ b/src/views/media/Stream/index.vue
@@ -216,15 +216,18 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             icon: state === 'enabled' ? 'StopOutlined' : 'CheckCircleOutlined',
             popConfirm: {
                 title: `确认${stateText}?`,
-                onConfirm: async () => {
-                    let res =
+                onConfirm: () => {
+                    let response =
                         state === 'enabled'
-                            ? await disable(data.id)
-                            : await enalbe(data.id);
-                    if (res.success) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value?.reload();
-                    }
+                            ? disable(data.id)
+                            : enalbe(data.id);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value?.reload();
+                        }
+                    });
+                    return response;
                 },
             },
         },
@@ -237,12 +240,15 @@ const getActions = (data: Partial<Record<string, any>>): ActionsType[] => {
             },
             popConfirm: {
                 title: '确认删除?',
-                onConfirm: async () => {
-                    const res = await remove(data.id);
-                    if (res.success) {
-                        onlyMessage('操作成功', 'success');
-                        tableRef.value.reload();
-                    }
+                onConfirm: () => {
+                    const response = remove(data.id);
+                    response.then((res) => {
+                        if (res.success) {
+                            onlyMessage('操作成功', 'success');
+                            tableRef.value.reload();
+                        }
+                    });
+                    return response
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/notice/Config/Detail/index.vue b/src/views/notice/Config/Detail/index.vue
index 7245ca1c..d74feeee 100644
--- a/src/views/notice/Config/Detail/index.vue
+++ b/src/views/notice/Config/Detail/index.vue
@@ -574,7 +574,7 @@ const handleSubmit = () => {
         })
         .finally(() => {
             btnLoading.value = false;
-        }); 
+        });
     }else{
         validate()
         .then(async () => {
@@ -604,7 +604,7 @@ const handleSubmit = () => {
         .finally(() => {
             btnLoading.value = false;
         });
-    }  
+    }
 };
 
 watchEffect(() => {
diff --git a/src/views/notice/Config/Log/index.vue b/src/views/notice/Config/Log/index.vue
index 6b151f60..4525ea78 100644
--- a/src/views/notice/Config/Log/index.vue
+++ b/src/views/notice/Config/Log/index.vue
@@ -1,6 +1,6 @@
 <!-- 通知记录 -->
 <template>
-    <j-modal v-model:visible="_vis" title="通知记录" :footer="null" width="70%">
+    <j-modal visible title="通知记录" :footer="null" width="70%" @cancel="emit('cancel')">
         <pro-search type="simple" :columns="columns" @search="handleSearch" />
 
         <JProTable
@@ -55,6 +55,7 @@ import Record from '../../Template/Log/components/Record.vue'
 
 type Emits = {
     (e: 'update:visible', data: boolean): void;
+    (e: 'cancel'): void;
 };
 const emit = defineEmits<Emits>();
 
@@ -160,7 +161,7 @@ const handleDetail = (data: any) => {
         content: h(
             "p",
             {
-               
+
                 style: {
                     maxHeight: '300px',
                     overflowY: 'auto',
@@ -183,7 +184,7 @@ const handleDetail = (data: any) => {
             },
         ),
     });
-    }  
+    }
 };
 </script>
 <style lang="less" scoped>
diff --git a/src/views/notice/Config/SyncUser/index.vue b/src/views/notice/Config/SyncUser/index.vue
index ed507c53..3419d4a9 100644
--- a/src/views/notice/Config/SyncUser/index.vue
+++ b/src/views/notice/Config/SyncUser/index.vue
@@ -66,40 +66,27 @@
                                 </j-space>
                             </template>
                             <template v-if="column.dataIndex === 'action'">
-                                <j-space :size="16">
-                                    <j-tooltip
+                                <j-space>
+                                    <template
                                         v-for="i in getActions(record, 'table')"
                                         :key="i.key"
-                                        v-bind="i.tooltip"
                                     >
-                                        <j-popconfirm
-                                            v-if="i.popConfirm"
-                                            v-bind="i.popConfirm"
+                                        <PermissionButton
                                             :disabled="i.disabled"
-                                        >
-                                            <j-button
-                                                :disabled="i.disabled"
-                                                style="padding: 0"
-                                                type="link"
-                                                ><AIcon :type="i.icon"
-                                            /></j-button>
-                                        </j-popconfirm>
-                                        <j-button
-                                            style="padding: 0"
+                                            :popConfirm="i.popConfirm"
+                                            :tooltip="{
+                                                ...i.tooltip,
+                                            }"
+                                            @click="i.onClick"
                                             type="link"
-                                            v-else
-                                            @click="
-                                                i.onClick && i.onClick(record)
-                                            "
+                                            style="padding: 0 5px"
+                                            :danger="i.key === 'delete'"
                                         >
-                                            <j-button
-                                                :disabled="i.disabled"
-                                                style="padding: 0"
-                                                type="link"
+                                            <template #icon
                                                 ><AIcon :type="i.icon"
-                                            /></j-button>
-                                        </j-button>
-                                    </j-tooltip>
+                                            /></template>
+                                        </PermissionButton>
+                                    </template>
                                 </j-space>
                             </template>
                         </template>
@@ -209,11 +196,11 @@ watch(
  * 部门点击
  */
 const onTreeSelect = (keys: any) => {
-  if (keys.length) {
-    deptId.value = keys[0];
-    pageSize.value = 12;
-    current.value = 1;
-  }
+    if (keys.length) {
+        deptId.value = keys[0];
+        pageSize.value = 12;
+        current.value = 1;
+    }
 };
 
 // 右侧表格
@@ -266,13 +253,16 @@ const getActions = (
             icon: 'DisconnectOutlined',
             popConfirm: {
                 title: '确认解绑?',
-                onConfirm: async () => {
-                    configApi
-                        .unBindUser({ bindingId: data.bindId }, data.bindId)
-                        .then(() => {
-                            onlyMessage('操作成功');
-                            getTableData();
-                        });
+                onConfirm:  () => {
+                    const response = configApi.unBindUser(
+                        { bindingId: data.bindId },
+                        data.bindId,
+                    );
+                    response.then(() => {
+                        onlyMessage('操作成功');
+                        getTableData();
+                    });
+                    return response;
                 },
             },
         },
@@ -452,12 +442,8 @@ const handleBind = (row: any) => {
  * 绑定用户, 用户下拉筛选
  */
 const filterOption = (input: string, option: any) => {
-    const text = option?.componentOptions?.children?.[0]?.text ||  option.label
-    return (
-        text
-            .toLowerCase()
-            .indexOf(input.toLowerCase()) >= 0
-    );
+    const text = option?.componentOptions?.children?.[0]?.text || option.label;
+    return text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
 };
 
 /**
diff --git a/src/views/notice/Config/index.vue b/src/views/notice/Config/index.vue
index 4c319631..e1207bbe 100644
--- a/src/views/notice/Config/index.vue
+++ b/src/views/notice/Config/index.vue
@@ -38,18 +38,15 @@
                                 导入
                             </PermissionButton>
                         </j-upload>
-                        <j-popconfirm
-                            title="确认导出？"
-                            ok-text="确定"
-                            cancel-text="取消"
-                            @confirm="handleExport"
+                        <PermissionButton
+                            :popConfirm="{
+                                title: '确认导出？',
+                                onConfirm: handleExport,
+                            }"
+                            hasPermission="notice/Config:export"
                         >
-                            <PermissionButton
-                                hasPermission="notice/Config:export"
-                            >
-                                导出
-                            </PermissionButton>
-                        </j-popconfirm>
+                            导出
+                        </PermissionButton>
                     </j-space>
                 </template>
                 <template #card="slotProps">
@@ -128,20 +125,16 @@
                                         </j-menu>
                                     </template>
                                 </j-dropdown>
-                                <j-popconfirm
+                                <PermissionButton
                                     v-else-if="item.key === 'delete'"
-                                    v-bind="item.popConfirm"
+                                    :popConfirm="item.popConfirm"
                                     :disabled="item.disabled"
+                                    :hasPermission="`notice/Config:${item.key}`"
                                 >
-                                    <PermissionButton
-                                        :disabled="item.disabled"
-                                        :hasPermission="`notice/Config:${item.key}`"
-                                    >
-                                        <template #icon>
-                                            <AIcon type="DeleteOutlined" />
-                                        </template>
-                                    </PermissionButton>
-                                </j-popconfirm>
+                                    <template #icon>
+                                        <AIcon type="DeleteOutlined" />
+                                    </template>
+                                </PermissionButton>
                                 <template v-else>
                                     <PermissionButton
                                         :disabled="item.disabled"
@@ -200,7 +193,7 @@
         </FullPage>
 
         <Debug v-model:visible="debugVis" :data="currentConfig" />
-        <Log v-model:visible="logVis" :data="currentConfig" />
+        <Log v-if="logVis" :data="currentConfig" @cancel="logVis = false" />
         <SyncUser v-model:visible="syncVis" :data="currentConfig" />
     </page-container>
 </template>
@@ -279,7 +272,7 @@ const columns = [
         title: '操作',
         key: 'action',
         fixed: 'right',
-        width: 200,
+        width: 210,
         scopedSlots: true,
     },
 ];
@@ -405,6 +398,7 @@ const getActions = (
                     } else {
                         onlyMessage('操作失败！', 'error');
                     }
+                    return
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/notice/Template/Log/index.vue b/src/views/notice/Template/Log/index.vue
index 8b66da5b..6b201a87 100644
--- a/src/views/notice/Template/Log/index.vue
+++ b/src/views/notice/Template/Log/index.vue
@@ -1,13 +1,13 @@
 <!-- 通知记录 -->
 <template>
-    <j-modal v-model:visible="_vis" title="通知记录" :footer="null" width="70%">
+    <j-modal visible title="通知记录" :footer="null" width="70%" @cancel="emit('cancel')">
         <pro-search type="simple" :columns="columns" @search="handleSearch" />
 
         <JProTable
             ref="logRef"
             model="table"
             :columns="columns"
-            :request="(e:any) => templateApi.getHistory(e, data.id)"
+            :request="(e) => templateApi.getHistory(e, data.id)"
             :defaultParams="{
                 sorts: [{ name: 'notifyTime', order: 'desc' }],
                 terms: [{ column: 'notifyType$IN', value: data.type }],
@@ -50,6 +50,7 @@ import { Modal } from 'jetlinks-ui-components';
 import Record from './components/Record.vue'
 type Emits = {
     (e: 'update:visible', data: boolean): void;
+    (e: 'cancel'): void;
 };
 const emit = defineEmits<Emits>();
 
@@ -66,13 +67,6 @@ const _vis = computed({
     set: (val) => emit('update:visible', val),
 });
 
-watch(
-    () => _vis.value,
-    (val) => {
-        if (val) handleSearch({ terms: [] });
-    },
-);
-
 const columns = [
     {
         title: 'ID',
@@ -155,7 +149,7 @@ const handleError = (e: any) => {
         content: h(
             "p",
             {
-               
+
                 style: {
                     maxHeight: '300px',
                     overflowY: 'auto',
@@ -178,8 +172,20 @@ const handleError = (e: any) => {
             },
         ),
     });
-    }  
+    }
 };
+
+watch(
+  () => _vis.value,
+  (val) => {
+    if (val) {
+      handleSearch({ terms: [] })
+    } else {
+      params.value = {}
+    }
+  },
+);
+
 </script>
 <style lang="less" scoped>
 .disableIcon{
diff --git a/src/views/notice/Template/index.vue b/src/views/notice/Template/index.vue
index 1749e8bc..2fc95409 100644
--- a/src/views/notice/Template/index.vue
+++ b/src/views/notice/Template/index.vue
@@ -38,18 +38,15 @@
                                 导入
                             </PermissionButton>
                         </j-upload>
-                        <j-popconfirm
-                            title="确认导出？"
-                            ok-text="确定"
-                            cancel-text="取消"
-                            @confirm="handleExport"
+                        <PermissionButton
+                            hasPermission="notice/Template:export"
+                            :popConfirm="{
+                                title: '确认导出？',
+                                onConfirm: handleExport,
+                            }"
                         >
-                            <PermissionButton
-                                hasPermission="notice/Template:export"
-                            >
-                                导出
-                            </PermissionButton>
-                        </j-popconfirm>
+                            导出
+                        </PermissionButton>
                     </j-space>
                 </template>
                 <template #card="slotProps">
@@ -128,20 +125,16 @@
                                         </j-menu>
                                     </template>
                                 </j-dropdown>
-                                <j-popconfirm
+                                <PermissionButton
                                     v-else-if="item.key === 'delete'"
-                                    v-bind="item.popConfirm"
                                     :disabled="item.disabled"
+                                    :hasPermission="`notice/Template:${item.key}`"
+                                    :popConfirm="item.popConfirm"
                                 >
-                                    <PermissionButton
-                                        :disabled="item.disabled"
-                                        :hasPermission="`notice/Template:${item.key}`"
-                                    >
-                                        <template #icon>
-                                            <AIcon type="DeleteOutlined" />
-                                        </template>
-                                    </PermissionButton>
-                                </j-popconfirm>
+                                    <template #icon>
+                                        <AIcon type="DeleteOutlined" />
+                                    </template>
+                                </PermissionButton>
                                 <template v-else>
                                     <PermissionButton
                                         :disabled="item.disabled"
@@ -200,7 +193,7 @@
         </FullPage>
 
         <Debug v-model:visible="debugVis" :data="currentConfig" />
-        <Log v-model:visible="logVis" :data="currentConfig" />
+        <Log v-if="logVis" :data="currentConfig" @cancel="logVis = false" />
     </page-container>
 </template>
 
@@ -274,7 +267,7 @@ const columns = [
         title: '操作',
         key: 'action',
         fixed: 'right',
-        width: 200,
+        width: 180,
         scopedSlots: true,
     },
 ];
@@ -404,6 +397,7 @@ const getActions = (
                     } else {
                         onlyMessage('操作失败！', 'error');
                     }
+                    return
                 },
             },
             icon: 'DeleteOutlined',
diff --git a/src/views/rule-engine/Alarm/Config/Io/index.vue b/src/views/rule-engine/Alarm/Config/Io/index.vue
index c521d7bb..6ac645cc 100644
--- a/src/views/rule-engine/Alarm/Config/Io/index.vue
+++ b/src/views/rule-engine/Alarm/Config/Io/index.vue
@@ -470,7 +470,6 @@ const saveOutput = () => {
     padding-left: 10px;
     color: rgba(0, 0, 0, 0.8);
     font-weight: 600;
-    line-height: 1;
     margin-bottom: 16px;
     line-height: 30px;
 }
@@ -480,7 +479,7 @@ const saveOutput = () => {
     left: 0;
     width: 4px;
     height: 100%;
-    background-color: #1d39c4;
+    background-color: @primary-color;
     border-radius: 0 3px 3px 0;
     content: ' ';
 }
@@ -534,4 +533,4 @@ const saveOutput = () => {
         background-color: #fafafa;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Alarm/Config/index.vue b/src/views/rule-engine/Alarm/Config/index.vue
index ada34673..f8787fc4 100644
--- a/src/views/rule-engine/Alarm/Config/index.vue
+++ b/src/views/rule-engine/Alarm/Config/index.vue
@@ -143,7 +143,7 @@ const onTabChange = (e: string) => {
     left: 0;
     width: 4px;
     height: 100%;
-    background-color: #1d39c4;
+    background-color: @primary-color;
     border-radius: 0 3px 3px 0;
     content: ' ';
 }
@@ -151,7 +151,6 @@ const onTabChange = (e: string) => {
     margin-bottom: 22px;
 }
 .description {
-    height: 700px;
     height: 100%;
     padding: 24px;
     overflow-y: auto;
@@ -165,4 +164,4 @@ const onTabChange = (e: string) => {
         font-size: 14px;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/Actions.vue b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/Actions.vue
new file mode 100644
index 00000000..f7c07d3b
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/Actions.vue
@@ -0,0 +1,186 @@
+<template>
+    <div class="actions-warp">
+        <div v-for="item in actions">
+            <div v-if="activeKeys.some((active) => active === item.actionId)">
+                <div class="actions-item" v-if="item.executor === 'alarm'">
+                    <div class="item-options-warp">
+                        <div class="item-options-type">
+                            <img
+                                style="width: 18px"
+                                :src="
+                                    iconMap.get(
+                                        item.executor === 'alarm'
+                                            ? item.alarm.mode
+                                            : item.executor,
+                                    )
+                                "
+                            />
+                        </div>
+                        <div class="item-options-content">
+                            <template v-if="item.executor === 'alarm'">
+                                <span>
+                                    满足条件后将{{
+                                        item.alarm.mode === 'trigger'
+                                            ? '触发'
+                                            : '解除'
+                                    }}当前告警
+                                </span>
+                            </template>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="Actions">
+import {
+    iconMap,
+} from '@/views/rule-engine/Scene/Save/action/ListItem/util';
+import { isBoolean } from 'lodash-es';
+
+const props = defineProps({
+    actions: {
+        type: Array,
+        default: () => [],
+    },
+    activeKeys: {
+        // 后端返回已关联的执行动作
+        type: Array,
+        default: () => [],
+    },
+});
+</script>
+
+<style scoped lang="less">
+.actions-item {
+    position: relative;
+    padding: 8px;
+    border: 1px dashed #999;
+    border-radius: 2px;
+    margin-bottom: 8px;
+
+    .item-options-warp {
+        display: inline-flex;
+        height: 48px;
+        border: 1px solid #e0e0e0;
+        border-radius: 6px;
+
+        .item-options-type {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 48px;
+            background-color: #f0f0f0;
+            border-radius: 6px 0 0 6px;
+            cursor: pointer;
+        }
+
+        .item-options-content {
+            display: flex;
+            align-items: center;
+            padding: 0 8px;
+            background: #fafafa;
+            border-radius: 0 6px 6px 0;
+            cursor: pointer;
+
+            div {
+                padding: 6px 10px;
+                color: #333;
+                font-size: 14px;
+                line-height: 22px;
+                background-color: #fff;
+                border-radius: 22px;
+
+                .notify-text-highlight {
+                    margin-left: 5px;
+                    font-weight: bold;
+                }
+
+                .notify-img-highlight {
+                    margin: 0 10px;
+                    color: rgba(0, 0, 0, 0.8);
+                }
+            }
+        }
+    }
+
+    .item-number {
+        position: absolute;
+        top: 0;
+        left: 16px;
+        font-weight: 800;
+        transform: translateY(-50%);
+    }
+}
+
+.actions-item-filter-warp {
+    position: relative;
+    margin-bottom: 12px;
+    margin-top: 16px;
+    padding: 2px 0;
+    border: 1px dashed #999;
+    border-radius: 2px;
+
+    &.filter-border {
+        padding: 2px 16px;
+        border-radius: 2px;
+    }
+
+    .actions-item-filter-warp-tip {
+        position: absolute;
+        top: 0;
+        left: 16px;
+        z-index: 2;
+        color: rgba(0, 0, 0, 0.55);
+        font-weight: 800;
+        font-size: 14px;
+        line-height: 1;
+        background-color: #fff;
+        transform: translateY(-50%);
+    }
+
+    .actions-item-filter-overflow {
+        display: flex;
+        padding-top: 4px;
+        overflow-x: auto;
+        overflow-y: visible;
+        row-gap: 16px;
+    }
+
+    .filter-add-button {
+        width: 100%;
+        color: rgba(0, 0, 0, 0.3);
+        text-align: center;
+        cursor: pointer;
+    }
+
+    .terms-params {
+        // display: inline-block;
+        display: flex;
+        flex-shrink: 0;
+
+        // &:not(:first-child) {
+        //   margin-bottom: 16px;
+        // }
+
+        .terms-params-warp {
+            display: flex;
+            align-items: baseline;
+        }
+
+        .term-type-warp {
+            // display: inline-block;
+            width: 50px;
+            margin: 0 16px;
+
+            .term-type {
+                padding-top: 4px;
+                padding-bottom: 4px;
+                border-radius: 2px;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/BranchesTabs.vue b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/BranchesTabs.vue
new file mode 100644
index 00000000..2af401bd
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/BranchesTabs.vue
@@ -0,0 +1,72 @@
+<template>
+    <div>
+        <div>
+            <div v-for="group in branchesGroup">
+                <div v-for="(branch, index) in group.children">
+                    <template v-if="branch.serial?.length">
+                        <Actions
+                            :actions="branch.serial"
+                            :activeKeys="activeKeys"
+                            :serial="true"
+                        />
+                    </template>
+                    <template v-if="branch.parallel?.length">
+                        <Actions
+                            :actions="branch.parallel"
+                            :activeKeys="activeKeys"
+                        />
+                    </template>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="BranchesTabs">
+import Actions from './Actions.vue';
+
+const props = defineProps({
+    branchesGroup: {
+        type: Array,
+        default: () => [],
+    },
+    alarmId: {
+        type: String,
+        default: undefined,
+    },
+    sceneId: {
+        type: String,
+        default: undefined,
+    },
+    activeKeys: {
+        // 后端返回已关联的执行动作
+        type: Array,
+        default: () => [],
+    },
+
+});
+
+const emit = defineEmits(['change', 'select']);
+
+</script>
+
+<style scoped lang="less">
+.branches-tabs-title {
+    margin-bottom: 8px;
+    font-size: 14px;
+    font-weight: 500;
+}
+
+.branches-tabs-alarm {
+    padding: 12px 16px;
+    border-radius: 4px;
+    border: 1px solid #a9a9a9;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    &:not(:last-child) {
+        margin-bottom: 8px;
+    }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/CardBox.vue b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/CardBox.vue
new file mode 100644
index 00000000..e6206073
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/HandTrigger/components/CardBox.vue
@@ -0,0 +1,566 @@
+<template>
+    <div class="card j-table-card-box" :class="{'selectedCard':selected}" @click="click">
+        <div class="card-warp" :class="{ disabled: disabled }">
+            <div class="card-type">
+                <div class="card-type-text">
+                    <img
+                        :height="16"
+                        :src="itemType.icon"
+                        style="margin-right: 5px"
+                    />
+                    {{ itemType.text }}
+                </div>
+            </div>
+            <div class="card-content" :style="{ paddingTop: '40px' }">
+                <div
+                    class="card-content-bg-item card-content-bg1"
+                    :style="bgcColor"
+                ></div>
+                <div
+                    class="card-content-bg-item card-content-bg2"
+                    :style="bgcColor"
+                ></div>
+                <div class="card-content-body">
+                    <!-- 图片 -->
+                    <div class="card-item-avatar">
+                        <img :src="itemType.img" />
+                    </div>
+
+                    <!-- 内容 -->
+                    <div class="card-item-body">
+                        <div>
+                            <Ellipsis style="width: calc(100% - 100px)">
+                                <span style="font-size: 16px; font-weight: 600">
+                                    {{ value.name }}
+                                </span>
+                            </Ellipsis>
+                            <div v-if="showBindTags && activeBranches.length">
+                                <a-tag v-for="tag in activeBranches">
+                                    <Ellipsis style="max-width: 120px">
+                                        {{ tag }}
+                                    </Ellipsis>
+                                </a-tag>
+                            </div>
+                            <Ellipsis v-else>
+                                <div class="subTitle">
+                                    说明：{{
+                                        value?.description || itemType.tip
+                                    }}
+                                </div>
+                            </Ellipsis>
+                        </div>
+                    </div>
+                </div>
+                <div class="card-content-tabs" v-if="showBranches">
+                    <BranchesTabs
+                        :branchesGroup="branchesGroup"
+                        :alarmId="alarmId"
+                        :branchesId="value.id"
+                        :activeKeys="activeKeys"
+                        :key="value.id"
+                        @change="bindAlarm"
+                    />
+                </div>
+                <div
+                    class="card-state"
+                    :style="{
+                        backgroundColor: getHexColor(statusNames[status]),
+                    }"
+                >
+                    <div class="card-state-content">
+                        <BadgeStatus
+                            :status="status"
+                            :text="statusText"
+                            :statusNames="statusNames"
+                        ></BadgeStatus>
+                    </div>
+                </div>
+            </div>
+            <div
+                v-if="status === 'disable' && !isInvalid"
+                class="card-mask mask-hover"
+                :style="maskStyle"
+            >
+                <div class="mask-content">
+                    <slot name="mask">
+                        <div>该场景为禁用状态,无法触发告警</div>
+                    </slot>
+                </div>
+            </div>
+            <div
+                v-if="isInvalid"
+                class="card-mask mask-full"
+                style="background-color: rgba(0, 0, 0, 0.2)"
+            >
+                <a-button style="font-size: 16px" type="link" @click="jumpView"
+                    >无效数据，请重新保存场景</a-button
+                >
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts" name="SceneCardBox">
+import BadgeStatus from '@/components/BadgeStatus/index.vue';
+import color, { getHexColor } from '@/components/BadgeStatus/color';
+import BranchesTabs from './BranchesTabs.vue';
+import { PropType } from 'vue';
+import { handleActiveBranches, handleGroupAndFilter, typeMap } from '../../Save/Scene/Save/utils';
+import { useMenuStore } from '@/store/menu';
+
+type EmitProps = {
+    (e: 'click'): void;
+    (e: 'change', key: string, selected: boolean): void;
+    (e: 'reload'): void;
+};
+
+const emit = defineEmits<EmitProps>();
+
+const props = defineProps({
+    value: {
+        type: Object as PropType<Record<string, any>>,
+        default: () => ({}),
+    },
+    statusText: {
+        type: String,
+        default: '正常',
+    },
+    status: {
+        type: [String, Number] as PropType<string | number>,
+        default: 'default',
+    },
+    statusNames: {
+        type: Object as PropType<Record<any, any>>,
+        default: () => ({
+            started: 'processing',
+            disable: 'error',
+        }),
+    },
+    disabled: {
+        type: Boolean,
+        default: false,
+    },
+    alarmId: {
+        type: String,
+        default: undefined,
+    },
+    activeKeys: {
+        // 后端返回已关联的执行动作
+        type: Array,
+        default: () => [],
+    },
+    showBranches: {
+        type: Boolean,
+        default: true,
+    },
+    showBindTags: {
+        type: Boolean,
+        default: false,
+    },
+    maskStyle: {
+        type: Object,
+        default: undefined,
+    },
+    selected:{
+        type: Boolean,
+        default: undefined,
+    }
+});
+
+const isInvalid = ref(false);
+const menuStory = useMenuStore();
+const bgcColor = computed(() => {
+    const key = props.statusNames[props.status];
+    const _color = color[key] || color.default;
+    return {
+        background: `linear-gradient(
+                  188.4deg,
+                  rgba(${_color}, 0.03) 30%,
+                  rgba(${_color}, 0) 80%
+              )`,
+    };
+});
+
+const itemType = computed(() => {
+    return typeMap.get(props.value.triggerType) || {};
+});
+
+const branchesGroup = computed(() => {
+    return handleGroupAndFilter(
+        props.value.branches,
+        props.value.options?.when || [],
+    );
+});
+
+const activeBranches = computed(() => {
+    const { data, invalid } = handleActiveBranches(
+        branchesGroup.value,
+        props.activeKeys,
+    );
+
+    isInvalid.value = invalid;
+    console.log(isInvalid.value,'isInvalid')
+    return data;
+});
+
+const bindAlarm = (key: string, selected: boolean) => {
+    emit('change', key, selected);
+};
+
+const click = () => {
+    emit('click');
+};
+
+const jumpView = () => {
+    const url = menuStory.menus['rule-engine/Scene/Save']?.path;
+    const tab: any = window.open(
+        `${
+            window.location.origin + window.location.pathname
+        }#${url}?triggerType=${props.value.triggerType}&id=${props.value.id}`,
+    );
+    tab.onTabSaveSuccess = (value: any) => {
+        console.log('', value);
+        if (value.success) {
+            emit('reload');
+        }
+    };
+};
+</script>
+
+<style scoped lang="less">
+.card {
+    width: 100%;
+    background-color: #fff;
+
+    .checked-icon {
+        position: absolute;
+        right: -22px;
+        bottom: -22px;
+        z-index: 2;
+        width: 44px;
+        height: 44px;
+        color: #fff;
+        background-color: #2f54eb;
+        transform: rotate(-45deg);
+
+        > div {
+            position: relative;
+            height: 100%;
+            transform: rotate(45deg);
+
+            > span {
+                position: absolute;
+                top: 6px;
+                left: 6px;
+                font-size: 12px;
+            }
+        }
+    }
+
+    .card-warp {
+        position: relative;
+        border: 1px solid #e6e6e6;
+        overflow: hidden;
+        cursor: pointer;
+
+        &.disabled {
+            filter: grayscale(100%);
+            cursor: not-allowed;
+        }
+
+        &.active {
+            position: relative;
+            border: 1px solid #2f54eb;
+        }
+
+        .card-type {
+            position: absolute;
+            top: 0;
+            left: -15px;
+            height: 32px;
+            padding: 0 30px;
+            color: rgba(0, 0, 0, 0.65);
+            line-height: 32px;
+            background-color: rgba(0, 0, 0, 0.06);
+            transform: skewX(-45deg);
+
+            .card-type-text {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                transform: skewX(45deg);
+            }
+        }
+
+        .card-content {
+            position: relative;
+            padding: 30px 12px 30px 30px;
+            overflow: hidden;
+            .card-content-tabs{
+                margin-top: 20px
+            }
+            .card-item-avatar {
+                margin-right: 16px;
+                display: flex;
+                align-items: center;
+            }
+
+            .card-item-body {
+                display: flex;
+                flex-direction: column;
+                flex-grow: 1;
+                width: 0;
+
+                .ant-row {
+                    margin-top: 19px;
+                }
+
+                .condition-name {
+                    margin-top: 10px;
+                }
+            }
+
+            .card-state {
+                position: absolute;
+                top: 30px;
+                right: -12px;
+                display: flex;
+                justify-content: center;
+                width: 100px;
+                padding: 2px 0;
+                background-color: rgba(#5995f5, 0.15);
+                transform: skewX(45deg);
+
+                &.success {
+                    background-color: @success-color-deprecated-bg;
+                }
+
+                &.warning {
+                    background-color: rgba(#ff9000, 0.1);
+                }
+
+                &.error {
+                    background-color: rgba(#e50012, 0.1);
+                }
+
+                .card-state-content {
+                    transform: skewX(-45deg);
+                }
+            }
+
+            :deep(.card-item-content-title) {
+                cursor: pointer;
+                font-size: 16px;
+                font-weight: 700;
+                color: @primary-color;
+                width: calc(100% - 100px);
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+
+            :deep(.card-item-heard-name) {
+                font-weight: 700;
+                font-size: 16px;
+                margin-bottom: 12px;
+            }
+
+            :deep(.card-item-content-text) {
+                color: rgba(0, 0, 0, 0.7);
+                font-size: 12px;
+            }
+        }
+
+        .card-content-top-line {
+            &::before {
+                position: absolute;
+                top: 0;
+                left: 30px + 10px;
+                display: block;
+                width: 15%;
+                min-width: 64px;
+                height: 2px;
+                background-image: url('/images/rectangle.png');
+                background-repeat: no-repeat;
+                background-size: 100% 100%;
+                content: ' ';
+            }
+        }
+
+        .card-content-bg-item {
+            position: absolute;
+            right: -5%;
+            height: 100%;
+            top: 0;
+            background: linear-gradient(
+                188.4deg,
+                rgba(229, 0, 18, 0.03) 22.94%,
+                rgba(229, 0, 18, 0) 94.62%
+            );
+            transform: skewX(-15deg);
+
+            &.card-content-bg1 {
+                width: 44.65%;
+            }
+
+            &.card-content-bg2 {
+                width: calc(44.65% + 34px);
+            }
+        }
+
+        .card-content-body {
+            display: flex;
+            position: relative;
+            z-index: 99;
+        }
+
+        .card-mask {
+            position: absolute;
+            top: 0;
+            left: 0;
+            z-index: 99;
+            display: flex;
+            justify-content: center;
+            width: 100%;
+            font-size: 16px;
+            height: 136px;
+            color: #fff;
+            padding-top: 30px;
+            background-color: rgba(#000, 0.45);
+            cursor: pointer;
+            transition: background-color 0.3s;
+
+            &.mask-hover:hover {
+                background-color: rgba(#000, 0.01);
+                color: transparent;
+            }
+
+            &.mask-full {
+                height: 100%;
+            }
+
+            .mask-content {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                width: 100%;
+                height: 100%;
+                padding: 24px !important;
+                flex-direction: column;
+            }
+        }
+    }
+
+    &.item-active {
+        position: relative;
+        color: #2f54eb;
+
+        .checked-icon {
+            display: block;
+        }
+
+        .card-warp {
+            border: 1px solid #2f54eb;
+        }
+    }
+
+    .card-tools {
+        display: flex;
+        margin-top: 8px;
+
+        .card-button {
+            display: flex;
+            flex-grow: 1;
+
+            & > :deep(span, button) {
+                width: 100%;
+                border-radius: 0;
+            }
+
+            :deep(button) {
+                width: 100%;
+                border-radius: 0;
+                background: #f6f6f6;
+                border: 1px solid #e6e6e6;
+                color: #2f54eb;
+
+                &:hover {
+                    background-color: @primary-color-hover;
+                    border-color: @primary-color-hover;
+
+                    span {
+                        color: #fff !important;
+                    }
+                }
+
+                &:active {
+                    background-color: @primary-color-active;
+                    border-color: @primary-color-active;
+
+                    span {
+                        color: #fff !important;
+                    }
+                }
+            }
+
+            &:not(:last-child) {
+                margin-right: 8px;
+            }
+
+            &.delete {
+                flex-basis: 60px;
+                flex-grow: 0;
+
+                :deep(button) {
+                    background: @error-color-deprecated-bg;
+                    border: 1px solid @error-color-outline;
+
+                    span {
+                        color: @error-color !important;
+                    }
+
+                    &:hover {
+                        background-color: @error-color-hover;
+
+                        span {
+                            color: #fff !important;
+                        }
+                    }
+
+                    &:active {
+                        background-color: @error-color-active;
+
+                        span {
+                            color: #fff !important;
+                        }
+                    }
+                }
+            }
+
+            :deep(button[disabled]) {
+                background: @disabled-bg;
+                border-color: @disabled-color;
+
+                span {
+                    color: @disabled-color !important;
+                }
+
+                &:hover {
+                    background-color: @disabled-active-bg;
+                }
+
+                &:active {
+                    background-color: @disabled-active-bg;
+                }
+            }
+
+            // :deep(.ant-tooltip-disabled-compatible-wrapper) {
+            //     width: 100%;
+            // }
+        }
+    }
+}
+.selectedCard{
+    border: 1px solid #2f54eb;
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/HandTrigger/index.vue b/src/views/rule-engine/Alarm/Configuration/HandTrigger/index.vue
index 9c5b5c39..d32f9b2b 100644
--- a/src/views/rule-engine/Alarm/Configuration/HandTrigger/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/HandTrigger/index.vue
@@ -31,7 +31,7 @@
                 :params="params"
             >
                 <template #card="slotProps">
-                    <CardBox
+                    <!-- <CardBox
                         :value="slotProps"
                         :status="slotProps.state?.value"
                         :statusText="slotProps.state?.text"
@@ -76,17 +76,29 @@
                                 </div>
                             </Ellipsis>
                         </template>
-                    </CardBox>
+                    </CardBox> -->
+                    <SceneCardBox
+                        :value="slotProps"
+                        :status="slotProps.state?.value"
+                        :statusText="slotProps.state?.text"
+                        :alarmId="props.data.id"
+                        :activeKeys="activeKeys[slotProps.id]"
+                        :selected="_selectedRowKeys.includes(slotProps.id)"
+                        @click="() => handleClick(slotProps)"
+                    ></SceneCardBox>
                 </template>
             </JProTable>
         </div>
     </j-modal>
 </template>
 
-<script lang="ts" setup>
+<script setup>
 import { getImage, onlyMessage } from '@/utils/comm';
 import { query } from '@/api/rule-engine/scene';
+import { queryBindScene } from '@/api/rule-engine/configuration';
 import { _execute } from '@/api/rule-engine/configuration';
+import SceneCardBox from './components/CardBox.vue';
+import { useRequest } from '@/hook';
 
 const columns = [
     {
@@ -96,32 +108,34 @@ const columns = [
         search: {
             type: 'select',
             options: async () => {
-              const res = await query(
-                  {
-                        sorts: [
-                          {
+                const res = await query({
+                    sorts: [
+                        {
                             name: 'createTime',
                             order: 'desc',
-                          },
-                        ],
-                        terms: [
-                          {
+                        },
+                    ],
+                    terms: [
+                        {
                             column: 'id',
                             termType: 'alarm-bind-rule',
                             value: props.data?.id,
-                          },
-                          { column: 'triggerType', termType: 'eq', value: 'manual' }
-                        ]
-                      }
-              );
-              if (res.status === 200) {
-                  return res.result.data.map((item: any) => ({
-                      label: item.name,
-                      value: item.id,
-                  }));
-              }
-              return []
-            }
+                        },
+                        {
+                            column: 'triggerType',
+                            termType: 'eq',
+                            value: 'manual',
+                        },
+                    ],
+                });
+                if (res.status === 200) {
+                    return res.result.data.map((item) => ({
+                        label: item.name,
+                        value: item.id,
+                    }));
+                }
+                return [];
+            },
         },
     },
     {
@@ -169,6 +183,21 @@ const terms = [
                 value: props.data?.sceneTriggerType,
             },
         ],
+    },
+    {
+        terms: [
+            {
+                column: 'features',
+                termType: 'in',
+                value: ['alarmTrigger', 'alarmReliever'],
+            },
+            {
+                column: 'features',
+                termType: 'isnull',
+                value: 1,
+                type: 'or',
+            },
+        ],
         type: 'and',
     },
 ];
@@ -183,13 +212,12 @@ typeMap.set('manual', {
     tip: '适用于第三方平台向物联网平台下发指令控制设备',
 });
 
-const _selectedRowKeys = ref<string[]>([]);
+const _selectedRowKeys = ref([]);
 
-const handleClick = (dt: any) => {
-   
-    if(dt.state?.value === 'disable') {
-        onlyMessage('该场景为禁用状态，无法触发告警','error')
-        return
+const handleClick = (dt) => {
+    if (dt.state?.value === 'disable') {
+        onlyMessage('该场景为禁用状态，无法触发告警', 'error');
+        return;
     }
     if (_selectedRowKeys.value.includes(dt.id)) {
         const _index = _selectedRowKeys.value.findIndex((i) => i === dt.id);
@@ -205,7 +233,7 @@ const onSelectChange = () => {
     _selectedRowKeys.value = [];
 };
 
-const handleSearch = (e: any) => {
+const handleSearch = (e) => {
     params.value = e;
 };
 const emit = defineEmits(['close', 'save']);
@@ -232,6 +260,21 @@ const saveCorrelation = async () => {
 const closeModal = () => {
     emit('close');
 };
+const { data: activeKeys } = useRequest(queryBindScene, {
+    defaultParams: { terms: [{ column: 'alarmId', value: props.data?.id }] },
+    onSuccess(res) {
+        const activeMap = res.result.data.reduce((prev, next) => {
+            if (prev[next.ruleId]) {
+                prev[next.ruleId].push(next.branchIndex);
+            } else {
+                prev[next.ruleId] = [next.branchIndex];
+            }
+            return prev;
+        }, {});
+        return activeMap || {};
+    },
+    defaultValue: {},
+});
 </script>
 <style lang="less" scoped>
 .subTitle {
@@ -239,4 +282,4 @@ const closeModal = () => {
     font-size: 14px;
     margin-top: 10px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Actions.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Actions.vue
new file mode 100644
index 00000000..8bf47734
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Actions.vue
@@ -0,0 +1,395 @@
+<template>
+  <div class="actions-warp">
+    <div v-for="item in actions">
+      <div class="actions-item" v-if="item.executor === 'alarm' || show">
+        <div class="item-options-warp">
+          <div class="item-options-type">
+<!--            <img-->
+<!--              style="width: 18px"-->
+<!--              :src="iconMap.get(item.executor === 'alarm' ? item.alarm.mode : item.executor)"-->
+<!--            />-->
+            <AIcon :type="iconMap.get(item.executor === 'alarm' ? item.alarm.mode : item.executor)"/>
+          </div>
+          <div class="item-options-content">
+            <template v-if="item.executor === 'alarm'">
+              <span>
+                满足条件后将{{ item.alarm.mode === 'trigger' ? '触发' : '解除' }}当前告警
+              </span>
+
+              <a-button v-if="!showUnbindBtn" type="link" @click.stop="onBind(item)" :disabled="activeKeys.some(active => active === item.actionId)">
+                <template #icon>
+                  <AIcon type="icon-bangding"/>
+                </template>
+                {{ selectedKeys.some(selectKey => selectKey === item.actionId) ? '已关联' : '关联' }}
+              </a-button>
+              <a-button v-else-if="activeKeys.some(active => active === item.actionId)" type="link" @click.stop="onSelect(item)">
+                <template #icon>
+                  <AIcon type="icon-jiebang"/>
+                </template>
+                取消关联
+              </a-button>
+            </template>
+            <template v-if="item.executor === 'notify' && show">
+              <template v-if="item.notify?.notifyType === 'dingTalk'">
+                <div v-if="item.options.provider === 'dingTalkRobotWebHook'">
+                  通过
+                  <span class="notify-text-highlight">群机器人消息</span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.notify?.templateId }}
+                  </span>
+                </div>
+                <div v-else>
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    >
+                    钉钉
+                  </span>
+                  {{ (item.options?.sendTo || item.options?.orgName) ? '向' : "" }}
+                  <span class="notify-text-highlight">{{ item.options?.sendTo || '' }}</span>
+                  <span class="notify-text-highlight">{{ item.options?.orgName || '' }}</span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.options?.templateName || item?.notify?.templateId }}
+                  </span>
+                </div>
+              </template>
+              <template v-else-if="item.notify?.notifyType === 'weixin'">
+                <div>
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    />
+                    微信
+                  </span>
+                  {{ (item.options.sendTo || item.options.orgName || item.options.tagName) ? '向' : '' }}
+                  <span class="notify-text-highlight">{{ item.options.sendTo || '' }}</span>
+                  <span class="notify-text-highlight">{{ item.options?.orgName || '' }}</span>
+                  <span class="notify-text-highlight">{{ item.options?.tagName || '' }}</span>
+                  发送
+                  <span class="notify-text-highlight">{{ item.options?.templateName || item?.notify?.templateId }}</span>
+                </div>
+              </template>
+              <template v-else-if="item.notify?.notifyType === 'email'">
+                <div style="display: flex;">
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    />
+                    邮件
+                  </span>
+                  {{ item.options?.sendTo ? '向' : '' }}
+                  <span class="notify-text-highlight">
+                    <Ellipsis style='max-width: 400px;'>
+                      {{ item.options?.sendTo || '' }}
+                    </Ellipsis>
+                  </span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.options?.templateName || item.notify?.templateId }}
+                  </span>
+                </div>
+              </template>
+              <template v-else-if="item.notify?.notifyType === 'voice'">
+                <div>
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    />
+                    语音
+                  </span>
+                  {{ item.options?.sendTo ? '向' : '' }}
+                  <span class="notify-text-highlight">{{ item.options?.sendTo || '' }}</span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.options?.templateName || item.notify?.templateId }}
+                  </span>
+                </div>
+              </template>
+              <template v-else-if="item.notify?.notifyType === 'sms'">
+                <div>
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    />
+                    短信
+                  </span>
+                  {{ item.options?.sendTo ? '向' : '' }}
+                  <span class="notify-text-highlight">{{ item.options?.sendTo || '' }}</span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.options?.templateName || item.notify?.templateId }}
+                  </span>
+                </div>
+              </template>
+              <template v-else-if="item.notify?.notifyType === 'webhooks'">
+                <div>
+                  通过
+                  <span class="notify-text-highlight">
+                    <img
+                      style="width: 18px"
+                      :src="itemNotifyIconMap.get(item.notify?.notifyType)"
+                    />
+                    WebHook
+                  </span>
+                  发送
+                  <span class="notify-text-highlight">
+                    {{ item.options?.templateName || item.notify?.templateId }}
+                  </span>
+                </div>
+              </template>
+            </template>
+            <template v-if="item.executor === 'delay' && show">
+              {{ item.options?.name }}
+            </template>
+            <template v-if="item.executor === 'device' && show">
+              <div v-if="['fixed', 'context'].includes(item.device?.selector)"
+                   style='display: flex; align-items: center;'>
+                <AIcon :type="typeIconMap[item.device?.message?.messageType ||'INVOKE_FUNCTION']"/>
+                <span style="padding-left: 4px">{{ item.options?.type }}</span>
+                <AIcon type="icon-mubiao" style="padding:0 4px"/>
+                <Ellipsis style='max-width: 120px;margin-right: 12px;'>
+                  {{ item.options?.name }}
+                </Ellipsis>
+                <Ellipsis style='max-width: 120px;'>
+                  {{ item.options?.propertiesName }}
+                </Ellipsis>
+                <span v-if='!isBoolean(item.options?.propertiesValue) && item.options?.propertiesValue'>为 </span>
+                <Ellipsis style='max-width: 120px;'>
+                  {{
+                    `${
+                      (
+                        isBoolean(
+                          item.options?.propertiesValue
+                        )
+                          ? true
+                          : item.options?.propertiesValue
+                      )
+                        ? `${item.options?.propertiesValue}`
+                        : ''
+                    }`
+                  }}
+                </Ellipsis>
+              </div>
+              <div v-else-if="item.device?.selector === 'tag'">
+                <AIcon :type="typeIconMap[item.device?.message?.messageType ||'INVOKE_FUNCTION']"/>
+                {{ item.options?.type }}
+                <span>{{ item.options?.tagName }}</span>
+                的{{ item.options?.productName }}
+                {{ item.options?.propertiesName }}
+              </div>
+              <div v-else-if="item.device?.selector === 'relation'">
+                <AIcon :type="typeIconMap[item.device?.message?.messageType ||'INVOKE_FUNCTION']"/>
+                {{ item.options?.type }}
+                与
+                <span>{{ item.options?.triggerName }}</span>
+                具有相同 {{ item.options?.relationName }}
+                的{{ item.options?.productName }}
+                设备的 {{ item.options?.propertiesName }}
+              </div>
+            </template>
+          </div>
+        </div>
+      </div>
+      <div v-if="serial && item.options?.terms?.length && show" class="actions-item-filter-warp">
+        <div class="actions-item-filter-warp-tip">
+          满足此条件后执行后续动作
+        </div>
+        <div class="actions-item-filter-overflow">
+          <Terms :when="item.options" :border="false" :data="item.terms"/>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="Actions">
+import {iconMap, itemNotifyIconMap, typeIconMap} from '@/views/rule-engine/Scene/Save/action/ListItem/util'
+import {isBoolean} from 'lodash-es'
+import Terms from './Terms/Terms.vue'
+
+const props = defineProps({
+  actions: {
+    type: Array,
+    default: () => []
+  },
+  activeKeys: { // 后端返回已关联的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  selectedKeys: { // 当前modal中选中的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  show: {
+    type: Boolean,
+    default: false
+  },
+  serial: {
+    type: Boolean,
+    default: false
+  },
+  showUnbindBtn: {
+    type: Boolean,
+    default: false
+  }
+})
+
+const emit = defineEmits(['change', 'select'])
+
+const onBind = (record) => {
+  const selected = props.selectedKeys.some(item => item === record.actionId)
+  emit('change', record.actionId, !selected)
+}
+
+const onSelect = (record) => {
+  const selected = props.activeKeys.some(item => item === record.actionId)
+  emit('select', record.actionId, !selected)
+}
+
+
+</script>
+
+<style scoped lang="less">
+.actions-item {
+  position: relative;
+  padding: 8px;
+  border: 1px dashed #999;
+  border-radius: 2px;
+  margin-bottom: 8px;
+
+  .item-options-warp {
+    display: inline-flex;
+    height: 48px;
+    border: 1px solid #e0e0e0;
+    border-radius: 6px;
+
+    .item-options-type {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 48px;
+      background-color: #f0f0f0;
+      border-radius: 6px 0 0 6px;
+      cursor: pointer;
+      font-size: 22px;
+    }
+
+    .item-options-content {
+      display: flex;
+      align-items: center;
+      padding: 0 8px;
+      background: #fafafa;
+      border-radius: 0 6px 6px 0;
+      cursor: pointer;
+
+      div {
+        padding: 6px 10px;
+        color: #333;
+        font-size: 14px;
+        line-height: 22px;
+        background-color: #fff;
+        border-radius: 22px;
+
+        .notify-text-highlight {
+          margin-left: 5px;
+          font-weight: bold;
+        }
+
+        .notify-img-highlight {
+          margin: 0 10px;
+          color: rgba(0, 0, 0, 0.8);
+        }
+      }
+    }
+  }
+
+  .item-number {
+    position: absolute;
+    top: 0;
+    left: 16px;
+    font-weight: 800;
+    transform: translateY(-50%);
+  }
+}
+
+.actions-item-filter-warp {
+  position: relative;
+  margin-bottom: 12px;
+  margin-top: 16px;
+  padding: 2px 0;
+  border: 1px dashed #999;
+  border-radius: 2px;
+
+  &.filter-border {
+    padding: 2px 16px;
+    border-radius: 2px;
+  }
+
+  .actions-item-filter-warp-tip {
+    position: absolute;
+    top: 0;
+    left: 16px;
+    z-index: 2;
+    color: rgba(0, 0, 0, 0.55);
+    font-weight: 800;
+    font-size: 14px;
+    line-height: 1;
+    background-color: #fff;
+    transform: translateY(-50%);
+  }
+
+  .actions-item-filter-overflow {
+    display: flex;
+    padding-top: 4px;
+    overflow-x: auto;
+    overflow-y: visible;
+    row-gap: 16px;
+  }
+
+  .filter-add-button {
+    width: 100%;
+    color: rgba(0, 0, 0, 0.3);
+    text-align: center;
+    cursor: pointer;
+  }
+
+  .terms-params {
+    // display: inline-block;
+    display: flex;
+    flex-shrink: 0;
+
+    // &:not(:first-child) {
+    //   margin-bottom: 16px;
+    // }
+
+    .terms-params-warp {
+      display: flex;
+      align-items: baseline;
+    }
+
+    .term-type-warp {
+      // display: inline-block;
+      width: 50px;
+      margin: 0 16px;
+
+      .term-type {
+        padding-top: 4px;
+        padding-bottom: 4px;
+        border-radius: 2px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue
new file mode 100644
index 00000000..93534cae
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/BranchesTabs.vue
@@ -0,0 +1,168 @@
+<template>
+  <div>
+    <div v-if="triggerType ==='device'">
+      <a-tabs v-if="branchesGroup.length" v-model:activeKey="activeKey">
+        <template v-if="showDetailBtn" #rightExtra>
+          <a-button @click.stop="show = !show">
+            {{ show ? '收起' : '点击查看详情'}}
+          </a-button>
+        </template>
+        <a-tab-pane
+          v-for="group in branchesGroup"
+          :tab="group.branchName"
+          :key="group.key"
+        >
+          <div v-for="(branch, index) in group.children">
+            <div style="display: flex;align-items: center" v-if="show">
+              <span v-if="branch.when" style="padding-right: 12px;font-weight: bold;font-size: 16px;width: 46px; display: inline-block;">{{ index === 0 ? '当' : '否则' }}</span>
+              <Terms :when="branch.whenOptions" :data="branch.when" />
+
+            </div>
+            <div class="branches-shakeLimit" v-if="show">
+              <span class="branches-shakeLimit-action">执行</span>
+              <template v-if="branch.shakeLimit?.enabled">
+                <span>开启防抖</span>
+                <span class="branches-shakeLimit-time">{{ branch.shakeLimit.time }}</span>
+                <span>秒内发送</span>
+                <span class="branches-shakeLimit-time">{{ branch.shakeLimit.threshold }}</span>
+                <span>次及以上时，处理</span>
+                <span>{{ branch.shakeLimit.alarmFirst ? '第一次' : '最后一次' }}</span>
+              </template>
+              <span v-else>
+                关闭防抖
+              </span>
+            </div>
+          <template v-if="branch.serial?.length">
+            <div v-if="show" class="branches-tabs-title">
+              串行
+            </div>
+            <Actions :actions="branch.serial" :activeKeys="activeKeys" :selectedKeys="selectedKeys" :show="show" :serial="true" :showUnbindBtn="showUnbindBtn" @change="change" @select="select" />
+          </template>
+          <template v-if="branch.parallel?.length">
+            <div v-if="show" class="branches-tabs-title">
+              并行
+            </div>
+            <Actions :actions="branch.parallel" :activeKeys="activeKeys" :selectedKeys="selectedKeys" :show="show" :showUnbindBtn="showUnbindBtn" @change="change" @select="select" />
+          </template>
+
+          </div>
+        </a-tab-pane>
+      </a-tabs>
+
+    </div>
+    <div v-else>
+      <div style="margin: 8px 0; text-align: right" v-if="showDetailBtn">
+        <a-button @click.stop="show = !show">
+          {{ show ? '收起' : '点击查看详情'}}
+        </a-button>
+      </div>
+      <div  v-for="group in branchesGroup">
+        <div v-for="(branch, index) in group.children">
+          <template v-if="branch.serial?.length">
+            <div v-if="show" class="branches-tabs-title">
+              串行
+            </div>
+            <Actions :actions="branch.serial" :activeKeys="activeKeys" :selectedKeys="selectedKeys" :show="show" :serial="true" :showUnbindBtn="showUnbindBtn" @change="change" @select="select" />
+          </template>
+          <template v-if="branch.parallel?.length">
+            <div v-if="show" class="branches-tabs-title">
+              并行
+            </div>
+            <Actions :actions="branch.parallel" :activeKeys="activeKeys" :selectedKeys="selectedKeys" :show="show" :showUnbindBtn="showUnbindBtn" @change="change" @select="select" />
+          </template>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup name="BranchesTabs">
+import Terms from './Terms/Terms.vue'
+import Actions from './Actions.vue'
+
+const props = defineProps({
+  branchesGroup: {
+    type: Array,
+    default: () => ([])
+  },
+  alarmId: {
+    type: String,
+    default: undefined
+  },
+  sceneId: {
+    type: String,
+    default: undefined
+  },
+  activeKeys: { // 后端返回已关联的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  selectedKeys: { // 当前modal中选中的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  show: {
+    type: Boolean,
+    default: false
+  },
+  showDetailBtn: {
+    type: Boolean,
+    default: true
+  },
+  showUnbindBtn: {
+    type: Boolean,
+    default: false
+  },
+  triggerType: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['change', 'select'])
+
+const activeKey = ref(props.branchesGroup?.length ? props.branchesGroup[0].key : '')
+const show = ref(props.show)
+
+const change = (id, selected) => {
+  emit('change', id, selected)
+}
+
+const select = (id, selected) => {
+  emit('select', id, selected)
+}
+
+</script>
+
+<style scoped lang="less">
+.branches-tabs-title {
+  margin-bottom: 8px;
+  font-size: 14px;
+  font-weight: 500;
+}
+
+.branches-tabs-alarm {
+  padding: 12px 16px;
+  border-radius: 4px;
+  border: 1px solid #a9a9a9;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  &:not(:last-child) {
+    margin-bottom: 8px;
+  }
+}
+
+.branches-shakeLimit {
+  .branches-shakeLimit-action {
+    font-weight: bold;
+    padding-right: 8px;
+  }
+
+  .branches-shakeLimit-time {
+    padding: 0 8px;
+    font-weight: bold;
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/CardBox.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/CardBox.vue
new file mode 100644
index 00000000..721e57cf
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/CardBox.vue
@@ -0,0 +1,599 @@
+<template>
+  <div class="card j-table-card-box" @click="click">
+    <div
+      class="card-warp"
+      :class="{ 'disabled': disabled }"
+    >
+      <div class="card-type" >
+        <div class="card-type-text">
+          <img
+            :height="16"
+            :src="itemType.icon"
+            style="margin-right: 5px"
+          />
+          {{itemType.text}}
+        </div>
+      </div>
+      <div
+        class="card-content"
+        :style="{ paddingTop: '40px'}"
+      >
+        <div class="card-content-bg-item card-content-bg1" :style="bgcColor"></div>
+        <div class="card-content-bg-item card-content-bg2" :style="bgcColor" ></div>
+        <div class="card-content-body">
+          <!-- 图片 -->
+          <div class="card-item-avatar">
+            <img :src="itemType.img" />
+          </div>
+
+          <!-- 内容 -->
+          <div class="card-item-body">
+            <div>
+              <Ellipsis style="width: calc(100% - 100px)">
+                <span style="font-size: 16px; font-weight: 600">
+                  {{ value.name }}
+                </span>
+              </Ellipsis>
+              <div v-if="showBindTags && activeBranches.length">
+                <div style="margin-top: 16px; margin-bottom: 8px" class="card-item-content-text">
+                  关联条件
+                </div>
+                <Tags :tags="activeBranches"/>
+              </div>
+              <Ellipsis v-else>
+                <div class="subTitle">
+                  说明：{{
+                    value?.description ||
+                    itemType.tip
+                  }}
+                </div>
+              </Ellipsis>
+
+            </div>
+            <div class="condition-name" v-if="showRule">
+              <AddButton
+                v-if="value.options || value.triggerType === 'manual'"
+                style='width: 100%;padding: 8px 12px; border-radius: 4px'
+                :showCircular="false"
+              >
+
+                <DeviceTitle v-if="value.triggerType === 'device'" :options='value.options?.trigger'/>
+                  <template v-if="value.triggerType === 'timer'" #extra>
+                    <span style="padding-right: 10px;">
+                      系统时间到达
+                    </span>
+                  </template>
+                  <TimerTitle v-if="value.triggerType === 'timer'" :options='value.options?.trigger'/>
+                <span v-if="value.triggerType === 'manual'">
+                  系统在接收到手动触发指令时，触发场景
+                </span>
+              </AddButton>
+            </div>
+          </div  >
+
+          <div v-if="showMask && activeBranches.length && !isInvalid" v-show="!showBranchesVisible" class="card-mask" :class="{ 'branches-tabs-mask': showBranchesVisible}" :style="maskStyle">
+            <div class="mask-content">
+              <slot name="mask">
+                <div>
+                  当前告警已关联：
+                </div>
+                <Tags :tags="activeBranches" :styles="{ justifyContent: 'center' }"/>
+              </slot>
+            </div>
+          </div>
+          <div v-if="isInvalid" class="card-mask mask-full" style="background-color: rgba(0, 0, 0, 0.2);" @click.stop="jumpView">
+            <a-button style="font-size: 16px;" type="link" >无效数据，请重新保存场景</a-button>
+          </div>
+        </div>
+        <div class="card-content-tabs" v-if="showBranches && showBranchesVisible" @click.stop>
+          <BranchesTabs
+            :branchesGroup="branchesGroup"
+            :alarmId="alarmId"
+            :branchesId="value.id"
+            :activeKeys="activeKeys"
+            :selectedKeys="selectedKeys"
+            :triggerType="value.triggerType"
+            :key="value.id"
+            @change="bindAlarm"
+          />
+        </div>
+        <div
+          class="card-state"
+          :style="{ backgroundColor: getHexColor(statusNames[status]) }"
+        >
+          <div class="card-state-content">
+            <BadgeStatus
+              :status="status"
+              :text="statusText"
+              :statusNames="statusNames"
+            ></BadgeStatus>
+          </div>
+        </div>
+      </div>
+
+      <slot></slot>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts" name="SceneCardBox">
+import BadgeStatus from '@/components/BadgeStatus/index.vue';
+import color, {getHexColor} from '@/components/BadgeStatus/color';
+import DeviceTitle from '@/views/rule-engine/Scene/Save/components/Title.vue'
+import TimerTitle from '@/views/rule-engine/Scene/Save/Timer/Title.vue'
+import AddButton from '@/views/rule-engine/Scene/Save/components/AddButton.vue'
+import BranchesTabs from './BranchesTabs.vue'
+import {PropType} from 'vue';
+import {handleActiveBranches, handleGroupAndFilter, typeMap} from './utils'
+import {useMenuStore} from "@/store/menu";
+import Tags from './tags.vue'
+
+type EmitProps = {
+  (e: 'click'): void;
+  (e: 'change', key: string, selected: boolean): void;
+  (e: 'reload'): void;
+};
+
+const emit = defineEmits<EmitProps>();
+
+const props = defineProps({
+  value: {
+    type: Object as PropType<Record<string, any>>,
+    default: () => ({}),
+  },
+  statusText: {
+    type: String,
+    default: '正常',
+  },
+  status: {
+    type: [String, Number] as PropType<string | number>,
+    default: 'default',
+  },
+  statusNames: {
+    type: Object as PropType<Record<any, any>>,
+    default: () => ({
+      started: 'processing',
+      disable: 'error',
+    })
+  },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
+  alarmId: {
+    type: String,
+    default: undefined
+  },
+  activeKeys: { // 后端返回已关联的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  selectedKeys: { // 当前modal中选中的执行动作
+    type: Array,
+    default: () => ([])
+  },
+  showMask: {
+    type: Boolean,
+    default: false
+  },
+  showBranches: {
+    type: Boolean,
+    default: true
+  },
+  showBindTags: {
+    type: Boolean,
+    default: false
+  },
+  showRule: {
+    type: Boolean,
+    default: true
+  },
+  maskStyle: {
+    type: Object,
+    default: undefined
+  }
+});
+
+const isInvalid = ref(false)
+const menuStory = useMenuStore();
+const bgcColor = computed(() => {
+  const key = props.statusNames[props.status]
+  const _color = color[key] || color.default;
+  return {
+    background: `linear-gradient(
+                188.4deg,
+                rgba(${_color}, 0.03) 30%,
+                rgba(${_color}, 0) 80%
+            )`
+  }
+})
+
+const showBranchesVisible = ref(false)
+
+const itemType = computed(() => {
+  return typeMap.get(props.value.triggerType) || {}
+})
+
+const branchesGroup = computed(() => {
+  return handleGroupAndFilter(props.value.branches, props.value.options?.when || [])
+})
+
+const activeBranches = computed(() => {
+  const { data, invalid } = handleActiveBranches(branchesGroup.value, props.activeKeys)
+
+  isInvalid.value = invalid
+  return data
+})
+
+const bindAlarm = (key: string, selected: boolean) => {
+  emit('change', key, selected)
+}
+
+const click = () => {
+  if (!isInvalid.value) {
+    emit('click')
+    onShowBranchesTabs()
+  }
+}
+
+const jumpView = () => {
+
+  const url = menuStory.menus['rule-engine/Scene/Save']?.path;
+  const tab: any = window.open(
+    `${window.location.origin + window.location.pathname}#${url}?triggerType=${props.value.triggerType}&id=${props.value.id}`,
+  );
+  tab.onTabSaveSuccess = (value: any) => {
+    if (value.success) {
+      emit('reload')
+    }
+  };
+}
+
+const onShowBranchesTabs = () => {
+  showBranchesVisible.value = !showBranchesVisible.value
+}
+
+watch(() => props.value.id, () => {
+  showBranchesVisible.value = false
+})
+
+</script>
+
+<style scoped lang="less">
+.card {
+  width: 100%;
+  background-color: #fff;
+
+  .checked-icon {
+    position: absolute;
+    right: -22px;
+    bottom: -22px;
+    z-index: 2;
+    width: 44px;
+    height: 44px;
+    color: #fff;
+    background-color: #2f54eb;
+    transform: rotate(-45deg);
+
+    > div {
+      position: relative;
+      height: 100%;
+      transform: rotate(45deg);
+
+      > span {
+        position: absolute;
+        top: 6px;
+        left: 6px;
+        font-size: 12px;
+      }
+    }
+  }
+
+  .card-warp {
+    position: relative;
+    border: 1px solid #e6e6e6;
+    overflow: hidden;
+    cursor: pointer;
+
+    &.disabled {
+      filter: grayscale(100%);
+      cursor: not-allowed;
+    }
+
+    &.active {
+      position: relative;
+      border: 1px solid #2f54eb;
+    }
+
+    .card-type {
+      position: absolute;
+      top: 0;
+      left: -15px;
+      height: 32px;
+      padding: 0 30px;
+      color: rgba(0, 0, 0, 0.65);
+      line-height: 32px;
+      background-color: rgba(0, 0, 0, 0.06);
+      transform: skewX(-45deg);
+
+      .card-type-text {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        transform: skewX(45deg);
+      }
+    }
+
+    .card-content {
+      position: relative;
+      padding: 30px 12px 30px 30px;
+      overflow: hidden;
+      min-height: 170px;
+
+      .card-item-avatar {
+        margin-right: 16px;
+        display: flex;
+        align-items: center;
+      }
+
+      .card-item-body {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+        width: 0;
+
+        .ant-row {
+          margin-top: 19px;
+        }
+
+        .condition-name {
+          margin-top: 10px;
+        }
+      }
+
+      .card-state {
+        position: absolute;
+        top: 30px;
+        right: -12px;
+        display: flex;
+        justify-content: center;
+        width: 100px;
+        padding: 2px 0;
+        background-color: rgba(#5995f5, 0.15);
+        transform: skewX(45deg);
+
+        &.success {
+          background-color: @success-color-deprecated-bg;
+        }
+
+        &.warning {
+          background-color: rgba(#ff9000, 0.1);
+        }
+
+        &.error {
+          background-color: rgba(#e50012, 0.1);
+        }
+
+        .card-state-content {
+          transform: skewX(-45deg);
+        }
+      }
+
+      :deep(.card-item-content-title) {
+        cursor: pointer;
+        font-size: 16px;
+        font-weight: 700;
+        color: @primary-color;
+        width: calc(100% - 100px);
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+      }
+
+      :deep(.card-item-heard-name) {
+        font-weight: 700;
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+
+      :deep(.card-item-content-text) {
+        color: rgba(0, 0, 0, 0.7);
+        font-size: 12px;
+      }
+    }
+
+    .card-content-top-line {
+      &::before {
+        position: absolute;
+        top: 0;
+        left: 30px + 10px;
+        display: block;
+        width: 15%;
+        min-width: 64px;
+        height: 2px;
+        background-image: url('/images/rectangle.png');
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+        content: ' ';
+      }
+    }
+
+    .card-content-bg-item {
+      position: absolute;
+      right: -5%;
+      height: 320px;
+      top: 0;
+      background: linear-gradient(188.4deg,
+      rgba(229, 0, 18, 0.03) 22.94%,
+      rgba(229, 0, 18, 0) 94.62%);
+      transform: skewX(-15deg);
+
+      &.card-content-bg1 {
+        width: 44.65%;
+      }
+
+      &.card-content-bg2 {
+        width: calc(44.65% + 34px);
+      }
+    }
+
+    .card-content-body {
+      display: flex;
+      position: relative;
+      z-index: 99;
+    }
+
+
+    .card-mask {
+      position: absolute;
+      top: -40px;
+      left: -30px;
+      bottom: -30px;
+      right: -12px;
+      z-index: 99;
+      display: flex;
+      justify-content: center;
+      font-size: 16px;
+      color: #fff;
+      padding-top: 10px;
+      background-color: rgba(#000, 0.45);
+      cursor: pointer;
+      transition: background-color 0.3s;
+
+      .mask-content {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 100%;
+        padding: 24px !important;
+        flex-direction: column;
+      }
+
+      &.mask-hover:hover {
+        background-color: rgba(#000, 0.01);
+        color: transparent;
+
+        .mask-content {
+          display: none;
+        }
+      }
+
+
+
+      &.branches-tabs-mask {
+        bottom: 0;
+      }
+    }
+  }
+
+  &.item-active {
+    position: relative;
+    color: #2f54eb;
+
+    .checked-icon {
+      display: block;
+    }
+
+    .card-warp {
+      border: 1px solid #2f54eb;
+    }
+  }
+
+  .card-tools {
+    display: flex;
+    margin-top: 8px;
+
+    .card-button {
+      display: flex;
+      flex-grow: 1;
+
+      & > :deep(span, button) {
+        width: 100%;
+        border-radius: 0;
+      }
+
+      :deep(button) {
+        width: 100%;
+        border-radius: 0;
+        background: #f6f6f6;
+        border: 1px solid #e6e6e6;
+        color: #2f54eb;
+
+        &:hover {
+          background-color: @primary-color-hover;
+          border-color: @primary-color-hover;
+
+          span {
+            color: #fff !important;
+          }
+        }
+
+        &:active {
+          background-color: @primary-color-active;
+          border-color: @primary-color-active;
+
+          span {
+            color: #fff !important;
+          }
+        }
+      }
+
+      &:not(:last-child) {
+        margin-right: 8px;
+      }
+
+      &.delete {
+        flex-basis: 60px;
+        flex-grow: 0;
+
+        :deep(button) {
+          background: @error-color-deprecated-bg;
+          border: 1px solid @error-color-outline;
+
+          span {
+            color: @error-color !important;
+          }
+
+          &:hover {
+            background-color: @error-color-hover;
+
+            span {
+              color: #fff !important;
+            }
+          }
+
+          &:active {
+            background-color: @error-color-active;
+
+            span {
+              color: #fff !important;
+            }
+          }
+        }
+      }
+
+      :deep(button[disabled]) {
+        background: @disabled-bg;
+        border-color: @disabled-color;
+
+        span {
+          color: @disabled-color !important;
+        }
+
+        &:hover {
+          background-color: @disabled-active-bg;
+        }
+
+        &:active {
+          background-color: @disabled-active-bg;
+        }
+      }
+
+      // :deep(.ant-tooltip-disabled-compatible-wrapper) {
+      //     width: 100%;
+      // }
+    }
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/ActionsFilter.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/ActionsFilter.vue
new file mode 100644
index 00000000..a33ed78f
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/ActionsFilter.vue
@@ -0,0 +1,71 @@
+<template>
+  <div class="terms-warp">
+    <j-scrollbar>
+      <div class="terms-content">
+        <div class="terms-group" v-for="(group, index) in when.terms">
+
+          <div v-if="group.termType && index !== 0" class="dropdown-button type">
+            {{ group.termType }}
+          </div>
+          <div class="terms-group-content" >
+            <WhenItem v-for="(item, groupIndex) in group.terms" :type="item.termType" :value="item" :showType="groupIndex !== 0" />
+          </div>
+        </div>
+      </div>
+    </j-scrollbar>
+  </div>
+</template>
+
+<script setup name="ActionFIlter">
+import WhenItem from "./WhenItem.vue";
+
+const props = defineProps({
+  when: {
+    type: Object,
+    default: () => ({})
+  }
+})
+</script>
+
+<style scoped lang="less">
+.terms-warp {
+  flex: 1 1 0;
+  min-width: 0;
+}
+
+.terms-content {
+  display: flex;
+  gap: 12px;
+}
+
+.terms-group {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  flex-shrink: 0;
+  user-select: none;
+
+  .terms-group-content {
+    position: relative;
+    display: flex;
+    padding: 8px 8px;
+    border: 1px dashed #e0e0e0;
+    border-radius: 6px;
+    row-gap: 16px;
+  }
+}
+
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  border: 1px solid #d9d9d9;
+  border-radius: 8px;
+  cursor: pointer;
+
+  &.type {
+    padding: 5px 10px;
+    height: 36px;
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/Terms.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/Terms.vue
new file mode 100644
index 00000000..ea4793bd
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/Terms.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="terms-warp">
+    <j-scrollbar>
+      <div class="terms-content">
+          <div class="terms-group" v-for="(group, index) in when.terms">
+
+            <div v-if="group.termType && index !== 0" class="dropdown-button type">
+              {{ group.termType }}
+            </div>
+            <div class="terms-group-content" :class="{'group-content-border': border, 'group-content-bg': !border}">
+              <WhenItem v-for="(item, groupIndex) in group.terms" :type="item.termType" :value="item" :showType="groupIndex !== 0" :data="data[index]?.terms[groupIndex]" />
+            </div>
+          </div>
+      </div>
+    </j-scrollbar>
+  </div>
+</template>
+
+<script setup name="Terms">
+import WhenItem from "./WhenItem.vue";
+
+const props = defineProps({
+  when: {
+    type: Object,
+    default: () => ({})
+  },
+  border: {
+    type: Boolean,
+    default: true
+  },
+  data: {
+    type: Array,
+    default: () => []
+  }
+})
+
+</script>
+
+<style scoped lang="less">
+.terms-warp {
+  flex: 1 1 0;
+  min-width: 0;
+}
+
+.terms-content {
+  display: flex;
+  gap: 12px;
+}
+
+.terms-group {
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  flex-shrink: 0;
+  user-select: none;
+
+  .terms-group-content {
+    position: relative;
+    display: flex;
+    padding: 8px 8px;
+    row-gap: 16px;
+    border-radius: 6px;
+
+    &.group-content-border {
+      border: 1px dashed #e0e0e0;
+    }
+
+    &.group-content-bg {
+      background-color: #fafafa;
+    }
+  }
+}
+
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  border: 1px solid #d9d9d9;
+  border-radius: 8px;
+  cursor: pointer;
+
+  &.type {
+    padding: 5px 10px;
+    height: 36px;
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue
new file mode 100644
index 00000000..35f7636f
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/Terms/WhenItem.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="terms-when-item">
+    <div v-if="showType"  class="dropdown-button type">
+      {{ TermTypeMap[value[3]] || value[3] }}
+    </div>
+    <div class="dropdown-button column">
+      <AIcon type='icon-zhihangdongzuoxie-1' />
+      {{ value[0] }}
+    </div>
+    <div v-if="showAlarm" class="dropdown-button alarm">
+      {{ value[4] }}
+    </div>
+    <div class="dropdown-button termType">
+      {{ TermsTypeMap[value[1]] || value[1] }}
+    </div>
+    <div v-if="_value" class="dropdown-button value">
+      <AIcon type='icon-canshu' />
+      {{ _value[0] }}
+    </div>
+    <div v-if="value[2][1]" class="dropdown-button value">
+      <AIcon type='icon-canshu' />
+      {{ _value[1] }}
+    </div>
+
+  </div>
+</template>
+
+<script setup name="WhenItem">
+import { TermTypeMap } from '../utils'
+
+const TermsTypeMap = {
+  eq: '等于',
+  neq: '不等于',
+  gt: '大于',
+  gte: '大于等于',
+  lt: '小于',
+  lte: '小于等于',
+  btw: '在...之间',
+  nbtw: '不在...之间',
+  time_gt_now: '距离当前时间大于',
+  time_lt_now: '距离当前时间小于',
+  in: '在...之中',
+  nin: '不在...之中',
+  like: '包含',
+  nlike: '不包含',
+  notnull: '不为空',
+  isnull: '为空'
+};
+
+const props = defineProps({
+  value: {
+    type: Array,
+    default: () => []
+  },
+  showType: {
+    type: Boolean,
+    default: false
+  },
+  data: {
+    type: Array,
+    default: () => []
+  }
+})
+
+const showAlarm = computed(() => {
+  return props.data.terms?.length
+})
+
+const _value = computed(() => {
+  if (['in', 'nin','contains_all', 'contains_any', 'not_contains', 'nbtw', 'btw',].includes(props.data.termType)) {
+    return props.data.value.value
+  }
+
+  return props.value[2]
+})
+
+</script>
+
+<style scoped lang="less">
+.terms-when-item {
+  display: flex;
+  gap: 6px;
+}
+
+.dropdown-button {
+  display: flex;
+  align-items: center;
+  padding: 6px 8px;
+  border: 1px solid #d9d9d9;
+  border-radius: 8px;
+  cursor: pointer;
+
+  &.column {
+    color: #00a4fe;
+    background-color: rgba(154, 219, 255, 0.3);
+    border-color: rgba(0, 164, 254, 0.3);
+  }
+
+  &.termType {
+    color: #13C2C2;
+    background: rgba(135, 232, 222, 0.3);
+    border: 1px solid rgba(54, 207, 201, 0.4);
+  }
+
+  &.value {
+    color: #692ca7;
+    background-color: rgba(188, 125, 238, 0.1);
+    border-color: rgba(188, 125, 238, 0.5);
+  }
+
+  &.type {
+    padding: 5px 10px;
+    margin-left: 8px;
+  }
+
+  &.alarm {
+    color: #2F54EB;
+    background: rgba(163, 202, 255, 0.3);
+    border: 1px solid rgba(47, 84, 235, 0.3);
+  }
+}
+
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/tags.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/tags.vue
new file mode 100644
index 00000000..bc8d1082
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/tags.vue
@@ -0,0 +1,70 @@
+<template>
+  <ResizeObserver
+    :onResize="onResize"
+  >
+    <div class="tags-warp" :style="styles">
+        <div v-for="item in tagOptions" class="tags-item">
+          <Ellipsis>
+            {{ item }}
+          </Ellipsis>
+        </div>
+        <div v-if="showMore" class="tags-item">
+          <AIcon type="EllipsisOutlined"/>
+        </div>
+    </div>
+  </ResizeObserver>
+</template>
+
+<script setup name="tags">
+import ResizeObserver from 'ant-design-vue/lib/vc-resize-observer';
+
+const props = defineProps({
+  tags: {
+    type: Array,
+    default: () => ([])
+  },
+  styles: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const showMore = ref(false)
+const warpWidth = ref(0)
+
+const onResize = ({ width }) => {
+  warpWidth.value = width
+}
+
+const tagOptions = computed(() => {
+  showMore.value = false
+  if (warpWidth.value) {
+    let max = warpWidth.value / (80 + 8)
+    if (max > props.tags.length) {
+      return props.tags
+    } else {
+      showMore.value = true
+      return props.tags.slice(0, max - 1)
+    }
+  }
+  return props.tags
+})
+
+</script>
+
+<style scoped lang="less">
+.tags-warp {
+  display: flex;
+  gap: 8px;
+  width: 100%;
+
+  .tags-item {
+    text-align: center;
+    color: #4096FF;
+    background-color: #F0F0F0;
+    border-radius: 2px;
+    padding: 4px 4px;
+    width: 80px;
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
index 4ac8d1e1..9585930c 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/Save/utils.ts
@@ -1,8 +1,8 @@
-import {send} from "vite";
 import {isArray, isBoolean, isObject} from "lodash-es";
 import {randomString} from "@/utils/utils";
+import {getImage} from "@/utils/comm";
 
-const TypeMap = {
+export const TermTypeMap = {
     'and': '并且',
     'or': '或者'
 }
@@ -111,8 +111,8 @@ const handleActions = (then: any): any[] => {
         if (item.executor === 'alarm') {
             actionsArr.push(
                 item.alarm.mode === 'trigger' ?
-                    '满足条件后将触发关联此条件的告警' :
-                    '满足条件后将解除关联此条件的告警'
+                    '满足条件后将触发关联告警' :
+                    '满足条件后将解除关联告警'
             )
         }
 
@@ -239,3 +239,88 @@ export const handleSceneBranches = (data: any): any[] => {
 
     return group
 }
+
+export const typeMap = new Map();
+typeMap.set('manual', {
+    text: '手动触发',
+    img: getImage('/scene/scene-hand.png'),
+    icon: getImage('/scene/trigger-type-icon/manual.png'),
+    tip: '适用于第三方平台向物联网平台下发指令控制设备',
+});
+typeMap.set('timer', {
+    text: '定时触发',
+    img: getImage('/scene/scene-timer.png'),
+    icon: getImage('/scene/trigger-type-icon/timing.png'),
+    tip: '适用于定期执行固定任务',
+});
+typeMap.set('device', {
+    text: '设备触发',
+    img: getImage('/scene/scene-device.png'),
+    icon: getImage('/scene/trigger-type-icon/device.png'),
+    tip: '适用于设备数据或行为满足触发条件时，执行指定的动作',
+});
+
+export const handleGroupAndFilter = (branches: any[], when: any[]) =>{
+    const group: any[] = []
+
+    if (!branches) return []
+
+    branches.forEach((item, index) => {
+        if (when) {
+            item.whenOptions = when[index]
+        }
+
+        if (index === 0 || item.executeAnyway) {
+            group.push({
+                branchName: item.branchName || item.whenOptions?.branchName || `条件${group.length + 1}`,
+                key: item.key || item.branchId,
+                children: []
+            })
+        }
+
+        const lastItem = group[group.length - 1]
+
+        if (item.then[0]?.actions.length) {
+            item.serial = item.then[0]?.actions
+        }
+
+        if (item.then[1]?.actions.length) {
+            item.parallel = item.then[1]?.actions
+        }
+
+        lastItem.children.push(item)
+    })
+    return group
+}
+
+export const handleActiveBranches = (branches: any[], activeKeys: any[]) => {
+    const branchesNames: string[] = []
+    const activeKeySet = new Set(activeKeys)
+    let invalid = false
+
+    branches.forEach((item) => {
+        let hasAlarmId = false
+
+        item.children.forEach(child => {
+            invalid = child.serial?.some(serial => !serial.actionId)
+            if (hasAlarmId === false) {
+
+                const status = child.serial?.some(serial => activeKeySet.has(serial.actionId)) || child.parallel?.some(parallel => activeKeySet.has(parallel.actionId))
+                if (status) {
+                    hasAlarmId = true
+                }
+            }
+        })
+
+        if (hasAlarmId) {
+            branchesNames.push(item.branchName)
+        }
+
+    })
+
+
+    return {
+        data: branchesNames,
+        invalid
+    }
+}
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/SceneDrawer.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/SceneDrawer.vue
new file mode 100644
index 00000000..9496320a
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/SceneDrawer.vue
@@ -0,0 +1,131 @@
+<template>
+  <a-drawer
+    visible
+    title="关联场景联动详情"
+    :width="600"
+    :closable="false"
+    :keyboard="false"
+    @close="onCancel"
+  >
+    <div class="scene-warp">
+      <TitleComponent data="基本信息" />
+      <j-descriptions size="small" :column="2" bordered>
+        <j-descriptions-item label="场景名称">
+          <j-ellipsis>{{ detail.name }}</j-ellipsis>
+        </j-descriptions-item>
+        <j-descriptions-item label="场景类型">{{ itemType.text }}</j-descriptions-item>
+      </j-descriptions>
+      <TitleComponent data="关联详情" style="margin: 12px 0;" />
+      <div class="branches-warp">
+        <BranchesTabs
+          :branchesGroup="branchesGroup"
+          :alarmId="id"
+          :branchesId="detail.id"
+          :activeKeys="activeKeys"
+          :show="true"
+          :showDetailBtn="false"
+          :showUnbindBtn="true"
+          :triggerType="detail.triggerType"
+          @select="handleBind"
+        />
+        <div v-if="loading" class="branches-loading">
+          <a-spin />
+        </div>
+      </div>
+    </div>
+  </a-drawer>
+</template>
+
+<script setup name="SceneDrawer">
+import {useRequest} from "@/hook";
+import {queryBindScene} from "@/api/rule-engine/configuration";
+import {handleGroupAndFilter, typeMap} from "./Save/utils";
+import BranchesTabs from './Save/BranchesTabs.vue'
+import { unBindAlarm, bindScene } from "@/api/rule-engine/configuration";
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: undefined
+  },
+  detail: {
+    type: Object,
+    default: () => ({})
+  }
+});
+
+const emit = defineEmits(['cancel'])
+
+const loading = ref(false)
+
+const itemType = computed(() => {
+  return typeMap.get(props.detail.triggerType) || {}
+})
+
+const branchesGroup = computed(() => {
+  return handleGroupAndFilter(props.detail.branches, props.detail.options?.when || [])
+})
+
+const { data: activeKeys } = useRequest(queryBindScene, {
+  defaultParams: { terms: [{ column: 'alarmId', value: props.id}]},
+  onSuccess(res) {
+    const activeMap = res.result.data.reduce((prev, next) => {
+      if (props.detail.id === next.ruleId) {
+        prev.push(next.branchIndex)
+      }
+      return prev
+    }, [])
+    return activeMap || []
+  },
+  defaultValue: []
+})
+
+const onCancel = () => {
+  emit('cancel')
+}
+
+const handleBind = (id, selected) => {
+  loading.value = true
+  if (selected) { //
+    bindScene([{
+      alarmId: props.id,
+      ruleId: props.detail.id,
+      branchIndex: id
+    }]).then(res => {
+      activeKeys.value.push(id)
+    }).finally(() => {
+      loading.value = false
+    })
+  } else {
+    unBindAlarm(props.detail.id, props.id, [id]).then(res => {
+      activeKeys.value = activeKeys.value.filter(key => key !== id)
+    }).finally(() => {
+      loading.value = false
+    })
+  }
+}
+
+</script>
+
+<style scoped lang="less">
+.scene-warp {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+
+  .branches-warp {
+    flex: 1 1 0;
+    min-height: 0;
+    overflow-y: auto;
+    position: relative;
+
+    .branches-loading {
+      position: absolute;
+      top: 0;
+      left: 0;
+      height: 0;
+      padding: 20%;
+    }
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
index e36e8078..6cc50191 100644
--- a/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/Save/Scene/index.vue
@@ -1,178 +1,146 @@
 <template>
-    <FullPage>
-        <JProTable
-            model="CARD"
-            :request="queryTable"
-            :defaultParams="{
+  <FullPage>
+    <JProTable
+      model="CARD"
+      :request="queryTable"
+      :gridColumns="[1, 2, 3]"
+      :defaultParams="{
                 sorts: [{ name: 'createTime', order: 'desc' }],
-                terms,
+                terms: [
+                  {
+                      terms: [
+                          {
+                              column: 'id',
+                              termType: 'alarm-bind-rule',
+                              value: id,
+                          },
+                      ],
+                      type: 'and',
+                  },
+              ],
             }"
-            ref="actionRef"
+      ref="actionRef"
+    >
+      <template #headerTitle>
+        <j-space>
+          <PermissionButton
+            type="primary"
+            @click="showModal"
+            hasPermission="rule-engine/Alarm/Configuration:add"
+          >
+            <template #icon>
+              <AIcon type="PlusOutlined"/>
+            </template>
+            新增
+          </PermissionButton>
+        </j-space>
+      </template>
+      <template #card="slotProps">
+        <SceneCardBox
+          :value="slotProps"
+          :status="slotProps.state?.value"
+          :statusText="slotProps.state?.text"
+          :alarmId="id"
+          :activeKeys="activeKeys[slotProps.id]"
+          :showMask="false"
+          :showBranches="false"
+          :showBindTags="true"
+          :showRule="false"
+          @click="handleView(slotProps)"
         >
-            <template #headerTitle>
-                <j-space>
-                    <PermissionButton
-                        type="primary"
-                        @click="showModal"
-                        hasPermission="rule-engine/Alarm/Configuration:add"
-                    >
-                        <template #icon><AIcon type="PlusOutlined" /></template>
-                        新增
-                    </PermissionButton>
-                </j-space>
-            </template>
-            <template #card="slotProps">
-                <CardBox
-                    :value="slotProps"
-                    :actions="getActions(slotProps, 'card')"
-                    :status="slotProps.state?.value"
-                    :statusText="slotProps.state?.text"
-                    :statusNames="{
-                        started: 'processing',
-                        disable: 'error',
-                    }"
-                    @click="handleView(slotProps.id, slotProps.triggerType)"
-                >
-                    <template #type>
-                        <span
-                            ><img
-                                :height="16"
-                                :src="typeMap.get(slotProps.triggerType)?.icon"
-                                style="margin-right: 5px"
-                            />{{
-                                typeMap.get(slotProps.triggerType)?.text
-                            }}</span
-                        >
-                    </template>
-                    <template #img>
-                        <img :src="typeMap.get(slotProps.triggerType)?.img" />
-                    </template>
-                    <template #content>
-                      <div style="height: 102px;">
-                        <Ellipsis style="width: calc(100% - 100px)">
-                            <span style="font-size: 16px; font-weight: 600">
-                                {{ slotProps.name }}
-                            </span>
-                        </Ellipsis>
-                        <div v-if="slotProps.branchName">
-                          {{ slotProps.branchName }}
-                        </div>
-                        <Ellipsis :lineClamp="2">
-                            <div class="subTitle">
-                                说明：{{
-                                    slotProps?.description ||
-                                    typeMap.get(slotProps.triggerType)?.tip
-                                }}
-                            </div>
-                        </Ellipsis>
-                      </div>
-                    </template>
-                    <template #actions="item">
-                        <PermissionButton
-                            :disabled="item.disabled"
-                            :popConfirm="item.popConfirm"
-                            :tooltip="{
-                                ...item.tooltip,
-                            }"
-                            @click="item.onClick"
-                            :hasPermission="'rule-engine/Scene:' + item.key"
-                        >
-                            <AIcon
-                                type="DeleteOutlined"
-                                v-if="item.key === 'delete'"
-                            />
-                            <template v-else>
-                                <AIcon :type="item.icon" />
-                                <span>{{ item?.text }}</span>
-                            </template>
-                        </PermissionButton>
-                    </template>
-                </CardBox>
-            </template>
-        </JProTable>
-    </FullPage>
-    <Save
-        :id="id"
-        :type="configurationData.current?.targetType"
-        @close-save="closeSave"
-        @save-scene="saveSuccess"
-        v-if="visible"
-    ></Save>
+          <div class="scene-view">
+            查看详情
+          </div>
+        </SceneCardBox>
+      </template>
+    </JProTable>
+  </FullPage>
+  <Save
+    v-if="visible"
+    :id="id"
+    :type="configurationData.current?.targetType"
+    @close-save="closeSave"
+    @save-scene="saveSuccess"
+  ></Save>
+
+  <SceneDrawer
+    v-if="scene.visible"
+    :detail="scene.detail"
+    :id="id"
+    @cancel="sceneCancel"
+  />
+
 </template>
 
 <script lang="ts" setup>
-import { queryBranch , query} from '@/api/rule-engine/scene';
-import { unbindScene } from '@/api/rule-engine/configuration';
-import { useRoute } from 'vue-router';
-import type { ActionsType } from '@/components/Table';
-import { getImage, onlyMessage } from '@/utils/comm';
+import {query} from '@/api/rule-engine/scene';
+import {queryBindScene, unbindScene} from '@/api/rule-engine/configuration';
+import {useRoute} from 'vue-router';
+import type {ActionsType} from '@/components/Table';
+import {onlyMessage} from '@/utils/comm';
 import Save from './Save/index.vue';
-import { useAlarmConfigurationStore } from '@/store/alarm';
-import { storeToRefs } from 'pinia';
-import { useMenuStore } from 'store/menu';
+import {useAlarmConfigurationStore} from '@/store/alarm';
+import {storeToRefs} from 'pinia';
+import {useMenuStore} from 'store/menu';
+import SceneDrawer from './SceneDrawer.vue'
+import SceneCardBox from './Save/CardBox.vue'
+import {useRequest} from "@/hook";
+
 const menuStory = useMenuStore();
 const route = useRoute();
 const id = route.query?.id;
 
 const alarmConfigurationStore = useAlarmConfigurationStore();
-const { configurationData } = storeToRefs(alarmConfigurationStore);
+const {configurationData} = storeToRefs(alarmConfigurationStore);
+const scene = reactive({
+  visible: false,
+  detail: undefined
+})
 
-const terms = [
-    {
-        terms: [
-            {
-                column: 'id',
-                termType: 'alarm-bind-rule',
-                value: id,
-            },
-        ],
-        type: 'and',
-    },
-];
 const actionRef = ref();
-const typeMap = new Map();
-typeMap.set('manual', {
-    text: '手动触发',
-    img: getImage('/scene/scene-hand.png'),
-    icon: getImage('/scene/trigger-type-icon/manual.png'),
-    tip: '适用于第三方平台向物联网平台下发指令控制设备',
-});
-typeMap.set('timer', {
-    text: '定时触发',
-    img: getImage('/scene/scene-timer.png'),
-    icon: getImage('/scene/trigger-type-icon/timing.png'),
-    tip: '适用于定期执行固定任务',
-});
-typeMap.set('device', {
-    text: '设备触发',
-    img: getImage('/scene/scene-device.png'),
-    icon: getImage('/scene/trigger-type-icon/device.png'),
-    tip: '适用于设备数据或行为满足触发条件时，执行指定的动作',
-});
+
+const {data: activeKeys, reload} = useRequest(queryBindScene, {
+  defaultParams: {terms: [{column: 'alarmId', value: id}]},
+  onSuccess(res) {
+    const activeMap = res.result.data.reduce((prev, next) => {
+
+      if (prev[next.ruleId]) {
+        prev[next.ruleId].push(next.branchIndex)
+      } else {
+        prev[next.ruleId] = [next.branchIndex]
+      }
+      return prev
+    }, {})
+    return activeMap || {}
+  },
+  defaultValue: {}
+})
+
 const getActions = (
-    data: Partial<Record<string, any>>,
-    type: 'card' | 'table',
+  data: Partial<Record<string, any>>,
+  type: 'card' | 'table',
 ): ActionsType[] => {
-    if (!data) return [];
-    const actions: ActionsType[] = [
-        {
-            key: 'action',
-            text: '解绑',
-            icon: 'DisconnectOutlined',
-            popConfirm: {
-                title: '确定解绑？',
-                onConfirm: async () => {
-                    // const res = await unbindScene(id, [data.id], data.branchIndex);
-                    const res = await unbindScene(id, [data.id]);
-                    if (res.status === 200) {
-                        onlyMessage('操作成功');
-                        actionRef.value.reload();
-                    }
-                },
-            },
+  if (!data) return [];
+  const actions: ActionsType[] = [
+    {
+      key: 'action',
+      text: '解绑',
+      icon: 'DisconnectOutlined',
+      popConfirm: {
+        title: '确认解绑？',
+        onConfirm: async () => {
+          // const res = await unbindScene(id, [data.id], data.branchIndex);
+          const res = await unbindScene(id, [data.id]);
+          if (res.status === 200) {
+            onlyMessage('操作成功');
+            actionRef.value.reload();
+          }
+          return
         },
-    ];
-    return actions;
+      },
+    },
+  ];
+  return actions;
 };
 
 const queryTable = (_terms: any) => {
@@ -180,37 +148,61 @@ const queryTable = (_terms: any) => {
 }
 
 const visible = ref(false);
-const log = () => {
-    console.log();
-};
-log();
+
+
 const showModal = () => {
-    visible.value = true;
+  visible.value = true;
 };
 const closeSave = () => {
-    visible.value = false;
+  visible.value = false;
 };
 const saveSuccess = () => {
-    visible.value = false;
-    actionRef.value.reload();
+  visible.value = false;
+  actionRef.value.reload();
+  reload()
 };
 /**
  * 查看
- * @param id
- * @param triggerType 触发类型
+ * @param record
  */
- const handleView = (id: string, triggerType: string) => {
-    menuStory.jumpPage(
-        'rule-engine/Scene/Save',
-        {},
-        { triggerType: triggerType, id, type: 'view' },
-    );
+const handleView = (record: Record<string, any>) => {
+  scene.detail = record
+  scene.visible = true
 };
+
+const sceneCancel = () => {
+  scene.visible = false
+  scene.detail = undefined
+  actionRef.value?.reload()
+}
 </script>
 <style lang="less" scoped>
 .subTitle {
-    color: rgba(0, 0, 0, 0.65);
-    font-size: 14px;
-    margin-top: 10px;
+  color: rgba(0, 0, 0, 0.65);
+  font-size: 14px;
+  margin-top: 10px;
+}
+
+.scene-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  z-index: 999;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  font-size: 16px;
+  height: 100%;
+  color: transparent;
+  padding-top: 30px;
+  background-color: rgba(#000, 0);
+  cursor: pointer;
+  transition: background-color 0.3s;
+
+  &:hover {
+    background-color: rgba(#000, 0.4);
+    color: #fff;
+  }
 }
 </style>
diff --git a/src/views/rule-engine/Alarm/Configuration/index.vue b/src/views/rule-engine/Alarm/Configuration/index.vue
index bdc10246..4d555023 100644
--- a/src/views/rule-engine/Alarm/Configuration/index.vue
+++ b/src/views/rule-engine/Alarm/Configuration/index.vue
@@ -63,49 +63,45 @@
                                 </slot>
                             </template>
                             <template #content>
-                                <Ellipsis style="width: calc(100% - 100px)">
-                                    <span
-                                        style="
-                                            font-weight: 600;
-                                            font-size: 16px;
-                                        "
+                                <a-row>
+                                    <Ellipsis
+                                        style="max-width: calc(100% - 120px)"
                                     >
-                                        {{ slotProps.name }}
-                                    </span>
-                                </Ellipsis>
-                                <j-row>
-                                    <j-col :span="12">
-                                        <div class="content-des-title">
-                                            关联场景联动
-                                        </div>
-                                        <Ellipsis style="margin-bottom: 18px"
-                                            ><div>
-                                                {{
-                                                    (slotProps?.scene || [])
-                                                        .map(
-                                                            (item: any) =>
-                                                                item?.name,
-                                                        )
-                                                        .join(',') || ''
-                                                }}
-                                            </div></Ellipsis
+                                        <span
+                                            style="
+                                                font-weight: 600;
+                                                font-size: 16px;
+                                            "
                                         >
+                                            {{ slotProps.name }}
+                                        </span>
+                                    </Ellipsis>
+                                </a-row>
+                                <a-row>
+                                    <j-col :span="12">
+                                        <div class="card-item-content-text">
+                                            说明
+                                        </div>
+                                        <div style="height: 22px; width: 100%">
+                                            <Ellipsis style="max-width: 100%">
+                                                {{ slotProps.description }}
+                                            </Ellipsis>
+                                        </div>
                                     </j-col>
                                     <j-col :span="12">
-                                        <div class="content-des-title">
+                                        <div class="card-item-content-text">
                                             告警级别
                                         </div>
-                                        <Ellipsis>
-                                            {{
-                                                (defaultLevel || []).find(
-                                                    (item: any) =>
-                                                        item?.level ===
-                                                        slotProps.level,
-                                                )?.title || slotProps.level
-                                            }}
-                                        </Ellipsis>
+                                        <div style="display: flex">
+                                            <LevelIcon
+                                                :level="slotProps.level"
+                                            ></LevelIcon>
+                                            <Ellipsis>
+                                                {{ levelMap[slotProps.level] }}
+                                            </Ellipsis>
+                                        </div>
                                     </j-col>
-                                </j-row>
+                                </a-row>
                             </template>
                             <template #actions="item">
                                 <PermissionButton
@@ -133,22 +129,7 @@
                     <template #targetType="slotProps">
                         <span>{{ map[slotProps.targetType] }}</span>
                     </template>
-                    <template #level="slotProps">
-                        <Ellipsis>
-                            {{
-                                (defaultLevel || []).find(
-                                    (item) => item?.level === slotProps.level,
-                                )?.title || slotProps.level
-                            }}
-                        </Ellipsis>
-                    </template>
-                    <template #scene="slotProps">
-                        <span>{{
-                            (slotProps?.scene || [])
-                                .map((item) => item?.name)
-                                .join(',') || ''
-                        }}</span>
-                    </template>
+
                     <template #state="slotProps">
                         <BadgeStatus
                             :text="
@@ -163,6 +144,14 @@
                             }"
                         />
                     </template>
+                    <template #level="slotProps">
+                        <div style="display: flex">
+                            <LevelIcon :level="slotProps.level"></LevelIcon>
+                            <Ellipsis>
+                                {{ levelMap[slotProps.level] }}
+                            </Ellipsis>
+                        </div>
+                    </template>
                     <template #action="slotProps">
                         <j-space :size="16">
                             <template
@@ -209,20 +198,24 @@ import {
     _enable,
     _disable,
     remove,
-    getScene,
 } from '@/api/rule-engine/configuration';
+import { query } from '@/api/rule-engine/log';
 import { queryLevel } from '@/api/rule-engine/config';
 import type { ActionsType } from '@/components/Table/index.vue';
 import { getImage, onlyMessage } from '@/utils/comm';
 import { useMenuStore } from '@/store/menu';
-import encodeQuery from '@/utils/encodeQuery';
 import HandTrigger from './HandTrigger/index.vue';
+import { Modal } from 'ant-design-vue';
+import { useAlarmLevel } from '@/hook';
 
 const params = ref<Record<string, any>>({});
-let isAdd = ref<number>(0);
-let title = ref<string>('');
 const tableRef = ref<Record<string, any>>({});
 const menuStory = useMenuStore();
+const { levelMap } = useAlarmLevel();
+const visibleDelete = ref(false);
+const configId = ref();
+const deleteState = ref(false);
+const alarmRecordNumber = ref(0);
 const columns = [
     {
         title: '配置名称',
@@ -231,7 +224,7 @@ const columns = [
         search: {
             type: 'string',
         },
-        width: 220,
+        width: 300,
         ellipsis: true,
     },
     {
@@ -260,7 +253,38 @@ const columns = [
                 },
             ],
         },
-        width: 100,
+        width: 150,
+    },
+    {
+        title: '关联场景联动',
+        dataIndex: 'scene',
+        hideInTable:true,
+        key: 'scene',
+        search: {
+            type: 'select',
+            options: async () => {
+                const allData = await queryList({
+                    paging: false,
+                    sorts: [{ name: 'createTime', order: 'desc' }],
+                });
+                const result = allData.result?.data as any[];
+                if (allData.success && result && result.length) {
+                    const sceneDataMap = new Map(); // 用于去重
+                    result.forEach((item) => {
+                        item.scene.forEach((a: any) => {
+                            sceneDataMap.set(a.id, {
+                                label: a.name,
+                                value: a.id,
+                            });
+                        });
+                    });
+                    return [...sceneDataMap.values()];
+                }
+                return [];
+            },
+        },
+        width: 220,
+        ellipsis: true,
     },
     {
         title: '告警级别',
@@ -282,52 +306,7 @@ const columns = [
                 return [];
             },
         },
-        width: 200,
-    },
-    {
-        title: '关联场景联动',
-        dataIndex: 'scene',
-        scopedSlots: true,
-        key: 'scene',
-        search: {
-            type: 'select',
-            // defaultTermType: 'rule-bind-alarm',
-            options: async () => {
-                const allData = await queryList({
-                    paging: false,
-                    sorts: [{ name: 'createTime', order: 'desc' }],
-                });
-                const result = allData.result?.data as any[];
-                if (allData.success && result && result.length) {
-                    const sceneDataMap = new Map(); // 用于去重
-                    result.forEach((item) => {
-                        item.scene.forEach((a: any) => {
-                            sceneDataMap.set(a.id, {
-                                label: a.name,
-                                value: a.id,
-                            });
-                        });
-                    });
-
-                    return [...sceneDataMap.values()];
-                }
-
-                // const res = await getScene(
-                //     encodeQuery({
-                //         sorts: { createTime: 'desc' },
-                //     }),
-                // );
-                // if (res.status === 200) {
-                //     return res.result.map((item: any) => ({
-                //         label: item.name,
-                //         value: item.id,
-                //     }));
-                // }
-                return [];
-            },
-        },
-        width: 220,
-        ellipsis: true,
+        width: 150,
     },
     {
         title: '状态',
@@ -347,7 +326,7 @@ const columns = [
                 },
             ],
         },
-        width: 90,
+        width: 120,
     },
     {
         title: '说明',
@@ -362,15 +341,13 @@ const columns = [
         title: '操作',
         key: 'action',
         fixed: 'right',
-        width: 120,
+        width: 170,
         scopedSlots: true,
     },
 ];
 const visible = ref<boolean>(false);
 const current = ref<any>({});
 
-const defaultLevel = ref<any[]>([]);
-
 const map = {
     product: '产品',
     device: '设备',
@@ -378,32 +355,9 @@ const map = {
     other: '其他',
 };
 const handleSearch = (e: any) => {
-    const _terms = (e?.terms || []).map((item: any) => {
-        item.terms = item.terms.map((i: any) => {
-            if (i.column === 'scene') {
-                return {
-                    ...i,
-                    termType: 'rule-bind-alarm',
-                    column: 'id',
-                };
-            }
-            return i;
-        });
-        return item;
-    });
-    params.value = {
-        ...e,
-        terms: _terms,
-    };
+    params.value = e;
 };
-const queryDefaultLevel = () => {
-    queryLevel().then((res) => {
-        if (res.status === 200) {
-            defaultLevel.value = res.result?.levels || [];
-        }
-    });
-};
-queryDefaultLevel();
+
 const getActions = (
     data: Partial<Record<string, any>>,
     type?: 'card' | 'table',
@@ -426,7 +380,7 @@ const getActions = (
                 visible.value = true;
                 current.value = data;
             },
-            icon: 'LikeOutlined',
+            icon: 'icon-shoudongchufa',
         },
         {
             key: 'update',
@@ -473,6 +427,7 @@ const getActions = (
                     } else {
                         onlyMessage('操作失败！', 'error');
                     }
+                    return;
                 },
             },
         },
@@ -487,17 +442,40 @@ const getActions = (
                         : '删除',
                 placement: 'topLeft',
             },
-            popConfirm: {
-                title: '确认删除?',
-                onConfirm: async () => {
-                    const resp = await remove(data.id);
-                    if (resp.status === 200) {
-                        onlyMessage('操作成功！');
-                        tableRef.value?.reload();
-                    } else {
-                        onlyMessage('操作失败！', 'error');
-                    }
-                },
+            onClick: async () => {
+                if (deleteState.value) {
+                    return;
+                }
+                deleteState.value = true;
+                const params = {
+                    paging: false,
+                    terms: [
+                        {
+                            termType: 'eq',
+                            column: 'alarmConfigId',
+                            value: data.id,
+                            type: 'and',
+                        },
+                    ],
+                };
+                const res = await query(params);
+                if (res.success) {
+                    alarmRecordNumber.value = res.result?.total || 0;
+                }
+                Modal.confirm({
+                    title: alarmRecordNumber.value
+                        ? `删除告警配置将同步删除相关联的${alarmRecordNumber.value}条告警记录,确认删除？`
+                        : '确认删除？',
+                    onOk() {
+                        return deleteConfig(data.id);
+                    },
+                    onCancel() {
+                        deleteState.value = false;
+                    },
+                });
+
+                visibleDelete.value = true;
+                configId.value = data.id;
             },
             icon: 'DeleteOutlined',
         },
@@ -513,9 +491,31 @@ const onSave = () => {
 const add = () => {
     menuStory.jumpPage('rule-engine/Alarm/Configuration/Save');
 };
+
+const deleteConfig = async (id: any) => {
+    const resp = await remove(id);
+    if (resp.success) {
+        onlyMessage('操作成功！');
+        refreshTable();
+    } else {
+        onlyMessage('操作失败！', 'error');
+    }
+    deleteState.value = false;
+};
+
+const refreshTable = () => {
+    visibleDelete.value = false;
+    tableRef.value.reload();
+};
 </script>
 <style lang="less" scoped>
 .content-des-title {
     font-size: 12px;
 }
+
+.card-item-content-text {
+    width: 100%;
+    margin-top: 16px;
+    margin-bottom: 8px;
+}
 </style>
diff --git a/src/views/rule-engine/Alarm/Log/Detail/info.vue b/src/views/rule-engine/Alarm/Log/Detail/info.vue
index eef73256..6ccd88eb 100644
--- a/src/views/rule-engine/Alarm/Log/Detail/info.vue
+++ b/src/views/rule-engine/Alarm/Log/Detail/info.vue
@@ -9,32 +9,17 @@
         @cancel="closeModal"
     >
         <j-descriptions bordered :column="2">
-            <j-descriptions-item
-                v-if="props.data.targetType === 'device'"
-                label="告警设备"
-                :span="1"
-                >{{ props.data?.targetName || '' }}</j-descriptions-item
-            >
-            <j-descriptions-item
-                v-if="props.data.targetType === 'device'"
-                label="设备ID"
-                :span="1"
-                >{{ props.data?.targetId || '' }}</j-descriptions-item
-            >
             <j-descriptions-item label="告警名称" :span="1">{{
-                props.data?.alarmConfigName
+                data?.alarmConfigName
             }}</j-descriptions-item>
             <j-descriptions-item label="告警时间" :span="1">{{
-                dayjs(props.data?.alarmTime).format('YYYY-MM-DD HH:mm:ss')
+                dayjs(data?.alarmTime).format('YYYY-MM-DD HH:mm:ss')
             }}</j-descriptions-item>
             <j-descriptions-item label="告警级别" :span="1">
-                <j-tooltip
-                    placement="topLeft"
-                    :title="_level"
-                >
+                <j-tooltip placement="topLeft" :title="levelMap?.[data?.level] || data?.level">
                     <Ellipsis>
                         <span>
-                            {{_level}}
+                           {{ levelMap?.[data?.level] || data?.level}}
                         </span>
                     </Ellipsis>
                 </j-tooltip>
@@ -42,15 +27,16 @@
             <j-descriptions-item label="告警说明" :span="1">
                 <Ellipsis style="width: calc(100% - 20px)">
                     <span>
-                        {{ description || '' }}
+                        {{ data?.description || '' }}
                     </span>
                 </Ellipsis>
             </j-descriptions-item>
             <j-descriptions-item label="告警流水" :span="2"
                 ><div style="max-height: 500px; overflow-y: auto">
                     <JsonViewer
-                        :value="data"
-                        :expanded="true" :expandDepth="4" 
+                        :value="runningWater"
+                        :expanded="true"
+                        :expandDepth="4"
                     ></JsonViewer></div
             ></j-descriptions-item>
         </j-descriptions>
@@ -58,34 +44,21 @@
 </template>
 
 <script lang="ts" setup>
-import { queryLevel } from '@/api/rule-engine/config';
 import dayjs from 'dayjs';
 import JsonViewer from 'vue-json-viewer';
+import { useAlarmLevel } from '@/hook';
 const props = defineProps({
     data: Object,
-    description: String,
 });
-const data = computed(()=>{
+const runningWater = computed(() => {
     return JSON.parse(props.data?.alarmInfo);
-})
-const defaultLevel = ref<any[]>([])
+});
+const { levelMap } = useAlarmLevel();
 
 const emit = defineEmits(['close']);
 const closeModal = () => {
     emit('close');
 };
 
-const _level = computed(() => {
-    return (defaultLevel.value || []).find((item: any) => item?.level === props.data?.level)?.title || props.data?.level
-})
-
-onMounted(() => {
-    queryLevel().then((res)=>{
-        if(res.status === 200 ){
-            defaultLevel.value = res.result?.levels || [];
-        }
-    })
-})
 </script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/src/views/rule-engine/Alarm/Log/Record/index.vue b/src/views/rule-engine/Alarm/Log/Record/index.vue
index 990c312b..5f2a3837 100644
--- a/src/views/rule-engine/Alarm/Log/Record/index.vue
+++ b/src/views/rule-engine/Alarm/Log/Record/index.vue
@@ -29,7 +29,10 @@
                     </span>
                 </template>
                 <template #handleType="slotProps">
-                    <span>{{ slotProps.handleType.text }}</span>
+                    <span>{{ slotProps.handleType?.text }}</span>
+                </template>
+                <template #alarmDuration="slotProps">
+                    <Ellipsis><Duration :data="slotProps" /></Ellipsis>
                 </template>
                 <template #alarmTime="slotProps">
                     <span>
@@ -49,6 +52,7 @@
 import { queryHandleHistory } from '@/api/rule-engine/log';
 import dayjs from 'dayjs';
 import { useRoute } from 'vue-router';
+import Duration from '../components/Duration.vue';
 const route = useRoute();
 const id = route.query?.id;
 const terms = [
@@ -98,10 +102,17 @@ const columns = [
         search: {
             type: 'date',
         },
-        width:180,
+        width: 180,
     },
     {
-        title: '告警处理',
+        title: '告警持续时长',
+        dataIndex: 'alarmDuration',
+        key: 'alarmDuration',
+        scopedSlots: true,
+        width: 180,
+    },
+    {
+        title: '处理结果',
         dataIndex: 'description',
         key: 'description',
         ellipsis: true,
@@ -119,6 +130,18 @@ const emit = defineEmits(['closeLog']);
 const handleSearch = (e: any) => {
     params.value = e;
 };
+const calculateDuration = (startTime, endTime) => {
+    const diffInSeconds = endTime.diff(startTime, 'second');
+    let result;
+
+    if (diffInSeconds < 60) {
+        result = `${diffInSeconds.toFixed(1)} s`;
+    } else if (diffInSeconds < 3600) {
+        result = `${(diffInSeconds / 60).toFixed(1)} min`;
+    } else {
+        result = `${(diffInSeconds / 3600).toFixed(1)} h`;
+    }
+    return result;
+};
 </script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue b/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue
index 82aa2eac..57705464 100644
--- a/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue
+++ b/src/views/rule-engine/Alarm/Log/SolveComponent/index.vue
@@ -12,6 +12,7 @@
         <j-form :rules="rules" layout="vertical" ref="formRef" :model="form">
             <j-form-item label="处理结果" name="describe">
                 <j-textarea
+                    :disabled="solveType === 'view'"
                     :rows="8"
                     :maxlength="200"
                     showCount
@@ -30,6 +31,14 @@ const props = defineProps({
     data: {
         type: Object,
     },
+    solveType: {
+        type: String,
+        default: 'handle',
+    },
+    handleDes: {
+        type: String,
+        default: '',
+    },
 });
 const loading = ref<boolean>(false);
 const formRef = ref();
@@ -44,12 +53,15 @@ const rules = {
 const form = reactive({
     describe: '',
 });
-let visible = ref(true);
-const emit = defineEmits(['closeSolve'])
+const emit = defineEmits(['closeSolve', 'refresh']);
 const handleCancel = () => {
     emit('closeSolve');
 };
 const handleSave = () => {
+    if (props.solveType === 'view') {
+        emit('closeSolve');
+        return;
+    }
     loading.value = true;
     formRef.value
         .validate()
@@ -58,13 +70,13 @@ const handleSave = () => {
                 describe: form.describe,
                 type: 'user',
                 state: 'normal',
-                alarmRecordId: props.data?.current?.id || '',
-                alarmConfigId: props.data?.current?.alarmConfigId || '',
-                alarmTime: props?.data?.current?.alarmTime || '',
+                alarmRecordId: props.data?.id || '',
+                alarmConfigId: props.data?.alarmConfigId || '',
+                alarmTime: props?.data?.alarmTime || '',
             });
             if (res.status === 200) {
                 onlyMessage('操作成功！');
-                emit('closeSolve');
+                emit('refresh');
             } else {
                 onlyMessage('操作失败！', 'error');
             }
@@ -75,6 +87,8 @@ const handleSave = () => {
             loading.value = false;
         });
 };
+onMounted(() => {
+    props.solveType === 'view' ? form.describe = props.handleDes : '';
+});
 </script>
-<style lang="less" scoped>
-</style>
\ No newline at end of file
+<style lang="less" scoped></style>
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/components/DetailDrawer.vue b/src/views/rule-engine/Alarm/Log/TabComponent/components/DetailDrawer.vue
new file mode 100644
index 00000000..ae3a5c8a
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/components/DetailDrawer.vue
@@ -0,0 +1,148 @@
+<template>
+    <a-drawer
+        :visible="true"
+        width="1000"
+        :destroyInactiveTabPane="true"
+        @close="closeDrawer"
+    >
+        <template #title>
+            <div class="alarmInfo">
+                <div>
+                    <div class="alarmTitle">
+                        <span class="alarmType">{{
+                            typeMap.get(AlarmData?.targetType)
+                        }}</span>
+                        <div>
+                            <Ellipsis style="max-width: 200px">{{
+                                AlarmData?.alarmName
+                            }}</Ellipsis>
+                        </div>
+                        <LevelIcon :level="AlarmData.level"></LevelIcon>
+                    </div>
+                    <div style="font-size: 12px; margin-left: 10px; margin-top:5px">
+                        {{ AlarmData?.description || '暂无说明' }}
+                    </div>
+                </div>
+                <div class="alarmInfoRight">
+                    <div>
+                        <BadgeStatus
+                            :status="AlarmData?.state.value"
+                            :statusNames="{
+                                warning: 'error',
+                                normal: 'default',
+                            }"
+                        >
+                        </BadgeStatus
+                        ><span>
+                            {{ AlarmData?.state.text }}
+                        </span>
+                        <a-button
+                            v-if="AlarmData?.state.value === 'warning'"
+                            type="link"
+                            @click="dealAlarm"
+                            >处理</a-button
+                        >
+                    </div>
+                </div>
+            </div>
+        </template>
+
+        <a-radio-group
+            v-model:value="activeKey"
+            button-style="solid"
+            style="margin: 20px 0"
+        >
+            <a-radio-button value="record">处理记录</a-radio-button>
+            <a-radio-button value="logs">告警日志</a-radio-button>
+        </a-radio-group>
+        <Record
+            :currentId="AlarmData.id"
+            ref="RecordRef"
+            v-if="activeKey === 'record'"
+        ></Record>
+        <Log
+            :currentId="AlarmData.id"
+            :configId="AlarmData.alarmConfigId"
+            v-else
+        />
+    </a-drawer>
+    <SolveComponent
+        v-if="solveVisible"
+        @closeSolve="closeSolve"
+        @refresh="refresh"
+        :data="AlarmData"
+    />
+</template>
+
+<script setup name="LogDrawer">
+import { query } from '@/api/rule-engine/log';
+import Record from './Record.vue';
+import Log from './Log.vue';
+import SolveComponent from '../../SolveComponent/index.vue';
+const props = defineProps({
+    logData: {
+        type: Object,
+        default: {},
+    },
+    typeMap: {
+        type: Object,
+        default: {},
+    },
+    levelMap: {
+        type: Object,
+        default: {},
+    },
+});
+const emit = defineEmits(['closeDrawer', 'refreshTable']);
+const solveVisible = ref(false);
+const RecordRef = ref();
+const AlarmData = ref(props.logData);
+const activeKey = ref('record');
+const closeDrawer = () => {
+    emit('closeDrawer');
+};
+const dealAlarm = () => {
+    solveVisible.value = true;
+};
+const closeSolve = () => {
+    solveVisible.value = false;
+};
+
+const refresh = async () => {
+    solveVisible.value = false;
+    const res = await query({
+        terms: [
+            {
+                column: 'id',
+                value: props.logData.id,
+                type: 'and',
+            },
+        ],
+    });
+    if (res.success) {
+        AlarmData.value = res.result.data[0];
+        if (activeKey.value === 'record') {
+            RecordRef?.value.refreshRecord();
+        }
+    }
+    emit('refreshTable');
+};
+</script>
+<style lang="less" scoped>
+.alarmInfo {
+    display: flex;
+    justify-content: space-between;
+    .alarmType {
+        background-color: #e6f4ff;
+        padding: 2px 8px;
+        margin-right: 10px;
+        color: #1677ff;
+    }
+    .alarmTitle {
+        display: flex;
+    }
+    .alarmInfoRight {
+        text-align: right;
+    }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue b/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
new file mode 100644
index 00000000..3513d9a3
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/components/Log.vue
@@ -0,0 +1,164 @@
+<template>
+    <a-table
+        :dataSource="dataSource"
+        :columns="columns"
+        :pagination="false"
+        bordered
+        :scroll="{ y: 'calc(100vh - 300px)' }"
+    >
+        <template #bodyCell="{ column, text, record }">
+            <template v-if="column.dataIndex === 'alarmTime'"
+                ><span
+                    >{{ dayjs(text).format('YYYY-MM-DD HH:mm:ss')
+                    }}</span
+            ></template>
+            <template v-if="column.dataIndex === 'sourceId'">
+                <Ellipsis>
+                    设备ID：
+                    <span class="deviceId" @click="() => gotoDevice(text)">{{
+                        text
+                    }}</span></Ellipsis
+                >
+            </template>
+            <template
+                v-if="
+                    column.dataIndex === 'triggerDesc' ||
+                    column.dataIndex === 'actualDesc'
+                "
+                ><Ellipsis>{{ text }}</Ellipsis></template
+            >
+            <template v-if="column.dataIndex === 'action'">
+                <a-button type="link" @click="() => showDetail(record)">
+                        <template #icon>
+                            <AIcon type="EyeOutlined"></AIcon>
+                        </template> </a-button>
+            </template>
+        </template></a-table
+    >
+    <div class="tableBottom">
+        <a-button
+            v-if="exceed"
+            class="moreBtn"
+            type="link"
+            @click="gotoAlarmLog"
+            >查看更多 ></a-button
+        >
+        <span v-else-if="dataSource.length">已展示全部数据</span>
+    </div>
+    <LogDetail v-if="visibleDetail" :data="current" @close="close" />
+</template>
+
+<script setup>
+import { queryLogList } from '@/api/rule-engine/log';
+import dayjs from 'dayjs';
+import { useMenuStore } from 'store/menu';
+import LogDetail from './LogDetail.vue';
+const props = defineProps({
+    currentId: {
+        type: String,
+        default: '',
+    },
+    configId: {
+        type: String,
+        default: '',
+    },
+});
+const menuStory = useMenuStore();
+const exceed = ref();
+const visibleDetail = ref(false);
+const dataSource = ref([]);
+const current = ref();
+const columns = [
+    {
+        title: '告警时间',
+        dataIndex: 'alarmTime',
+        key: 'alarmTime',
+    },
+    {
+        title: '触发条件',
+        dataIndex: 'triggerDesc',
+        key: 'triggerDesc',
+    },
+    {
+        title: '告警源',
+        dataIndex: 'sourceId',
+        key: 'sourceId',
+    },
+    {
+        title: '告警原因',
+        dataIndex: 'actualDesc',
+        key: 'actualDesc',
+    },
+    {
+        title: '操作',
+        dataIndex: 'action',
+        key: 'action',
+        width:100
+    }
+];
+const queryData = async () => {
+    const res = await queryLogList(props.configId, {
+        pageIndex: 0,
+        pageSize: 51,
+        terms: [
+            {
+                column: 'alarmRecordId',
+                termType: 'eq',
+                value: props.currentId,
+                type: 'and',
+            },
+        ],
+        sorts: [
+            {
+                name: 'alarmTime',
+                order: 'desc',
+            },
+        ],
+    });
+    if (res.success) {
+        if (res.result.data?.length > 50) {
+            exceed.value = true;
+            dataSource.value = res.result.data.slice(0, 50);
+        } else {
+            exceed.value = false;
+            dataSource.value = res.result.data;
+        }
+    }
+};
+
+const gotoDevice = (id) => {
+    menuStory.jumpPage('device/Instance/Detail', { id, tab: 'Running' });
+};
+const showDetail = (data) => {
+    visibleDetail.value = true;
+    current.value = data;
+};
+const close = () => {
+    visibleDetail.value = false;
+};
+const gotoAlarmLog = () => {
+    menuStory.jumpPage(`rule-engine/Alarm/Log/Detail`, {
+        id: props.currentId,
+    });
+};
+onMounted(() => {
+    queryData();
+});
+</script>
+<style lang="less" scoped>
+.tableBottom {
+    text-align: center;
+    position: relative;
+    height: 50px;
+    margin-top: 20px;
+    .moreBtn {
+        position: absolute;
+        right: 50%;
+        top: 10px;
+    }
+}
+.deviceId {
+    cursor: pointer;
+    color:#4096FF;
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/components/LogDetail.vue b/src/views/rule-engine/Alarm/Log/TabComponent/components/LogDetail.vue
new file mode 100644
index 00000000..6d8639eb
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/components/LogDetail.vue
@@ -0,0 +1,78 @@
+<template>
+    <j-modal
+        visible
+        okText="确定"
+        cancelText="取消"
+        :width="1000"
+        title="告警日志"
+        :closable="true"
+        @ok="closeModal"
+        @cancel="closeModal"
+    >
+        <div class="alarmInfo">
+            <span class="alarmTitle">{{ data?.alarmConfigName }}</span>
+            <span class="alarmTime">{{
+                dayjs(data?.alarmTime).format('YYYY-MM-DD HH:mm:ss')
+            }}</span>
+        </div>
+        <j-descriptions bordered :column="2">
+            <j-descriptions-item label="触发条件" :span="2">{{
+                data?.triggerDesc
+            }}</j-descriptions-item>
+            <j-descriptions-item label="告警原因" :span="2">{{
+                data?.actualDesc
+            }}</j-descriptions-item>
+            <j-descriptions-item label="告警源" :span="2">
+                设备ID：<a-button
+                    type="link"
+                    @click="() => gotoDevice(data?.sourceId)"
+                    >{{ data?.sourceId }}</a-button
+                >
+            </j-descriptions-item>
+            <j-descriptions-item label="告警流水" :span="2"
+                ><div style="max-height: 500px; overflow-y: auto">
+                    <JsonViewer
+                        :value="JSON.parse(data?.alarmInfo)"
+                        :expanded="true"
+                        :expandDepth="4"
+                    ></JsonViewer></div
+            ></j-descriptions-item>
+        </j-descriptions>
+    </j-modal>
+</template>
+
+<script setup>
+import dayjs from 'dayjs';
+import JsonViewer from 'vue-json-viewer';
+import { useMenuStore } from 'store/menu';
+const props = defineProps({
+    data: Object,
+});
+const menuStory = useMenuStore();
+const runningWater = computed(() => {
+    return JSON.parse(props.data?.alarmInfo);
+});
+
+const emit = defineEmits(['close']);
+const closeModal = () => {
+    emit('close');
+};
+const gotoDevice = (id) => {
+    menuStory.jumpPage('device/Instance/Detail', { id, tab: 'Running' });
+};
+</script>
+<style lang="less" scoped>
+.alarmInfo {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 8px;
+    .alarmTitle {
+        font-weight: 600;
+        font-size: 16px;
+        color: #1a1a1a;
+    }
+    .alarmTime {
+        font-size: 14px;
+    }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Log/TabComponent/components/Record.vue b/src/views/rule-engine/Alarm/Log/TabComponent/components/Record.vue
new file mode 100644
index 00000000..b1418d6c
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/TabComponent/components/Record.vue
@@ -0,0 +1,134 @@
+<template>
+    <a-table
+        :dataSource="dataSource"
+        :columns="columns"
+        :pagination="false"
+        bordered
+        :scroll="{ y: 'calc(100vh - 260px)' }"
+    >
+        <template #bodyCell="{ column, text, record }">
+            <template
+                v-if="['alarmTime', 'handleTime'].includes(column.dataIndex)"
+            >
+                {{ dayjs(text).format('YYYY-MM-DD HH:mm:ss') }}
+            </template>
+            <template v-if="column.dataIndex === 'duration'">
+                <Duration :data="record" />
+            </template>
+            <template v-if="column.dataIndex === 'handleType'">
+                {{ text?.text }}
+            </template>
+            <template v-if="column.dataIndex === 'description'">
+                <Ellipsis>
+                    {{ text || '--' }}
+                </Ellipsis>
+            </template>
+        </template>
+    </a-table>
+    <div class="tableBottom">
+        <a-button
+            v-if="exceed"
+            class="moreBtn"
+            type="link"
+            @click="gotoAlarmRecord"
+            >查看更多 ></a-button
+        ><span v-else-if="dataSource.length">已展示全部数据</span>
+    </div>
+</template>
+
+<script setup>
+import { queryHandleHistory } from '@/api/rule-engine/log';
+import dayjs from 'dayjs';
+import { useMenuStore } from 'store/menu';
+import { defineExpose } from 'vue';
+import Duration from '../../components/Duration.vue';
+const props = defineProps({
+    currentId: {
+        type: String,
+        default: '',
+    },
+});
+const exceed = ref();
+const dataSource = ref([]);
+const menuStory = useMenuStore();
+const columns = [
+    {
+        title: '告警时间',
+        dataIndex: 'alarmTime',
+        key: 'alarmTime',
+    },
+    {
+        title: '处理时间',
+        dataIndex: 'handleTime',
+        key: 'handleTime',
+    },
+    {
+        title: '告警持续时长',
+        dataIndex: 'duration',
+        key: 'duration',
+    },
+    {
+        title: '处理类型',
+        dataIndex: 'handleType',
+        key: 'handleType',
+    },
+    {
+        title: '处理结果',
+        dataIndex: 'description',
+        key: 'description',
+    },
+];
+const queryList = async () => {
+    const res = await queryHandleHistory({
+        sorts: [{ name: 'createTime', order: 'desc' }],
+        terms: [
+            {
+                column: 'alarmRecordId',
+                termType: 'eq',
+                value: props.currentId,
+                type: 'and',
+            },
+        ],
+        pageIndex: 0,
+        pageSize: 51,
+    });
+    if (res.success) {
+        if (res.result.data?.length > 50) {
+            exceed.value = true;
+            dataSource.value = res.result.data.slice(0, 50);
+        } else {
+            exceed.value = false;
+            dataSource.value = res.result.data;
+        }
+    }
+};
+const gotoAlarmRecord = () => {
+    menuStory.jumpPage(
+        'rule-engine/Alarm/Log/Record',
+        {},
+        { id: props.currentId },
+    );
+};
+const refreshRecord = () => {
+    queryList();
+};
+defineExpose({
+    refreshRecord,
+});
+onMounted(() => {
+    queryList();
+});
+</script>
+<style lang="less" scoped>
+.tableBottom {
+    text-align: center;
+    position: relative;
+    height: 50px;
+    margin-top: 20px;
+    .moreBtn {
+        position: absolute;
+        right: 50%;
+        top: 10px;
+    }
+}
+</style>
diff --git a/src/views/rule-engine/Alarm/Log/components/Duration.vue b/src/views/rule-engine/Alarm/Log/components/Duration.vue
new file mode 100644
index 00000000..b64401e9
--- /dev/null
+++ b/src/views/rule-engine/Alarm/Log/components/Duration.vue
@@ -0,0 +1,43 @@
+<template>
+    <div>{{ duration }}</div>
+</template>
+
+<script setup name="Duration">
+const props = defineProps({
+    data: {
+        type: Object,
+        default: {},
+    },
+});
+const duration = ref();
+import dayjs from 'dayjs';
+const calculateDuration = (startTime, endTime) => {
+    const diffInSeconds = endTime.diff(startTime, 'second');
+    let result;
+
+    if (diffInSeconds < 60) {
+        result = `${diffInSeconds.toFixed(1)} s`;
+    } else if (diffInSeconds < 3600) {
+        result = `${(diffInSeconds / 60).toFixed(1)} min`;
+    } else {
+        result = `${(diffInSeconds / 3600).toFixed(1)} h`;
+    }
+    return result;
+};
+watch(
+    () => props.data,
+    () => {
+        duration.value = calculateDuration(
+            dayjs(props.data.alarmTime),
+            props.data?.state?.value === 'warning'
+                ? dayjs()
+                : dayjs(props.data?.handleTime),
+        );
+    },
+    {
+        deep: true,
+        immediate: true,
+    },
+);
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/rule-engine/Instance/index.vue b/src/views/rule-engine/Instance/index.vue
index 8076fbcc..49124048 100644
--- a/src/views/rule-engine/Instance/index.vue
+++ b/src/views/rule-engine/Instance/index.vue
@@ -208,6 +208,7 @@ const columns = [
         title: '名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true,
     },
     {
         title: '状态',
@@ -219,6 +220,7 @@ const columns = [
         title: '说明',
         dataIndex: 'description',
         key: 'description',
+        ellipsis: true,
     },
     {
         title: '操作',
@@ -272,7 +274,7 @@ const getActions = (
                     ? 'StopOutlined'
                     : 'CheckCircleOutlined',
             popConfirm: {
-                title: `确认${data.state !== 'disable' ? '禁用' : '启用'}?`,
+                title: `确认${data.state.value !== 'disable' ? '禁用' : '启用'}?`,
                 onConfirm: async () => {
                     let response = undefined;
                     if (data.state?.value !== 'started') {
diff --git a/src/views/rule-engine/Scene/Save/Device/AddModal.vue b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
index 3abcd91d..49184238 100644
--- a/src/views/rule-engine/Scene/Save/Device/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Device/AddModal.vue
@@ -2,7 +2,7 @@
   <j-modal
     title='触发规则'
     visible
-    :width='820'
+    :width='950'
     @ok='save'
     @cancel='cancel'
     :maskClosable="false"
@@ -20,26 +20,26 @@
     </j-steps>
     <j-divider style='margin-bottom: 0px' />
     <div class='steps-content'>
-      <Product
-        v-if='addModel.stepNumber === 0'
-        v-model:rowKey='addModel.productId'
-        v-model:detail='addModel.productDetail'
-        @change='productChange'
-      />
-      <DeviceSelect
-        v-else-if='addModel.stepNumber === 1'
-        :productId='addModel.productId'
-        v-model:deviceKeys='addModel.deviceKeys'
-        v-model:orgId='addModel.orgId'
-        v-model:selector='addModel.selector'
-        v-model:selectorValues='addModel.selectorValues'
-      />
-      <Type
-        ref='typeRef'
-        v-else-if='addModel.stepNumber === 2'
-        :metadata='addModel.metadata'
-        :operator='addModel.operator'
-      />
+        <Product
+          v-if='addModel.stepNumber === 0'
+          v-model:rowKey='addModel.productId'
+          v-model:detail='addModel.productDetail'
+          @change='productChange'
+        />
+        <DeviceSelect
+          v-else-if='addModel.stepNumber === 1'
+          :productId='addModel.productId'
+          v-model:deviceKeys='addModel.deviceKeys'
+          v-model:orgId='addModel.orgId'
+          v-model:selector='addModel.selector'
+          v-model:selectorValues='addModel.selectorValues'
+        />
+        <Type
+          ref='typeRef'
+          v-else-if='addModel.stepNumber === 2'
+          :metadata='addModel.metadata'
+          :operator='addModel.operator'
+        />
     </div>
     <template #footer>
       <div class='steps-action'>
@@ -282,4 +282,4 @@ nextTick(() => {
   overflow-y: auto;
   overflow-x: hidden;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/CheckItem.vue b/src/views/rule-engine/Scene/Save/Device/CheckItem.vue
index 55536fda..2b54a488 100644
--- a/src/views/rule-engine/Scene/Save/Device/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/Device/CheckItem.vue
@@ -9,6 +9,7 @@ import { Form } from 'jetlinks-ui-components'
 import { queryProductList } from '@/api/device/product'
 import {query as deviceQuery, detail as deviceDetailQuery} from '@/api/device/instance'
 import { getTreeData_api } from '@/api/system/department'
+import {queryDetailListNoPaging} from "@/api/device/firmware";
 
 const sceneStore = useSceneStore()
 const { data } = storeToRefs(sceneStore)
@@ -35,15 +36,24 @@ const check = async (): Promise<boolean> => {
 
   // 判断设备是否删除
   if (deviceTrigger.selector === 'fixed') { // 设备
-    const deviceResp = await deviceQuery({ terms: [{ column: 'id', termType: 'in', value: selectorValues?.toString() }]})
-    if (deviceResp.success && (deviceResp.result as any)?.total !== (selectorValues!.length)) {
+    const deviceResp = await queryDetailListNoPaging({
+      terms: [{ column: 'id', termType: 'in', value: selectorValues?.toString() }],
+      context: {
+        "includeTags": false,
+        "includeBind": false,
+        "includeRelations": false,
+        "includeFirmwareInfos": false
+      }
+    })
+    if (deviceResp.success && deviceResp.result.length !== (selectorValues!.length)) {
       data.value.trigger!.device!.selectorValues = undefined
       return false
     }
 
     if (selectorValues!.length === 1) {
-      const deviceDetailResp = await deviceDetailQuery(selectorValues![0])
-      const deviceDetail = deviceDetailResp?.result
+      // const deviceDetailResp = await deviceDetailQuery(selectorValues![0])
+      // const deviceDetail = deviceDetailResp?.result
+      const deviceDetail = deviceResp.result[0]
       metadata = JSON.parse(deviceDetail?.metadata || '{}') // 只选中一个设备，以设备物模型为准
     }
   } else if (deviceTrigger.selector === 'org') { // 组织
diff --git a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
index 76234e03..c1430f9b 100644
--- a/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
+++ b/src/views/rule-engine/Scene/Save/Device/InvokeFunction.vue
@@ -103,6 +103,7 @@ const functionData = computed(() => {
         id: datum.id,
         name: datum.name,
         type: datum.valueType?.type || '-',
+        type: datum.valueType?.type || '-',
         format: datum.valueType?.format || undefined,
         options: handlePropertiesOptions(datum.valueType),
         value: undefined,
@@ -154,4 +155,4 @@ defineExpose({
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/OrgList.vue b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
index 5317be8f..7e157d40 100644
--- a/src/views/rule-engine/Scene/Save/Device/OrgList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/OrgList.vue
@@ -117,7 +117,6 @@ const query = async (p: any) => {
 
 const selectedRowChange = (values: any, selectedRows: any[]) => {
   const item = selectedRows[0]
-  console.log(values, selectedRows)
   emit('update', [{ name: item.name, value: item.id }])
 }
 
@@ -137,4 +136,4 @@ const expandedRowChange = (keys: string[]) => {
   padding-right: 0px;
   padding-left: 0px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/Type.vue b/src/views/rule-engine/Scene/Save/Device/Type.vue
index 58fdfdc8..145e33f8 100644
--- a/src/views/rule-engine/Scene/Save/Device/Type.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Type.vue
@@ -1,5 +1,9 @@
 <template>
   <div class='type'>
+    <div class="alert">
+      <AIcon type="InfoCircleOutlined"/>
+      <span style="padding-left: 10px;">只能依据产品物模型进行配置</span>
+    </div>
     <j-form ref='typeForm' :model='formModel' layout='vertical' :colon='false'>
       <j-form-item
         required
@@ -104,6 +108,7 @@ const writeRef = ref()
 const invokeRef = ref()
 
 const topOptions = computed(() => {
+  const cloneTypeEnum = cloneDeep(TypeEnum)
   const baseOptions = [
     {
       label: '设备上线',
@@ -114,47 +119,60 @@ const topOptions = computed(() => {
       label: '设备离线',
       value: 'offline',
       img: getImage('/scene/offline.png')
-    }
+    },
+    cloneTypeEnum.reportEvent,
+    cloneTypeEnum.readProperty,
+    cloneTypeEnum.writeProperty,
+    cloneTypeEnum.reportProperty,
+    cloneTypeEnum.invokeFunction
   ]
 
+  if (!props.metadata) return baseOptions;
+
   if (props.metadata.events?.length) {
-    baseOptions.push(TypeEnum.reportEvent)
+    // baseOptions.push(TypeEnum.reportEvent)
+    cloneTypeEnum.reportEvent.disabled = false
     eventOptions.value = props.metadata.events.map(item => ({ ...item, label: item.name, value: item.id }))
   }
 
   if (props.metadata.properties?.length) {
     const _properties = props.metadata.properties
-    readProperties.value = _properties.filter((item: any) => item.expands.type?.includes('read')).map(item => ({
+    readProperties.value = _properties.filter((item: any) => item.expands?.type?.includes('read')).map(item => ({
       ...item,
       label: item.name,
       value: item.id
     }))
-    writeProperties.value = _properties.filter((item: any) => item.expands.type?.includes('write')).map(item => ({
+    writeProperties.value = _properties.filter((item: any) => item.expands?.type?.includes('write')).map(item => ({
       ...item,
       label: item.name,
       value: item.id
     }))
-    const reportProperties = _properties.filter((item: any) => item.expands.type?.includes('report')).map(item => ({
+    // 兼容上传的设备物模型没有type时，type值默认为上报
+    const reportProperties = _properties.filter((item: any) => item.expands?.type?.includes('report') || !item.expands?.type).map(item => ({
       ...item,
       label: item.name,
       value: item.id
     }))
 
     if (readProperties.value.length) {
-      baseOptions.push(TypeEnum.readProperty)
+      // baseOptions.push(TypeEnum.readProperty)
+      cloneTypeEnum.readProperty.disabled = false
     }
 
     if (writeProperties.value.length) {
-      baseOptions.push(TypeEnum.writeProperty)
+      // baseOptions.push(TypeEnum.writeProperty)
+      cloneTypeEnum.writeProperty.disabled = false
     }
 
     if (reportProperties.length) {
-      baseOptions.push(TypeEnum.reportProperty)
+      // baseOptions.push(TypeEnum.reportProperty)
+      cloneTypeEnum.reportProperty.disabled = false
     }
   }
 
   if (props.metadata.functions?.length) {
-    baseOptions.push(TypeEnum.invokeFunction)
+    cloneTypeEnum.invokeFunction.disabled = false
+    // baseOptions.push(TypeEnum.invokeFunction)
     functionOptions.value = props.metadata.functions.map(item => ({ ...item, label: item.name, value: item.id }))
   }
 
@@ -238,5 +256,13 @@ defineExpose({
 <style scoped lang='less'>
 .type {
   margin-top: 24px;
+
+  .alert {
+    height: 40px;
+    padding-left: 10px;
+    color: rgba(0, 0, 0, 0.55);
+    line-height: 40px;
+    background-color: #f6f6f6;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
index ec692610..6fb91884 100644
--- a/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/Device/WriteProperty.vue
@@ -92,7 +92,6 @@ const callDataOptions = computed(() => {
   if (_valueKeys.length) {
     return _valueKeys.map(key => {
       const item: any = props.properties.find((p: any) => p.id === key)
-      console.log(item, props.value, key)
       if (item) {
         const _options = handleOptions(item, item.valueType?.type)
         return {
@@ -142,14 +141,12 @@ const callDataChange = (v: any[]) => {
 
 const rules = [{
   validator(_: string, value: any) {
-    console.log(value, callDataOptions.value)
     if (!value?.length && callDataOptions.value.length) {
       return Promise.reject('请选择属性值')
     } else {
       let hasValue = value.find((item: { name: string, value: any}) => !item.value)
       if (hasValue) {
         const item = callDataOptions.value.find((item: any) => item.id === hasValue.name)
-        console.log()
         return Promise.reject(item?.name ? `请输入${item?.name}值` : '请输入属性值')
       }
     }
@@ -175,4 +172,4 @@ defineExpose({
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/index.vue b/src/views/rule-engine/Scene/Save/Device/index.vue
index ff4b5efa..584d8971 100644
--- a/src/views/rule-engine/Scene/Save/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/Device/index.vue
@@ -17,7 +17,7 @@
         <AddModel v-if='visible' @cancel='visible = false' @save='save' :value='data.trigger.device' :options='data.options.trigger' />
         <CheckItem />
     </j-form-item>
-    <Terms />
+    <Terms ref="termsRef" />
   </div>
 </template>
 
@@ -36,13 +36,13 @@ const sceneStore = useSceneStore()
 const { data } = storeToRefs(sceneStore)
 
 const visible = ref(false)
+const termsRef = ref()
 
 const rules = [{
   validator(_: any, v: any) {
     if (!v) {
       return Promise.reject(new Error('请配置设备触发规则'));
     } else {
-        console.log('device-validator', v)
         if (
           !v.productId ||
           (['fixed', 'org'].includes(v.selector) && !v.selectorValues) ||
@@ -68,8 +68,12 @@ const save = (device: TriggerDevice, options: Record<string, any>) => {
   EventEmitter.emit(DeviceEmitterKey, device)
 }
 
+defineExpose({
+  changePaneIndex: (index: number) => termsRef.value?.changePaneIndex(index)
+})
+
 </script>
 
 <style scoped lang='less'>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Device/util.ts b/src/views/rule-engine/Scene/Save/Device/util.ts
index 06cee863..e71e966c 100644
--- a/src/views/rule-engine/Scene/Save/Device/util.ts
+++ b/src/views/rule-engine/Scene/Save/Device/util.ts
@@ -15,26 +15,31 @@ export const TypeEnum = {
     label: '属性上报',
     value: 'reportProperty',
     img: getImage('/scene/reportProperty.png'),
+    disabled: true
   },
   reportEvent: {
     label: '事件上报',
     value: 'reportEvent',
     img: getImage('/scene/reportProperty.png'),
+    disabled: true
   },
   readProperty: {
     label: '读取属性',
     value: 'readProperty',
     img: getImage('/scene/readProperty.png'),
+    disabled: true
   },
   writeProperty: {
     label: '修改属性',
     value: 'writeProperty',
     img: getImage('/scene/writeProperty.png'),
+    disabled: true
   },
   invokeFunction: {
     label: '功能调用',
     value: 'invokeFunction',
     img: getImage('/scene/invokeFunction.png'),
+    disabled: true
   },
 };
 
@@ -66,4 +71,4 @@ export const getExpandedRowById = (id: string, data: any[]): string[] => {
   getExp(id)
 
   return expandedKeys
-}
\ No newline at end of file
+}
diff --git a/src/views/rule-engine/Scene/Save/Manual/index.vue b/src/views/rule-engine/Scene/Save/Manual/index.vue
index 5527eef9..5bdf73c2 100644
--- a/src/views/rule-engine/Scene/Save/Manual/index.vue
+++ b/src/views/rule-engine/Scene/Save/Manual/index.vue
@@ -1,9 +1,24 @@
 <template>
   <div class='manual actions-branches-item'>
+    <j-form-item>
+      <template #label>
+        <TitleComponent data='触发规则' style='font-size: 14px;' >
+        </TitleComponent>
+      </template>
+      <AddButton
+        style='width: 100%'
+        :showCircular="false"
+      >
+        系统在接收到手动触发指令时，触发场景
+      </AddButton>
+    </j-form-item>
     <j-form-item
       :rules="actionRules"
       :name="['branches', 0, 'then']"
     >
+      <template #label>
+        <TitleComponent data='执行动作' style='font-size: 14px;' />
+      </template>
       <Action
         :thenOptions="data.branches ? data?.branches[0].then : []"
         :name="0"
@@ -17,6 +32,7 @@ import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
 import type { BranchesThen } from '@/views/rule-engine/Scene/typings'
 import Action from '../action/index.vue';
+import AddButton from '../components/AddButton.vue'
 
 const sceneStore = useSceneStore();
 const { data } = storeToRefs(sceneStore);
@@ -50,4 +66,4 @@ const actionRules = [{
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
index 82631c0f..d606f34c 100644
--- a/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/AddModal.vue
@@ -3,11 +3,13 @@
       title='触发规则'
       visible
       :width='820'
+      :maskClosable="false"
+      :keyboard="false"
       @ok='save'
       @cancel='cancel'
   >
     <Timer
-        ref='timerRef' v-model:value='addModel.timer'
+        ref='timerRef' v-model:value='addModel.timer' type="timer"
     />
   </j-modal>
 </template>
@@ -17,6 +19,7 @@ import Timer from '../components/Timer'
 import type { OperationTimer } from '@/views/rule-engine/Scene/typings'
 import { PropType} from "vue";
 import {handleTimerOptions} from "@/views/rule-engine/Scene/Save/components/Timer/util";
+import {cloneDeep} from "lodash-es";
 
 type Emit = {
   (e: 'cancel'): void
@@ -38,7 +41,7 @@ interface AddModelType {
 }
 
 const addModel = reactive<AddModelType>({
-  timer: props.value
+  timer: cloneDeep(props.value)
 })
 
 const save = async () => {
@@ -61,4 +64,4 @@ const cancel = () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Timer/Title.vue b/src/views/rule-engine/Scene/Save/Timer/Title.vue
index 0a620951..c8cad325 100644
--- a/src/views/rule-engine/Scene/Save/Timer/Title.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/Title.vue
@@ -1,6 +1,6 @@
 <template>
   <div :class='["trigger-options-content", isAdd ? "is-add" : ""]'>
-    <span v-if='!isAdd'> 点击配置定时触发 </span>
+    <span v-if='!isAdd'> 点击设定时间 </span>
     <template v-else>
       <div v-if='options.when'>
         <span className='trigger-options-when'>{{ options.when }}</span>
@@ -25,7 +25,6 @@ const props = defineProps({
 })
 
 const isAdd = computed(() => {
-  console.log(props.options, Object.keys(props.options).length)
   return !!Object.keys(props.options).length
 })
 
@@ -46,4 +45,4 @@ const isAdd = computed(() => {
   }
 
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/Timer/index.vue b/src/views/rule-engine/Scene/Save/Timer/index.vue
index 43ff6cb2..41bb18eb 100644
--- a/src/views/rule-engine/Scene/Save/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/Timer/index.vue
@@ -11,14 +11,23 @@
             style='width: 100%'
             @click='visible = true'
         >
+          <template #extra>
+            <span style="padding-right: 10px;">
+              系统时间到达
+            </span>
+          </template>
           <Title :options='data.options.trigger' />
         </AddButton>
       </j-form-item>
       <div class='actions-branches-item' >
+
         <j-form-item
           :rules="actionRules"
           :name="['branches', 0, 'then']"
         >
+          <template #label>
+            <TitleComponent data='执行动作' style='font-size: 14px;' />
+          </template>
           <Action
             :thenOptions="data.branches ? data?.branches[0].then : []"
             :name="0"
@@ -49,7 +58,6 @@ const visible = ref(false)
 
 const rules = [{
   validator(_: any, v: any) {
-    console.log(v)
     if (!v) {
       return Promise.reject(new Error('请配置定时触发规则'));
     }
@@ -103,4 +111,4 @@ const save = (_data: OperationTimer, options: Record<string, any>) => {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
index 8adf820d..d8e8abdd 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/EditTable.vue
@@ -16,10 +16,11 @@
             <template v-else>
                 <FunctionItem
                     :builtInList="builtInList"
-                    @change="onChange"
                     v-model:source="record.source"
-                    :data="record"
                     v-model:value="record.value"
+                    v-model:upperKey="record.upperKey"
+                    :data="record"
+                    @change="onChange"
                 />
             </template>
         </template>
@@ -43,9 +44,13 @@ const _props = defineProps({
         type: Array,
         default: () => [],
     },
+    columnMap: {
+        type: Object,
+        default: () => ({})
+    }
 });
 
-const emit = defineEmits(['update:value']);
+const emit = defineEmits(['update:value', 'update:columnMap']);
 
 const columns = [
     {
@@ -66,6 +71,7 @@ const columns = [
 ];
 
 const dataSource = ref<any[]>([]);
+const columnMap = ref(_props.columnMap || {})
 
 watchEffect(() => {
     const list = (_props.functions || []).map((item: any) => {
@@ -82,7 +88,10 @@ watchEffect(() => {
     dataSource.value = list;
 });
 
-const onChange = () => {
+const onChange = (v: any, obj: any, option: any, record: any) => {
+
+  columnMap.value[record.id] = v.source === 'fixed' ? undefined : obj.column
+
     const arr = [...dataSource.value].map((item) => {
         return {
             name: item.id,
@@ -94,5 +103,6 @@ const onChange = () => {
         };
     });
     emit('update:value', arr);
+    emit('update:columnMap', columnMap.value);
 };
 </script>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
index 64dd0f80..a29d8472 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/FunctionItem.vue
@@ -1,125 +1,131 @@
 <template>
-    <ParamsDropdown
-        :options="handleOptions"
-        :tabsOptions="tabOptions"
-        :metricOptions="upperOptions"
-        v-model:value="_value"
-        v-model:source="_source"
-        @select="onChange"
-        valueName="id"
-    >
-        <template v-slot="{ label }">
-            <j-input :value="label" readonly placeholder="请选择" />
-        </template>
-    </ParamsDropdown>
+  <ParamsDropdown
+    :options="handleOptions"
+    :tabsOptions="tabOptions"
+    :metricOptions="upperOptions"
+    v-model:value="_value"
+    v-model:source="_source"
+    valueName="id"
+    treeKey="id"
+    @select="onChange"
+  >
+    <template v-slot="{ label }">
+      <j-input :value="label" readonly placeholder="请选择"/>
+    </template>
+  </ParamsDropdown>
 </template>
 
-<script lang="ts" setup>
-import { cloneDeep } from 'lodash-es';
+<script lang="ts" setup name="FunctionItem">
+import {cloneDeep} from 'lodash-es';
 import ParamsDropdown from '../../../components/ParamsDropdown';
-import { handleParamsData } from './index';
+import {handleParamsData} from './index';
 
 const props = defineProps({
-    data: {
-        type: Object,
-        default: () => {},
-    },
-    builtInList: {
-        type: Array,
-        default: () => [],
-    },
-    value: {
-        type: String,
-    },
-    source: {
-        type: String,
-        default: 'fixed',
+  data: {
+    type: Object,
+    default: () => {
     },
+  },
+  builtInList: {
+    type: Array,
+    default: () => [],
+  },
+  value: {
+    type: String,
+  },
+  upperKey: {
+    type: String,
+  },
+  source: {
+    type: String,
+    default: 'fixed',
+  },
 });
 
-const emit = defineEmits(['update:value', 'update:source', 'change']);
+const emit = defineEmits(['update:value', 'update:source', 'update:upperKey', 'change']);
 
 const _value = ref();
 const _source = ref();
 
 const tabOptions = computed(() => {
-    return [
-        {
-            label: '手动输入',
-            component: props.data?.valueType?.type,
-            key: 'fixed',
-        },
-        {
-            label: '内置参数',
-            component: 'tree',
-            key: 'upper',
-        },
-    ];
+  return [
+    {
+      label: '手动输入',
+      component: props.data?.valueType?.type,
+      key: 'fixed',
+    },
+    {
+      label: '内置参数',
+      component: 'tree',
+      key: 'upper',
+    },
+  ];
 });
 
 const handleOptions = computed(() => {
-    const _item = props.data?.valueType || 'int';
-    const _type = _item?.type;
-    if (_type === 'boolean') {
-        return [
-            {
-                label: _item.trueText || true,
-                value: _item.trueValue || true,
-                id: String(_item.trueValue || true),
-            },
-            {
-                label: _item.falseText || false,
-                value: _item.falseValue || false,
-                id: String(_item.falseValue || false),
-            },
-        ];
-    }
-    if (_type === 'enum') {
-        return _item?.elements.map((i: any) => {
-            return {
-                label: i.text,
-                value: i.value,
-                id: i.value,
-            };
-        });
-    }
-    return [];
+  const _item = props.data?.valueType || 'int';
+  const _type = _item?.type;
+  if (_type === 'boolean') {
+    return [
+      {
+        label: _item.trueText || true,
+        value: _item.trueValue || true,
+        id: String(_item.trueValue || true),
+      },
+      {
+        label: _item.falseText || false,
+        value: _item.falseValue || false,
+        id: String(_item.falseValue || false),
+      },
+    ];
+  }
+  if (_type === 'enum') {
+    return _item?.elements.map((i: any) => {
+      return {
+        label: i.text,
+        value: i.value,
+        id: i.value,
+      };
+    });
+  }
+  return [];
 });
 
 const filterParamsData = (type?: string, data?: any[]): any[] => {
-    if (type && data) {
-        const list = data.filter((item) => {
-            if (item.children) {
-                const _children = filterParamsData(type, item.children);
-                item.children = _children;
-                return _children.length ? true : false;
-            } else if (item.type === type) {
-                //   optionMap.current.set(item.id, item);
-                return true;
-            }
-            return false;
-        });
-        return handleParamsData(list);
-    }
-    return data || [];
+  if (type && data) {
+    const list = data.filter((item) => {
+      if (item.children) {
+        const _children = filterParamsData(type, item.children);
+        item.children = _children;
+        return _children.length ? true : false;
+      } else if (item.type === type) {
+        //   optionMap.current.set(item.id, item);
+        return true;
+      }
+      return false;
+    });
+    return handleParamsData(list);
+  }
+  return data || [];
 };
 
 const upperOptions = computed(() => {
-    return filterParamsData(props.data.valueType?.type, cloneDeep(props?.builtInList));
+  return filterParamsData(props.data.valueType?.type, cloneDeep(props?.builtInList));
 });
 
-const onChange = () => {
-  const objValue: any = { source: _source.value, value: _value.value }
+const onChange = (e: any, label: string, option: any) => {
+  const objValue: any = {source: _source.value, value: _value.value}
   if (_source.value === 'upper') {
     objValue.upperKey = _value.value
+    emit('update:upperKey', _value.value);
   }
-    emit('update:value', _value.value);
-    emit('update:source', _source.value);
-    emit('change', objValue);
+  emit('update:value', _value.value);
+  emit('update:source', _source.value);
+  emit('change', objValue, e, option, props.data);
 };
 
 watchEffect(() => {
-    _value.value = props.value;
-    _source.value = props.source || 'fixed';
+  _value.value = props.value;
+  _source.value = props.source || 'fixed';
 });
 </script>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
index 7c1d621c..a8215b77 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/WriteProperty.vue
@@ -38,8 +38,9 @@
                         :metricOptions="upperOptions"
                         v-model:value="propertyModelRef.propertiesValue"
                         v-model:source="propertyModelRef.source"
-                        @select="onValueChange"
                         valueName="id"
+                        treeKey="id"
+                        @select="onValueChange"
                     >
                         <template v-slot="{ label }">
                             <j-input readonly :value="label" placeholder="请选择" />
@@ -72,11 +73,16 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    columnMap: {
+      type: Object,
+      default: () => ({})
+    }
 });
 
-const emit = defineEmits(['update:value', 'change']);
+const emit = defineEmits(['update:value', 'change', 'update:columnMap']);
 
 const propertyFormRef = ref();
+const columnMap = ref(props.columnMap || {})
 
 const propertyModelRef = reactive({
     properties: undefined,
@@ -163,6 +169,7 @@ const handleOptions = computed(() => {
 const onChange = () => {
     propertyModelRef.propertiesValue = undefined;
     propertyModelRef.source = 'fixed';
+    columnMap.value = {}
     emit('update:value', {
         [`${propertyModelRef.properties}`]: {
             value: propertyModelRef?.propertiesValue,
@@ -186,7 +193,13 @@ const onValueChange = (val: any, label: string) => {
     const obj = {
         [`${propertyModelRef.properties}`]: objectValue
     };
+
+    columnMap.value = {
+      [propertyModelRef.properties]: propertyModelRef?.source === 'upper' ? val.column : undefined
+    }
+
     emit('update:value', obj);
+    emit('update:columnMap', columnMap.value);
     emit('change', label || val, optionColumn)
 };
 
diff --git a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
index d9518123..78a9569a 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/actions/index.vue
@@ -39,8 +39,9 @@
                     :rules="functionRules"
                 >
                     <EditTable
-                        :functions="functions"
                         v-model:value="modelRef.message.inputs"
+                        v-model:columnMap="columnMap"
+                        :functions="functions"
                         :builtInList="builtInList"
                     />
                 </j-form-item>
@@ -58,8 +59,8 @@
                         @change="propertySelect"
                     >
                         <j-select-option
-                            v-for="item in (metadata?.properties || []).filter((i) =>
-                                i?.expands?.type?.includes('read'),
+                            v-for="item in (metadata?.properties || []).filter(
+                                (i) => i?.expands?.type?.includes('read'),
                             ) || []"
                             :value="item?.id"
                             :key="item?.id"
@@ -73,6 +74,7 @@
                 <WriteProperty
                     ref="writeFormRef"
                     v-model:value="modelRef.message.properties"
+                    v-model:columnMap="columnMap"
                     :metadata="metadata"
                     :builtInList="builtInList"
                     @change="onWriteChange"
@@ -82,7 +84,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="ActionDeviceActions">
 import { getImage } from '@/utils/comm';
 import TopCard from '../device/TopCard.vue';
 import { detail } from '@/api/device/instance';
@@ -101,18 +103,21 @@ const TypeList = [
         value: 'INVOKE_FUNCTION',
         image: getImage('/scene/invoke-function.png'),
         tip: '',
+        disabled: false,
     },
     {
         label: '读取属性',
         value: 'READ_PROPERTY',
         image: getImage('/scene/read-property.png'),
         tip: '',
+        disabled: false,
     },
     {
         label: '设置属性',
         value: 'WRITE_PROPERTY',
         image: getImage('/scene/write-property.png'),
         tip: '',
+        disabled: false,
     },
 ];
 
@@ -137,11 +142,16 @@ const props = defineProps({
         type: Object,
         default: () => {},
     },
+    columnMap: {
+        type: Object,
+        default: () => ({}),
+    },
 });
 
 const emit = defineEmits(['change']);
 
 const formRef = ref();
+const columnMap = ref(props.columnMap || {});
 
 const modelRef = reactive({
     message: {
@@ -156,6 +166,7 @@ const modelRef = reactive({
 const writeFormRef = ref();
 
 const functionSelect = (val: any, options?: any) => {
+    columnMap.value = {};
     modelRef.message.inputs = [];
     emit('change', {
         propertiesName: options?.label,
@@ -174,14 +185,15 @@ const functionRules = [
     {
         validator(_: string, value: any) {
             const arr = functions.value.filter((i: any) => {
-                return i?.expands?.required
-            })
-            if(arr.length){
-                if(!value?.length) {
+                return i?.expands?.required;
+            });
+            if (arr.length) {
+                if (!value?.length) {
                     return Promise.reject('请输入功能值');
                 } else {
                     const hasValue = value?.find(
-                        (item: { name: string; value: any }) => item.value === undefined,
+                        (item: { name: string; value: any }) =>
+                            item.value === undefined,
                     );
                     if (hasValue) {
                         const functionItem = arr?.find(
@@ -197,7 +209,7 @@ const functionRules = [
             }
             return Promise.resolve();
         },
-        trigger: ['change', 'blur']
+        trigger: ['change', 'blur'],
     },
 ];
 
@@ -252,6 +264,7 @@ const queryBuiltIn = async () => {
 };
 
 const onMessageTypeChange = (val: string) => {
+    columnMap.value = {};
     const flag = ['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(val);
     modelRef.message = {
         messageType: val,
@@ -264,58 +277,19 @@ const onMessageTypeChange = (val: string) => {
     }
 };
 
-watch(
-    () => props.productDetail,
-    (newVal) => {
-        if (newVal?.id) {
-            if (props.values?.selector === 'fixed' && props.values?.selectorValues?.length === 1) {
-                const id = props.values?.selectorValues?.[0]?.value;
-                if (id) {
-                    detail(id).then((resp) => {
-                        if (resp.status === 200) {
-                            metadata.value = JSON.parse(
-                                resp.result?.metadata || '{}',
-                            );
-                          console.log(metadata.value, resp.result?.metadata)
-                        }
-                    });
-                }
-            } else {
-                metadata.value = JSON.parse(newVal?.metadata || '{}');
-            }
-        }
-    },
-    { immediate: true },
-);
-
-watch(
-    () => props.values?.message,
-    (newVal) => {
-        if (newVal?.messageType) {
-            modelRef.message = newVal;
-            if (
-                ['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(
-                    newVal.messageType,
-                )
-            ) {
-                queryBuiltIn();
-            }else{
-                modelRef.message.properties =  [] as any;
-            }
-        }
-    },
-    { immediate: true },
-);
-
 const onWriteChange = (val: string, optionColumn: string[]) => {
     modelRef.propertiesValue = val;
-    emit('change', {
-        propertiesName:
-            deviceMessageType.value === 'INVOKE_FUNCTION'
-                ? _function.value?.name
-                : _property.value?.name,
-        propertiesValue: modelRef.propertiesValue,
-    }, optionColumn);
+    emit(
+        'change',
+        {
+            propertiesName:
+                deviceMessageType.value === 'INVOKE_FUNCTION'
+                    ? _function.value?.name
+                    : _property.value?.name,
+            propertiesValue: modelRef.propertiesValue,
+        },
+        optionColumn,
+    );
 };
 
 const onFormSave = () => {
@@ -349,5 +323,58 @@ const onFormSave = () => {
     });
 };
 
-defineExpose({ onFormSave });
-</script>
\ No newline at end of file
+const getColumnMap = () => {
+    return columnMap.value;
+};
+
+watch(
+    () => props.productDetail,
+    (newVal) => {
+        if (newVal?.id) {
+            if (
+                props.values?.selector === 'fixed' &&
+                props.values?.selectorValues?.length === 1
+            ) {
+                const id = props.values?.selectorValues?.[0]?.value;
+                if (id) {
+                    detail(id).then((resp) => {
+                        if (resp.status === 200) {
+                            metadata.value = JSON.parse(
+                                resp.result?.metadata || '{}',
+                            );
+                        }
+                    });
+                }
+            } else {
+                metadata.value = JSON.parse(newVal?.metadata || '{}');
+            }
+        }
+    },
+    { immediate: true },
+);
+
+watch(
+    () => props.values?.message,
+    (newVal) => {
+        if (newVal?.messageType) {
+            modelRef.message = JSON.parse(JSON.stringify(newVal));
+            if (
+                ['WRITE_PROPERTY', 'INVOKE_FUNCTION'].includes(
+                    newVal.messageType,
+                )
+            ) {
+                queryBuiltIn();
+            } else {
+                if (!modelRef.message.properties) {
+                    modelRef.message = Object.assign(modelRef.message, {
+                        properties: [],
+                    });
+                }
+            }
+        }
+    },
+    { immediate: true },
+);
+
+defineExpose({ onFormSave, getColumnMap });
+</script>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
index 9dbac1a0..4ecf1298 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/Tag.vue
@@ -3,7 +3,10 @@
         <template v-for="(item, index) in tagList" :key="item.id">
             <j-row :gutter="24" style="margin-bottom: 12px">
                 <j-col :span="4">
-                    <span v-if="index === 0" class="tagName">标签选择</span>
+                    <span
+                      v-if="index === 0" class="tagName">
+                      标签选择
+                    </span>
                     <j-select
                         :options="[
                             { label: '并且', value: 'and' },
@@ -74,7 +77,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="DeviceTag">
 import { PropType } from 'vue';
 
 const props = defineProps({
@@ -109,7 +112,7 @@ const addItem = () => {
 
 const deleteItem = (_index: number) => {
     tagList.value.splice(_index, 1);
-    onValueChange();
+    onValueChange()
 };
 
 const onTypeSelect = (key: any, _index: number) => {
@@ -145,32 +148,31 @@ watch(
         options.value = newTag.map((item: any) => {
             return { label: item.name, value: item.id, ...item };
         });
-        if (newVal && newVal[0] && newVal[0]?.name && newTag && newTag.length) {
-            const names: string[] = [];
-            const newTagList = newVal[0]?.value
-                .filter((valueItem: any) => {
-                    return newTag.some(
-                        (item: any) => valueItem.column === item.id,
-                    );
-                })
-                .map((valueItem: any) => {
-                    const oldItem = newTag.find(
-                        (item: any) => item.id === valueItem.column,
-                    );
-                    if (oldItem) {
-                        names.push(oldItem.name);
-                        return {
-                            ...handleItem(oldItem),
-                            value: valueItem?.value,
-                            type: valueItem?.type,
-                        };
-                    }
-                    return valueItem;
-                });
-            tagList.value = newTagList;
-        } else {
-            tagList.value = [{}];
-        }
+
+      // const names: string[] = [];
+      const newTagList = newVal[0]?.value.map((valueItem: any) => {
+          const oldItem = newTag.find(
+            (item: any) => item.id === valueItem.column,
+          );
+          if (oldItem) {
+            // names.push(oldItem.name);
+            return {
+              ...handleItem(oldItem),
+              value: valueItem?.value,
+              type: valueItem?.type,
+            };
+          }
+          return valueItem;
+        }) || [{}];
+
+      tagList.value = newTagList;
+
+        // if (newVal && newVal[0] && newVal[0]?.name && newTag && newTag.length) {
+        //
+        //     tagList.value = newTagList;
+        // } else {
+        //     tagList.value = [{}];
+        // }
     },
     {
         immediate: true,
@@ -196,9 +198,14 @@ onMounted(() => {
 </script>
 
 <style lang="less" scoped>
-.tagName::before {
+.tagName {
+  display: inline-block;
+  height: 100%;
+  line-height: 32px;
+
+  &::before {
     position: relative;
-    left: 70px;
+    left: 72px;
     display: inline-block;
     margin-right: 4px;
     color: #ff4d4f;
@@ -206,5 +213,7 @@ onMounted(() => {
     font-family: SimSun, sans-serif;
     line-height: 1;
     content: '*';
+  }
 }
-</style>
\ No newline at end of file
+
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue b/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue
index 5fc46f7e..21fb4929 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/TopCard.vue
@@ -2,24 +2,24 @@
     <div class="trigger-way-warp" :class="{ disabled: disabled }">
         <div
             v-for="item in typeList"
-            :key="item.value"
             class="trigger-way-item"
+            :key="item.value"
             :class="{
                 active: _value === item.value,
                 labelBottom: labelBottom,
+                itemDisabled: item.disabled,
             }"
-            @click="onSelect(item.value)"
+            @click="onSelect(item.value, item.disabled)"
         >
             <div class="'way-item-title">
                 <span class="way-item-label">{{ item.label }}</span>
-                <j-popover v-if="item.tip">
-                    <j-tooltip :title="item.tip">
-                        <AIcon
-                            type="QuestionCircleOutlined"
-                            class="way-item-icon"
-                        />
-                    </j-tooltip>
-                </j-popover>
+                <j-tooltip v-if="item.tip" :title="item.tip">
+                    <AIcon
+                        type="QuestionCircleOutlined"
+                        class="way-item-icon"
+                        style="padding-left: 8px"
+                    />
+                </j-tooltip>
             </div>
             <div class="way-item-image">
                 <img :width="48" :src="item.image" />
@@ -28,7 +28,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="DeviceTopCard">
 import { PropType } from 'vue';
 
 const props = defineProps({
@@ -61,8 +61,8 @@ watch(
     { immediate: true, deep: true },
 );
 
-const onSelect = (_type: string) => {
-    if (!props.disabled) {
+const onSelect = (_type: string, disabled: Boolean) => {
+    if (!props.disabled && !disabled) {
         _value.value = _type;
         emits('update:value', _type);
         emits('change', _type);
@@ -78,16 +78,20 @@ const onSelect = (_type: string) => {
     width: 100%;
 
     .trigger-way-item {
+        flex: 1 1 0;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        width: 237px;
+        min-width: 0;
+        //width: 237px;
         padding: 12px 16px;
         border: 1px solid #e0e4e8;
         border-radius: 2px;
         cursor: pointer;
         transition: all 0.3s;
-
+        &.itemDisabled {
+        cursor: not-allowed;
+    }
         .way-item-title {
             span {
                 font-size: 16px;
@@ -99,25 +103,20 @@ const onSelect = (_type: string) => {
 
             .way-item-icon {
                 color: rgba(#000, 0.5);
+                padding-left: 8px;
             }
         }
 
         .way-item-image {
             margin: 0 !important;
-            opacity: 0.6;
         }
 
         &:hover {
-            .way-item-image {
-                opacity: 0.8;
-            }
+          border-color: @primary-color-hover;
         }
 
         &.active {
             border-color: @primary-color-active;
-            .way-item-image {
-                opacity: 1;
-            }
         }
 
         &.labelBottom {
@@ -148,4 +147,4 @@ const onSelect = (_type: string) => {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
index 343c01ce..1ecce83b 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/index.vue
@@ -69,7 +69,7 @@
     </div>
 </template>
 
-<script setup lang='ts' name="Device">
+<script setup lang="ts" name="Device">
 import { useSceneStore } from '@/store/scene';
 import TopCard from './TopCard.vue';
 import { storeToRefs } from 'pinia';
@@ -81,6 +81,7 @@ import RelationSelect from './RelationSelect.vue';
 import { getParams } from '../../../util';
 import { handleParamsData } from '../../../components/Terms/util';
 import _ from 'lodash-es';
+import { TypeMap } from './util';
 
 const props = defineProps({
     values: {
@@ -133,52 +134,27 @@ const list = ref<any[]>([]);
 const builtInList = ref<any[]>([]);
 const tagList = ref<any[]>([]);
 
-const TypeList = [
-    {
-        label: '自定义',
-        value: 'fixed',
-        image: getImage('/scene/device-custom.png'),
-        tip: '自定义选择当前产品下的任意设备',
-    },
-    {
-        label: '按关系',
-        value: 'relation',
-        image: getImage('/scene/device-relation.png'),
-        tip: '选择与触发设备具有相同关系的设备',
-    },
-    {
-        label: '按标签',
-        value: 'tag',
-        image: getImage('/scene/device-tag.png'),
-        tip: '按标签选择产品下具有特定标签的设备',
-    },
-    {
-        label: '按变量',
-        value: 'context',
-        image: getImage('/scene/device-variable.png'),
-        tip: '选择设备ID为上游变量值的设备',
-    },
-];
-
 const filterTree = (nodes: any[]) => {
     if (!nodes?.length) {
         return nodes;
     }
-    const arr = nodes.filter((it) => {
-        if (
-            it.children.find(
-                (item: any) =>
-                    item?.id?.indexOf(
-                        'deviceId' || 'device_id' || 'device_Id',
-                    ) > -1,
-            ) &&
-            !it.children.find((item: any) => item?.id.indexOf('boolean') > -1)
-        ) {
-            return true;
-        }
-        return false;
-    });
-    return arr.map((item) => {
+    // const arr = nodes.filter((it) => {
+    //     const deviceAttr = ['deviceId', 'device_id', 'device_Id']
+    //     return it.children.some((item: any) => deviceAttr.includes(item.id) && !item.id.includes('boolean'))
+    //     // if (
+    //     //     it.children.find(
+    //     //         (item: any) =>
+    //     //             item?.id?.indexOf(
+    //     //                 'deviceId' || 'device_id' || 'device_Id',
+    //     //             ) > -1,
+    //     //     ) &&
+    //     //     !it.children.find((item: any) => item?.id.indexOf('boolean') > -1)
+    //     // ) {
+    //     //     return true;
+    //     // }
+    //     // return false;
+    // });
+    return nodes.map((item) => {
         if (item.children) {
         }
         return {
@@ -197,20 +173,46 @@ const sourceChangeEvent = async () => {
         action: props.name - 1,
     };
     //判断相同产品才有按变量
-    const productId =
-        data.value?.branches?.[props.branchesName].then?.[props.thenName]
-            ?.actions?.[props.name > 0 ? props.name - 1 : 0]?.device?.productId;
-    if (productId === props?.productDetail?.id) {
-        const _data = await getParams(_params, unref(data));
-        builtInList.value = handleParamsData(filterTree(_data), 'id');
-    } else {
-        builtInList.value = [];
-    }
+    // const productId =
+    //     data.value?.branches?.[props.branchesName].then?.[props.thenName]
+    //         ?.actions?.[props.name > 0 ? props.name - 1 : 0]?.device?.productId;
+    // if (productId === props?.productDetail?.id) {
+    //     const _data = await getParams(_params, unref(data));
+    //     builtInList.value = handleParamsData(filterTree(_data), 'id');
+    // } else {
+    //     builtInList.value = [];
+    // }
+  const _data = await getParams(_params, unref(data));
+  builtInList.value = handleParamsData(filterTree(_data), 'id');
+
+  if (props.productDetail?.id) {
+    filterType(props.productDetail);
+  }
 };
 
 const filterType = async (newVal: any) => {
-    const _list = TypeList.filter((item) => item.value === 'fixed');
-    if (unref(data)?.trigger?.type === 'device') {
+    // const _typeList = [
+    //   TypeMap.fixed,
+    // ]
+    let _typeList = [
+        TypeMap.fixed,
+        TypeMap.context,
+        TypeMap.relation,
+        TypeMap.tag,
+    ];
+    const triggerType = unref(data)?.trigger?.type;
+
+    //标签
+    const tag = JSON.parse(newVal?.metadata || '{}')?.tags;
+
+    tagList.value = tag || [];
+
+    if (tag?.length === 0) {
+      _typeList[3].disabled = true
+    }
+
+    if (triggerType === 'device') {
+        // _typeList.push(TypeMap.tag) // 设备输出一直展示标签
         //关系
         const res = await NoticeApi.getRelationUsers({
             paging: false,
@@ -219,38 +221,46 @@ const filterType = async (newVal: any) => {
                 { termType: 'eq', column: 'objectTypeName', value: '设备' },
             ],
         });
-        if (res.status === 200 && res.result.length !== 0) {
-            const array = TypeList.filter((item) => item.value === 'relation');
-            _list.push(...array);
-        }
-        //标签
-        const tag = JSON.parse(newVal?.metadata || '{}')?.tags;
-        if (tag && tag.length !== 0) {
-            tagList.value = tag || [];
-            const array = TypeList.filter((item) => item.value === 'tag');
-            _list.push(...array);
+        if (res.success && res.result.length !== 0) {
+            // _typeList.push(TypeMap.relation)
+            // TypeMap.relation.disabled = true;
+          _typeList[2].disabled = true
         }
         //变量
-        if (
-            builtInList.value.length !== 0 &&
-            !props.parallel &&
-            props.name !== 0
-        ) {
-            const array = TypeList.filter((item) => item.value === 'context');
-            _list.push(...array);
-        }
-        list.value = _list;
+
+        // if (builtInList.value.length) {
+        //     //   _typeList.push(TypeMap.context)
+        //     // TypeMap.context.disabled = true;
+        //
+        // }
+      _typeList[1].disabled = !builtInList.value.length
     } else {
-        if (
-            builtInList.value.length !== 0 &&
-            !props.parallel &&
-            props.name !== 0
-        ) {
-            const array = TypeList.filter((item) => item.value === 'context');
-            _list.push(...array);
-        }
-        list.value = _list;
+        // if (
+        //     // builtInList.value.length !== 0 &&
+        //     // !props.parallel &&
+        //     // props.name !== 0
+        //   builtInList.value.length
+        // ) {
+        //     //   _typeList.push(TypeMap.context)
+        //     // TypeMap.context.disabled = true;
+        //   _typeList[1].disabled = true
+        // }
+
+
+      if (props.name === 0) {
+        _typeList = [
+          TypeMap.fixed,
+          TypeMap.tag,
+        ]
+      } else {
+        _typeList.splice(2, 1)
+        _typeList[1].disabled = !builtInList.value.length
+      }
     }
+
+  console.log(_typeList)
+
+    list.value = _typeList;
 };
 
 const onSelectorChange = (val: string) => {
@@ -273,7 +283,7 @@ const onDeviceChange = (_detail: any) => {
             modelRef.deviceId = '';
             modelRef.selectorValues = [] as any;
         }
-        modelRef.upperKey = ''
+        modelRef.upperKey = '';
         emits('save', unref(modelRef), { name: _detail.name });
     }
 };
@@ -317,7 +327,7 @@ const onVariableChange = (val: any, node: any) => {
     modelRef.deviceId = val;
     modelRef.source = 'upper';
     modelRef.upperKey = val;
-    modelRef.selectorValues = undefined // [{ value: val, name: node.description }] as any;
+    modelRef.selectorValues = undefined; // [{ value: val, name: node.description }] as any;
     emits('save', unref(modelRef), { name: node.description });
 };
 
@@ -334,11 +344,8 @@ watch(
 
 watch(
     () => props.productDetail,
-    async (newVal) => {
-        await sourceChangeEvent();
-        if (newVal?.id) {
-            filterType(newVal);
-        }
+    (newVal) => {
+        sourceChangeEvent();
     },
     {
         immediate: true,
@@ -381,7 +388,7 @@ const onFormSave = () => {
                         });
                     }
                 } else {
-                    resolve({..._data});
+                    resolve({ ..._data });
                 }
             })
             .catch((err: any) => {
@@ -393,5 +400,4 @@ const onFormSave = () => {
 defineExpose({ onFormSave });
 </script>
 
-<style scoped lang='less'>
-</style>
\ No newline at end of file
+<style scoped lang="less"></style>
diff --git a/src/views/rule-engine/Scene/Save/action/Device/device/util.ts b/src/views/rule-engine/Scene/Save/action/Device/device/util.ts
new file mode 100644
index 00000000..33b18b7a
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/Device/device/util.ts
@@ -0,0 +1,32 @@
+import {getImage} from "@/utils/comm";
+
+export const TypeMap = {
+    fixed: {
+        label: '自定义',
+        value: 'fixed',
+        image: getImage('/scene/device-custom.png'),
+        tip: '自定义选择当前产品下的任意设备',
+        disabled: false
+    },
+    relation: {
+        label: '按关系',
+        value: 'relation',
+        image: getImage('/scene/device-relation.png'),
+        tip: '选择与触发设备具有相同关系的设备',
+        disabled: false
+    },
+    tag: {
+        label: '按标签',
+        value: 'tag',
+        image: getImage('/scene/device-tag.png'),
+        tip: '按标签选择产品下具有特定标签的设备',
+        disabled: false
+    },
+    context: {
+        label: '按变量',
+        value: 'context',
+        image: getImage('/scene/device-variable.png'),
+        tip: '选择设备ID为上游变量值的设备',
+        disabled: false
+    },
+}
diff --git a/src/views/rule-engine/Scene/Save/action/Device/index.vue b/src/views/rule-engine/Scene/Save/action/Device/index.vue
index 80943c9d..fde6967d 100644
--- a/src/views/rule-engine/Scene/Save/action/Device/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Device/index.vue
@@ -44,6 +44,7 @@
                 :thenName="thenName"
                 :values="DeviceModel"
                 :productDetail="productDetail"
+                :columnMap="options.columnMap"
                 ref="actionRef"
                 @change="onActionsChange"
             />
@@ -63,7 +64,7 @@
     </j-modal>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="ActionDeviceModal">
 import { DeviceModelType, DeviceOptionType } from './typings';
 import Product from './Product.vue';
 import Device from './device/index.vue';
@@ -135,7 +136,7 @@ const onCancel = () => {
     emit('cancel');
 };
 
-const onSave = (_data: any) => {
+const onSave = (_data: any, _columnMap: any = {}) => {
     const item: any = {
         selector: DeviceModel.selector,
         source: DeviceModel.source,
@@ -155,7 +156,8 @@ const onSave = (_data: any) => {
         selector: DeviceModel.selector, //选择器标识
         triggerName: data.value.options?.trigger?.name || '触发设备',
         ...DeviceOptions.value,
-        otherColumns: []
+        otherColumns: [],
+        columnMap: _columnMap
     };
     const _type = _data.message.messageType;
     if (_type === 'INVOKE_FUNCTION') {
@@ -229,7 +231,8 @@ const save = async (step?: number) => {
     } else {
         if (actionRef.value) {
             const _data = await actionRef.value?.onFormSave();
-            onSave(_data);
+            const _columnMap = actionRef.value?.getColumnMap()
+            onSave(_data, _columnMap);
         }
     }
 };
@@ -271,4 +274,4 @@ watch(
     overflow-y: auto;
     overflow-x: hidden;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckFilterItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckFilterItem.vue
new file mode 100644
index 00000000..2fbb9f36
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckFilterItem.vue
@@ -0,0 +1,102 @@
+<template>
+  <slot />
+</template>
+
+<script setup name="CheckFilterItem">
+import { Form } from "jetlinks-ui-components";
+import {queryAlarmList} from "@/api/rule-engine/scene";
+import {defineExpose} from "vue";
+import {useSceneStore} from "@/store/scene";
+import {storeToRefs} from "pinia";
+import { CHECK_FILTER_KEY } from './util'
+
+const props = defineProps({
+  name: {
+    type: Number,
+    default: 0,
+  },
+  termsName: {
+    type: Number,
+    default: 0,
+  },
+  actionName: {
+    type: Number,
+    default: 0,
+  },
+  thenName: {
+    type: Number,
+    default: 0,
+  },
+  branchName: {
+    type: Number,
+    default: 0,
+  },
+  value: {
+    type: Object,
+    default: () => ({})
+  }
+})
+
+const formItemContext = Form.useInjectFormItemContext()
+const sceneStore = useSceneStore();
+const { data } = storeToRefs(sceneStore);
+
+const formTouchOff = () => {
+  formItemContext.onFieldChange()
+}
+
+const check = async () => {
+  if (props.value?.terms?.length) {
+    const alarmTerms = props.value.terms[1]
+    const id = data.value.id
+    const bindId = data.value.branches[props.branchName].then[props.thenName].actions[props.actionName].actionId || data.value.branches[props.branchName].branchId
+    if (alarmTerms?.value.value) {
+      const resp = await queryAlarmList({
+        terms: [
+          {
+            column: 'id',
+            termType: 'eq',
+            value: alarmTerms.value.value,
+            type: 'and'
+          },
+          {
+            terms: [
+              {
+                column: 'id$rule-bind-alarm',
+                value: `${id}:${bindId}`,
+              },
+              {
+                column: 'id$rule-bind-alarm',
+                value: `${id}:${-1}`,
+                type: 'or'
+              },
+            ],
+            type: 'and'
+          },
+        ]
+      })
+
+      if (!resp.result?.length) {
+        formTouchOff()
+      }
+    } else {
+      formTouchOff()
+    }
+  }
+}
+
+check()
+
+provide(CHECK_FILTER_KEY, {
+  onFieldChange: formTouchOff
+})
+
+defineExpose({
+  formTouchOff
+})
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
index 002739b8..5043bd03 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/CheckItem.vue
@@ -3,11 +3,10 @@
 </template>
 
 <script setup lang='ts' name='ActionCheckItem'>
-import { ActionsType, FormModelType, PlatformRelation } from '@/views/rule-engine/Scene/typings'
+import type { PlatformRelation } from '@/views/rule-engine/Scene/typings'
 import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
 import { queryProductList } from '@/api/device/product'
-import { query as deviceQuery } from '@/api/device/instance'
 import noticeConfig from '@/api/notice/config'
 import noticeTemplate from '@/api/notice/template'
 import { Form } from 'jetlinks-ui-components'
@@ -15,6 +14,8 @@ import { EventEmitter, EventSubscribeKeys, getParams } from '@/views/rule-engine
 import { getOption } from '@/views/rule-engine/Scene/Save/components/DropdownButton/util'
 import { getBuildInData, getNotifyVariablesUser } from './util'
 import { defineExpose } from 'vue'
+import {queryDetailListNoPaging} from "@/api/device/firmware";
+
 
 const sceneStore = useSceneStore();
 const { data: _data } = storeToRefs(sceneStore);
@@ -57,17 +58,27 @@ const checkDeviceDelete = async () => {
 
   const productDetail = proResp?.result?.data?.[0]
   let metadata = JSON.parse(productDetail?.metadata || '{}')
-
   if (item?.selector === 'fixed') {
     let hasDevice = false
     if (item!.selectorValues) {
       const deviceList = item!.selectorValues?.map(item => item.value) || []
-      const deviceResp = await deviceQuery({ terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}]})
-      hasDevice = deviceResp.success && (deviceResp.result as any)?.total === (item!.selectorValues?.length || 0)
+      const deviceResp = await queryDetailListNoPaging(
+        {
+          terms: [{ terms: [{ column: 'id', termType: 'in', value: deviceList.toString() }]}],
+          context: {
+            "includeTags": false,
+            "includeBind": false,
+            "includeRelations": false,
+            "includeFirmwareInfos": false
+          }
+        })
+
+      hasDevice = deviceResp.success && deviceResp.result.length === (item!.selectorValues?.length || 0)
 
       if (item!.selectorValues!.length === 1 && hasDevice) {
-        const deviceDetail = deviceResp?.result?.data?.[0]
-        metadata = JSON.parse(deviceDetail?.deriveMetadata || productDetail?.metadata || '{}') // 只选中一个设备，以设备物模型为准
+        const deviceDetail = deviceResp.result?.[0]
+        // const deviceDetailResp = await getDeviceDetail(deviceList[0])
+        metadata = JSON.parse(deviceDetail?.metadata || productDetail?.metadata || '{}') // 只选中一个设备，以设备物模型为准
       }
     }
     if (!hasDevice) { // 某一个设备被删除
@@ -78,33 +89,47 @@ const checkDeviceDelete = async () => {
     }
 
   } else if (item!.selector === 'context') { // 如果是按变量，校验上一个设备输出的产品id
-    if (props.name === 0) {
+    // if (props.name === 0) {
+    //   _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
+    //   formTouchOff()
+    //   return
+    // } else {
+    //   const prevItem = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].device
+    //   if (prevItem?.productId !== item?.productId) {
+    //     _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
+    //     _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
+    //     formTouchOff()
+    //     return
+    //   } else {
+    //     const _upperKey = item!.upperKey
+    //     const _params = {
+    //       branch: props.thenName,
+    //       branchGroup: props.branchesName,
+    //       action: props.name - 1,
+    //     };
+    //     const upperData = await getParams(_params, unref(_data.value));
+    //     const option = getOption(upperData, _upperKey, 'id')
+    //     if (!option) {
+    //       _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
+    //       _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
+    //       formTouchOff()
+    //       return
+    //     }
+    //   }
+    // }
+    const _upperKey = item!.upperKey
+    const _params = {
+      branch: props.thenName,
+      branchGroup: props.branchesName,
+      action: props.name - 1,
+    };
+    const upperData = await getParams(_params, unref(_data.value));
+    const option = getOption(upperData, _upperKey, 'id')
+    if (!option) {
       _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
+      _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
       formTouchOff()
       return
-    } else {
-      const prevItem = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].device
-      if (prevItem?.productId !== item?.productId) {
-        _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
-        _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
-        formTouchOff()
-        return
-      } else {
-        const _upperKey = item!.upperKey
-        const _params = {
-          branch: props.thenName,
-          branchGroup: props.branchesName,
-          action: props.name - 1,
-        };
-        const upperData = await getParams(_params, unref(_data.value));
-        const option = getOption(upperData, _upperKey, 'id')
-        if (!option) {
-          _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.upperKey = undefined
-          _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].device!.changeData = true
-          formTouchOff()
-          return
-        }
-      }
     }
   } else if (item!.selector === 'relation') {
     const _relationValue = (item!.selectorValues?.[0]?.value as any)?.relation
@@ -316,12 +341,15 @@ const checkNoticeDelete = async () => {
 }
 
 const check = () => {
-  console.log(_data.value.branches)
-  const _executor = _data.value.branches![props.branchesName].then[props.thenName].actions?.[props.name]?.executor
-  if (_executor === 'device' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.device) { // 设备输出，并且有值
-    checkDeviceDelete()
-  } else if (_executor === 'notify' && _data.value.branches![props.branchesName].then[props.thenName].actions[props.name]?.notify) {
-    checkNoticeDelete()
+  if (_data.value.branches![props.branchesName].then[props.thenName]) {
+
+    const action = _data.value.branches![props.branchesName].then[props.thenName].actions?.[props.name]
+    const _executor = action?.executor
+    if (_executor === 'device' && action?.device) { // 设备输出，并且有值
+      checkDeviceDelete()
+    } else if (_executor === 'notify' && action?.notify) {
+      checkNoticeDelete()
+    }
   }
 }
 
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
index 17b92bd6..4f49613d 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterCondition.vue
@@ -1,381 +1,603 @@
 <template>
-  <div class='terms-params-item'>
-    <div v-if='!isFirst' class='term-type-warp'>
-      <DropdownButton
-        :options='[
-            { label: "并且", value: "and" },
-            { label: "或者", value: "or" },
-          ]'
-        type='type'
-        v-model:value='paramsValue.type'
-        @select='typeChange'
-      />
+    <div class="terms-params-item">
+        <div v-if="!isFirst" class="term-type-warp">
+            <DropdownButton
+                :options="[
+                    { label: '并且', value: 'and' },
+                    { label: '或者', value: 'or' },
+                ]"
+                type="type"
+                v-model:value="paramsValue.type"
+                @select="typeChange"
+            />
+        </div>
+        <div
+            class="params-item_button"
+            @mouseover="mouseover"
+            @mouseout="mouseout"
+        >
+            <DropdownButton
+                :options="columnOptions"
+                icon="icon-zhihangdongzuoxie-1"
+                type="column"
+                value-name="id"
+                label-name="fullName"
+                placeholder="请选择参数"
+                v-model:value="paramsValue.column"
+                component="treeSelect"
+                @select="columnSelect"
+            />
+            <DropdownButton
+                v-if="showAlarm"
+                :options="alarmOptions"
+                type="alarm"
+                placeholder="请选择告警配置"
+                v-model:value="paramsValue.alarm"
+                @select="alarmSelect"
+            />
+            <DropdownButton
+                :options="termTypeOptions"
+                type="termType"
+                value-name="id"
+                label-name="name"
+                placeholder="操作符"
+                v-model:value="paramsValue.termType"
+                @select="termsTypeSelect"
+            />
+            <DoubleParamsDropdown
+                v-if="showDouble"
+                icon="icon-canshu"
+                placeholder="参数值"
+                value-name="id"
+                label-name="name"
+                :options="valueOptions"
+                :metricOptions="valueColumnOptions"
+                :tabsOptions="tabsOptions"
+                v-model:value="paramsValue.value.value"
+                v-model:source="paramsValue.value.source"
+                @select="valueSelect"
+            />
+            <ParamsDropdown
+                v-else
+                icon="icon-canshu"
+                placeholder="参数值"
+                value-name="id"
+                label-name="name"
+                :options="showAlarmSelect ? alarmOptions : valueOptions"
+                :metricOptions="valueColumnOptions"
+                :tabsOptions="tabsOptions"
+                v-model:value="paramsValue.value.value"
+                v-model:source="paramsValue.value.source"
+                @select="valueSelect"
+            />
+            <ConfirmModal
+                title="确认删除？"
+                :onConfirm="onDelete"
+                :show="showDelete"
+                className="button-delete"
+            >
+                <AIcon type="CloseOutlined" />
+            </ConfirmModal>
+        </div>
+        <div class="term-add" @click.stop="termAdd" v-if="isLast">
+            <div class="terms-content">
+                <AIcon type="PlusOutlined" style="font-size: 12px" />
+            </div>
+        </div>
     </div>
-    <div
-      class='params-item_button'
-      @mouseover='mouseover'
-      @mouseout='mouseout'
-    >
-      <DropdownButton
-        :options='columnOptions'
-        icon='icon-zhihangdongzuoxie-1'
-        type='column'
-        value-name='id'
-        label-name='fullName'
-        placeholder='请选择参数'
-        v-model:value='paramsValue.column'
-        component='treeSelect'
-        @select='columnSelect'
-      />
-      <DropdownButton
-        :options='termTypeOptions'
-        type="termType"
-        value-name='id'
-        label-name='name'
-        placeholder="操作符"
-        v-model:value='paramsValue.termType'
-        @select='termsTypeSelect'
-      />
-      <DoubleParamsDropdown
-        v-if='showDouble'
-        icon='icon-canshu'
-        placeholder='参数值'
-        value-name='id'
-        label-name='name'
-        :options='valueOptions'
-        :metricOptions='valueColumnOptions'
-        :tabsOptions='tabsOptions'
-        v-model:value='paramsValue.value.value'
-        v-model:source='paramsValue.value.source'
-        @select='valueSelect'
-      />
-      <ParamsDropdown
-        v-else
-        icon='icon-canshu'
-        placeholder='参数值'
-        value-name='id'
-        label-name='name'
-        :options='valueOptions'
-        :metricOptions='valueColumnOptions'
-        :tabsOptions='tabsOptions'
-        v-model:value='paramsValue.value.value'
-        v-model:source='paramsValue.value.source'
-        @select='valueSelect'
-      />
-      <j-popconfirm title='确认删除？' @confirm='onDelete'>
-        <div v-show='showDelete' class='button-delete'> <AIcon type='CloseOutlined' /></div>
-      </j-popconfirm>
-    </div>
-    <div class='term-add' @click.stop='termAdd' v-if='isLast'>
-      <div class='terms-content'>
-        <AIcon type='PlusOutlined' style='font-size: 12px' />
-      </div>
-    </div>
-  </div>
 </template>
 
-<script setup lang='ts' name='FilterCondition'>
-import type { PropType } from 'vue'
-import type { TermsType } from '@/views/rule-engine/Scene/typings'
-import DropdownButton from '../../components/DropdownButton'
-import { getOption } from '../../components/DropdownButton/util'
-import ParamsDropdown, { DoubleParamsDropdown } from '../../components/ParamsDropdown'
-import { inject } from 'vue'
-import { useSceneStore } from 'store/scene'
+<script setup lang="ts" name="FilterCondition">
+import type { PropType } from 'vue';
+import type { TermsType } from '@/views/rule-engine/Scene/typings';
+import DropdownButton from '../../components/DropdownButton';
+import { getOption } from '../../components/DropdownButton/util';
+import ParamsDropdown, {
+    DoubleParamsDropdown,
+} from '../../components/ParamsDropdown';
+import { inject } from 'vue';
+import { useSceneStore } from 'store/scene';
 import { storeToRefs } from 'pinia';
-import { cloneDeep, flattenDeep, isArray, isObject, set } from 'lodash-es'
-import { Form } from 'jetlinks-ui-components'
-import {treeFilter} from "@/utils/comm";
-import { timeTypeKeys } from '@/views/rule-engine/Scene/Save/components/Terms/util'
+import {cloneDeep, flattenDeep, isArray, isObject, omit, set} from 'lodash-es';
+import { Form } from 'jetlinks-ui-components';
+import { treeFilter } from '@/utils/comm';
+import { timeTypeKeys } from '@/views/rule-engine/Scene/Save/components/Terms/util';
+import { EventEmitter } from '@/views/rule-engine/Scene/Save/util'
+import {queryAlarmList} from '@/api/rule-engine/scene';
+import {analysisFilterTerms, handleFilterTerms, useCheckFilter } from "@/views/rule-engine/Scene/Save/action/ListItem/util";
 
-const sceneStore = useSceneStore()
-const { data: formModel } = storeToRefs(sceneStore)
+
+const sceneStore = useSceneStore();
+const { data: formModel } = storeToRefs(sceneStore);
 
 type Emit = {
-  (e: 'update:value', data: TermsType): void
-}
+    (e: 'update:value', data: TermsType): void;
+};
 
 type TabsOption = {
-  label: string;
-  key: string;
-  component: string
-}
+    label: string;
+    key: string;
+    component: string;
+};
 
 const props = defineProps({
-  isFirst: {
-    type: Boolean,
-    default: true
-  },
-  isLast: {
-    type: Boolean,
-    default: true
-  },
-  showDeleteBtn: {
-    type: Boolean,
-    default: true
-  },
-  name: {
-    type: Number,
-    default: 0
-  },
-  termsName: {
-    type: Number,
-    default: 0
-  },
-  actionName: {
-    type: Number,
-    default: 0
-  },
-  thenName: {
-    type: Number,
-    default: 0
-  },
-  branchName: {
-    type: Number,
-    default: 0
-  },
-  value: {
-    type: Object as PropType<TermsType>,
-    default: () => ({
-      column: '',
-      type: 'and',
-      termType: 'eq',
-      value: {
-        source: 'fixed',
-        value: undefined
-      }
-    })
-  }
-})
+    isFirst: {
+        type: Boolean,
+        default: true,
+    },
+    isLast: {
+        type: Boolean,
+        default: true,
+    },
+    showDeleteBtn: {
+        type: Boolean,
+        default: true,
+    },
+    name: {
+        type: Number,
+        default: 0,
+    },
+    termsName: {
+        type: Number,
+        default: 0,
+    },
+    actionName: {
+        type: Number,
+        default: 0,
+    },
+    thenName: {
+        type: Number,
+        default: 0,
+    },
+    branchName: {
+        type: Number,
+        default: 0,
+    },
+    value: {
+        type: Object as PropType<TermsType>,
+        default: () => ({
+            column: '',
+            type: 'and',
+            termType: 'eq',
+            value: {
+                source: 'fixed',
+                value: undefined,
+            },
+        }),
+    },
+});
 
-const emit = defineEmits<Emit>()
+const emit = defineEmits<Emit>();
 
 const paramsValue = reactive<TermsType>({
-  column: props.value.column,
-  type: props.value.type,
-  termType: props.value.termType,
-  value: props.value.value
-})
-const formItemContext = Form.useInjectFormItemContext()
-const showDelete = ref(false)
-const columnOptions: any = inject('filter-params') //
-const columnType = ref<string>()
-const termTypeOptions = ref<Array<{ id: string, name: string}>>([]) // 条件值
-const valueOptions = ref<any[]>([]) // 默认手动输入下拉
-const arrayParamsKey = ['nbtw', 'btw', 'in', 'nin', 'contains_all', 'contains_any', 'not_contains']
-const valueColumnOptions = ref<any[]>([])
+    column: props.value.column,
+    type: props.value.type,
+    termType: props.value.termType,
+    value: props.value.value,
+    alarm: undefined
+});
+const formItemContext = Form.useInjectFormItemContext();
+const showDelete = ref(false);
+const columnOptions: any = inject('filter-params'); //
+const columnType = ref<string>();
+const termTypeOptions = ref<Array<{ id: string; name: string }>>([]); // 条件值
+const valueOptions = ref<any[]>([]); // 默认手动输入下拉
+const arrayParamsKey = [
+    'nbtw',
+    'btw',
+    'in',
+    'nin',
+    'contains_all',
+    'contains_any',
+    'not_contains',
+];
+const valueColumnOptions = ref<any[]>([]);
 
-const tabsOptions = ref<Array<TabsOption>>(
-  [
+const showAlarmKey = ['lastAlarmTime', 'firstAlarm', 'alarmTime', 'level']
+const showAlarmSelectKey = ['alarmConfigId', 'alarmName']
+
+const tabsOptions = ref<Array<TabsOption>>([
     { label: '手动输入', key: 'fixed', component: 'string' },
-    { label: '内置参数', key: 'upper', component: 'tree' }
-  ]
-)
+    { label: '内置参数', key: 'upper', component: 'tree' },
+]);
 
-const handOptionByColumn = (option: any) => {
-  if (option) {
-    termTypeOptions.value = option.termTypes || []
-    tabsOptions.value[0].component = option.type
-    columnType.value = option.type
-    const _options = option.options
-    if (option.type === 'boolean') {
-      // 处理_options为Object时
-      if (isObject(_options)) {
-        const bool = (_options as any)?.bool
-        valueOptions.value = [
-          { label: bool.falseText, name: bool.falseText, value: bool.falseValue, id: bool.falseValue },
-          { label: bool.trueText, name: bool.trueText, value: bool.trueValue, id: bool.trueValue },
-        ]
-      } else {
-        valueOptions.value = _options?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || [
-          { label: '是', name: '是', value: 'true', id: 'true' },
-          { label: '否', name: '否', value: 'false', id: 'false' },
-        ]
-      }
-    } else if(option.type === 'enum') {
-      valueOptions.value = _options?.elements?.map((item: any) => ({ ...item, label: item.text, value: item.value})) || []
-    } else{
-      valueOptions.value = (isObject(_options) ? [] : _options)?.map((item: any) => ({ ...item, label: item.name, value: item.id})) || []
-    }
-    valueColumnOptions.value = treeFilter(cloneDeep(columnOptions.value), option.type, 'type')
-  } else {
-    termTypeOptions.value = []
-    valueOptions.value = []
-    valueColumnOptions.value = []
-  }
-  if(paramsValue.termType){
-    if (columnType.value ==='date') {
-      if (timeTypeKeys.includes(paramsValue.termType)) {
-        if (tabsOptions.value[0].component !== 'int') {
-        }
-        tabsOptions.value[0].component = 'int'
-      } else if (!timeTypeKeys.includes(paramsValue.termType) && tabsOptions.value[0].component == 'int') {
-        tabsOptions.value[0].component = 'date'
-      }
-    }
-  }
-}
+const alarmOptions = ref([])
 
-watch(() => [columnOptions.value, paramsValue.column], () => {
-  if (paramsValue.column) {
-    const option = getOption(columnOptions.value, paramsValue.column, 'id')
-    if (option && Object.keys(option).length) {
-      handOptionByColumn(option)
-      if (props.value.error) {
-        emit('update:value', {
-          ...props.value,
-          error: false
-        })
-        formItemContext.onFieldChange()
-      }
-    } else {
-      emit('update:value', {
-        ...props.value,
-        error: true
-      })
-      formItemContext.onFieldChange()
-    }
-  }
-})
+const checkFilter = useCheckFilter()
 
 const showDouble = computed(() => {
-  const isRange = paramsValue.termType ? arrayParamsKey.includes(paramsValue.termType) : false
-  return isRange
+  return paramsValue.termType
+    ? arrayParamsKey.includes(paramsValue.termType)
+    : false;
+});
+
+const showAlarm = computed(() => {
+  return showAlarmKey.includes(paramsValue.column?.split('.')?.[1])
 })
 
-const mouseover = () => {
-  if (props.showDeleteBtn){
-    showDelete.value = true
-  }
+const showAlarmSelect = computed(() => {
+  return showAlarmSelectKey.includes(paramsValue.column?.split('.')?.[1])
+})
+
+const valueChangeAfter = () => {
+  checkFilter.onFieldChange()
 }
 
+const handOptionByColumn = (option: any) => {
+    if (option) {
+        termTypeOptions.value = option.termTypes || [];
+        const _showAlarmSelect = showAlarmSelectKey.includes(option.column?.split('.')?.[1])
+        const _type = _showAlarmSelect ? 'select' : option.type;
+        tabsOptions.value[0].component = _type
+        columnType.value = option.type;
+        const _options = option.options;
+        if (_type === 'boolean') {
+            // 处理_options为Object时
+            if (isObject(_options)) {
+                const bool = (_options as any)?.bool;
+                valueOptions.value = [
+                    {
+                        label: bool.falseText,
+                        name: bool.falseText,
+                        value: bool.falseValue,
+                        id: bool.falseValue,
+                    },
+                    {
+                        label: bool.trueText,
+                        name: bool.trueText,
+                        value: bool.trueValue,
+                        id: bool.trueValue,
+                    },
+                ];
+            } else {
+                valueOptions.value = _options?.map((item: any) => ({
+                    ...item,
+                    label: item.name,
+                    value: item.id,
+                })) || [
+                    { label: '是', name: '是', value: 'true', id: 'true' },
+                    { label: '否', name: '否', value: 'false', id: 'false' },
+                ];
+            }
+        } else if (_type === 'enum') {
+            valueOptions.value =
+                _options?.elements?.map((item: any) => ({
+                    ...item,
+                    label: item.text,
+                    value: item.value,
+                })) || [];
+        } else {
+            valueOptions.value =
+                (isObject(_options) ? [] : _options)?.map((item: any) => ({
+                    ...item,
+                    label: item.name,
+                    value: item.id,
+                })) || [];
+        }
+
+        valueColumnOptions.value = treeFilter(
+            cloneDeep(columnOptions.value),
+            _type,
+            'type',
+        );
+    } else {
+        // termTypeOptions.value = [];
+        valueOptions.value = [];
+        valueColumnOptions.value = [];
+    }
+    if (paramsValue.termType) {
+        if (columnType.value === 'date') {
+            if (timeTypeKeys.includes(paramsValue.termType)) {
+                if (tabsOptions.value[0].component !== 'int') {
+                }
+                tabsOptions.value[0].component = 'int';
+            } else if (
+                !timeTypeKeys.includes(paramsValue.termType) &&
+                tabsOptions.value[0].component == 'int'
+            ) {
+                tabsOptions.value[0].component = 'date';
+            }
+        }
+    }
+};
+
+
+const mouseover = () => {
+    if (props.showDeleteBtn) {
+        showDelete.value = true;
+    }
+};
+
 const mouseout = () => {
-  if (props.showDeleteBtn){
-    showDelete.value = false
-  }
-}
+    if (props.showDeleteBtn) {
+        showDelete.value = false;
+    }
+};
 
 const handleOptionsColumnsValue = (termsColumns: any[], _options: any) => {
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options!.termsColumns = termsColumns
-  const flatten = new Set(flattenDeep(termsColumns))
-  let newColumns = [...flatten.values()]
-  if (_options?.otherColumns) {
-    newColumns = [..._options?.otherColumns, ...newColumns]
-  }
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options!.columns = newColumns
-}
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.name
+    ].options!.termsColumns = termsColumns;
+    const flatten = new Set(flattenDeep(termsColumns));
+    let newColumns = [...flatten.values()];
+    if (_options?.otherColumns) {
+        newColumns = [..._options?.otherColumns, ...newColumns];
+    }
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.name
+    ].options!.columns = newColumns;
+};
 
 const columnSelect = (e: any) => {
-  const dataType = e.type
-  const hasTypeChange = dataType !== tabsOptions.value[0].component
-  let termTypeChange = false
+    const dataType = e.type;
+    const hasTypeChange = dataType !== tabsOptions.value[0].component;
+    let termTypeChange = false;
 
-  // 如果参数类型未发生变化，则不修改操作符以及值
-  const termTypes = e.termTypes
-  if (!termTypes.some((item: {id: string}) => paramsValue.termType === item.id)) { // 修改操作符
-    termTypeChange = true
-    paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
-  }
-
-  if (hasTypeChange) {
-    paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq'
-    paramsValue.value = {
-      source: tabsOptions.value[0].key,
-      value: undefined
-    }
-  } else if (termTypeChange) {
-    const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
-    const value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
-    paramsValue.value = {
-      source: paramsValue.value?.source || tabsOptions.value[0].key,
-      value: value
-    }
-  }
-
-  const columns = e.metadata === true ? [e.column] : []
-  const _options = formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options
-  const termsColumns = _options?.termsColumns || []
-  set(
-    termsColumns,
-    [props.termsName, props.name],
-    columns
-  )
-  handleOptionsColumnsValue(termsColumns, _options)
-  emit('update:value', { ...paramsValue })
-  formItemContext.onFieldChange()
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms[props.termsName].terms[props.name][0] = e.name
-}
-
-const termsTypeSelect = (e: { key: string, name: string }) => {
-  const oldValue = isArray(paramsValue.value!.value) ? paramsValue.value!.value[0] : paramsValue.value!.value
-  let value = arrayParamsKey.includes(e.key) ? [ oldValue, undefined ] : oldValue
-
-  // 如果上次的值 在 timeTypeKeys中 则不变
-  if (columnType.value ==='date') {
-    if (timeTypeKeys.includes(e.key)) {
-      if (tabsOptions.value[0].component !== 'int') {
-        value = undefined
+    if (showAlarmKey.includes(paramsValue.column?.split('.')?.[1])) {
+      if (!paramsValue.alarm) {
+        paramsValue.alarm = undefined
       }
-      tabsOptions.value[0].component = 'int'
-    } else if (!timeTypeKeys.includes(e.key) && tabsOptions.value[0].component == 'int') {
-      value = undefined
-      tabsOptions.value[0].component = 'date'
+    } else {
+      delete paramsValue.alarm
+      delete paramsValue.terms
     }
-  }
 
-  paramsValue.value = {
-    source: paramsValue.value?.source || tabsOptions.value[0].key,
-    value: value
-  }
-  emit('update:value', { ...paramsValue })
-  formItemContext.onFieldChange()
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms[props.termsName].terms[props.name][1] = e.name
+    // 如果参数类型未发生变化，则不修改操作符以及值
+    const termTypes = e.termTypes;
+    if (
+        !termTypes.some(
+            (item: { id: string }) => paramsValue.termType === item.id,
+        )
+    ) {
+        // 修改操作符
+        termTypeChange = true;
+        paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq';
+    }
+
+    if (hasTypeChange) {
+        paramsValue.termType = termTypes?.length ? termTypes[0].id : 'eq';
+        paramsValue.value = {
+            source: tabsOptions.value[0].key,
+            value: undefined,
+        };
+    } else if (termTypeChange) {
+        const oldValue = isArray(paramsValue.value!.value)
+            ? paramsValue.value!.value[0]
+            : paramsValue.value!.value;
+        const value = arrayParamsKey.includes(e.key)
+            ? [oldValue, undefined]
+            : oldValue;
+        paramsValue.value = {
+            source: paramsValue.value?.source || tabsOptions.value[0].key,
+            value: value,
+        };
+    }
+
+    const columns = e.metadata === true ? [e.column] : [];
+    const _options =
+        formModel.value.branches![props.branchName].then[props.thenName]
+            .actions[props.actionName].options;
+    const termsColumns = _options?.termsColumns || [];
+    set(termsColumns, [props.termsName, props.name], columns);
+    handleOptionsColumnsValue(termsColumns, _options);
+    emit('update:value', handleFilterTerms({ ...paramsValue }));
+    termTypeOptions.value = e.termTypes
+    valueChangeAfter();
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms[props.termsName].terms[props.name][0] = e.name;
+};
+
+const termsTypeSelect = (e: { key: string; name: string }) => {
+    const oldValue = isArray(paramsValue.value!.value)
+        ? paramsValue.value!.value[0]
+        : paramsValue.value!.value;
+    let value = arrayParamsKey.includes(e.key)
+        ? [oldValue, undefined]
+        : oldValue;
+
+    // 如果上次的值 在 timeTypeKeys中 则不变
+    if (columnType.value === 'date') {
+        if (timeTypeKeys.includes(e.key)) {
+            if (tabsOptions.value[0].component !== 'int') {
+                value = undefined;
+            }
+            tabsOptions.value[0].component = 'int';
+        } else if (
+            !timeTypeKeys.includes(e.key) &&
+            tabsOptions.value[0].component == 'int'
+        ) {
+            value = undefined;
+            tabsOptions.value[0].component = 'date';
+        }
+    }
+
+    paramsValue.value = {
+        source: paramsValue.value?.source || tabsOptions.value[0].key,
+        value: value,
+    };
+    const updateValue = omit(paramsValue, !showAlarm.value ? ['alarm', 'terms'] : [])
+    emit('update:value', handleFilterTerms({ ...updateValue }));
+  valueChangeAfter();
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms[props.termsName].terms[props.name][1] = e.name;
+};
+
+const alarmSelect = (e: { key: string; label: string }) => {
+  emit('update:value', handleFilterTerms({ ...paramsValue }));
+  valueChangeAfter();
+  formModel.value.branches![props.branchName].then[props.thenName].actions[
+    props.actionName
+    ].options!.terms[props.termsName].terms[props.name][4] = e.label;
 }
-
 const valueSelect = (_: any, label: string, labelObj: Record<number, any>) => {
-  emit('update:value', { ...paramsValue })
-  formItemContext.onFieldChange()
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms[props.termsName].terms[props.name][2] = labelObj
-}
+  const updateValue = omit(paramsValue, !showAlarm.value ? ['alarm', 'terms'] : [])
+  console.log(updateValue, showAlarm.value)
+    emit('update:value', handleFilterTerms({ ...updateValue }));
+  valueChangeAfter();
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms[props.termsName].terms[props.name][2] = labelObj;
+};
 
 const typeChange = (e: any) => {
-  paramsValue.type = e.value
-  emit('update:value', { ...paramsValue })
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms[props.termsName].terms[props.name][3] = e.label
-}
+    paramsValue.type = e.value;
+  const updateValue = omit(paramsValue, !showAlarm.value ? ['alarm', 'terms'] : [])
+    emit('update:value', handleFilterTerms({ ...updateValue }));
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms[props.termsName].terms[props.name][3] = e.label;
+};
 
 const termAdd = () => {
-  const terms = {
-    column: undefined,
-    value: {
-      source: 'fixed',
-      value: undefined
-    },
-    termType: undefined,
-    type: 'and',
-    key: `params_${new Date().getTime()}`
-  }
-  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.push(terms)
-}
+    const terms = {
+        column: undefined,
+        value: {
+            source: 'fixed',
+            value: undefined,
+        },
+        termType: undefined,
+        type: 'and',
+        key: `params_${new Date().getTime()}`,
+    };
+    formModel.value.branches![props.branchName].then[
+        props.thenName
+    ].actions[props.actionName].terms[props.termsName].terms.push(terms);
+
+    formModel.value.branches?.[props.branchName]?.then?.[
+        props.thenName
+    ]?.actions?.[props.actionName].options?.terms?.[
+        props.termsName
+    ].terms?.push(['', 'eq', '', 'and']);
+};
 
 const onDelete = () => {
-  const key = formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.[props.name].key
-  formModel.value.branches?.[props.branchName]?.then?.[props.thenName]?.actions?.[props.actionName].terms?.[props.termsName].terms?.splice(props.name, 1)
-  const _options = formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options
-  const termsColumns = _options?.termsColumns || []
-  set(
-    termsColumns,
-    [props.termsName, props.name],
-    []
-  )
-  handleOptionsColumnsValue(termsColumns, _options)
+    // const key =
+    //     formModel.value.branches?.[props.branchName]?.then?.[props.thenName]
+    //         ?.actions?.[props.actionName].terms?.[props.termsName].terms?.[
+    //         props.name
+    //     ].key;
+    formModel.value.branches![props.branchName].then[
+        props.thenName
+    ].actions[props.actionName].terms[props.termsName].terms?.splice(
+        props.name,
+        1,
+    );
+    const _options =
+        formModel.value.branches![props.branchName].then[props.thenName]
+            .actions[props.name].options;
+    const termsColumns = _options?.termsColumns || [];
+    set(termsColumns, [props.termsName, props.name], []);
+    handleOptionsColumnsValue(termsColumns, _options);
+};
+
+const getAlarmOptions = () => {
+  const actionId = formModel.value.branches![props.branchName].then[props.thenName]
+    .actions[props.name].actionId
+  const branchId = formModel.value.branches![props.branchName].branchId
+  const _id = formModel.value.id
+  queryAlarmList({
+    sorts: [{ name: 'createTime', order: 'desc' }],
+    terms: [
+      {
+        terms: [
+          {
+            column: 'id$rule-bind-alarm',
+            value: `${_id}:${actionId || branchId}`,
+          },
+          {
+            column: 'id$rule-bind-alarm',
+            value: `${_id}:${-1}`,
+            type: 'or'
+          },
+        ]
+      }
+    ]
+  }).then(resp => {
+    if (resp.success) {
+      alarmOptions.value = resp.result?.map(item => {
+        return {
+          ...item,
+          label: item.name,
+          value: item.id
+        }
+      }) || []
+    }
+  })
+}
+const subscribe = () => {
+  const actionId = formModel.value.branches![props.branchName].then[props.thenName]
+    .actions[props.name].actionId
+  const _key = actionId || formModel.value.branches![props.branchName].branchId
+  EventEmitter.subscribe([`${_key}_alarm`], () => {
+    console.log('subscribe')
+    getAlarmOptions()
+  })
 }
 
-nextTick(() => {
-  Object.assign(paramsValue, props.value)
+subscribe()
+
+watch([showAlarm.value, showAlarmSelect.value], (val) => {
+  if (val && !alarmOptions.value.length) {
+    getAlarmOptions()
+  }
+}, { immediate: true })
+
+watch(
+  () => [columnOptions.value, paramsValue.column],
+  () => {
+    if (paramsValue.column) {
+      const option = getOption(
+        columnOptions.value,
+        paramsValue.column,
+        'id',
+      );
+
+      if (option && Object.keys(option).length) {
+        handOptionByColumn(option);
+        if (props.value.error) {
+          emit('update:value', handleFilterTerms({
+            ...props.value,
+            error: false,
+          }));
+          valueChangeAfter();
+        }
+      } else {
+        emit('update:value', handleFilterTerms({
+          ...props.value,
+          error: true,
+        }));
+        valueChangeAfter();
+      }
+    }
+  },
+  { deep: true });
+
+watch(() => props.value, () => {
+  const terms = analysisFilterTerms(props.value)
+  console.log(props.value, terms)
+  paramsValue.value = terms.value
+  paramsValue.column = terms.column
+  paramsValue.type = terms.type
+  paramsValue.termType = terms.termType
+  if (terms.hasOwnProperty('alarm')) {
+    paramsValue.alarm = terms.alarm
+  }
+}, { immediate: true, deep: true })
+
+onMounted(() => {
+  if (paramsValue.column) {
+    const option = getOption(
+      columnOptions.value,
+      paramsValue.column,
+      'id',
+    );
+    if (option && Object.keys(option).length) {
+      handOptionByColumn(option);
+    }
+  }
 })
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
index c178ad34..84991fe8 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/FilterGroup.vue
@@ -1,257 +1,290 @@
 <template>
-  <div class='terms-params filter-group'>
-    <div class='terms-params-warp'>
-      <div v-if='!isFirst' class='term-type-warp'>
-        <DropdownButton
-          :options='[
-              { label: "并且", value: "and" },
-              { label: "或者", value: "or" },
-            ]'
-          type='type'
-          v-model:value='formModel.branches[branchName].then[thenName].actions[actionName].terms[name].type'
-          @select='typeChange'
-        />
-      </div>
-      <div
-        class='terms-params-content'
-        @mouseover='mouseover'
-        @mouseout='mouseout'
-      >
-        <j-popconfirm
-          title='确认删除？'
-          @confirm='onDelete'
-        >
-          <div v-show='showDelete' class='terms-params-delete'>
-            <AIcon type='CloseOutlined' />
-          </div>
-        </j-popconfirm>
-        <j-form-item
-          v-for='(item, index) in termsOptions'
-          :key='item.key'
-          :name='["branches", branchName, "then", thenName, "actions", actionName, "terms", name, "terms", index]'
-          :rules='rules'
-        >
-          <FilterItem
-            v-model:value='formModel.branches[branchName].then[thenName].actions[actionName].terms[name].terms[index]'
-            :isFirst='index === 0'
-            :isLast='index === termsOptions.length - 1'
-            :showDeleteBtn='termsOptions.length !== 1'
-            :name='index'
-            :termsName='name'
-            :actionName='actionName'
-            :thenName='thenName'
-            :branchName='branchName'
-          />
-        </j-form-item>
-      </div>
-      <div v-if='isLast' class='terms-group-add' @click='addTerms'>
-        <div class='terms-content'>
-          <AIcon type='PlusOutlined' style='font-size: 12px;padding-right: 4px;' />
-          <span>分组</span>
+    <div class="terms-params filter-group">
+        <div class="terms-params-warp">
+            <div v-if="!isFirst" class="term-type-warp">
+                <DropdownButton
+                    :options="[
+                        { label: '并且', value: 'and' },
+                        { label: '或者', value: 'or' },
+                    ]"
+                    type="type"
+                    v-model:value="
+                        formModel.branches[branchName].then[thenName].actions[
+                            actionName
+                        ].terms[name].type
+                    "
+                    @select="typeChange"
+                />
+            </div>
+            <div
+                class="terms-params-content"
+                @mouseover="mouseover"
+                @mouseout="mouseout"
+            >
+                <ConfirmModal
+                    title="确认删除？"
+                    :onConfirm="onDelete"
+                    :show="showDelete"
+                    className="terms-params-delete"
+                >
+                    <AIcon type="CloseOutlined" />
+                </ConfirmModal>
+                <j-form-item
+                    v-for="(item, index) in termsOptions"
+                    :key="item.key"
+                    :name="[
+                        'branches',
+                        branchName,
+                        'then',
+                        thenName,
+                        'actions',
+                        actionName,
+                        'terms',
+                        name,
+                        'terms',
+                        index,
+                    ]"
+                    :rules="rules"
+                >
+                  <CheckFilterItem
+                    :value="
+                            formModel.branches[branchName].then[thenName]
+                                .actions[actionName].terms[name].terms[index]
+                        "
+                    :name="index"
+                    :termsName="name"
+                    :actionName="actionName"
+                    :thenName="thenName"
+                    :branchName="branchName"
+                  >
+                    <FilterItem
+                      v-model:value="
+                            formModel.branches[branchName].then[thenName]
+                                .actions[actionName].terms[name].terms[index]
+                        "
+                      :isFirst="index === 0"
+                      :isLast="index === termsOptions.length - 1"
+                      :showDeleteBtn="termsOptions.length !== 1"
+                      :name="index"
+                      :termsName="name"
+                      :actionName="actionName"
+                      :thenName="thenName"
+                      :branchName="branchName"
+                    />
+                  </CheckFilterItem>
+
+                </j-form-item>
+            </div>
+            <div v-if="isLast" class="terms-group-add" @click="addTerms">
+                <div class="terms-content">
+                    <AIcon
+                        type="PlusOutlined"
+                        style="font-size: 12px; padding-right: 4px"
+                    />
+                    <span>分组</span>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
-<script setup lang='ts' name='FilterGroup'>
-import { storeToRefs } from 'pinia'
-import { useSceneStore } from 'store/scene'
-import DropdownButton from '../../components/DropdownButton'
-import FilterItem from './FilterCondition.vue'
-import { flattenDeep, isArray } from 'lodash-es'
-import { provide } from 'vue'
-import { randomString } from '@/utils/utils'
-import { getParams, EventEmitter, EventSubscribeKeys } from '@/views/rule-engine/Scene/Save/util'
-import { handleParamsData } from '@/views/rule-engine/Scene/Save/components/Terms/util'
+<script setup lang="ts" name="FilterGroup">
+import { storeToRefs } from 'pinia';
+import { useSceneStore } from 'store/scene';
+import DropdownButton from '../../components/DropdownButton';
+import FilterItem from './FilterCondition.vue';
+import { flattenDeep, isArray } from 'lodash-es';
+import { provide } from 'vue';
+import { randomString } from '@/utils/utils';
+import {
+    getParams,
+    EventEmitter,
+    EventSubscribeKeys,
+} from '@/views/rule-engine/Scene/Save/util';
+import { handleParamsData } from '@/views/rule-engine/Scene/Save/components/Terms/util';
+import {filterTermsValidator} from "@/views/rule-engine/Scene/Save/action/ListItem/util";
+import CheckFilterItem from './CheckFilterItem.vue'
 
-const sceneStore = useSceneStore()
-const { data: formModel } = storeToRefs(sceneStore)
+const sceneStore = useSceneStore();
+const { data: formModel } = storeToRefs(sceneStore);
 
 const props = defineProps({
-  isFirst: {
-    type: Boolean,
-    default: true
-  },
-  isLast: {
-    type: Boolean,
-    default: true
-  },
-  showDeleteBtn: {
-    type: Boolean,
-    default: true
-  },
-  name: {
-    type: Number,
-    default: 0
-  },
-  branchName: {
-    type: Number,
-    default: 0
-  },
-  thenName: {
-    type: Number,
-    default: 0
-  },
-  actionName: {
-    type: Number,
-    default: 0
-  }
-})
+    isFirst: {
+        type: Boolean,
+        default: true,
+    },
+    isLast: {
+        type: Boolean,
+        default: true,
+    },
+    showDeleteBtn: {
+        type: Boolean,
+        default: true,
+    },
+    name: {
+        type: Number,
+        default: 0,
+    },
+    branchName: {
+        type: Number,
+        default: 0,
+    },
+    thenName: {
+        type: Number,
+        default: 0,
+    },
+    actionName: {
+        type: Number,
+        default: 0,
+    },
+});
 
-const columnOptions = ref<any[]>([])
+const columnOptions = ref<any[]>([]);
 
 const onKeys: string[] = EventSubscribeKeys({
-  branch: props.branchName,
-  branchGroup: props.thenName,
-  action: props.actionName
-})
-
-const handleRequest = (e: any) => {
-  const hasDelete = 'isDelete' in e
-  if (!hasDelete) {
-    columnRequest()
-  }
-}
-
-EventEmitter.subscribe(onKeys, handleRequest)
-
-provide('filter-params', columnOptions)
-
-const columnRequest = () => {
-  const param = {
     branch: props.branchName,
     branchGroup: props.thenName,
-    action: props.actionName
-  }
-  getParams(param, formModel.value).then(res => {
-    columnOptions.value = handleParamsData(res, 'id')
-  })
-}
+    action: props.actionName,
+});
+
+const handleRequest = (e: any) => {
+    const hasDelete = 'isDelete' in e;
+    if (!hasDelete) {
+        columnRequest();
+    }
+};
+
+EventEmitter.subscribe(onKeys, handleRequest);
+
+provide('filter-params', columnOptions);
+
+const columnRequest = () => {
+    const param = {
+        branch: props.branchName,
+        branchGroup: props.thenName,
+        action: props.actionName,
+    };
+    getParams(param, formModel.value).then((res) => {
+        columnOptions.value = handleParamsData(res, 'id');
+    });
+};
 
 const termsOptions = computed(() => {
-  return formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].terms?.[props.name].terms
-})
+    return formModel.value.branches![props.branchName].then[props.thenName]
+        .actions[props.actionName].terms?.[props.name].terms;
+});
 
-const showDelete = ref(false)
+const showDelete = ref(false);
 
 const mouseover = () => {
-  showDelete.value = true
-}
+    showDelete.value = true;
+};
 
 const mouseout = () => {
-  showDelete.value = false
-}
+    showDelete.value = false;
+};
 
 const handleOptionsColumnsValue = (termsColumns: any[], _options: any) => {
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options!.termsColumns = termsColumns
-  const flatten = new Set(flattenDeep(termsColumns))
-  let newColumns = [...flatten.values()]
-  if (_options?.otherColumns) {
-    newColumns = [..._options?.otherColumns, ...newColumns]
-  }
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.name].options!.columns = newColumns
-}
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.name
+    ].options!.termsColumns = termsColumns;
+    const flatten = new Set(flattenDeep(termsColumns));
+    let newColumns = [...flatten.values()];
+    if (_options?.otherColumns) {
+        newColumns = [..._options?.otherColumns, ...newColumns];
+    }
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.name
+    ].options!.columns = newColumns;
+};
 
 const addTerms = () => {
-  const item: any = {
-    type: 'and',
-    key: randomString(),
-    terms: [
-      {
-        column: undefined,
-        value: {
-          type: 'fixed',
-          value: undefined
-        },
-        termType: undefined,
+    const item: any = {
         type: 'and',
-        key: randomString()
-      }
-    ]
-  }
+        key: randomString(),
+        terms: [
+            {
+                column: undefined,
+                value: {
+                    type: 'fixed',
+                    value: undefined,
+                },
+                termType: undefined,
+                type: 'and',
+                key: randomString(),
+            },
+        ],
+    };
 
-  formModel.value
-    .branches![props.branchName]
-    .then[props.thenName]
-    .actions[props.actionName]
-    .terms?.push(item)
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].terms?.push(item);
 
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms.push({
-    terms: [['','eq','','and']],
-    termType: '并且'
-  })
-}
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms.push({
+        terms: [['', 'eq', '', 'and']],
+        termType: '并且',
+    });
+};
 
 const typeChange = (e: any) => {
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms[props.name].termType = e.label
-}
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms[props.name].termType = e.label;
+};
 
 const onDelete = () => {
-  formModel.value
-    .branches![props.branchName]
-    .then[props.thenName]
-    .actions[props.actionName]
-    .terms?.splice(props.name, 1)
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].terms?.splice(props.name, 1);
 
-  const _options = formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options
-  const termsColumns = _options?.termsColumns || []
-  if (_options?.termsColumns) {
-    termsColumns.splice(props.name, 1)
-    handleOptionsColumnsValue(termsColumns, _options)
-  }
+    const _options =
+        formModel.value.branches![props.branchName].then[props.thenName]
+            .actions[props.actionName].options;
+    const termsColumns = _options?.termsColumns || [];
+    if (_options?.termsColumns) {
+        termsColumns.splice(props.name, 1);
+        handleOptionsColumnsValue(termsColumns, _options);
+    }
 
-  formModel.value.branches![props.branchName].then[props.thenName].actions[props.actionName].options!.terms.splice(props.name, 1)
-}
+    formModel.value.branches![props.branchName].then[props.thenName].actions[
+        props.actionName
+    ].options!.terms.splice(props.name, 1);
+};
 
 const rules = [
-  {
-    validator(_: any, v?: Record<string, any>) {
-      if (v !== undefined && !v.error) {
-        if (!Object.keys(v).length) {
-          return Promise.reject(new Error('该数据已发生变更，请重新配置'))
-        }
-        if (!v.column) {
-          return Promise.reject(new Error('请选择参数'))
-        }
+    {
+        validator(_: any, v?: Record<string, any>) {
+          console.log(v)
+            if (v !== undefined && !v.error) {
+                if (!Object.keys(v).length) {
+                    return Promise.reject(
+                        new Error('该数据已发生变更，请重新配置'),
+                    );
+                }
 
-        if (!v.termType) {
-          return Promise.reject(new Error('请选择操作符'))
-        }
-
-        if (v.value.value === undefined) {
-          return Promise.reject(new Error('请选择或输入参数值'))
-        } else {
-          if (
-            isArray(v.value.value) &&
-            v.value.value.some((_v: any) => _v === undefined)
-          ) {
-            return Promise.reject(new Error('请选择或输入参数值'))
-          } else if (v.value.value === undefined) {
-            return Promise.reject(new Error('请选择或输入参数值'))
-          }
-        }
-      } else {
-        if (v?.error) { // 数据发生变化
-          return Promise.reject(new Error('该数据已发生变更，请重新配置'))
-        }
-        return Promise.reject(new Error('请选择参数'))
-      }
-      return Promise.resolve()
-    }
-  }
-]
+              return filterTermsValidator(v)
+            } else {
+                if (v?.error) {
+                    // 数据发生变化
+                    return Promise.reject(
+                        new Error('该数据已发生变更，请重新配置'),
+                    );
+                }
+                return Promise.reject(new Error('请选择参数'));
+            }
+        },
+    },
+];
 
 nextTick(() => {
-  columnRequest()
-})
+    columnRequest();
+});
 
 onUnmounted(() => {
-  EventEmitter.unSubscribe(onKeys, handleRequest)
-})
-
+    EventEmitter.unSubscribe(onKeys, handleRequest);
+});
 </script>
 
-<style scoped>
-
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
index 502b845a..ae329bb1 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/Item.vue
@@ -1,336 +1,396 @@
 <template>
     <div class="actions-item-warp">
-      <j-form-item
-        :name='["branches", branchesName, "then", thenName, "actions", name]'
-        :rules='rules'
-      >
-        <div class="actions-item">
-            <CheckItem v-bind='props' ref='checkItemRef'>
-              <div class="item-options-warp">
-                  <div class="item-options-type" @click="onAdd">
-                      <img
-                          style="width: 18px"
-                          :src="
-                              iconMap.get(
-                                  data?.executor === 'alarm'
-                                      ? data?.alarm?.mode
-                                      : data?.executor,
-                              )
-                          "
-                      />
-                  </div>
-                  <div
-                      class="item-options-content"
-                      v-if="data?.executor === 'alarm'"
-                  >
-                      <template v-if="data?.alarm?.mode === 'trigger'">
-                          满足条件后将触发<j-button
-                              style="padding: 0"
-                              type="link"
-                              @click.stop="triggerVisible = true"
-                              >关联此条件的告警</j-button
-                          >
-                      </template>
-                      <template v-else>
-                          满足条件后将解除<j-button
-                              style="padding: 0"
-                              type="link"
-                              @click.stop="triggerVisible = true"
-                              >关联此条件的告警</j-button
-                          >
-                      </template>
-                  </div>
-                  <div
-                      class="item-options-content"
-                      v-else-if="data?.executor === 'notify'"
-                      @click="onType('notify')"
-                  >
-                      <template v-if="data?.notify?.notifyType === 'dingTalk'">
-                          <template
-                              v-if="options?.provider === 'dingTalkRobotWebHook'"
-                          >
-                              <div>
-                                  通过<span class="notify-text-highlight"
-                                      >群机器人消息</span
-                                  >
-                                  发送
-                                  <span class="notify-text-highlight">
-                                      {{
-                                          options?.templateName ||
-                                          data?.notify?.templateId
-                                      }}
-                                  </span>
-                              </div>
-                          </template>
-                          <template v-else>
-                              <div>
-                                  通过
-                                  <span class="notify-text-highlight">
-                                      <img
-                                          style="width: 18px"
-                                          :src="
-                                              itemNotifyIconMap.get(
-                                                  data?.notify?.notifyType,
-                                              )
-                                          "
-                                      />
-                                      钉钉
-                                  </span>
-                                  {{(options?.sendTo || options?.orgName) ? '向' : ""}}<span class="notify-text-highlight">{{
-                                      options?.sendTo || ''
-                                  }}</span>
-                                  <span class="notify-text-highlight">{{
-                                      options?.orgName || ''
-                                  }}</span>
-                                  发送
-                                  <span class="notify-text-highlight">
-                                      {{
-                                          options?.templateName ||
-                                          data?.notify?.templateId
-                                      }}
-                                  </span>
-                              </div>
-                          </template>
-                      </template>
-                      <template v-else-if="data?.notify?.notifyType === 'weixin'">
-                          <div>
-                              通过
-                              <span class="notify-text-highlight">
-                                  <img
-                                      style="width: 18px"
-                                      :src="
-                                          itemNotifyIconMap.get(
-                                              data?.notify?.notifyType,
-                                          )
-                                      "
-                                  />
-                                  微信
-                              </span>
-                              {{(options?.sendTo || options?.orgName || options?.tagName) ? '向' : ''}}<span class="notify-text-highlight">{{
-                                  options?.sendTo || ''
-                              }}</span>
-                              <span class="notify-text-highlight">{{
-                                  options?.orgName || ''
-                              }}</span>
-                              <span class="notify-text-highlight">{{
-                                  options?.tagName || ''
-                              }}</span>
-                              发送
-                              <span class="notify-text-highlight">
-                                  {{
-                                      options?.templateName ||
-                                      data?.notify?.templateId
-                                  }}
-                              </span>
-                          </div>
-                      </template>
-                      <template v-else-if="data?.notify?.notifyType === 'email'">
-                          <div style="display: flex;">
-                              通过
-                              <span class="notify-text-highlight">
-                                  <img
-                                      style="width: 18px"
-                                      :src="
-                                          itemNotifyIconMap.get(
-                                              data?.notify?.notifyType,
-                                          )
-                                      "
-                                  />
-                                  邮件
-                              </span>
-                              {{options?.sendTo ? '向' : ''}}<span class="notify-text-highlight">
-                                <Ellipsis style='max-width: 400px;'>
-                                {{
-                                    options?.sendTo || ''
-                                  }}
-                                </Ellipsis>
-                            </span>
-                              发送
-                              <span class="notify-text-highlight">
-                                  {{
-                                      options?.templateName ||
-                                      data?.notify?.templateId
-                                  }}
-                              </span>
-                          </div>
-                      </template>
-                      <template v-else-if="data?.notify?.notifyType === 'voice'">
-                          <div>
-                              通过
-                              <span class="notify-text-highlight">
-                                  <img
-                                      style="width: 18px"
-                                      :src="
-                                          itemNotifyIconMap.get(
-                                              data?.notify?.notifyType,
-                                          )
-                                      "
-                                  />
-                                  语音
-                              </span>
-                              {{ options?.sendTo ? '向' : ''}}<span class="notify-text-highlight">{{
-                                  options?.sendTo || ''
-                              }}</span>
-                              发送
-                              <span class="notify-text-highlight">
-                                  {{
-                                      options?.templateName ||
-                                      data?.notify?.templateId
-                                  }}
-                              </span>
-                          </div>
-                      </template>
-                      <template v-else-if="data?.notify?.notifyType === 'sms'">
-                          <div>
-                              通过
-                              <span class="notify-text-highlight">
-                                  <img
-                                      style="width: 18px"
-                                      :src="
-                                          itemNotifyIconMap.get(
-                                              data?.notify?.notifyType,
-                                          )
-                                      "
-                                  />
-                                  短信
-                              </span>
-                              {{options?.sendTo ? '向' : ''}}<span class="notify-text-highlight">{{
-                                  options?.sendTo || ''
-                              }}</span>
-                              发送
-                              <span class="notify-text-highlight">
-                                  {{
-                                      options?.templateName ||
-                                      data?.notify?.templateId
-                                  }}
-                              </span>
-                          </div>
-                      </template>
-                      <template
-                          v-else-if="data?.notify?.notifyType === 'webhook'"
-                      >
-                          <div>
-                              通过
-                              <span class="notify-text-highlight">
-                                  <img
-                                      style="width: 18px"
-                                      :src="
-                                          itemNotifyIconMap.get(
-                                              data?.notify?.notifyType,
-                                          )
-                                      "
-                                  />
-                                  WebHook
-                              </span>
-                              发送
-                              <span>{{
-                                  options?.templateName ||
-                                  data?.notify?.templateId
-                              }}</span>
-                          </div>
-                      </template>
-                  </div>
-                  <div
-                      class="item-options-content"
-                      v-else-if="data?.executor === 'delay'"
-                      @click="onType('delay')"
-                  >
-                      {{ options?.name }}
-                  </div>
-                  <div
-                      class="item-options-content"
-                      v-else-if="data?.executor === 'device'"
-                      @click="onType('device')"
-                  >
-                      <template v-if="['fixed', 'context'].includes(data?.device?.selector)">
-                          <div style='display: flex; align-items: center;'>
-                              <AIcon
-                                  :type="
-                                      typeIconMap[
-                                          data?.device?.message?.messageType ||
-                                              'INVOKE_FUNCTION'
-                                      ]
-                                  "
-                              />
-                              <span style="padding-left: 4px">{{
-                                  data?.options?.type
-                              }}</span>
-                              <AIcon
-                                  type="icon-mubiao"
-                                  style="padding:0 4px"
-                              />
-                            <Ellipsis style='max-width: 200px;margin-right: 12px;'>
-                              {{data?.options?.name}}
-                            </Ellipsis>
-                            <Ellipsis style='max-width: 400px;'>
-                              {{data?.options?.propertiesName}}
-                            </Ellipsis>
-                            <span v-if='!isBoolean(data?.options?.propertiesValue) && data?.options?.propertiesValue'>为 </span>
-                            <Ellipsis style='max-width: 200px;'>
-                              {{
-                                `${
-                                    (
-                                        isBoolean(
-                                            data?.options?.propertiesValue,
-                                        )
-                                            ? true
-                                            : data?.options?.propertiesValue
+        <j-form-item
+            :name="[
+                'branches',
+                branchesName,
+                'then',
+                thenName,
+                'actions',
+                name,
+            ]"
+            :rules="rules"
+        >
+            <div class="actions-item">
+                <CheckItem v-bind="props" ref="checkItemRef">
+                    <div class="item-options-warp">
+                        <div class="item-options-type" @click="onAdd">
+                          <AIcon :type="iconMap.get(data?.executor === 'alarm' ? data.alarm.mode : data.executor)"/>
+                        </div>
+                        <div
+                            class="item-options-content"
+                            v-if="data?.executor === 'alarm'"
+                        >
+                            <template v-if="data?.alarm?.mode === 'trigger'">
+                                满足条件后将触发<j-button
+                                    style="padding: 0"
+                                    type="link"
+                                    @click.stop="triggerVisible = true"
+                                    >关联告警</j-button
+                                >
+                            </template>
+                            <template v-else>
+                                满足条件后将解除<j-button
+                                    style="padding: 0"
+                                    type="link"
+                                    @click.stop="triggerVisible = true"
+                                    >关联告警</j-button
+                                >
+                            </template>
+                        </div>
+                        <div
+                            class="item-options-content"
+                            v-else-if="data?.executor === 'notify'"
+                            @click="onType('notify')"
+                        >
+                            <template
+                                v-if="data?.notify?.notifyType === 'dingTalk'"
+                            >
+                                <template
+                                    v-if="
+                                        options?.provider ===
+                                        'dingTalkRobotWebHook'
+                                    "
+                                >
+                                    <div>
+                                        通过<span class="notify-text-highlight"
+                                            >群机器人消息</span
+                                        >
+                                        发送
+                                        <span class="notify-text-highlight">
+                                            {{
+                                                options?.templateName ||
+                                                data?.notify?.templateId
+                                            }}
+                                        </span>
+                                    </div>
+                                </template>
+                                <template v-else>
+                                    <div>
+                                        通过
+                                        <span class="notify-text-highlight">
+                                            <img
+                                                style="width: 18px"
+                                                :src="
+                                                    itemNotifyIconMap.get(
+                                                        data?.notify
+                                                            ?.notifyType,
+                                                    )
+                                                "
+                                            />
+                                            钉钉
+                                        </span>
+                                        {{
+                                            options?.sendTo || options?.orgName
+                                                ? '向'
+                                                : ''
+                                        }}<span class="notify-text-highlight">{{
+                                            options?.sendTo || ''
+                                        }}</span>
+                                        <span class="notify-text-highlight">{{
+                                            options?.orgName || ''
+                                        }}</span>
+                                        发送
+                                        <span class="notify-text-highlight">
+                                            {{
+                                                options?.templateName ||
+                                                data?.notify?.templateId
+                                            }}
+                                        </span>
+                                    </div>
+                                </template>
+                            </template>
+                            <template
+                                v-else-if="
+                                    data?.notify?.notifyType === 'weixin'
+                                "
+                            >
+                                <div>
+                                    通过
+                                    <span class="notify-text-highlight">
+                                        <img
+                                            style="width: 18px"
+                                            :src="
+                                                itemNotifyIconMap.get(
+                                                    data?.notify?.notifyType,
+                                                )
+                                            "
+                                        />
+                                        微信
+                                    </span>
+                                    {{
+                                        options?.sendTo ||
+                                        options?.orgName ||
+                                        options?.tagName
+                                            ? '向'
+                                            : ''
+                                    }}<span class="notify-text-highlight">{{
+                                        options?.sendTo || ''
+                                    }}</span>
+                                    <span class="notify-text-highlight">{{
+                                        options?.orgName || ''
+                                    }}</span>
+                                    <span class="notify-text-highlight">{{
+                                        options?.tagName || ''
+                                    }}</span>
+                                    发送
+                                    <span class="notify-text-highlight">
+                                        {{
+                                            options?.templateName ||
+                                            data?.notify?.templateId
+                                        }}
+                                    </span>
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="data?.notify?.notifyType === 'email'"
+                            >
+                                <div style="display: flex">
+                                    通过
+                                    <span class="notify-text-highlight">
+                                        <img
+                                            style="width: 18px"
+                                            :src="
+                                                itemNotifyIconMap.get(
+                                                    data?.notify?.notifyType,
+                                                )
+                                            "
+                                        />
+                                        邮件
+                                    </span>
+                                    {{ options?.sendTo ? '向' : ''
+                                    }}<span class="notify-text-highlight">
+                                        <Ellipsis style="max-width: 400px">
+                                            {{ options?.sendTo || '' }}
+                                        </Ellipsis>
+                                    </span>
+                                    发送
+                                    <span class="notify-text-highlight">
+                                        {{
+                                            options?.templateName ||
+                                            data?.notify?.templateId
+                                        }}
+                                    </span>
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="data?.notify?.notifyType === 'voice'"
+                            >
+                                <div>
+                                    通过
+                                    <span class="notify-text-highlight">
+                                        <img
+                                            style="width: 18px"
+                                            :src="
+                                                itemNotifyIconMap.get(
+                                                    data?.notify?.notifyType,
+                                                )
+                                            "
+                                        />
+                                        语音
+                                    </span>
+                                    {{ options?.sendTo ? '向' : ''
+                                    }}<span class="notify-text-highlight">{{
+                                        options?.sendTo || ''
+                                    }}</span>
+                                    发送
+                                    <span class="notify-text-highlight">
+                                        {{
+                                            options?.templateName ||
+                                            data?.notify?.templateId
+                                        }}
+                                    </span>
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="data?.notify?.notifyType === 'sms'"
+                            >
+                                <div>
+                                    通过
+                                    <span class="notify-text-highlight">
+                                        <img
+                                            style="width: 18px"
+                                            :src="
+                                                itemNotifyIconMap.get(
+                                                    data?.notify?.notifyType,
+                                                )
+                                            "
+                                        />
+                                        短信
+                                    </span>
+                                    {{ options?.sendTo ? '向' : ''
+                                    }}<span class="notify-text-highlight">{{
+                                        options?.sendTo || ''
+                                    }}</span>
+                                    发送
+                                    <span class="notify-text-highlight">
+                                        {{
+                                            options?.templateName ||
+                                            data?.notify?.templateId
+                                        }}
+                                    </span>
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="
+                                    data?.notify?.notifyType === 'webhook'
+                                "
+                            >
+                                <div>
+                                    通过
+                                    <span class="notify-text-highlight">
+                                        <img
+                                            style="width: 18px"
+                                            :src="
+                                                itemNotifyIconMap.get(
+                                                    data?.notify?.notifyType,
+                                                )
+                                            "
+                                        />
+                                        WebHook
+                                    </span>
+                                    发送
+                                    <span>{{
+                                        options?.templateName ||
+                                        data?.notify?.templateId
+                                    }}</span>
+                                </div>
+                            </template>
+                        </div>
+                        <div
+                            class="item-options-content"
+                            v-else-if="data?.executor === 'delay'"
+                            @click="onType('delay')"
+                        >
+                            {{ options?.name }}
+                        </div>
+                        <div
+                            class="item-options-content"
+                            v-else-if="data?.executor === 'device'"
+                            @click="onType('device')"
+                        >
+                            <template
+                                v-if="
+                                    ['fixed', 'context'].includes(
+                                        data?.device?.selector,
                                     )
-                                        ? `${data?.options?.propertiesValue}`
-                                        : ''
-                                }`
-                              }}
-                            </Ellipsis>
-
-                          </div>
-                      </template>
-                      <template v-else-if="data?.device?.selector === 'tag'">
-                          <div>
-                              <AIcon
-                                  :type="
-                                      typeIconMap[
-                                          data?.device?.message?.messageType ||
-                                              'INVOKE_FUNCTION'
-                                      ]
-                                  "
-                              />
-                              {{ data?.options?.type }}
-                              <span>{{ data?.options?.tagName }}</span>
-                              的{{ data?.options?.productName }}
-                              {{ data?.options?.propertiesName }}
-                          </div>
-                      </template>
-                      <template v-else-if="data?.device?.selector === 'relation'">
-                          <div>
-                              <AIcon
-                                  :type="
-                                      typeIconMap[
-                                          data?.device?.message?.messageType ||
-                                              'INVOKE_FUNCTION'
-                                      ]
-                                  "
-                              />
-                              {{ data?.options?.type }}与<span>{{
-                                  data?.options?.triggerName
-                              }}</span
-                              >具有相同 {{ data?.options?.relationName }}的{{
-                                  data?.options?.productName
-                              }}设备的
-                              {{ data?.options?.propertiesName }}
-                          </div>
-                      </template>
-                  </div>
-                  <j-button v-else @click="onAdd">点击配置执行动作</j-button>
-              </div>
-              <div class="item-number">{{ name + 1 }}</div>
-              <j-popconfirm title="确认删除？" @confirm="onDelete" placement="topRight" :overlayStyle='{minWidth: "190px"}'>
-                  <div class="item-delete">
-                      <AIcon type="DeleteOutlined" />
-                  </div>
-              </j-popconfirm>
-            </CheckItem>
-        </div>
-      </j-form-item>
+                                "
+                            >
+                                <div style="display: flex; align-items: center">
+                                    <AIcon
+                                        :type="
+                                            typeIconMap[
+                                                data?.device?.message
+                                                    ?.messageType ||
+                                                    'INVOKE_FUNCTION'
+                                            ]
+                                        "
+                                    />
+                                    <span style="padding-left: 4px">{{
+                                        data?.options?.type
+                                    }}</span>
+                                    <AIcon
+                                        type="icon-mubiao"
+                                        style="padding: 0 4px"
+                                    />
+                                    <Ellipsis
+                                        style="
+                                            max-width: 200px;
+                                            margin-right: 12px;
+                                        "
+                                    >
+                                        {{ data?.options?.name }}
+                                    </Ellipsis>
+                                    <Ellipsis style="max-width: 400px">
+                                        {{ data?.options?.propertiesName }}
+                                    </Ellipsis>
+                                    <span
+                                        v-if="
+                                            !isBoolean(
+                                                data?.options?.propertiesValue,
+                                            ) && data?.options?.propertiesValue
+                                        "
+                                        >为
+                                    </span>
+                                    <Ellipsis style="max-width: 200px">
+                                        {{
+                                            `${
+                                                (
+                                                    isBoolean(
+                                                        data?.options
+                                                            ?.propertiesValue,
+                                                    )
+                                                        ? true
+                                                        : data?.options
+                                                              ?.propertiesValue
+                                                )
+                                                    ? `${data?.options?.propertiesValue}`
+                                                    : ''
+                                            }`
+                                        }}
+                                    </Ellipsis>
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="data?.device?.selector === 'tag'"
+                            >
+                                <div>
+                                    <AIcon
+                                        :type="
+                                            typeIconMap[
+                                                data?.device?.message
+                                                    ?.messageType ||
+                                                    'INVOKE_FUNCTION'
+                                            ]
+                                        "
+                                    />
+                                    {{ data?.options?.type }}
+                                    <span>{{ data?.options?.tagName }}</span>
+                                    的{{ data?.options?.productName }}
+                                    {{ data?.options?.propertiesName }}
+                                </div>
+                            </template>
+                            <template
+                                v-else-if="
+                                    data?.device?.selector === 'relation'
+                                "
+                            >
+                                <div>
+                                    <AIcon
+                                        :type="
+                                            typeIconMap[
+                                                data?.device?.message
+                                                    ?.messageType ||
+                                                    'INVOKE_FUNCTION'
+                                            ]
+                                        "
+                                    />
+                                    {{ data?.options?.type }}与<span>{{
+                                        data?.options?.triggerName
+                                    }}</span
+                                    >具有相同
+                                    {{ data?.options?.relationName }}的{{
+                                        data?.options?.productName
+                                    }}设备的
+                                    {{ data?.options?.propertiesName }}
+                                </div>
+                            </template>
+                        </div>
+                        <j-button v-else @click="onAdd"
+                            >点击配置执行动作</j-button
+                        >
+                    </div>
+                    <div class="item-number">{{ name + 1 }}</div>
+                    <ConfirmModal
+                        title="确认删除？"
+                        :onConfirm="onDelete"
+                        className="actions-item-delete"
+                    >
+                        <AIcon type="DeleteOutlined" />
+                    </ConfirmModal>
+                </CheckItem>
+            </div>
+        </j-form-item>
         <template v-if="!isLast && type === 'serial'">
             <div
                 :class="[
@@ -355,7 +415,7 @@
                         />
                     </div>
                 </template>
-                <div v-else class="filter-add-button" @click='addFilterParams'>
+                <div v-else class="filter-add-button" @click="addFilterParams">
                     <AIcon type="PlusOutlined" style="padding-right: 4px" />
                     <span>添加过滤条件</span>
                 </div>
@@ -368,7 +428,10 @@
                 :branchGroup="thenName"
                 :branchesName="branchesName"
                 :data="data"
-                :options='_data.branches[branchesName].then[thenName].actions[name].options'
+                :options="
+                    _data.branches[branchesName].then[thenName].actions[name]
+                        .options
+                "
                 @cancel="onClose"
                 @save="onSave"
             />
@@ -379,7 +442,10 @@
                 v-bind="props"
                 v-if="!!actionType"
                 :actionType="actionType"
-                :options='_data.branches[branchesName].then[thenName].actions[name].options'
+                :options="
+                    _data.branches[branchesName].then[thenName].actions[name]
+                        .options
+                "
                 @save="onPropsOk"
                 @cancel="onPropsCancel"
             />
@@ -387,13 +453,18 @@
         <TriggerAlarm
             :id="_data.id"
             :branchId="_data.branches[branchesName].branchId"
+            :actionId="
+                _data.branches[branchesName].then[thenName].actions[name]
+                    .actionId
+            "
+            :targetType="_data.triggerType"
             v-if="triggerVisible"
             @close="triggerVisible = false"
         />
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="ActionItem">
 import { isBoolean } from 'lodash-es';
 import { PropType } from 'vue';
 import { ActionsType, ParallelType } from '../../../typings';
@@ -404,9 +475,12 @@ import { useSceneStore } from '@/store/scene';
 import { storeToRefs } from 'pinia';
 import { iconMap, itemNotifyIconMap, typeIconMap } from './util';
 import FilterGroup from './FilterGroup.vue';
-import { randomString } from '@/utils/utils'
-import { EventEmitter, EventEmitterKeys } from '@/views/rule-engine/Scene/Save/util'
-import CheckItem from './CheckItem.vue'
+import { randomString } from '@/utils/utils';
+import {
+    EventEmitter,
+    EventEmitterKeys,
+} from '@/views/rule-engine/Scene/Save/util';
+import CheckItem from './CheckItem.vue';
 
 const sceneStore = useSceneStore();
 const { data: _data } = storeToRefs(sceneStore);
@@ -442,15 +516,23 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['delete', 'update']);
-const checkItemRef = ref()
+const checkItemRef = ref();
 const visible = ref<boolean>(false);
 const triggerVisible = ref<boolean>(false);
 const actionType = ref('');
-const eventEmitterKey = ref(EventEmitterKeys({
-  branch: props.branchesName,
-  branchGroup: props.thenName,
-  action: props.name
-}))
+const eventEmitterKey = ref(
+    EventEmitterKeys({
+        branch: props.branchesName,
+        branchGroup: props.thenName,
+        action: props.name,
+    }),
+);
+
+const triggerData = reactive({
+    visible: false,
+    actionId: undefined,
+});
+
 const termsOptions = computed(() => {
     if (!props.parallel) {
         // 串行
@@ -463,12 +545,22 @@ const termsOptions = computed(() => {
 });
 
 const onDelete = () => {
-    const key = _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].key
-    EventEmitter.emit(key!, { isDelete: true }) // 发布消息
-    if (props.name !== 0 && !props.parallel) { // 清空上一个串行执行动作中的options.termsColumns和terms
-      _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.termsColumns = []
-      _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].options!.terms = []
-      _data.value.branches![props.branchesName].then[props.thenName].actions[props.name - 1].terms = []
+    const key =
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name
+        ].key;
+    EventEmitter.emit(key!, { isDelete: true }); // 发布消息
+    if (props.name !== 0 && !props.parallel) {
+        // 清空上一个串行执行动作中的options.termsColumns和terms
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name - 1
+        ].options!.termsColumns = [];
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name - 1
+        ].options!.terms = [];
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name - 1
+        ].terms = [];
     }
 
     emit('delete');
@@ -482,32 +574,44 @@ const onClose = () => {
  * 添加过滤条件
  */
 const addFilterParams = () => {
-  const item: any = {
-    type: 'and',
-    key: randomString(),
-    terms: [
-      {
-        column: undefined,
-        value: {
-          type: 'fixed',
-          value: undefined
-        },
-        termType: undefined,
+    const item: any = {
         type: 'and',
-        key: randomString()
-      }
-    ]
-  }
-  if (_data.value.branches![props.branchesName].then[props.thenName].actions[props.name].terms) {
-    _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].terms!.push(item)
-  } else {
-    _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].terms = [item]
-  }
-  _data.value.branches![props.branchesName].then[props.thenName].actions[props.name].options!.terms = [{
-    terms: [['','eq','','and']],
-    termType: '并且'
-  }]
-}
+        key: randomString(),
+        terms: [
+            {
+                column: undefined,
+                value: {
+                    type: 'fixed',
+                    value: undefined,
+                },
+                termType: undefined,
+                type: 'and',
+                key: randomString(),
+            },
+        ],
+    };
+    if (
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name
+        ].terms
+    ) {
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name
+        ].terms!.push(item);
+    } else {
+        _data.value.branches![props.branchesName].then[props.thenName].actions[
+            props.name
+        ].terms = [item];
+    }
+    _data.value.branches![props.branchesName].then[props.thenName].actions[
+        props.name
+    ].options!.terms = [
+        {
+            terms: [['', 'eq', '', 'and']],
+            termType: '并且',
+        },
+    ];
+};
 
 const onAdd = () => {
     visible.value = true;
@@ -523,21 +627,33 @@ const onType = (_type: string) => {
  * @param options
  */
 const onSave = (data: ActionsType, options: any) => {
-  const { key, terms } = _data.value.branches![props.branchesName].then?.[props.thenName].actions?.[props.name]
+    const { key, actionId, terms } =
+        _data.value.branches![props.branchesName].then?.[props.thenName]
+            .actions?.[props.name];
 
-  const columns = new Set([...(props.options?.termsColumns || []), ...(options?.otherColumns?.filter?.((item?: string) => item) || [])])
+    const columns = new Set([
+        ...(props.options?.termsColumns || []),
+        ...(options?.otherColumns?.filter?.((item?: string) => item) || []),
+    ]);
 
-  const actionItem: ActionsType = {
-    ...data,
-    options: {...props.options, ...options, columns: [...columns.values()]},
-    key,
-    terms
-  }
+    const actionItem: ActionsType = {
+        ...data,
+        options: {
+            ...props.options,
+            ...options,
+            columns: [...columns.values()],
+        },
+        key,
+        actionId,
+        terms,
+    };
 
-  _data.value.branches![props.branchesName].then[props.thenName].actions.splice(props.name, 1, actionItem)
-  checkItemRef.value?.formTouchOff?.()
-  visible.value = false;
-  EventEmitter.emit(key!, data) // 发布消息
+    _data.value.branches![props.branchesName].then[
+        props.thenName
+    ].actions.splice(props.name, 1, actionItem);
+    checkItemRef.value?.formTouchOff?.();
+    visible.value = false;
+    EventEmitter.emit(key!, data); // 发布消息
 };
 
 /**
@@ -546,40 +662,48 @@ const onSave = (data: ActionsType, options: any) => {
  * @param options
  */
 const onPropsOk = (data: ActionsType, options?: any) => {
-  onSave(data, options);
-  actionType.value = '';
+    onSave(data, options);
+    actionType.value = '';
 };
 
 const onPropsCancel = () => {
     actionType.value = '';
 };
 
-const rules = [{
-  validator(_: any, v?: ActionsType) {
-    if (v?.executor === 'device') {
-      const _device = v.device!
-      if (
-        (_device?.selector === 'fixed' && (!_device?.productId || !_device?.selectorValues?.length )) ||
-        (_device?.selector === 'context' && !_device?.upperKey) ||
-        (_device?.selector === 'relation' && !_device?.selectorValues?.length) ||
-        _device?.changeData === true
-      ) {
-        return Promise.reject(new Error('该数据已发生变更，请重新配置'))
-      }
-    } else if (v?.executor === 'notify') {
-      const _notify = v.notify
-      if (
-        !_notify?.notifierId ||
-        !_notify?.templateId ||
-        _notify?.changeData === true
-      ) {
-        return Promise.reject(new Error('该数据已发生变更，请重新配置'))
-      }
-    }
-    return Promise.resolve()
-  }
-}]
-
+const rules = [
+    {
+        validator(_: any, v?: ActionsType) {
+            if (v?.executor === 'device') {
+                const _device = v.device!;
+                if (
+                    (_device?.selector === 'fixed' &&
+                        (!_device?.productId ||
+                            !_device?.selectorValues?.length)) ||
+                    (_device?.selector === 'context' && !_device?.upperKey) ||
+                    (_device?.selector === 'relation' &&
+                        !_device?.selectorValues?.length) ||
+                    _device?.changeData === true
+                ) {
+                    return Promise.reject(
+                        new Error('该数据已发生变更，请重新配置'),
+                    );
+                }
+            } else if (v?.executor === 'notify') {
+                const _notify = v.notify;
+                if (
+                    !_notify?.notifierId ||
+                    !_notify?.templateId ||
+                    _notify?.changeData === true
+                ) {
+                    return Promise.reject(
+                        new Error('该数据已发生变更，请重新配置'),
+                    );
+                }
+            }
+            return Promise.resolve();
+        },
+    },
+];
 </script>
 
 <style lang="less" scoped>
@@ -665,26 +789,6 @@ const rules = [{
         font-weight: 800;
         transform: translateY(-50%);
     }
-
-    .item-delete {
-        position: absolute;
-        top: 0;
-        right: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 32px;
-        height: 32px;
-        color: #e50012;
-        background-color: rgba(229, 0, 18, 0.1);
-        border-radius: 50%;
-        transform: translate(50%, -50%);
-        cursor: pointer;
-
-        &:hover {
-            background-color: rgba(#e50012, 0.2);
-        }
-    }
 }
 
 .actions-item-filter-warp {
@@ -755,3 +859,24 @@ const rules = [{
     }
 }
 </style>
+<style lang="less">
+.actions-item-delete {
+        position: absolute;
+        top: 0;
+        right: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 32px;
+        height: 32px;
+        color: #e50012;
+        background-color: rgba(229, 0, 18, 0.1);
+        border-radius: 50%;
+        transform: translate(50%, -50%);
+        cursor: pointer;
+
+        &:hover {
+            background-color: rgba(#e50012, 0.2);
+        }
+    }
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
index c923dba6..82dc61d8 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/List.vue
@@ -21,17 +21,17 @@
         </div>
         <Modal
             v-if="visible"
-            @cancel="onCancel"
             :parallel="parallel"
             :name="actions.length"
             :branchGroup="thenName"
-            @save="onSave"
             :branchesName="branchesName"
+            @save="onSave"
+            @cancel="onCancel"
         />
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="ActionList">
 import { PropType } from 'vue';
 import { ActionsType, ParallelType } from '../../../typings';
 import Modal from '../Modal/index.vue';
@@ -82,6 +82,7 @@ const onSave = (data: any, options?: any) => {
     const item: ActionsType = {
         ...extra,
         key: data.key,
+        actionId: data.actionId,
         options: {
           ...options,
           columns: options.otherColumns?.filter((item?: string) => item) || []
@@ -132,4 +133,4 @@ const _update = () => {
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/ListItem/util.ts b/src/views/rule-engine/Scene/Save/action/ListItem/util.ts
index 7c5e84d6..52deefed 100644
--- a/src/views/rule-engine/Scene/Save/action/ListItem/util.ts
+++ b/src/views/rule-engine/Scene/Save/action/ListItem/util.ts
@@ -2,13 +2,14 @@ import { getImage } from '@/utils/comm'
 import NoticeApi from '@/api/notice/config'
 import { getParams } from '@/views/rule-engine/Scene/Save/util'
 import { getOption } from '@/views/rule-engine/Scene/Save/components/DropdownButton/util'
+import {cloneDeep, isArray, omit} from "lodash-es";
 
 export const iconMap = new Map();
-iconMap.set('trigger', getImage('/scene/action-bind-icon.png'));
-iconMap.set('notify', getImage('/scene/action-notify-icon.png'));
-iconMap.set('device', getImage('/scene/action-device-icon.png'));
-iconMap.set('relieve', getImage('/scene/action-unbind-icon.png'));
-iconMap.set('delay', getImage('/scene/action-delay-icon.png'));
+iconMap.set('trigger', 'icon-chufagaojing');
+iconMap.set('notify', 'icon-xiaoxitongzhi');
+iconMap.set('device', 'icon-shebeishuchu');
+iconMap.set('relieve', 'icon-jiechugaojing');
+iconMap.set('delay', 'icon-yanchizhihang');
 
 export const itemNotifyIconMap = new Map();
 itemNotifyIconMap.set(
@@ -30,6 +31,8 @@ export const typeIconMap = {
   WRITE_PROPERTY: 'icon-zhihangdongzuoxie',
 };
 
+export const CHECK_FILTER_KEY = Symbol('check-filter-key')
+
 export const getBuildInData = async (params: any, data: any) => {
   const buildInData = await getParams(params, unref(data));
 
@@ -58,3 +61,80 @@ export const getNotifyVariablesUser = (isRelationUser: boolean = false): Promise
     })
   })
 }
+
+
+export const analysisFilterTerms = (terms: any) => {
+  if (terms.terms?.length) {
+    const realTerms = terms.terms[0]
+    const alarmTerms = terms.terms[1]
+    return {
+      ...omit(realTerms, ['terms']),
+      alarm: alarmTerms.value.value
+    }
+  }
+  return terms
+}
+
+export const handleFilterTerms = (terms: any) => {
+  const {alarm, ...extra} = cloneDeep(terms)
+  console.log('handleFilterTerms', terms)
+  if (terms.hasOwnProperty('alarm')) {
+    const column = extra.column
+    const identifying = column.split('.')[0]
+    return {
+      terms: [
+        extra,
+        {
+          column: `${identifying}.alarmConfigId`,
+          value: {
+            source: 'fixed',
+            value: alarm
+          },
+          type: 'and',
+          termType: 'eq'
+        }
+      ]
+    }
+  }
+  return terms
+}
+
+const termsValidator = (terms: any) => {
+  if (!terms.column) {
+    return Promise.reject(new Error('请选择参数'));
+  }
+
+  if (!terms.termType) {
+    return Promise.reject(new Error('请选择操作符'));
+  }
+
+  if (terms.value.value === undefined) {
+    return Promise.reject(new Error('请选择或输入参数值'));
+  } else {
+    if (
+        isArray(terms.value.value) &&
+        terms.value.value.some((_v: any) => _v === undefined) || terms.value.value === undefined
+    ) {
+      return Promise.reject(new Error('请选择或输入参数值'));
+    }
+  }
+
+  return Promise.resolve();
+}
+
+export const filterTermsValidator = (terms: any) => {
+  if (terms.terms?.length) {
+    const realTerms = terms.terms[0]
+    const alarmTerms = terms.terms[1]
+
+    if (!alarmTerms.value.value) {
+      return Promise.reject(new Error('请选择告警配置'))
+    }
+    return termsValidator(realTerms)
+  } else {
+    return termsValidator(terms)
+  }
+}
+
+
+export const useCheckFilter = () =>  inject(CHECK_FILTER_KEY, {})
diff --git a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
index 7956088e..1c08952d 100644
--- a/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
+++ b/src/views/rule-engine/Scene/Save/action/Modal/ActionTypeComponent.vue
@@ -18,6 +18,7 @@ import { ActionsType } from '../../../typings';
 import Delay from '../Delay/index.vue';
 import Notify from '../Notify/index.vue';
 import Device from '../Device/index.vue';
+import {randomNumber} from "@/utils/utils";
 
 const props = defineProps({
     branchesName: {
@@ -59,10 +60,11 @@ const onPropsOk = (data: any, options: any) => {
         type: props.actionType,
         executor: props.actionType,
         key: props?.data?.key || `${props.actionType}_${new Date().getTime()}`,
+        actionId: props?.data?.actionId || randomNumber(),
         [props.actionType]: {
             ...data,
         },
     };
     emit('save', { ..._data }, options);
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/rule-engine/Scene/Save/action/Modal/index.vue b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
index 2db68701..35393ad5 100644
--- a/src/views/rule-engine/Scene/Save/action/Modal/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Modal/index.vue
@@ -9,7 +9,6 @@
     >
         <j-form ref="actionForm" :model="formModel" layout="vertical">
             <j-form-item
-                label="类型"
                 name="type"
                 :rules="[
                     {
@@ -17,7 +16,16 @@
                         message: '请选择类型',
                     },
                 ]"
+
             >
+                <template #label>
+                  <div style="position: relative">
+                    类型
+                    <div v-if="optionDisabled" class="action-tip">
+                      告警类型执行动作涉及绑定告警配置，不支持修改为其它类型
+                    </div>
+                  </div>
+                </template>
                 <CardSelect v-model:value="formModel.type" :options="options.filter(item => !(item.value === 'delay' && parallel))"/>
             </j-form-item>
             <ActionTypeComponent
@@ -33,14 +41,10 @@
 </template>
 
 <script lang="ts" setup name='UpdateActionItemModal'>
-import { getImage } from '@/utils/comm';
-import Delay from '../Delay/index.vue';
-import Notify from '../Notify/index.vue';
-import Device from '../Device/index.vue';
 import { PropType } from 'vue';
 import { ActionsType } from '../../../typings';
 import ActionTypeComponent from './ActionTypeComponent.vue';
-import { randomString } from '@/utils/utils';
+import { randomNumber, randomString } from '@/utils/utils';
 import CardSelect from '../../components/CardSelect.vue'
 
 const props = defineProps({
@@ -60,6 +64,7 @@ const props = defineProps({
         type: Object as PropType<ActionsType>,
         default: () => ({
             key: randomString(),
+            actionId: randomNumber(),
         }),
     },
     parallel: {
@@ -73,35 +78,40 @@ const props = defineProps({
 
 const emit = defineEmits(['cancel', 'save']);
 
+const optionDisabled = Object.keys(props.data).length > 2 && props.data?.executor === 'alarm'
+
 const options = [
   {
     label: '设备输出',
     value: 'device',
-    iconUrl: getImage('/scene/device-type.png'),
+    iconUrl: 'icon-shebeishuchu',
     subLabel: '配置设备调用功能、读取属性、设置属性规则',
+    disabled: optionDisabled
   },
   {
     label: '消息通知',
     value: 'notify',
-    iconUrl: getImage('/scene/message-type.png'),
+    iconUrl: 'icon-xiaoxitongzhi',
     subLabel: '配置向指定用户发邮件、钉钉、微信、短信等通知',
+    disabled: optionDisabled
   },
   {
     label: '延迟执行',
     value: 'delay',
-    iconUrl: getImage('/scene/delay-type.png'),
+    iconUrl: 'icon-yanchizhihang',
     subLabel: '等待一段时间后，再执行后续动作',
+    disabled: optionDisabled
   },
   {
     label: '触发告警',
     value: 'trigger',
-    iconUrl: getImage('/scene/trigger-type.png'),
+    iconUrl: 'icon-chufagaojing',
     subLabel: '配置触发告警规则，需配合“告警配置”使用',
   },
   {
     label: '解除告警',
     value: 'relieve',
-    iconUrl: getImage('/scene/cancel-type.png'),
+    iconUrl: 'icon-jiechugaojing',
     subLabel: '配置解除告警规则，需配合“告警配置”使用',
   },
 ];
@@ -138,6 +148,7 @@ const onOk = () => {
                 {
                     // ...props.data,
                     key: props.data.key,
+                    actionId: props.data.actionId,
                     executor: 'alarm',
                     alarm: { mode: values.type },
                 },
@@ -159,4 +170,14 @@ const onPropsOk = (data: any, options?: any) => {
 const onPropsCancel = () => {
     actionType.value = '';
 };
-</script>
\ No newline at end of file
+
+</script>
+<style scoped>
+.action-tip {
+  position: absolute;
+  top: 0;
+  left: 50px;
+  width: 500px;
+  color: #777;
+}
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue b/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue
index 07a485c3..6eca2f76 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/VariableDefinitions.vue
@@ -142,7 +142,11 @@ const checkValue = (_rule: any, value: any, item: any) => {
             }
         }
     } else if (value?.source === 'fixed' && !value?.value) {
-        return Promise.reject(new Error('请输入' + item.name));
+      let tip = '请输入' + item.name
+      if (props.notify.notifyType === 'email') {
+        tip = '请输入收件人'
+      }
+        return Promise.reject(new Error(tip));
     } else if (
         value?.source === 'relation' &&
         !value?.value &&
@@ -225,4 +229,4 @@ const onSave = () =>
     });
 
 defineExpose({ onSave });
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/index.vue b/src/views/rule-engine/Scene/Save/action/Notify/index.vue
index 3b6259d8..74d9a71d 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/index.vue
@@ -2,7 +2,7 @@
     <j-modal
         title="执行动作"
         visible
-        :width="800"
+        :width="900"
         @cancel="onCancel"
         @ok="onOk"
         :maskClosable="false"
@@ -234,5 +234,15 @@ const onOk = async () => {
 
 .steps-content {
     width: 100%;
+
+  :deep(.JSearch-item) {
+    .JSearch-item--column {
+      width: 130px !important;
+    }
+
+    .JSearch-item--termType {
+      width: 110px !important;
+    }
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
index bdfa4e52..325e89bc 100644
--- a/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
+++ b/src/views/rule-engine/Scene/Save/action/Notify/variableItem/User.vue
@@ -137,7 +137,7 @@
     </j-input-group>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="NotifyUser">
 import { storeToRefs } from 'pinia';
 import { useSceneStore } from '@/store/scene';
 import NoticeApi from '@/api/notice/config';
@@ -340,27 +340,42 @@ const onChange = (
     const _names: string[] = Array.isArray(_name) ? _name : [_name || ''];
     if (Array.isArray(_value)) {
         if (props?.notify?.notifyType === 'email') {
-            _values = _value.map((item) => {
-                const _item = treeDataMap.get(item)
-                const _isRelation = _item?.isRelation
-                if(_isRelation) {
-                    return getObj(_source, item, _isRelation);
-                } else {
-                    return {
-                        source: "relation",
-                        relation:{
-                            objectType: "user",
-                            objectId: item
-                        }
-                    }
-                }
-            });
+          if (_source === 'fixed') {
+            _values = {
+              source: "fixed",
+              value: _value
+            }
+          } else {
+            _values = {
+              source: "relation",
+              relation: {
+                objectType: "user",
+                objectId: _value?.[0]
+              }
+            }
+          }
+            // _values = _value.map((item) => {
+            //     const _item = treeDataMap.get(item)
+            //     const _isRelation = _item?.isRelation
+            //     if(_isRelation) {
+            //         return getObj(_source, item, _isRelation);
+            //     } else {
+            //         return {
+            //             source: "relation",
+            //             relation:{
+            //                 objectType: "user",
+            //                 objectId: item
+            //             }
+            //         }
+            //     }
+            // });
         }
     } else {
       const item = treeDataMap.get(_value)
       const _isRelation = item?.isRelation
         _values = getObj(_source, _value, _isRelation);
     }
+
     emit('update:value', _values);
     emit('change', _names.filter((item) => !!item).join(','));
 };
@@ -391,4 +406,4 @@ watch(
     },
     { deep: true, immediate: true },
 );
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/rule-engine/Scene/Save/action/TriggerAlarm/AlarmModal.vue b/src/views/rule-engine/Scene/Save/action/TriggerAlarm/AlarmModal.vue
new file mode 100644
index 00000000..0aa878c2
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/action/TriggerAlarm/AlarmModal.vue
@@ -0,0 +1,233 @@
+<template>
+  <j-modal
+    visible
+    title="新增关联告警"
+    :width="1000"
+    :keyboard="false"
+    :mask="false"
+    :maskClosable="false"
+    :loading="loading"
+    @cancel="onCancel"
+    @ok="onOk"
+  >
+    <pro-search :columns="columns" type="simple" @search="handleSearch" style="padding: 0"/>
+    <j-scrollbar :maxHeight="500">
+      <JProTable
+        model="CARD"
+        :columns="columns"
+        :request="queryAlarmPage"
+        :bodyStyle="{ padding: 0 }"
+        :gridColumn="3"
+        :defaultParams="{
+                  sorts: [{ name: 'createTime', order: 'desc' }],
+                  terms: [
+                      {
+                          terms: [
+                              {
+                                  column: 'id$rule-bind-alarm$not',
+                                  value: `${id}:${actionId || branchId}`,
+                              },
+                              {
+                                column: 'branchIndex$rule-bind-alarm$not',
+                                value: `${id}:${-1}`,
+                                type: 'and'
+                              },
+                              {
+                                column: targetType === 'device' ? 'targetType$in' : 'targetType',
+                                value: targetType === 'device' ? [] : 'other',
+                                type: 'and'
+                              }
+                          ],
+                      },
+                  ],
+              }"
+        :rowSelection="{
+          selectedRowKeys: selectKeys,
+          onSelectNone: cancelSelect
+        }"
+        :params="params"
+      >
+        <template #card="slotProps">
+          <CardBox
+            :value="slotProps"
+            :active="selectKeys.includes(slotProps.id)"
+            :status="slotProps.state?.value"
+            :statusText="slotProps.state?.text"
+            :statusNames="{
+              enabled: 'processing',
+              disabled: 'error',
+            }"
+            :scroll="{ y: 510 }"
+            @click="handleClick"
+          >
+            <template #img>
+              <slot name="img">
+                <img
+                  src="/images/alarm/alarm-config.png"
+                />
+              </slot>
+            </template>
+            <template #content>
+              <div style="margin-top: 36px; display: flex;gap: 6px;line-height: 1">
+                <LevelIcon :level="slotProps.level" />
+                <div style="flex: 1 1 0;min-width: 0">
+                  <Ellipsis>
+                    {{ slotProps.name }}
+                  </Ellipsis>
+                </div>
+              </div>
+            </template>
+          </CardBox>
+        </template>
+      </JProTable>
+    </j-scrollbar>
+  </j-modal>
+</template>
+
+<script setup name="AlarmModal">
+import {queryAlarmPage} from '@/api/rule-engine/scene';
+import { useAlarmLevel, useRequest } from '@/hook'
+import {bindScene, getTargetTypes} from "@/api/rule-engine/configuration";
+import {onlyMessage} from "@/utils/comm";
+
+const props = defineProps({
+  id: {
+    type: String,
+    default: '',
+  },
+  actionId: {
+    type: String,
+    default: undefined
+  },
+  branchId: {
+    type: String,
+    default: '',
+  },
+  targetType: {
+    type: String
+  }
+});
+
+const emit = defineEmits(['cancel', 'ok'])
+
+const params = ref({})
+const selectKeys = ref([])
+
+const { run, loading } = useRequest(bindScene, {
+  immediate: false,
+  onSuccess() {
+    emit('ok')
+    onlyMessage('操作成功！')
+  }
+})
+
+const { levelMap, levelList } = useAlarmLevel()
+
+const columns = [
+  {
+    title: '类型',
+    dataIndex: 'targetType',
+    search: {
+      type: 'select',
+      options: async () => {
+        const resp = await getTargetTypes()
+        if (resp.success) {
+          return resp.result.filter(item => {
+            return props.targetType === 'device' || item.id === 'other'
+          }).map(item => ({ label: item.name, value: item.id }))
+        } else {
+          return []
+        }
+      },
+    }
+  },
+  {
+    title: '配置名称',
+    dataIndex: 'name',
+    key: 'name',
+    search: {
+      type: 'string',
+    },
+    width: 220,
+    ellipsis: true,
+  },
+  {
+    title: '状态',
+    dataIndex: 'state',
+    key: 'state',
+    scopedSlots: true,
+    search: {
+      type: 'select',
+      options: [
+        {
+          label: '正常',
+          value: 'enabled',
+        },
+        {
+          label: '禁用',
+          value: 'disabled',
+        },
+      ],
+    },
+    width: 90,
+  },
+  {
+    title: '等级',
+    dataIndex: 'level',
+    key: 'level',
+    scopedSlots: true,
+    search: {
+      type: 'select',
+      options: async () => {
+        return levelList.value
+      },
+    },
+    width: 200,
+  },
+
+]
+
+const handleSearch = (e) => {
+  params.value = e
+}
+
+const handleClick = (record) => {
+  const selectSet = new Set(selectKeys.value)
+
+  if (selectSet.has(record.id)) {
+    selectSet.delete(record.id)
+  } else {
+    selectSet.add(record.id)
+  }
+
+  selectKeys.value = [...selectSet.values()]
+}
+
+const cancelSelect = () => {
+  selectKeys.value = []
+}
+
+const onCancel = () => {
+  emit('cancel')
+}
+
+const onOk = async () => {
+  if (selectKeys.value.length) {
+    run(selectKeys.value.map(key => {
+      return {
+        alarmId: key,
+        ruleId: props.id,
+        branchIndex: props.actionId
+      }
+    }))
+  } else {
+    onlyMessage('请选择告警', 'warning')
+  }
+
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/TriggerAlarm/index.vue b/src/views/rule-engine/Scene/Save/action/TriggerAlarm/index.vue
index bf53256f..28c5710b 100644
--- a/src/views/rule-engine/Scene/Save/action/TriggerAlarm/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/TriggerAlarm/index.vue
@@ -1,16 +1,30 @@
 <template>
     <j-modal
+        visible
+        title="关联告警"
         :width="1000"
+        :keyboard="false"
+        :maskClosable="false"
+        :footer="null"
         @cancel="emit('close')"
         @ok="emit('close')"
-        visible
-        title="关联此条件的告警"
     >
-        <div style="margin-bottom: 24px">关联告警数量：{{ count }}</div>
+      <div class="related-alarms-content">
+        <div class="related-alarms-add-btn">
+          <a-button type="link" @click="showAlarm">
+            <template #icon>
+              <AIcon type="PlusOutlined"/>
+            </template>
+            关联告警
+          </a-button>
+        </div>
+        <div class="related-alarms-total" style="margin-bottom: 8px">关联告警数量：<span>{{ count }}</span></div>
+        <div class="related-alarms-tip" >注意：关联的告警配置处于“禁用”状态时会导致场景联动无法完成执行动作</div>
         <JProTable
-            :columns="columns"
-            :request="queryAlarmList"
+            ref="tableRef"
             model="TABLE"
+            :columns="columns"
+            :request="queryData"
             :bodyStyle="{ padding: 0 }"
             :defaultParams="{
                 sorts: [{ name: 'createTime', order: 'desc' }],
@@ -19,7 +33,12 @@
                         terms: [
                             {
                                 column: 'id$rule-bind-alarm',
-                                value: branchId ? `${id}:${branchId}` : id,
+                                value: `${id}:${actionId || branchId}`,
+                            },
+                            {
+                              column: 'id$rule-bind-alarm',
+                              value: `${id}:${-1}`,
+                              type: 'or'
                             },
                         ],
                     },
@@ -27,7 +46,12 @@
             }"
         >
             <template #level="slotProps">
-                {{ levelList.find(i => slotProps.level === i.level)?.title || '' }}
+              <div style="display: flex;">
+                <LevelIcon :level="slotProps.level" ></LevelIcon>
+                <Ellipsis>
+                  {{ levelMap[slotProps.level] }}
+                </Ellipsis>
+              </div>
             </template>
             <template #targetType="slotProps">
                 {{ map[slotProps.targetType] }}
@@ -42,31 +66,70 @@
                     "
                 />
             </template>
+            <template #action="slotProps">
+              <PermissionButton
+                danger
+                type="link"
+                style="padding: 0;"
+                :popConfirm="{
+                  title: '确认取消关联',
+                  onConfirm: () => {
+                    unBind(slotProps)
+                  }
+                }"
+                :tooltip="{
+                  title: '取消关联'
+                }"
+              >
+                <AIcon type="DisconnectOutlined" />
+              </PermissionButton>
+
+            </template>
         </JProTable>
+      </div>
+
     </j-modal>
+  <AlarmModal
+    v-if="visible"
+    v-bind="props"
+    @ok="onOk"
+    @cancel="visible = false"
+  />
 </template>
 
 <script setup lang="ts">
-import { queryAlarmList } from '@/api/rule-engine/scene';
-import {
-    getAlarmLevel,
-    getAlarmConfigCount,
-} from '@/api/rule-engine/dashboard';
+import { queryAlarmPage } from '@/api/rule-engine/scene';
+import AlarmModal from "./AlarmModal.vue";
+import {unBindAlarm} from "@/api/rule-engine/configuration";
+import {onlyMessage} from "@/utils/comm";
+import { EventEmitter } from '@/views/rule-engine/Scene/Save/util'
+import {useAlarmLevel} from "@/hook";
 
 const props = defineProps({
     id: {
-        type: String,
-        default: '',
+      type: String,
+      default: '',
+    },
+    actionId: {
+      type: String,
+      default: undefined
     },
     branchId: {
-    type: String,
-    default: '',
-  },
+      type: String,
+      default: '',
+    },
+    targetType: {
+      type: String
+    }
 });
+
 const emit = defineEmits(['close']);
 
 const count = ref<number>(0);
-const levelList = ref<any[]>([]);
+
+const visible = ref(false)
+const tableRef = ref()
+const { levelMap } = useAlarmLevel();
 
 const map = {
     product: '产品',
@@ -102,34 +165,101 @@ const columns = [
         title: '说明',
         ellipsis: true,
     },
+    {
+      dataIndex: 'action',
+      title: '操作',
+      width: 80,
+      scopedSlots: true,
+    }
 ];
-watch(
-    () => props.id,
-    (newId) => {
-        if (newId) {
-            getAlarmConfigCount({
-                terms: [
-                    {
-                        column: 'id$rule-bind-alarm',
-                        // value: newId,
-                        value: props.branchId ? `${newId}:${props.branchId}` : newId,
-                    },
-                ],
-            }).then((resp) => {
-                if (resp.status === 200) {
-                    count.value = (resp.result || 0) as number;
-                }
-            });
-        }
-    },
-    { immediate: true },
-);
 
-onMounted(() => {
-    getAlarmLevel().then((resp) => {
-        if (resp.status === 200) {
-            levelList.value = resp.result?.levels || []
-        }
-    });
-});
+/**
+ * 发布订阅
+ */
+const eventEmit = () => {
+  const _key = props.actionId || props.branchId
+  EventEmitter.emit(`${_key}_alarm`, { updateTime: new Date().getTime()})
+}
+
+const onOk = () => {
+  visible.value = false
+  tableRef.value.reload()
+
+  eventEmit()
+}
+
+const showAlarm = () => {
+  visible.value = true
+}
+
+const unBind = async (record: any) => {
+  const res = await unBindAlarm(props.id, record.id, [props.actionId])
+  if (res.success) {
+    tableRef.value.reload()
+    onlyMessage('操作成功！')
+    eventEmit()
+  }
+}
+
+const queryData = async (terms: any) => {
+
+  const resp = await queryAlarmPage(terms)
+
+  count.value = resp.result.total
+
+  return {
+    code: resp.status,
+    result: resp.result,
+    status: resp.status,
+  };
+}
+
+// watch(
+//     () => props.id,
+//     (newId) => {
+//         if (newId) {
+//             getAlarmConfigCount({
+//                 terms: [
+//                     {
+//                         column: 'id$rule-bind-alarm',
+//                         // value: newId,
+//                         value: props.branchId ? `${newId}:${props.branchId}` : newId,
+//                     },
+//                 ],
+//             }).then((resp) => {
+//                 if (resp.status === 200) {
+//                     count.value = (resp.result || 0) as number;
+//                 }
+//             });
+//         }
+//     },
+//     { immediate: true },
+// );
+
 </script>
+<style scoped lang="less">
+.related-alarms-content {
+  position: relative;
+
+  .related-alarms-add-btn {
+    position: absolute;
+    top: 0;
+    right: 0;
+  }
+
+  .related-alarms-total {
+    font-size: 16px;
+    color: #1a1a1a;
+
+    >span {
+      color: #1677FF;
+    }
+  }
+
+  .related-alarms-tip {
+    font-size: 12px;
+    color: #777;
+    margin-bottom: 12px
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Scene/Save/action/index.vue b/src/views/rule-engine/Scene/Save/action/index.vue
index fdaa9e83..24141b16 100644
--- a/src/views/rule-engine/Scene/Save/action/index.vue
+++ b/src/views/rule-engine/Scene/Save/action/index.vue
@@ -69,6 +69,9 @@ import { randomString } from '@/utils/utils'
 import { storeToRefs } from 'pinia'
 import { useSceneStore } from 'store/scene'
 import { Form } from 'jetlinks-ui-components'
+import { Modal } from 'ant-design-vue'
+import {queryAlarmCount, queryAlarmPage} from "@/api/rule-engine/scene";
+import {unBindAlarm, unBindAlarmMultiple} from "@/api/rule-engine/configuration";
 
 const sceneStore = useSceneStore()
 const { data: FormModel } = storeToRefs(sceneStore)
@@ -86,7 +89,11 @@ const props = defineProps({
   openShakeLimit: {
     type: Boolean,
     default: false
-  }
+  },
+  groupIndex: {
+    type: Number,
+    default: 0
+  },
 })
 
 const emit = defineEmits(['update', 'add'])
@@ -106,13 +113,10 @@ watch(
       return !!item.actions.length
     })
 
-    if (
-      !lock.value &&
-      parallelArray.value.length &&
-      (!serialArray.value.length || !isSerialActions)
-    ) {
-      activeKeys.value = ['2']
-      lock.value = true
+    const isParallelActions = parallelArray.value.some((item) => !!item.actions?.length)
+
+    if (!lock.value && isParallelActions) {
+      activeKeys.value = !serialArray.value.length || !isSerialActions ? ['2'] : ['1', '2']
     }
   },
   {
@@ -121,13 +125,58 @@ watch(
   }
 )
 
-const onDelete = (_key: string, _parallel: boolean) => {
+const onDelete = async (_key: string, _parallel: boolean) => {
   const thenName = props.thenOptions.findIndex(item => item.parallel === _parallel)
   const actionIndex = FormModel.value.branches?.[props.name].then?.[thenName].actions.findIndex(item => item.key === _key)
+
   if (actionIndex !== -1) {
-    FormModel.value.branches?.[props.name].then?.[thenName].actions.splice(actionIndex!, 1)
+
+    const actionItem = FormModel.value.branches?.[props.name].then?.[thenName].actions[actionIndex]
+
+    if (actionItem.executor === 'alarm') {
+      const _branchId = FormModel.value.branches?.[props.name].branchId
+      const resp = await queryAlarmPage({
+        terms: [
+          {
+            terms: [
+              {
+                column: 'id$rule-bind-alarm',
+                value: `${FormModel.value.id}:${actionItem.actionId || _branchId}`,
+              },
+              {
+                column: 'id$rule-bind-alarm',
+                value: `${FormModel.value.id}:${-1}`,
+                type: 'or'
+              },
+            ],
+          },
+        ]
+      })
+      if (resp.success && resp.result.total) {
+        Modal.confirm({
+          title: `已关联 ${resp.result.total} 条告警，删除该执行动作会同步解除对应的关联告警，确认删除？`,
+          onOk() {
+            const _data = resp.result.data.map(item => {
+                return {
+                  "alarmId": item.id,
+                  "ruleId": FormModel.value.id,
+                  "branchIndex": actionItem.actionId
+                }
+            })
+            unBindAlarmMultiple(_data)
+            FormModel.value.branches?.[props.name].then?.[thenName].actions.splice(actionIndex!, 1)
+            formItemContext.onFieldChange()
+          }
+        })
+      } else {
+        FormModel.value.branches?.[props.name].then?.[thenName].actions.splice(actionIndex!, 1)
+        formItemContext.onFieldChange()
+      }
+    } else {
+      FormModel.value.branches?.[props.name].then?.[thenName].actions.splice(actionIndex!, 1)
+      formItemContext.onFieldChange()
+    }
   }
-  formItemContext.onFieldChange()
 }
 
 const onAdd = (actionItem: any, _parallel: boolean) => {
@@ -177,4 +226,4 @@ const onAdd = (actionItem: any, _parallel: boolean) => {
     color: rgba(#000, 0.45);
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/asstes.ts b/src/views/rule-engine/Scene/Save/asstes.ts
index 6c42b67a..fe3835be 100644
--- a/src/views/rule-engine/Scene/Save/asstes.ts
+++ b/src/views/rule-engine/Scene/Save/asstes.ts
@@ -1,13 +1,13 @@
 import { getImage } from '@/utils/comm'
 
 export const TriggerHeaderIcon = {
-  time: getImage('/scene/trigger-type-icon/timing.png'),
+  timer: getImage('/scene/trigger-type-icon/timing.png'),
   manual: getImage('/scene/trigger-type-icon/manual.png'),
   device: getImage('/scene/trigger-type-icon/device.png')
 }
 
 export const TriggerListIcon = {
-  time: getImage('/scene/scene-timer.png'),
+  timer: getImage('/scene/scene-timer.png'),
   manual: getImage('/scene/scene-hand.png'),
   device: getImage('/scene/scene-device.png')
 }
diff --git a/src/views/rule-engine/Scene/Save/components/AddButton.vue b/src/views/rule-engine/Scene/Save/components/AddButton.vue
index a30f2f66..bd9e6b71 100644
--- a/src/views/rule-engine/Scene/Save/components/AddButton.vue
+++ b/src/views/rule-engine/Scene/Save/components/AddButton.vue
@@ -1,6 +1,7 @@
 <template>
   <div class='rule-button-warp' :style='style'>
-    <div class='rule-button add-button' @click='click'>
+    <slot name="extra"/>
+    <div class='rule-button add-button' :class="{'add-circular': showCircular}" @click='click'>
       <slot />
     </div>
   </div>
@@ -17,6 +18,10 @@ const props = defineProps({
   style: {
     type: Object as PropType<CSSProperties>,
     default: () => ({})
+  },
+  showCircular: {
+    type: Boolean,
+    default: true
   }
 })
 
@@ -39,16 +44,18 @@ const click = () => {
 
 .rule-button {
   display: inline-block;
-  padding: 6px 20px;
   font-size: 14px;
   line-height: 22px;
-  background-color: #fff;
-  border: 1px solid #e0e0e0;
-  border-radius: 22px;
 }
+  .add-circular {
+    padding: 6px 20px;
+    background-color: #fff;
+    border: 1px solid #e0e0e0;
+    border-radius: 22px;
+  }
 
 .add-button {
-  color: #bdbdbd;
+  color: #777;
 
 &:hover,
 &:active {
@@ -56,4 +63,4 @@ const click = () => {
  }
 }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/CardSelect.vue b/src/views/rule-engine/Scene/Save/components/CardSelect.vue
index 17228c11..4036890f 100644
--- a/src/views/rule-engine/Scene/Save/components/CardSelect.vue
+++ b/src/views/rule-engine/Scene/Save/components/CardSelect.vue
@@ -1,19 +1,23 @@
 <template>
-    <div class="scene-trigger-way-warp" :class="{disabled: disabled}">
+    <div class="scene-trigger-way-warp" >
         <template v-for="item in options" :key="item.value">
             <div
                 class="trigger-way-item"
-                :class="{ active: item?.value === value }"
-                :style="{width: `${cardSize}px`}"
-                @click="onSelect(item.value)"
+                :class="{
+                  active: item?.value === value,
+                  disabled: item.disabled || disabled
+                }"
+                @click="onSelect(item)"
             >
+                <div class="way-item-image">
+<!--                  <img :src="item.iconUrl" :width="imageSize" />-->
+                  <AIcon :type="item.iconUrl" />
+                </div>
                 <div class="way-item-title">
                     <p>{{ item.label }}</p>
-                    <span>{{ item.subLabel }}</span>
-                </div>
-                <div class="way-item-image">
-                    <img :src="item.iconUrl" :width="imageSize" />
+                    <div>{{ item.subLabel }}</div>
                 </div>
+
             </div>
         </template>
     </div>
@@ -43,56 +47,63 @@ const props = defineProps({
         type: Number,
         default: 48
     },
-    cardSize: {
-        type: Number,
-        default: 237
-    }
 });
 
 const emit = defineEmits(['update:value'])
 
-const onSelect = (_type: string) => {
-    if (!props.disabled) {
-      emit('update:value', _type)
+const onSelect = (record: any) => {
+    if (!props.disabled && !record.disabled) {
+      emit('update:value', record.value)
     }
 }
+
 </script>
 
 <style lang="less" scoped>
 .scene-trigger-way-warp {
-    display: flex;
-    flex-wrap: wrap;
-    gap: 16px 24px;
+    display: grid;
+    gap: 24px;
     width: 100%;
+    grid-template-columns: 1fr 1fr 1fr;
 
     .trigger-way-item {
         display: flex;
         justify-content: space-between;
         padding: 16px;
-        border: 1px solid #e0e4e8;
+        border: 1px solid transparent;
         border-radius: 2px;
         cursor: pointer;
         transition: all 0.3s;
+        background-color: #F5F5F5;
+        gap: 16px;
+        align-items: center;
 
         .way-item-title {
+          flex: 1 1 0;
+          min-width: 0;
             p {
                 margin-bottom: 8px;
                 font-weight: bold;
-                font-size: 16px;
+                font-size: 14px;
             }
 
-            span {
-                color: rgba(#000, 0.35);
+            div {
+                color: #777;
                 font-size: 12px;
             }
         }
 
         .way-item-image {
-            display: flex;
-            align-items: center;
-            height: 100%;
-            margin: 0 !important;
-            opacity: 0.6;
+
+          display: flex;
+          width: 40px;
+          height: 40px;
+          font-size: 24px;
+          color: #fff;
+          background-color: @primary-color;
+          border-radius: 2px;
+          align-items: center;
+          justify-content: center;
         }
 
         &:hover {
@@ -108,21 +119,19 @@ const onSelect = (_type: string) => {
                 opacity: 1;
             }
         }
-    }
 
-    &.disabled {
-        .trigger-way-item {
-            cursor: not-allowed;
+        &.disabled {
+          cursor: not-allowed;
 
-            &:hover {
-                color: initial;
-                opacity: 0.6;
-            }
+          &:hover {
+            color: initial;
+            opacity: 0.6;
+          }
 
-            &.active {
-                opacity: 1;
-            }
+          &.active {
+            opacity: 1;
+          }
         }
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/Description.vue b/src/views/rule-engine/Scene/Save/components/Description.vue
new file mode 100644
index 00000000..8e562582
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Description.vue
@@ -0,0 +1,84 @@
+<template>
+  <div class="scene-description">
+    <a-button type="primary" v-if="showAddBtn" @click="showEdit">
+      <template #icon>
+        <AIcon type="PlusOutlined"/>
+      </template>
+      场景说明
+    </a-button>
+    <div class="scene-description-content" v-if="showEditBtn">
+      <a-input v-model:value="myValue" show-count :maxlength="200" placeholder='请输入说明' style="flex: 1 1 0"/>
+      <a-button @click="cancel">取消</a-button>
+      <a-button type="primary" @click="save">确认</a-button>
+    </div>
+    <div class="scene-description-content " v-if="showDetail">
+      <div style="max-width: calc(100% - 32px);">
+        <Ellipsis>
+          {{ myValue }}
+        </Ellipsis>
+      </div>
+      <a-button type="link" @click="showEdit">
+        <template #icon>
+          <AIcon type="EditOutlined" style="font-size: 14px;"/>
+        </template>
+      </a-button>
+    </div>
+  </div>
+</template>
+
+<script setup name="Description">
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: ''
+  }
+})
+const emit = defineEmits(['update:value'])
+
+const visible = ref()
+const myValue = ref()
+
+const showAddBtn = computed(() => {
+  return !props.value && !visible.value
+})
+
+const showEditBtn = computed(() => {
+  return visible.value
+})
+
+const showDetail = computed(() => {
+  return props.value && !visible.value
+})
+
+const showEdit = () => {
+  visible.value = true
+}
+
+const save = () => {
+  visible.value = false
+  emit('update:value', myValue.value)
+}
+
+const cancel = () => {
+  visible.value = false
+  myValue.value = props.value
+}
+
+watch(() => props.value, () => {
+  myValue.value = props.value
+}, { immediate: true })
+
+</script>
+
+<style scoped lang="less">
+.scene-description {
+  width: 100%;
+
+  .scene-description-content {
+    display: flex;
+    gap: 8px;
+    align-items: center;
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
index 1f5e11d6..aae857ee 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/DropdownButton.vue
@@ -35,13 +35,13 @@
               v-model:expandedKeys="treeOpenKeys"
               :selectedKeys='selectValue ? [selectValue] : []'
               :treeData='options'
-              :height='450'
+              :height='350'
               :virtual='true'
               @select='treeSelect'
             >
-              <template #title="{ name, description }">
+              <template #title="{ name, fullName, description }">
                 <j-space>
-                  {{ name }}
+                  {{ name || fullName }}
                   <span v-if='description' class='tree-title-description'>{{ description }}</span>
                 </j-space>
               </template>
@@ -118,10 +118,7 @@ const visibleChange = (v: boolean) => {
 
 const dropdownButtonClass = computed(() => ({
   'dropdown-button': true,
-  'column': props.type === 'column',
-  'termType': props.type === 'termType',
-  'value': props.type === 'value',
-  'type': props.type === 'type',
+  [props.type]: true
 }))
 
 const treeSelect = (v: any, option: any) => {
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
index 62da28bb..0e6eb88e 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/Time.vue
@@ -60,7 +60,6 @@ const getPopupContainer = (trigger: HTMLElement) => {
 }
 
 const change = (e: string) => {
-  console.log('Time',e)
   myValue.value =  e
   emit('update:value', e)
   emit('change', e)
@@ -99,4 +98,4 @@ const change = (e: string) => {
 .wrapper{
   display: none;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/index.less b/src/views/rule-engine/Scene/Save/components/DropdownButton/index.less
index c0bd9314..d1316b6d 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/index.less
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/index.less
@@ -27,9 +27,9 @@
 }
 
 .termType {
-  color: #2f54eb;
-  background-color: rgba(163, 202, 255, 0.3);
-  border-color: rgba(47, 84, 235, 0.3);
+  color: #13C2C2;
+  background: rgba(135, 232, 222, 0.3);
+  border: 1px solid rgba(54, 207, 201, 0.4);
 }
 
 .value {
@@ -38,6 +38,12 @@
   border-color: rgba(188, 125, 238, 0.5);
 }
 
+.alarm {
+  color: #2F54EB;
+  background: rgba(163, 202, 255, 0.3);
+  border: 1px solid rgba(47, 84, 235, 0.3);
+}
+
 .type {
   padding: 5px 10px;
 }
@@ -45,4 +51,4 @@
 .tree-title-description {
   padding-left: 5px;
   color: grey;
-}
\ No newline at end of file
+}
diff --git a/src/views/rule-engine/Scene/Save/components/DropdownButton/util.ts b/src/views/rule-engine/Scene/Save/components/DropdownButton/util.ts
index 9346be24..160ce450 100644
--- a/src/views/rule-engine/Scene/Save/components/DropdownButton/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/DropdownButton/util.ts
@@ -1,4 +1,4 @@
-import { isBoolean, isEqual } from 'lodash-es'
+import {cloneDeep, isBoolean, isEqual} from 'lodash-es'
 
 export type DropdownButtonOptions = {
   label: string;
@@ -33,12 +33,13 @@ export const getComponent = (type: string): string => {
 
 export const getOption = (data: any[], value?: string | number | boolean, key: string = 'name'): DropdownButtonOptions | any => {
   let option
+  const deepData = cloneDeep(data)
   if (value === undefined && value === null) return option
   let _value = isBoolean(value) ? String(value) : value
   for (let i = 0; i < data.length; i++) {
-    const item = data[i]
+    const item = deepData[i]
     if (isEqual(item[key], _value)) {
-      option = data[i]
+      option = deepData[i]
       break
     } else if (item.children && item.children.length) {
       option = getOption(item.children, value, key)
@@ -48,4 +49,4 @@ export const getOption = (data: any[], value?: string | number | boolean, key: s
     }
   }
   return option
-}
\ No newline at end of file
+}
diff --git a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
index 44115eb5..bba496e4 100644
--- a/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
+++ b/src/views/rule-engine/Scene/Save/components/FunctionCall/FunctionCall.vue
@@ -34,7 +34,7 @@
         <div style='max-width: 260px'>
           <ValueItem
             v-model:modelValue='record.value'
-            :itemType="record.type"
+            :itemType="record.type === 'date'? 'time' : record.type"
             :options="record.options"
             @change='valueChange'
           />
@@ -108,4 +108,4 @@ watch(() => props.data, () => {
 
 <style scoped>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Array.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Array.vue
index 37cf597d..1e224660 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Array.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/Array.vue
@@ -26,18 +26,7 @@
                         :tab="item.label"
                         :key="item.key"
                     >
-                        <div v-for="(i, index) in myValue" class="scene-select-item">
-                            <ArrayItem
-                                v-model:value="myValue[index]"
-                                :valueName="valueName"
-                                :labelName="labelName"
-                                :options="options"
-                                :component="item.component"
-                                @select="(v, l) => onSelect(v, l, index)"
-                            />
-                        </div>
-                        <j-button @click="addItem">+</j-button>
-                        <j-button @click="deleteItem">-</j-button>
+                      <a-input placeholder="多个值以英文逗号隔开" v-model:value="myValue" @change="onSelect"/>
                     </j-tab-pane>
                 </j-tabs>
             </div>
@@ -52,7 +41,7 @@ import ArrayItem from './ArrayItem.vue';
 import { cloneDeep } from 'lodash-es';
 import { getOption } from '../DropdownButton/util';
 type Emit = {
-    (e: 'update:value', data: ValueType): void;
+    (e: 'update:value', data: Array<ValueType>): void;
     (e: 'update:source', data: string): void;
     (
         e: 'select',
@@ -69,55 +58,35 @@ const props = defineProps({
 });
 
 const emit = defineEmits<Emit>();
-const myValue = ref<ValueType>(cloneDeep(props.value) || [undefined, undefined] as any);
+const myValue = ref<string>();
 const mySource = ref<string>(props.source);
-const label = ref<any>(props.placeholder);
+const label = ref<any>('[]');
 const visible = ref(false);
 const tabsChange = (e: string) => {
     mySource.value = e;
     emit('update:source', mySource.value);
 };
 
-const onSelect = (v: any, _label: string, index: number) => {
-    emit('update:value', myValue.value);
-    label.value[index] = _label;
-    emit('select', myValue.value, _label, label.value);
+const onSelect = () => {
+    const _value = myValue.value.split(',')
+    emit('update:value', _value);
+    label.value = JSON.stringify(_value)
+    emit('select', _value, myValue.value, label.value);
 };
 
 const visibleChange = (v: boolean) => {
     visible.value = v;
 };
 
-const addItem = () => {
-    myValue.value?.push(null);
-    emit('update:value', myValue.value);
-};
-
-const deleteItem = () => {
-    myValue.value?.pop();
-    emit('update:value', myValue.value);
-};
-
-watchEffect(() => {
-    const _options = props.options;
-    const _value = props.value;
-    const _valueName = props.valueName;
-    if (Array.isArray(_value) && _value.length) {
-        label.value = []
-        _value?.forEach((i: any, index: number) => {
-            const option = getOption(_options, i as string, _valueName);
-            if (option) {
-                label.value.push(option[props.labelName] || option.name);
-            } else {
-                label.value.push(i);
-            }
-        });
+watch(()=>props.value,() => {
+    if (props.value?.every(item => !item)) {
+      myValue.value = undefined
+      label.value = '[]'
+    } else {
+      myValue.value = props.value.toString()
+      label.value = JSON.stringify(props.value)
     }
-});
-
-watch(()=>props.value,()=>{
-    myValue.value = cloneDeep(props.value);
-})
+}, { immediate: true })
 </script>
 
 <style scoped lang="less">
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/ArrayItem.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/ArrayItem.vue
index 2d4eeab0..79bf9140 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/ArrayItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/ArrayItem.vue
@@ -30,7 +30,7 @@
     </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="ParamsDropdownArrayItem">
 import ValueItem from '@/components/ValueItem/index.vue';
 import type { ValueType } from './typings';
 import { DropdownMenus, DropdownTimePicker } from '../DropdownButton';
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.ts b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.ts
index c8423c9e..33863a94 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.ts
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.ts
@@ -1,10 +1,6 @@
 import ParamsDropdown from './index.vue'
-import DoubleParamsDropdown from './Double.vue'
-import ArrayParamsDropdown from './Array.vue'
+
+export { default as ArrayParamsDropdown } from './Array.vue'
+export { default as DoubleParamsDropdown } from './Double.vue'
 
 export default ParamsDropdown
-
-export {
-  DoubleParamsDropdown,
-  ArrayParamsDropdown
-}
\ No newline at end of file
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
index 6f66d10a..0f960607 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/index.vue
@@ -54,6 +54,7 @@
                     :treeData='item.key === "upper" ?  metricOptions : options'
                     :height='450'
                     :virtual='true'
+                      :fieldNames="{ key: treeKey }"
                     @select='treeSelect'
                   >
                     <template #title="{ name, description }">
@@ -74,6 +75,7 @@
                 v-model:modelValue='myValue'
                 :itemType='item.component'
                 :options='item.key === "upper" ?  metricOptions : options'
+                :extra="props"
                 @change='valueItemChange'
               />
             </div>
@@ -129,7 +131,7 @@ const tabsChange = (e: string) => {
 const treeSelect = (v: any, option: any) => {
   const node = option.node
   visible.value = false
-  label.value = node[props.labelName] || node.name
+  label.value = node[props.labelName] || node.name || node.fullName
   emit('update:value', node[props.valueName])
   emit('select', node, label.value, { 0: label.value })
 }
@@ -143,7 +145,6 @@ const valueItemChange = (e: string) => {
 const onSelect = (e: string, option: any) => {
   visible.value = false
   label.value = option[props.labelName]
-  console.log(e, option)
   emit('update:value', e)
   emit('select', e, label.value, { 0: label.value }, option)
 }
@@ -167,8 +168,9 @@ watchEffect(() => {
   const option = getOption(_options, _value as string, _valueName) // 回显label值
   myValue.value = isMetric ? props.metric : props.value
   mySource.value = props.source
+
   if (option) {
-    label.value = option[props.labelName] || option.name
+    label.value = option[props.labelName] || option.name || option.fullName
     treeOpenKeys.value = openKeysByTree(_options, props.value, props.valueName)
   } else {
     if (isMetric) { // 处理指标值回显
diff --git a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
index 02010315..7002c1bb 100644
--- a/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
+++ b/src/views/rule-engine/Scene/Save/components/ParamsDropdown/typings.ts
@@ -57,5 +57,9 @@ export const defaultSetting = {
   metric: {
     type: String,
     default: undefined
+  },
+  treeKey: {
+    type: String,
+    default: 'key'
   }
 }
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue b/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue
index 688f36b0..1168d397 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/Branches.vue
@@ -1,44 +1,20 @@
 <template>
   <div :class='WarpClass'>
-    <j-popconfirm
-      title='确认删除？'
-      v-if="showGroupDelete && isFirst"
-      placement="topRight"
-      :overlayStyle='{minWidth: "180px"}'
-      @confirm='deleteGroup'
-    >
-      <div v-if="showGroupDelete && isFirst" class="group-delete">
-        删除条件
-      </div>
-    </j-popconfirm>
     <div class='actions-terms-title'>
       {{ isFirst ? '当' : '否则' }}
     </div>
     <div :class='optionsClass'>
-        <j-popconfirm
-          title='确认删除？'
-          @confirm='onDelete'
-          :overlayStyle='{minWidth: "180px"}'
-        >
-          <div v-if='!isFirst' class='terms-params-delete danger show'>
-            <AIcon type='DeleteOutlined' />
-          </div>
-        </j-popconfirm>
+        <ConfirmModal title="确认删除？" v-if='!isFirst' :onConfirm="onDelete" className="terms-params-delete danger show">
+          <AIcon type='DeleteOutlined' />
+        </ConfirmModal>
       <div
         class='actions-terms-list'
         @mouseover='mouseover'
         @mouseout='mouseout'
       >
-        <j-popconfirm
-          title='该操作将清空过滤条件，确认删除？'
-          placement="topRight"
-          @confirm='onDeleteAll'
-        >
-          <div class='terms-params-delete' v-show='showDelete && whenData.length'>
-            <AIcon type='CloseOutlined' />
-          </div>
-        </j-popconfirm>
-
+        <ConfirmModal title="该操作将清空过滤条件，确认删除？" :show='showDelete && whenData.length' :onConfirm="onDeleteAll" className="terms-params-delete">
+          <AIcon type='CloseOutlined' />
+        </ConfirmModal>
         <div class='actions-terms-list-content'>
           <template v-if='showWhen'>
             <j-scrollbar>
@@ -75,6 +51,7 @@
             :name='name'
             :openShakeLimit="true"
             :thenOptions='FormModel.branches[name]?.then'
+            :groupIndex="groupIndex"
           />
         </j-form-item>
       </div>
@@ -89,7 +66,7 @@ import WhenItem from './WhenItem.vue'
 import { storeToRefs } from 'pinia';
 import { useSceneStore } from 'store/scene'
 import Action from '../../action/index.vue'
-import { randomString } from '@/utils/utils'
+import {randomNumber, randomString} from '@/utils/utils'
 
 const sceneStore = useSceneStore()
 const { data: FormModel } = storeToRefs(sceneStore)
@@ -133,7 +110,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['deleteGroup'])
+const emit = defineEmits(['deleteGroup', 'delete'])
 
 const showDelete = ref(false)
 const error = ref(false)
@@ -155,11 +132,12 @@ const WarpClass = computed(() => {
 })
 
 const onDelete = () => {
-  if (FormModel.value.branches?.length == 2) {
-    FormModel.value.branches?.splice(props.name, 1)
-  } else {
-    FormModel.value.branches?.splice(props.name, 1)
-  }
+  // if (FormModel.value.branches?.length == 2) {
+  //   FormModel.value.branches?.splice(props.name, 1)
+  // } else {
+  //   FormModel.value.branches?.splice(props.name, 1)
+  // }
+  emit('delete')
 }
 
 const onDeleteAll = () => {
@@ -201,7 +179,7 @@ const addWhen = () => {
         type: 'and',
       }
     ],
-    key: `terms_${randomString()}`
+    key: `terms_${randomString()}`,
   }
   FormModel.value.branches?.[props.name].when?.push(terms)
   if(FormModel.value.branches?.length <= props.name + 1){
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/BranchesNameEdit.vue b/src/views/rule-engine/Scene/Save/components/Terms/BranchesNameEdit.vue
new file mode 100644
index 00000000..b1920d5d
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Terms/BranchesNameEdit.vue
@@ -0,0 +1,50 @@
+<template>
+  <j-modal
+    visible
+    title="编辑"
+    :keyboard="false"
+    :maskClosable="false"
+    @cancel="onCancel"
+    @ok="onOk"
+  >
+    <j-form ref='formRef' layout='vertical' :model="formData">
+      <j-form-item label="条件名称" required name="name" :rules="[{ max: 64, message: '最多输入64个字符'}]">
+        <j-input v-model:value="formData.name"></j-input>
+      </j-form-item>
+    </j-form>
+  </j-modal>
+</template>
+
+<script setup name="BranchesNameEdit">
+const props = defineProps({
+  name: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['cancel', 'ok'])
+
+const formData = reactive({
+  name: props.name
+})
+const formRef = ref()
+
+
+const onCancel = () => {
+  emit('cancel')
+}
+
+const onOk = async () => {
+  const data = await formRef.value.validate()
+
+  if (data) {
+    emit('ok', formData.name)
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue
index 6c05a4ec..b81a477d 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/TermsItem.vue
@@ -23,7 +23,6 @@ import { storeToRefs } from 'pinia';
 import { useSceneStore } from 'store/scene'
 import ParamsItem from './ParamsItem.vue'
 import { isArray } from 'lodash-es'
-import { randomString } from '@/utils/utils'
 
 const sceneStore = useSceneStore()
 const { data: formModel } = storeToRefs(sceneStore)
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/TermsTabPane.vue b/src/views/rule-engine/Scene/Save/components/Terms/TermsTabPane.vue
new file mode 100644
index 00000000..9abeec57
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Terms/TermsTabPane.vue
@@ -0,0 +1,53 @@
+<template>
+  <div class="terms-tab-pane" @mouseleave="mouseleave" @mouseover="mouseover">
+    <div class="terms-tab-pane-content">
+      <slot />
+    </div>
+
+    <div class="terms-tab-pane-btn" @click="close">
+      <AIcon v-show="showClose && showIcon" type="CloseOutlined" />
+    </div>
+  </div>
+</template>
+
+<script setup name="TermsTabPane">
+
+const emit = defineEmits('close')
+
+const props = defineProps({
+  showClose: {
+    type: Boolean,
+    default: true
+  }
+})
+
+const showIcon = ref(false)
+const mouseleave = () => {
+  showIcon.value = false
+}
+
+const mouseover = () => {
+  showIcon.value = true
+}
+
+const close = (e) => {
+  e.stopPropagation()
+  if (props.showClose && showIcon.value) {
+    emit('close')
+  }
+}
+</script>
+
+<style scoped lang="less">
+.terms-tab-pane {
+  display: flex;
+  gap: 8px;
+
+  .terms-tab-pane-btn {
+    width: 14px;
+    >span {
+      margin: 0;
+    }
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue b/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue
index 842b7bec..f0cfe0f8 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue
+++ b/src/views/rule-engine/Scene/Save/components/Terms/WhenItem.vue
@@ -1,158 +1,165 @@
 <template>
-  <div class='terms-params'>
-    <div class='terms-params-warp'>
-      <div v-if='!isFirst' class='term-type-warp'>
-        <DropdownButton
-          :options='[
-              { label: "并且", value: "and" },
-              { label: "或者", value: "or" },
-            ]'
-          type='type'
-          v-model:value='formModel.branches[branchName].when[name].type'
-          @select='typeChange'
-        />
-      </div>
-      <div
-          class='terms-params-content'
-          @mouseover='mouseover'
-          @mouseout='mouseout'
-      >
-        <j-popconfirm
-            title='确认删除？'
-            :overlayStyle='{minWidth: "180px"}'
-            @confirm='onDelete'
-        >
-          <div v-show='showDelete' class='terms-params-delete'>
-            <AIcon type='CloseOutlined' />
-          </div>
-        </j-popconfirm>
-        <TermsItem
-          v-for='(item, index) in termsData'
-          :key='item.key'
-          :branchName='branchName'
-          :branches_Index='branches_Index'
-          :whenName='props.name'
-          :name='index'
-          :showDeleteBtn='termsData.length > 1'
-          :isFirst='index === 0'
-          :isLast='index === termsData.length -1'
-          :data='item'
-        />
-      </div>
-      <div class='terms-group-add' @click='addWhen' v-if='isLast'>
-        <div class='terms-content'>
-          <AIcon type='PlusOutlined' />
-          <span>分组</span>
+    <div class="terms-params">
+        <div class="terms-params-warp">
+            <div v-if="!isFirst" class="term-type-warp">
+                <DropdownButton
+                    :options="[
+                        { label: '并且', value: 'and' },
+                        { label: '或者', value: 'or' },
+                    ]"
+                    type="type"
+                    v-model:value="
+                        formModel.branches[branchName].when[name].type
+                    "
+                    @select="typeChange"
+                />
+            </div>
+            <div
+                class="terms-params-content"
+                @mouseover="mouseover"
+                @mouseout="mouseout"
+            >
+                <ConfirmModal
+                    title="确认删除？"
+                    :onConfirm="onDelete"
+                    :show="showDelete"
+                    className="terms-params-delete"
+                >
+                    <AIcon type="CloseOutlined" />
+                </ConfirmModal>
+                <TermsItem
+                    v-for="(item, index) in termsData"
+                    :key="item.key"
+                    :branchName="branchName"
+                    :branches_Index="branches_Index"
+                    :whenName="props.name"
+                    :name="index"
+                    :showDeleteBtn="termsData.length > 1"
+                    :isFirst="index === 0"
+                    :isLast="index === termsData.length - 1"
+                    :data="item"
+                />
+            </div>
+            <div class="terms-group-add" @click="addWhen" v-if="isLast">
+                <div class="terms-content">
+                    <AIcon type="PlusOutlined" />
+                    <span>分组</span>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 </template>
 
-<script setup lang='ts' name='WhenItem'>
-import type { PropType } from 'vue'
-import TermsItem from './TermsItem.vue'
-import { TermsType } from '@/views/rule-engine/Scene/typings'
-import { useSceneStore } from 'store/scene'
-import DropdownButton from '../DropdownButton'
+<script setup lang="ts" name="WhenItem">
+import type { PropType } from 'vue';
+import TermsItem from './TermsItem.vue';
+import { TermsType } from '@/views/rule-engine/Scene/typings';
+import { useSceneStore } from 'store/scene';
+import DropdownButton from '../DropdownButton';
 import { storeToRefs } from 'pinia';
-import { randomString } from '@/utils/utils'
+import { randomString } from '@/utils/utils';
 
-const sceneStore = useSceneStore()
-const { data: formModel } = storeToRefs(sceneStore)
+const sceneStore = useSceneStore();
+const { data: formModel } = storeToRefs(sceneStore);
 
 const props = defineProps({
-  isFirst: {
-    type: Boolean,
-    default: true
-  },
-  data: {
-    type: Object as PropType<TermsType>,
-    default: () => ({
-      when: [],
-      shakeLimit: {},
-      then: []
-    })
-  },
-  showDeleteBtn: {
-    type: Boolean,
-    default: true
-  },
-  class: {
-    type: String,
-    default: ''
-  },
-  name: {
-    type: Number,
-    default: 0
-  },
-  branchName: {
-    type: Number,
-    default: 0
-  },
-  branches_Index: {
-    type: Number,
-    default: 0
-  },
-  isLast: {
-    type: Boolean,
-    default: true
-  }
-})
+    isFirst: {
+        type: Boolean,
+        default: true,
+    },
+    data: {
+        type: Object as PropType<TermsType>,
+        default: () => ({
+            when: [],
+            shakeLimit: {},
+            then: [],
+        }),
+    },
+    showDeleteBtn: {
+        type: Boolean,
+        default: true,
+    },
+    class: {
+        type: String,
+        default: '',
+    },
+    name: {
+        type: Number,
+        default: 0,
+    },
+    branchName: {
+        type: Number,
+        default: 0,
+    },
+    branches_Index: {
+        type: Number,
+        default: 0,
+    },
+    isLast: {
+        type: Boolean,
+        default: true,
+    },
+});
 
-const showDelete = ref(false)
+const showDelete = ref(false);
 
 const mouseover = () => {
-  if (props.showDeleteBtn){
-    showDelete.value = true
-  }
-}
+    if (props.showDeleteBtn) {
+        showDelete.value = true;
+    }
+};
 
 const mouseout = () => {
-  if (props.showDeleteBtn){
-    showDelete.value = false
-  }
-}
+    if (props.showDeleteBtn) {
+        showDelete.value = false;
+    }
+};
 
 const termsData = computed(() => {
-  return props.data.terms
-})
+    return props.data.terms;
+});
 
 const typeChange = (e: any) => {
-  formModel.value.options!.when[props.name].terms[props.name].termType = e.label
-}
+    formModel.value.options!.when[props.name].terms[props.name].termType =
+        e.label;
+};
 
 const onDelete = () => {
-  formModel.value.branches?.[props.branchName]?.when?.splice(props.name, 1)
-  formModel.value.options!.when[props.branches_Index].terms.splice(props.name, 1)
-}
+    formModel.value.branches?.[props.branchName]?.when?.splice(props.name, 1);
+    formModel.value.options!.when[props.branches_Index].terms.splice(
+        props.name,
+        1,
+    );
+};
 
 const addWhen = () => {
-  const terms = {
-    type: 'and',
-    terms: [
-      {
-        column: undefined,
-        value: {
-          source: 'manual',
-          value: undefined
-        },
-        termType: undefined,
-        key: `params_${randomString()}`,
+    const terms = {
         type: 'and',
-      }
-    ],
-    key: `terms_${randomString()}`
-  }
-  formModel.value.branches?.[props.branchName]?.when?.push(terms)
-  if (!formModel.value.options!.when[props.branches_Index]) {
-    formModel.value.options!.when[props.branches_Index] = {terms:[{terms: [['', '', '', '并且']]}]}
-  }
-  formModel.value.options?.when?.[props.branches_Index]?.terms.push({ termType: '并且', terms: [['','eq','','and']]})
-}
-
+        terms: [
+            {
+                column: undefined,
+                value: {
+                    source: 'manual',
+                    value: undefined,
+                },
+                termType: undefined,
+                key: `params_${randomString()}`,
+                type: 'and',
+            },
+        ],
+        key: `terms_${randomString()}`,
+    };
+    formModel.value.branches?.[props.branchName]?.when?.push(terms);
+    if (!formModel.value.options!.when[props.branches_Index]) {
+        formModel.value.options!.when[props.branches_Index] = {
+            terms: [{ terms: [['', '', '', '并且']] }],
+        };
+    }
+    formModel.value.options?.when?.[props.branches_Index]?.terms.push({
+        termType: '并且',
+        terms: [['', 'eq', '', 'and']],
+    });
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>
diff --git a/src/views/rule-engine/Scene/Save/components/Terms/util.ts b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
index cbb210b7..352b8fdf 100644
--- a/src/views/rule-engine/Scene/Save/components/Terms/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Terms/util.ts
@@ -6,13 +6,21 @@ export const doubleParamsKey= ['nbtw','btw']
 export const timeTypeKeys = ['time_gt_now', 'time_lt_now']
 
 
-export const handleParamsData = (data: any[], key: string = 'column'): any[] => {
-  return data?.map(item => {
+export const handleParamsData = (data: any[], key: string = 'column', parentId?: string): any[] => {
+  return data?.map((item, index) => {
+    const hasChildren = !!item.children?.length
+
+    let keyValue = item[key]
+
+    if (hasChildren && key === 'column') {
+      keyValue = item[key] + index
+    }
+
     return {
       ...item,
-      key: item[key],
-      disabled: !!item.children,
-      children: handleParamsData(item.children, key)
+      key: keyValue,
+      disabled: hasChildren,
+      children: handleParamsData(item.children, key, item[key])
     }
   }) || []
 }
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/Calendar.vue b/src/views/rule-engine/Scene/Save/components/Timer/Calendar.vue
new file mode 100644
index 00000000..d447ea8a
--- /dev/null
+++ b/src/views/rule-engine/Scene/Save/components/Timer/Calendar.vue
@@ -0,0 +1,263 @@
+<template>
+  <div class="calendar-form-item-content">
+    <div class="header">
+      <a-button type="link" @click="onView" style="padding-right: 2px">预览日历</a-button>
+    </div>
+    <div class="calendar-items">
+      <j-scrollbar :maxHeight="350">
+        <div class="calendar-item" v-for="(item, index) in myValue.spec">
+          <div class="calendar-item-delete">
+            <AIcon type="DeleteOutlined" style="" @click="() => deleteItem(index)"/>
+          </div>
+          <div class="calendar-item-tags">
+            <div class="calendar-item-name">
+              规则：{{ index + 1 }}
+            </div>
+            <div style="flex: 1 1 0;min-width: 0">
+              <j-select
+                placeholder="请选择日期类型"
+                v-model:value="item.scheduleTags"
+                style="width: calc(100% - 30px)"
+                mode="multiple"
+                :options="options"
+                :fieldNames="{
+                    label: 'name',
+                    value: 'id'
+                  }"
+                :filterOption="filterOption"
+                @change='updateValue'
+              />
+            </div>
+          </div>
+          <div class="calendar-item-content">
+            <div class="calendar-item-top">
+              <div>
+                <j-radio-group
+                  :value='item.mod'
+                  :options='[
+                    { label: "周期执行", value: "period" },
+                    { label: "执行一次", value: "once" },
+                  ]'
+                  option-type='button'
+                  button-style='solid'
+                  @change='(e) => modChange(e, index)'
+                />
+              </div>
+            </div>
+            <div class="calendar-item-bottom">
+              <template v-if="item.mod === 'once'">
+                <j-time-picker
+                  valueFormat='HH:mm:ss'
+                  v-model:value='item.once.time'
+                  style='width: 180px'
+                  format='HH:mm:ss'
+                  @change='updateValue'
+                />
+                <div>执行一次</div>
+              </template>
+              <template v-if="item.mod === 'period'">
+                <j-time-range-picker
+                  valueFormat='HH:mm:ss'
+                  :value='[
+                    item.period.from,
+                    item.period.to,
+                  ]'
+                  @change='(v) => {
+                          item.period.from = v[0]
+                          item.period.to = v[1]
+                          updateValue()
+                    }'
+                />
+                <span>每</span>
+                <j-input-number
+                  placeholder='请输入时间'
+                  style='max-width: 170px'
+                  :precision='0'
+                  :min='1'
+                  :max="item.period.unit === 'hours' ? 99999 : 99 "
+                  v-model:value='item.period.every'
+                  @change='updateValue'
+                >
+                  <template #addonAfter>
+                    <j-select
+                      v-model:value='item.period.unit'
+                      :options='[
+                        { label: "秒", value: "seconds" },
+                        { label: "分", value: "minutes" },
+                        { label: "小时", value: "hours" },
+                      ]'
+                      @select='e => periodUnitChange(e, index)'
+                    />
+                  </template>
+                </j-input-number>
+              </template>
+            </div>
+
+          </div>
+        </div>
+      </j-scrollbar>
+    </div>
+    <a-button @click="addItem" style="width: 100%;">
+      新增规则
+    </a-button>
+    <j-modal
+      v-model:visible="visible"
+      :width="1000"
+      okText="关闭"
+    >
+      <div>
+        正在预览日历
+      </div>
+      <FullCalendar  :preview="true"/>
+      <template #footer>
+        <a-button type="primary" @click="visible = false">
+          关闭
+        </a-button>
+      </template>
+    </j-modal>
+  </div>
+</template>
+
+<script setup name="Calendar">
+import dayjs from "dayjs";
+import { useRequest } from '@/hook'
+import {queryTags} from "@/api/system/calendar";
+import FullCalendar from '@/views/system/Calendar/FullCalendar/index.vue'
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: () => ({})
+  }
+})
+const emit = defineEmits(['update:value', 'change'])
+const { data:options } = useRequest(queryTags)
+const visible = ref(false)
+
+const myValue = reactive({
+  type: 'or',
+  spec: []
+})
+
+const updateValue = () => {
+  emit('update:value', myValue)
+  emit('change', myValue)
+}
+
+const onView = () => {
+  visible.value = true
+}
+
+const filterOption = (value, option) => {
+  return option.name?.includes(value)
+}
+
+const addItem = () => {
+  myValue.spec.push({
+    trigger: "calender",
+    scheduleTags: [],
+    mod: "period",
+    // once: {
+    //   time: dayjs(new Date()).format('HH:mm:ss')
+    // },
+    period: {
+      from: dayjs(new Date()).startOf('day').format('HH:mm:ss'),
+      to: dayjs(new Date()).endOf('day').format('HH:mm:ss'),
+      every: 1,
+      unit: 'seconds'
+    }
+  })
+  updateValue()
+}
+
+const deleteItem = (index) => {
+  myValue.spec.splice(index, 1)
+  updateValue()
+}
+
+const modChange = (e, index) => {
+  let mod = e.target.value
+
+  if (mod === 'once') {
+    myValue.spec[index].once = {
+      time: dayjs(new Date()).format('HH:mm:ss')
+    }
+    delete myValue.spec[index].period
+  } else {
+    myValue.spec[index].period = {
+      from: dayjs(new Date()).startOf('day').format('HH:mm:ss'),
+      to: dayjs(new Date()).endOf('day').format('HH:mm:ss'),
+      every: 1,
+      unit: 'seconds'
+    }
+    delete myValue.spec[index].once
+  }
+  myValue.spec[index].mod = mod
+  updateValue()
+}
+
+const periodUnitChange = (e, index) => {
+  myValue.spec[index].period.every = 1
+  updateValue()
+}
+
+watch(() => props.value, () => {
+  myValue.spec = props.value?.spec || []
+}, { immediate: true, deep: true})
+
+</script>
+
+<style scoped lang="less">
+.calendar-form-item-content {
+  position: relative;
+  .header {
+    position: absolute;
+    right: 0;
+    top: -55px;
+  }
+  .calendar-items {
+    max-height: 350px;
+
+    .calendar-item {
+      position: relative;
+      margin-bottom: 12px;
+      border: 1px solid #cfcfcf;
+      border-radius: 4px;
+      padding: 12px;
+      display: flex;
+      gap: 16px;
+      flex-direction: column;
+
+      .calendar-item-tags {
+        display: flex;
+        gap: 12px;
+        align-items: center;
+        //height: max-content;
+      }
+
+      .calendar-item-delete {
+        position: absolute;
+        right: 12px;
+        color: #e50012;
+      }
+
+      .calendar-item-content {
+        display: flex;
+        gap: 24px;
+      }
+
+      .calendar-item-top {
+        display: flex;
+        gap: 12px;
+        align-items: center;
+        //margin-bottom: 12px;
+      }
+      .calendar-item-bottom {
+        display: flex;
+        gap: 12px;
+        align-items: center;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/index.vue b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
index e7e5cb39..3b708c5c 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/index.vue
+++ b/src/views/rule-engine/Scene/Save/components/Timer/index.vue
@@ -2,17 +2,13 @@
   <j-form
     ref='timerForm'
     :model='formModel'
-    layout='vertical'
     :colon='false'
+    layout='vertical'
   >
     <j-form-item name='trigger'>
       <j-radio-group
         v-model:value='formModel.trigger'
-        :options='[
-          { label: "按周", value: "week" },
-          { label: "按月", value: "month" },
-          { label: "cron表达式", value: "cron" },
-        ]'
+        :options='triggerOptions'
         option-type='button'
         button-style='solid'
         @change='triggerChange'
@@ -21,6 +17,9 @@
     <j-form-item v-if='showCron' name='cron' :rules="cronRules">
       <j-input placeholder='corn表达式' v-model:value='formModel.cron' @change='updateValue' />
     </j-form-item>
+    <j-form-item v-else-if="showMulti" name="multi" :rules="multiRules">
+      <Calendar v-model:value="formModel.multi" @change='updateValue'/>
+    </j-form-item>
     <template v-else>
       <j-form-item name='when'>
         <WhenOption v-model:value='formModel.when' :type='formModel.trigger' @change='updateValue' />
@@ -38,7 +37,7 @@
         />
       </j-form-item>
     </template>
-    <j-space v-if='showOnce' style='display: flex;gap: 24px'>
+    <j-space v-if='showOnce && !showMulti' style='display: flex;gap: 24px'>
       <j-form-item :name="['once', 'time']">
         <j-time-picker
           valueFormat='HH:mm:ss'
@@ -50,7 +49,7 @@
       </j-form-item>
       <j-form-item> 执行一次</j-form-item>
     </j-space>
-    <j-space v-if='showPeriod' style='display: flex;gap: 24px'>
+    <j-space v-if='showPeriod && !showMulti' style='display: flex;gap: 24px'>
       <j-form-item>
         <j-time-range-picker
           valueFormat='HH:mm:ss'
@@ -103,8 +102,9 @@ import dayjs from 'dayjs'
 import WhenOption from './WhenOption.vue'
 import {cloneDeep, pick} from 'lodash-es'
 import type { OperationTimer } from '../../../typings'
-import { isCron } from '@/utils/regular'
 import { defineExpose } from 'vue'
+import Calendar from './Calendar.vue'
+import cronstrue from 'cronstrue'
 
 type NameType = string[] | string
 
@@ -120,6 +120,10 @@ const props = defineProps({
   value: {
     type: Object,
     default: () => ({})
+  },
+  type: {
+    type: String,
+    default: undefined
   }
 })
 
@@ -130,8 +134,11 @@ const cronRules = [
   { max: 64, message: '最多可输入64个字符' },
   {
     validator: async (_: any, v: string) => {
+
       if (v) {
-        if (!isCron(v)) {
+        try {
+          console.log(v, cronstrue.toString(v))
+        } catch (e) {
           return Promise.reject(new Error('请输入正确的cron表达式'));
         }
       } else {
@@ -142,6 +149,39 @@ const cronRules = [
   }
 ]
 
+const multiRules = [
+  {
+    validator: async (_: any, v: string) => {
+      if (!v.spec?.length) {
+        return Promise.reject('请添加自定义日历规则');
+      } else {
+        const index = v.spec.findIndex(item => !item.scheduleTags.length)
+        if (index > -1) {
+          return Promise.reject(`规则【${index + 1}】请选择日期类型`);
+        }
+      }
+
+      return Promise.resolve()
+    }
+  }
+]
+
+const triggerOptions = computed(() => {
+  let _options = [
+    { label: "按周", value: "week" },
+    { label: "按月", value: "month" },
+    { label: "cron表达式", value: "cron" },
+    { label: "自定义日历", value: "multi" }
+  ]
+
+  // if (props.type === 'timer') {
+  //   _options = [..._options, {
+  //     label: "自定义日历", value: "multi"
+  //   }]
+  // }
+  return _options
+})
+
 const formModel = reactive<OperationTimer>({
   trigger: 'week',
   when: props.value.when || [],
@@ -155,6 +195,10 @@ const formModel = reactive<OperationTimer>({
     to: dayjs(new Date()).endOf('day').format('HH:mm:ss'),
     every: 1,
     unit: 'seconds'
+  },
+  multi: {
+    type: "and",
+    spec: []
   }
 })
 const timerForm = ref()
@@ -162,6 +206,9 @@ const timerForm = ref()
 const showCron = computed(() => {
   return formModel.trigger === 'cron'
 })
+const showMulti = computed(() => {
+  return formModel.trigger === 'multi'
+})
 
 const showOnce = computed(() => {
   return formModel.trigger !== 'cron' && formModel.mod === 'once'
@@ -177,6 +224,8 @@ const updateValue = () => {
   let keys: string[] = ['trigger']
   if (cloneValue.trigger === 'cron') {
     keys.push('cron')
+  } else if (cloneValue.trigger === 'multi') {
+    keys.push('multi')
   } else {
     keys = keys.concat(['mod', 'when'])
 
@@ -186,7 +235,6 @@ const updateValue = () => {
       keys.push('once')
     }
   }
-
   emit('update:value', pick(cloneValue, keys))
 }
 
@@ -234,4 +282,4 @@ watchEffect(() => {
 
 <style scoped lang='less'>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/components/Timer/util.ts b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
index 23ad9b50..02c8b5d4 100644
--- a/src/views/rule-engine/Scene/Save/components/Timer/util.ts
+++ b/src/views/rule-engine/Scene/Save/components/Timer/util.ts
@@ -83,9 +83,15 @@ export const handleTimerOptions = (timer: OperationTimer):TimerOption => {
     extraTime = `每${timer.period.every}${timeUnitEnum[timer.period.unit]}执行1次`;
   }
 
+  if (timer.trigger === 'multi') {
+    const len = timer.multi!.spec.length
+    when = ''
+    extraTime = `自定义日历 共${len}个规则`
+  }
+
   return {
     when,
     time,
     extraTime
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/rule-engine/Scene/Save/components/Title.vue b/src/views/rule-engine/Scene/Save/components/Title.vue
index 23fa3c2f..cf7d2ca7 100644
--- a/src/views/rule-engine/Scene/Save/components/Title.vue
+++ b/src/views/rule-engine/Scene/Save/components/Title.vue
@@ -49,7 +49,6 @@ const props = defineProps({
 })
 
 const isAdd = computed(() => {
-  console.log(props.options, Object.keys(props.options).length)
   return !!Object.keys(props.options).length
 })
 
diff --git a/src/views/rule-engine/Scene/Save/components/TopCard.vue b/src/views/rule-engine/Scene/Save/components/TopCard.vue
index 66a60fb6..ba392fff 100644
--- a/src/views/rule-engine/Scene/Save/components/TopCard.vue
+++ b/src/views/rule-engine/Scene/Save/components/TopCard.vue
@@ -1,29 +1,37 @@
 <template>
   <div :class='classNames'>
-    <div
-      v-for='item in options'
-      :key='item.value'
-      :class='[
-        "trigger-way-item",
-        value === item.value ? "active" : "",
-        labelBottom ? "label-bottom" : ""
-        ]'
-      @click='() => click(item.value)'
-    >
-      <div class='way-item-title'>
-        <span class='label'>{{ item.label }}</span>
-        <j-popover v-if='item.tip' :content='item.tip'>
-          <AIcon type='QuestionCircleOutlined' class='icon' />
-        </j-popover>
+
+      <div
+        v-for='item in options'
+        :key='item.value'
+        :class='[
+          "trigger-way-item",
+          value === item.value ? "active" : "",
+          labelBottom ? "label-bottom" : "",
+          item.disabled ? "item-disabled" : ""
+          ]'
+        @click='() => click(item.value, item)'
+      >
+        <div class='way-item-title'>
+          <span class='label'>{{ item.label }}</span>
+          <j-popover v-if='item.tip' :content='item.tip'>
+            <AIcon type='QuestionCircleOutlined' class='icon' />
+          </j-popover>
+        </div>
+        <div class='way-item-image'>
+          <img
+            width='48'
+            v-bind='item.imgProps'
+            :src='item.img'
+          />
+        </div>
+        <a-tooltip
+          title="该设备不支持"
+          v-if="item.disabled"
+        >
+          <div class="trigger-way-disabled-tip"></div>
+        </a-tooltip>
       </div>
-      <div class='way-item-image'>
-        <img
-          width='48'
-          v-bind='item.imgProps'
-          :src='item.img'
-        />
-      </div>
-    </div>
   </div>
 </template>
 
@@ -77,9 +85,11 @@ const classNames = computed(() => {
 
 const emit = defineEmits<Emit>()
 
-const click = (value: string) => {
-  emit('update:value', value)
-  emit('select', value)
+const click = (value: string, record: any) => {
+  if (!record.disabled) {
+    emit('update:value', value)
+    emit('select', value)
+  }
 }
 
 </script>
@@ -102,6 +112,19 @@ const click = (value: string) => {
     border-radius: 2px;
     cursor: pointer;
     transition: all 0.3s;
+    position: relative;
+
+    .trigger-way-disabled-tip {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      right: 0;
+    }
+
+    &.item-disabled {
+      cursor: not-allowed;
+    }
 
     .way-item-title {
       span {
@@ -119,21 +142,14 @@ const click = (value: string) => {
 
     .way-item-image {
       margin: 0 !important;
-      opacity: 0.6;
     }
 
     &:hover {
-      //color: @primary-color-hover;
-      .way-item-image {
-        opacity: 0.8;
-      }
+      border-color: @primary-color-hover;
     }
 
     &.active {
       border-color: @primary-color-active;
-      .way-item-image {
-        opacity: 1;
-      }
     }
 
     &.label-bottom {
@@ -155,7 +171,6 @@ const click = (value: string) => {
 
       &:hover {
         color: initial;
-        opacity: 0.6;
       }
 
       &.active {
@@ -164,4 +179,4 @@ const click = (value: string) => {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/hooks/useTrigger.ts b/src/views/rule-engine/Scene/Save/hooks/useTrigger.ts
index 543acc91..f3a0d052 100644
--- a/src/views/rule-engine/Scene/Save/hooks/useTrigger.ts
+++ b/src/views/rule-engine/Scene/Save/hooks/useTrigger.ts
@@ -9,7 +9,6 @@ export const useTrigger = () => {
 
     watchEffect(() => {
         const group = data.value.branches as BranchesGroup
-        console.log(group)
         open.value = !!group?.filter(item => item.filter(b => b)?.length).length
     })
 
diff --git a/src/views/rule-engine/Scene/Save/index.vue b/src/views/rule-engine/Scene/Save/index.vue
index 3dc79615..ef3c86f2 100644
--- a/src/views/rule-engine/Scene/Save/index.vue
+++ b/src/views/rule-engine/Scene/Save/index.vue
@@ -2,7 +2,7 @@
   <page-container>
     <FullPage>
       <div class='scene-warp'>
-        <div class='header'>
+        <div class='header' v-if="data.name">
           <Ellipsis :tooltip='data.name' style='max-width: 50%'>
             <span class='title'>{{ data.name }}</span>
           </Ellipsis>
@@ -10,24 +10,27 @@
             <img :src='TriggerHeaderIcon[data.triggerType]' />
             {{ keyByLabel[data.triggerType] }}
           </div>
+          <div style='flex: 1 1 0;min-width: 0;margin-left: 8px'>
+            <Description v-model:value="data.description" />
+          </div>
         </div>
         <j-form ref='sceneForm' :model='data' :colon='false' layout='vertical'>
-          <Device v-if='data.triggerType === "device"' />
+          <Device ref="deviceRef" v-if='data.triggerType === "device"' />
           <Manual v-else-if='data.triggerType === "manual"' />
           <Timer v-else-if='data.triggerType === "timer"' />
-          <j-form-item
-          >
-            <template #label>
-              <TitleComponent data='说明' style='font-size: 14px;' />
-            </template>
-            <j-textarea
-                v-model:value="data.description"
-                placeholder='请输入说明'
-                :rows="4"
-                show-count
-                :maxLength="200"
-            />
-          </j-form-item>
+<!--          <j-form-item-->
+<!--          >-->
+<!--            <template #label>-->
+<!--              <TitleComponent data='说明' style='font-size: 14px;' />-->
+<!--            </template>-->
+<!--            <j-textarea-->
+<!--                v-model:value="data.description"-->
+<!--                placeholder='请输入说明'-->
+<!--                :rows="4"-->
+<!--                show-count-->
+<!--                :maxLength="200"-->
+<!--            />-->
+<!--          </j-form-item>-->
         </j-form>
         <PermissionButton
           type='primary'
@@ -53,6 +56,8 @@ import Timer from './Timer/index.vue'
 import { modify } from '@/api/rule-engine/scene'
 import { useMenuStore } from '@/store/menu'
 import { onlyMessage } from '@/utils/comm';
+import Description from './components/Description.vue'
+import {handleFeatures} from "@/views/rule-engine/Scene/Save/util";
 
 const sceneStore = useSceneStore()
 const menuStore = useMenuStore()
@@ -62,18 +67,28 @@ const { getDetail, refresh } = sceneStore
 const route = useRoute();
 const sceneForm = ref()
 const loading = ref(false)
+const deviceRef = ref()
 
 const save = async () => {
-  const formData = await sceneForm.value.validateFields()
+  const formData = await sceneForm.value.validateFields().catch(err => {
+    const names = err.errorFields[0].name
+    deviceRef.value?.changePaneIndex(names[1])
+  })
   if (formData) {
     loading.value = true
     const branches = data.value.branches?.filter(item => item)
-    const resp: any = await modify(data.value.id!, { ...data.value, branches }).then(res => res).catch(() => {
+    const features = handleFeatures(branches)
+    const resp: any = await modify(data.value.id!, { ...data.value, features, branches }).then(res => res).catch(() => {
       loading.value = false
     })
     loading.value = false
     if (resp.success) {
-      menuStore.jumpPage('rule-engine/Scene');
+      if ((window as any).onTabSaveSuccess) {
+        (window as any).onTabSaveSuccess(resp);
+        setTimeout(() => window.close(), 300);
+      } else {
+        menuStore.jumpPage('rule-engine/Scene');
+      }
       onlyMessage('操作成功');
     }
   }
@@ -121,4 +136,4 @@ onUnmounted(() => {
 </style>
 <style lang='less'>
 @import "./style.less";
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/rule-engine/Scene/Save/util.ts b/src/views/rule-engine/Scene/Save/util.ts
index 9df2ad76..03fd0bff 100644
--- a/src/views/rule-engine/Scene/Save/util.ts
+++ b/src/views/rule-engine/Scene/Save/util.ts
@@ -1,51 +1,52 @@
-import { queryBuiltInParams } from '@/api/rule-engine/scene'
-import { handleParamsData } from './components/Terms/util'
-import { useSceneStore } from 'store/scene'
-import { storeToRefs } from 'pinia'
-import type { FormModelType } from '@/views/rule-engine/Scene/typings'
+import {queryBuiltInParams} from '@/api/rule-engine/scene'
+import {handleParamsData} from './components/Terms/util'
+import {useSceneStore} from 'store/scene'
+import {storeToRefs} from 'pinia'
+import type {FormModelType} from '@/views/rule-engine/Scene/typings'
+import {ActionBranchesProps} from "@/views/rule-engine/Scene/typings";
 
 interface Params {
-  branch: number
-  branchGroup: number
-  action: number
+    branch: number
+    branchGroup: number
+    action: number
 }
 
 export const getParams = (params: Params, sceneModel: FormModelType): Promise<any[]> => {
-  return new Promise(res => {
-    const data = sceneModel.branches!.filter(item => !!item)
-    queryBuiltInParams({
-      ...sceneModel,
-      branches: data
-    }, params).then(resp => {
-      if (resp.success) {
-        res(resp.result as any[])
-      }
-    }).catch(() => res([]))
-  })
+    return new Promise(res => {
+        const data = sceneModel.branches!.filter(item => !!item)
+        queryBuiltInParams({
+            ...sceneModel,
+            branches: data
+        }, params).then(resp => {
+            if (resp.success) {
+                res(resp.result as any[])
+            }
+        }).catch(() => res([]))
+    })
 }
 
 /**
  * @param params
  */
 export const useParams = (params: Params) => {
-  const sceneStore = useSceneStore()
-  const { data: formModel } = storeToRefs(sceneStore)
-  const columnOptions = ref<any[]>([])
+    const sceneStore = useSceneStore()
+    const {data: formModel} = storeToRefs(sceneStore)
+    const columnOptions = ref<any[]>([])
 
-  const handleParams = async () => {
-    const _data = await getParams(params, formModel.value)
-    columnOptions.value = handleParamsData(_data, 'id')
-  }
-
-  watchEffect(() => {
-    if (formModel.value.branches![params.branch].then[params.branchGroup].actions[params.action]) {
-      handleParams()
+    const handleParams = async () => {
+        const _data = await getParams(params, formModel.value)
+        columnOptions.value = handleParamsData(_data, 'id')
     }
-  })
 
-  return {
-    columnOptions
-  }
+    watchEffect(() => {
+        if (formModel.value.branches![params.branch].then[params.branchGroup].actions[params.action]) {
+            handleParams()
+        }
+    })
+
+    return {
+        columnOptions
+    }
 }
 
 export const DeviceEmitterKey = 'device_rules'
@@ -56,10 +57,10 @@ export const DeviceEmitterKey = 'device_rules'
  * @constructor
  */
 export const EventEmitterKeys = (params: Params): string => {
-  const _b = `branches_${params.branch}` // branchesName
-  const _t = `then_${params.branchGroup}` // thenName
-  const _a = `then_${params.action}` // actionName
-  return `${_b}_${_t}_${_a}`
+    const _b = `branches_${params.branch}` // branchesName
+    const _t = `then_${params.branchGroup}` // thenName
+    const _a = `then_${params.action}` // actionName
+    return `${_b}_${_t}_${_a}`
 }
 
 /**
@@ -68,92 +69,114 @@ export const EventEmitterKeys = (params: Params): string => {
  * @constructor
  */
 export const EventSubscribeKeys = (params: Params): string[] => {
-  const sceneStore = useSceneStore()
+    const sceneStore = useSceneStore()
 
-  let keys: string[] = []
+    let keys: string[] = []
 
-  if (params.action === 0) {
-    keys.push(DeviceEmitterKey)
-  }
-
-  for (let i = 0; i <= params.action - 1; i++) {
-    let key = sceneStore.data.branches?.[params.branch].then[params.branchGroup].actions[i]?.key
-    if (!key) {
-      const _b = `branches_${params.branch}` // branchesName
-      const _t = `then_${params.branchGroup}` // thenName
-      const _a = `then_${i}` // actionName
-      key = `${_b}_${_t}_${_a}`
+    if (params.action === 0) {
+        keys.push(DeviceEmitterKey)
     }
-    keys.push(key)
-  }
 
-  return keys
+    for (let i = 0; i <= params.action - 1; i++) {
+        let key = sceneStore.data.branches?.[params.branch].then[params.branchGroup].actions[i]?.key
+        if (!key) {
+            const _b = `branches_${params.branch}` // branchesName
+            const _t = `then_${params.branchGroup}` // thenName
+            const _a = `then_${i}` // actionName
+            key = `${_b}_${_t}_${_a}`
+        }
+        keys.push(key)
+    }
+
+    return keys
 }
 
 export const EventEmitter = {
-  list: {},
-  subscribe: function(events: string[], fn: Function) {
-    const list = this.list
-    events.forEach(event => {
-      (list[event] || (list[event] = [])).push(fn)
-    })
-    return this
-  },
-  emit: function(events:string, data?: any) {
-    const list = this.list
-    const fns: Function[] = list[events] ? [...list[events]] : []
+    list: {},
+    subscribe: function (events: string[], fn: Function) {
+        const list = this.list
+        events.forEach(event => {
+            (list[event] || (list[event] = [])).push(fn)
+        })
+        return this
+    },
+    emit: function (events: string, data?: any) {
+        const list = this.list
+        const fns: Function[] = list[events] ? [...list[events]] : []
 
-    if (!fns.length) return false;
+        if (!fns.length) return false;
 
-    fns.forEach(fn => {
-      fn(data)
-    })
+        fns.forEach(fn => {
+            fn(data)
+        })
 
-    return this
-  },
-  unSubscribe: function(events:string[], fn: Function) {
-    const list = this.list
-    events.forEach(key => {
-      if (key in list) {
-        const fns = list[key]
-        for (let i = 0; i < fns.length; i++) {
-          if (fns[i] === fn) {
-            fns.splice(i, 1)
-            break;
-          }
-        }
-      }
-    })
-    return this
-  }
+        return this
+    },
+    unSubscribe: function (events: string[], fn: Function) {
+        const list = this.list
+        events.forEach(key => {
+            if (key in list) {
+                const fns = list[key]
+                for (let i = 0; i < fns.length; i++) {
+                    if (fns[i] === fn) {
+                        fns.splice(i, 1)
+                        break;
+                    }
+                }
+            }
+        })
+        return this
+    }
 }
 
 export const isActionChange = (_metadata: any, _message: any) => {
-  const _properties = _metadata?.properties || [];
-  const _functions = _metadata?.functions || [];
-  if (
-      _message?.messageType === 'READ_PROPERTY' &&
-      _message?.properties?.[0]
-  ) {
-      const _item = _properties.find(
-          (i: any) => i.id === _message?.properties?.[0],
-      );
-      return _item?.id;
-  } else if (
-      _message?.messageType === 'INVOKE_FUNCTION' &&
-      _message?.functionId
-  ) {
-      const _item = _functions.find(
-          (i: any) => i.id === _message?.functionId,
-      );
-      return _item?.id;
-  } else if (_message?.messageType === 'WRITE_PROPERTY') {
-      const _data = Object.keys(_message?.properties)?.[0]
-      if (_data) {
-          const _item = _properties.find((i: any) => i.id === _data);
-          return _item?.id;
-      }
-      return false;
-  }
-  return false;
+    const _properties = _metadata?.properties || [];
+    const _functions = _metadata?.functions || [];
+    if (
+        _message?.messageType === 'READ_PROPERTY' &&
+        _message?.properties?.[0]
+    ) {
+        const _item = _properties.find(
+            (i: any) => i.id === _message?.properties?.[0],
+        );
+        return _item?.id;
+    } else if (
+        _message?.messageType === 'INVOKE_FUNCTION' &&
+        _message?.functionId
+    ) {
+        const _item = _functions.find(
+            (i: any) => i.id === _message?.functionId,
+        );
+        return _item?.id;
+    } else if (_message?.messageType === 'WRITE_PROPERTY') {
+        const _data = Object.keys(_message?.properties)?.[0]
+        if (_data) {
+            const _item = _properties.find((i: any) => i.id === _data);
+            return _item?.id;
+        }
+        return false;
+    }
+    return false;
 };
+
+export const handleFeatures = (branches: ActionBranchesProps[]): string[] => {
+    let features = new Set<string>()
+    branches.forEach(branchesItem => {
+        if (branchesItem?.then) {
+            branchesItem.then.forEach(thenItem => {
+                thenItem.actions.forEach(actionItem => {
+                    if (actionItem.executor === 'alarm') {
+                        features.add(actionItem.alarm?.mode === 'trigger' ? 'alarmTrigger' : 'alarmReliever')
+                    }
+                    // 处理options中的column、columnMap
+                    const _options = actionItem.options || {}
+                    const columnMapKeys = Object.values(_options.columnMap || {})
+                    const columns = new Set([...(_options.columns || []), ...columnMapKeys]) // 去重
+                    actionItem.options.columns = [...columns.values()]
+                })
+            })
+        }
+    })
+
+    return features.size === 0 ? ['none'] : [...features.values()]
+}
diff --git a/src/views/rule-engine/Scene/index.vue b/src/views/rule-engine/Scene/index.vue
index 92beb999..0c96c67f 100644
--- a/src/views/rule-engine/Scene/index.vue
+++ b/src/views/rule-engine/Scene/index.vue
@@ -104,7 +104,7 @@
                 />
             </template>
             <template #action="slotProps">
-                <j-space>
+                <j-space :size="16">
                     <template
                         v-for="i in getActions(slotProps, 'table')"
                         :key="i.key"
@@ -337,7 +337,6 @@ const getActions = (
                       }
                     ],
                   })
-                  console.log(resp)
                   if (resp.success && resp.result?.total) {
                     await deleteModal(data.id)
                   } else {
diff --git a/src/views/rule-engine/Scene/typings.ts b/src/views/rule-engine/Scene/typings.ts
index 2ad78d7d..2d5eb4ca 100644
--- a/src/views/rule-engine/Scene/typings.ts
+++ b/src/views/rule-engine/Scene/typings.ts
@@ -65,6 +65,8 @@ export enum TimerTrigger {
   'week' = 'week',
   'month' = 'month',
   'cron' = 'cron',
+
+  'multi' = 'multi',
 }
 
 export enum TimeUnit {
@@ -105,6 +107,11 @@ export interface OperationTimer {
   when?: string[];
   period?: OperationTimerPeriod;
   once?: Record<string, any>;
+
+  multi?: {
+    type: string,
+    spec: Array<Record<string, any>>
+  };
 }
 
 export interface TriggerDeviceOptions {
@@ -205,6 +212,8 @@ export type TermsType = {
   key?: string;
   error?: boolean
   metric?: string
+
+  alarm?: string
 };
 
 export type PlatformRelation = {
@@ -300,6 +309,8 @@ export interface ActionsType {
   terms?: TermsType[];
   /** map中的key，用于删除 */
   key?: string;
+
+  actionId?: number
   options?: Record<string, any>;
 }
 
diff --git a/src/views/system/Apply/Save/components/EditForm.vue b/src/views/system/Apply/Save/components/EditForm.vue
index e7b91fa6..14127808 100644
--- a/src/views/system/Apply/Save/components/EditForm.vue
+++ b/src/views/system/Apply/Save/components/EditForm.vue
@@ -98,7 +98,10 @@
                                 {
                                     required: true,
                                     message: '请输入接入地址',
-                                },
+                                },{
+                                    validator:validateBaseUrl,
+                                    trigger: 'change'
+                                }
                             ]"
                         >
                             <template #label>
@@ -663,7 +666,7 @@
                                     tooltip="第三方应用唯一标识匹配的秘钥"
                                 />
                             </template>
-                            <j-input
+                            <j-input-password   
                                 v-model:value="form.data.apiServer.secureKey"
                                 placeholder="请输入secureKey"
                             />
@@ -1912,6 +1915,20 @@ const validateIP = (_rule: Rule, value: string) => {
         return Promise.resolve();
     }
 };
+
+/**
+ * 校验接入地址
+ */
+const validateBaseUrl = (_rule:Rule , value: string) =>{
+    if(value){
+        if(value === 'http://' || value === 'https://'){
+            return Promise.reject('请输入接入地址')
+        }
+        return Promise.resolve()
+    }else{
+        return Promise.reject('请输入接入地址')
+    }
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/src/views/system/Apply/Save/components/RequestTable.vue b/src/views/system/Apply/Save/components/RequestTable.vue
index 20c178c4..8938edbf 100644
--- a/src/views/system/Apply/Save/components/RequestTable.vue
+++ b/src/views/system/Apply/Save/components/RequestTable.vue
@@ -195,7 +195,7 @@ function addRow() {
         color: #000000d9;
 
         &:hover {
-            color: #1d39c4;
+            color: @primary-color;
         }
     }
     .add-btn {
diff --git a/src/views/system/Apply/componenets/ThirdMenu.vue b/src/views/system/Apply/componenets/ThirdMenu.vue
index 765b9ae4..2b019c33 100644
--- a/src/views/system/Apply/componenets/ThirdMenu.vue
+++ b/src/views/system/Apply/componenets/ThirdMenu.vue
@@ -1,142 +1,199 @@
 <template>
-  <j-modal
-      class="edit-dialog-container"
-      title="集成菜单"
-      visible
-      width="800px"
-      :maskClosable="false"
-      @cancel="cancel"
-      @ok="cancel"
-  >
-  <div style="display: flex;">
-    <div class="menuList" >
-        菜单列表
-      <div class="content">
-        <PermissionButton
-          type="link"
-          :hasPermission="`${permission}:add`"
-          @click="addMenu"
-        >
-            + 新增菜单
-        </PermissionButton>
-        <div class="treeContainer">
-            <j-tree 
-              :fieldNames="{
-                    title:'name',
-                    key:'id',
-                    children:'children'
-              }"
-              :treeData="treeData"
-          >
-              <template #title="data">
-                <div class="tree-item">
-                    <div class="title">
-                      <j-ellipsis>{{ data.name }}</j-ellipsis>
-                    </div>
-                    <div class="menuControls">
-                        <PermissionButton
-                            v-if="data.options?.owner"
-                            type="link"
-                            :hasPermission="`${permission}:update`"
-                            tooltip="编辑"
-                            @click="()=>editMenu(data)"
-                          >
-                          <AIcon type="EditOutlined" />
-                        </PermissionButton>
-                        <PermissionButton
-                          type="link"
-                          :hasPermission="`${permission}:add`"
-                          :tooltip="{ title: data.level >= 3 ? '仅支持3级菜单' :   '新增子菜单' }"
-                          :disabled="data.level >= 3 || data.options?.LowCode"
-                          @click="()=>addChildrenMenu(data)"
+    <j-modal
+        class="edit-dialog-container"
+        title="集成菜单"
+        visible
+        width="800px"
+        :maskClosable="false"
+        @cancel="cancel"
+        @ok="cancel"
+    >
+        <div style="display: flex">
+            <div class="menuList">
+                菜单列表
+                <div class="content">
+                    <PermissionButton
+                        type="link"
+                        :hasPermission="`${permission}:add`"
+                        @click="addMenu"
+                    >
+                        + 新增菜单
+                    </PermissionButton>
+                    <div class="treeContainer">
+                        <j-tree
+                            :fieldNames="{
+                                title: 'name',
+                                key: 'id',
+                                children: 'children',
+                            }"
+                            :treeData="treeData"
                         >
-                        <AIcon type="PlusCircleOutlined" />
-                      </PermissionButton>
-                      <PermissionButton
-                          v-if="data.options?.owner"
-                          type="link"
-                          :hasPermission="`${permission}:delete`"
-                          tooltip="删除"
-                          :popConfirm="{
-                            title: `是否删除该菜单`,
-                            onConfirm: () => deleteMenu(data),
-                          }"
-                        >
-                        <AIcon type="DeleteOutlined" />
-                      </PermissionButton>
+                            <template #title="data">
+                                <div class="tree-item">
+                                    <div class="title">
+                                        <j-ellipsis>{{ data.name }}</j-ellipsis>
+                                    </div>
+                                    <div class="menuControls">
+                                        <PermissionButton
+                                            v-if="data.options?.owner"
+                                            type="link"
+                                            :hasPermission="`${permission}:update`"
+                                            tooltip="编辑"
+                                            @click="() => editMenu(data)"
+                                        >
+                                            <AIcon type="EditOutlined" />
+                                        </PermissionButton>
+                                        <PermissionButton
+                                            type="link"
+                                            :hasPermission="`${permission}:add`"
+                                            :tooltip="{
+                                                title:
+                                                    data.level >= 3
+                                                        ? '仅支持3级菜单'
+                                                        : '新增子菜单',
+                                            }"
+                                            :disabled="
+                                                data.level >= 3 ||
+                                                data.options?.LowCode
+                                            "
+                                            @click="() => addChildrenMenu(data)"
+                                        >
+                                            <AIcon type="PlusCircleOutlined" />
+                                        </PermissionButton>
+                                        <PermissionButton
+                                            v-if="data.options?.owner"
+                                            type="link"
+                                            :hasPermission="`${permission}:delete`"
+                                            tooltip="删除"
+                                            :popConfirm="{
+                                                title: `是否删除该菜单`,
+                                                onConfirm: () =>
+                                                    deleteMenu(data),
+                                            }"
+                                        >
+                                            <AIcon type="DeleteOutlined" />
+                                        </PermissionButton>
+                                    </div>
+                                </div>
+                            </template>
+                        </j-tree>
                     </div>
                 </div>
-              </template>
-          </j-tree>
-        </div>
-      </div>
-    </div>
-    <div class="configuration" v-if="showControls">
-      菜单配置
-      <div class="content">
-        <div class="saveBtn">
-          <PermissionButton type="primary" :hasPermission="`${permission}:${ editType === 'add' ? 'add' : 'update'
-                }`" :loading='saveLoading' @click="saveMenu">
-                保存
-          </PermissionButton>
-        </div>
-        <j-form ref="basicFormRef" :model="formData" class="basic-form" layout="vertical">
-                <div class="row" style="display: flex">
-                    <j-form-item ref="uploadIcon" label="菜单图标" name="icon" :rules="[
-                        {
-                            required: true,
-                            message: '请上传图标',
-                            trigger: 'change',
-                        },
-                    ]" style="flex: 0 0 186px">
-                        <div class="icon-upload has-icon" v-if="formData.icon">
-                            <AIcon :type="formData.icon" style="font-size: 90px" />
-                            <span class="mark" @click="dialogVisible = true">点击修改</span>
-                        </div>
+            </div>
+            <div class="configuration" v-if="showControls">
+                菜单配置
+                <div class="content">
+                    <div class="saveBtn">
+                        <PermissionButton
+                            type="primary"
+                            :hasPermission="`${permission}:${
+                                editType === 'add' ? 'add' : 'update'
+                            }`"
+                            :loading="saveLoading"
+                            @click="saveMenu"
+                        >
+                            保存
+                        </PermissionButton>
+                    </div>
+                    <j-form
+                        ref="basicFormRef"
+                        :model="formData"
+                        class="basic-form"
+                        layout="vertical"
+                    >
+                        <div class="row" style="display: flex">
+                            <j-form-item
+                                ref="uploadIcon"
+                                label="菜单图标"
+                                name="icon"
+                                :rules="[
+                                    {
+                                        required: true,
+                                        message: '请上传图标',
+                                        trigger: 'change',
+                                    },
+                                ]"
+                                style="flex: 0 0 186px"
+                            >
+                                <div
+                                    class="icon-upload has-icon"
+                                    v-if="formData.icon"
+                                >
+                                    <AIcon
+                                        :type="formData.icon"
+                                        style="font-size: 90px"
+                                    />
+                                    <span
+                                        class="mark"
+                                        @click="dialogVisible = true"
+                                        >点击修改</span
+                                    >
+                                </div>
 
-                        <div v-else @click="dialogVisible = true" class="icon-upload no-icon">
-                            <span>
-                                <AIcon type="PlusOutlined" style="font-size: 30px" />
-                                <p>点击选择图标</p>
-                            </span>
-                        </div>
-                    </j-form-item>
-                        <j-row>
-                          <j-col :span="24">
-                              <j-form-item label="名称" name="name" :rules="[
-                                  {
-                                      required: true,
-                                      message: '请输入名称',
-                                  },
-                                  {
-                                      max: 64,
-                                      message: '最多可输入64个字符',
-                                  },
-                              ]">
-                                  <j-input v-model:value="formData.name" placeholder="请输入名称" />
-                              </j-form-item>
-                            </j-col>
-                            <j-col :span="24">
-                              <j-form-item label="编码" name="code" :validateFirst="true" :rules="[
-                                  {
-                                      required: true,
-                                      message: '请输入编码',
-                                  },
-                                  {
-                                      max: 64,
-                                      message: '最多可输入64个字符',
-                                  },
-                                  {
-                                      validator: checkCode,
-                                      trigger: 'blur',
-                                  },
-                              ]">
-                                  <j-input v-model:value="formData.code" placeholder="请输入编码" />
-                              </j-form-item>
-                            </j-col>
-                       
-                           
-                       <!-- <j-col :span="12">
+                                <div
+                                    v-else
+                                    @click="dialogVisible = true"
+                                    class="icon-upload no-icon"
+                                >
+                                    <span>
+                                        <AIcon
+                                            type="PlusOutlined"
+                                            style="font-size: 30px"
+                                        />
+                                        <p>点击选择图标</p>
+                                    </span>
+                                </div>
+                            </j-form-item>
+                            <j-row>
+                                <j-col :span="24">
+                                    <j-form-item
+                                        label="名称"
+                                        name="name"
+                                        :rules="[
+                                            {
+                                                required: true,
+                                                message: '请输入名称',
+                                            },
+                                            {
+                                                max: 64,
+                                                message: '最多可输入64个字符',
+                                            },
+                                        ]"
+                                    >
+                                        <j-input
+                                            v-model:value="formData.name"
+                                            placeholder="请输入名称"
+                                        />
+                                    </j-form-item>
+                                </j-col>
+                                <j-col :span="24">
+                                    <j-form-item
+                                        label="编码"
+                                        name="code"
+                                        :validateFirst="true"
+                                        :rules="[
+                                            {
+                                                required: true,
+                                                message: '请输入编码',
+                                            },
+                                            {
+                                                max: 64,
+                                                message: '最多可输入64个字符',
+                                            },
+                                            {
+                                                validator: checkCode,
+                                                trigger: 'blur',
+                                            },
+                                        ]"
+                                    >
+                                        <j-input
+                                            v-model:value="formData.code"
+                                            placeholder="请输入编码"
+                                        />
+                                    </j-form-item>
+                                </j-col>
+
+                                <!-- <j-col :span="12">
                             <j-form-item label="排序" name="sortIndex" :rules="[
                                 {
                                     pattern: /^[0-9]*[1-9][0-9]*$/,
@@ -147,310 +204,340 @@
                                     style="width: 100%" />
                             </j-form-item>
                         </j-col> -->
-                      </j-row>
-                </div>
-                <j-form-item label="页面地址" name="url" :validateFirst="true" :rules="[
+                            </j-row>
+                        </div>
+                        <j-form-item
+                            label="页面地址"
+                            name="url"
+                            :validateFirst="true"
+                            :rules="[
                                 {
                                     required: true,
                                     message: '请输入页面地址',
                                 },
-                                { max: 128, message: '最多可输入128个字符'},
-                                { pattern: /^\//, message: '请正确填写地址，以/开头' },
-                            ]">
-                                <j-input v-model:value="formData.url" placeholder="请输入页面地址" />
-                </j-form-item>
-                <!-- <j-form-item label="说明" name="describe">
+                                { max: 128, message: '最多可输入128个字符' },
+                                {
+                                    pattern: /^\//,
+                                    message: '请正确填写地址，以/开头',
+                                },
+                            ]"
+                        >
+                            <j-input
+                                v-model:value="formData.url"
+                                placeholder="请输入页面地址"
+                            />
+                        </j-form-item>
+                        <!-- <j-form-item label="说明" name="describe">
                     <j-textarea v-model:value="formData.describe" :rows="4" show-count :maxlength="200"
                         placeholder="请输入说明" />
                 </j-form-item> -->
-            </j-form>
-      </div>
-    </div>
-  </div>
-  <ChooseIconDialog v-if="dialogVisible" v-model:visible="dialogVisible" :icon="formData.icon"
-            @confirm="(typeStr: string) => choseIcon(typeStr)" />
-  </j-modal>
+                    </j-form>
+                </div>
+            </div>
+        </div>
+        <ChooseIconDialog
+            v-if="dialogVisible"
+            v-model:visible="dialogVisible"
+            :icon="formData.icon"
+            @confirm="(typeStr: string) => choseIcon(typeStr)"
+        />
+    </j-modal>
 </template>
 
 <script name="ThirdMenu" setup lang="ts">
-import { getMenuTree_api , validCode_api , addMenuInfo_api ,saveMenuInfo_api , getMenuInfo_api , delMenuInfo_api} from '@/api/system/menu'
-import { USER_CENTER_MENU_CODE,messageSubscribe } from '@/utils/consts'
-import ChooseIconDialog from '../../Menu/components/ChooseIconDialog.vue'
+import {
+    getMenuTree_api,
+    validCode_api,
+    addMenuInfo_api,
+    saveMenuInfo_api,
+    getMenuInfo_api,
+    delMenuInfo_api,
+} from '@/api/system/menu';
+import { USER_CENTER_MENU_CODE, messageSubscribe } from '@/utils/consts';
+import ChooseIconDialog from '../../Menu/components/ChooseIconDialog.vue';
 import { Rule } from 'ant-design-vue/lib/form';
 import { onlyMessage } from '@/utils/comm';
 const props = defineProps({
-  data: {
-    type: Object,
-    default: () => ({})
-  }
-})
-const emit = defineEmits(['cancel'])
+    data: {
+        type: Object,
+        default: () => ({}),
+    },
+});
+const emit = defineEmits(['cancel']);
 const permission = 'system/Menu';
-const basicFormRef = ref()
-const treeData = ref([])
+const basicFormRef = ref();
+const treeData = ref([]);
 const formData = ref<any>({
-  icon:'',
-  name:'',
-  code:'',
-  url:'',
-  sortIndex:0
-})
-const sourceCode = ref()
-const dialogVisible = ref(false)
-const uploadIcon = ref()
-const showControls = ref(false)
-const editType = ref()
-const saveLoading = ref(false)
-const rootMenuTotal = ref<Number>(0)
+    icon: '',
+    name: '',
+    code: '',
+    url: '',
+    sortIndex: 0,
+});
+const sourceCode = ref();
+const dialogVisible = ref(false);
+const uploadIcon = ref();
+const showControls = ref(false);
+const editType = ref();
+const saveLoading = ref(false);
+const rootMenuTotal = ref<Number>(0);
 const queryParams = {
-  sorts: [{ name: 'sortIndex', order: 'asc' }],
-  paging: false,
-  terms: [
+    sorts: [{ name: 'sortIndex', order: 'asc' }],
+    paging: false,
+    terms: [
+        {
+            terms: [
+                {
+                    column: 'owner',
+                    termType: 'eq',
+                    value: 'iot',
+                },
+                {
+                    column: 'owner',
+                    termType: 'isnull',
+                    value: '1',
+                    type: 'or',
+                },
+            ],
+        },
+        {
+            terms: [
                 {
                     terms: [
                         {
-                            column: 'owner',
-                            termType: 'eq',
-                            value: 'iot',
+                            value: '%show":true%',
+                            termType: 'like',
+                            column: 'options',
+                            type: 'and',
                         },
                         {
-                            column: 'owner',
-                            termType: 'isnull',
-                            value: '1',
-                            type: 'or',
+                            value: '%owner"%',
+                            termType: 'nlike',
+                            column: 'options',
+                            type: 'and',
                         },
                     ],
                 },
                 {
-                terms:[
-                    {
-                        terms:[
-                            {
-                                value:"%show\":true%",
-                                termType:"like",
-                                column:"options",
-                                type:'and'
-                            },
-                            {
-                            value:"%owner\"%",
-                            termType:"nlike",
-                            column:"options",
-                            type:"and"
-                            }
-                        ]
-                    },
-                    {
-                    terms:[
+                    terms: [
                         {
-                            value:`%owner\":\"${props.data.id}%`,
-                            termType:"like",
-                            column:"options"
-                        }
+                            value: `%owner\":\"${props.data.id}%`,
+                            termType: 'like',
+                            column: 'options',
+                        },
                     ],
-                    type:"or"
-                }
-                ]
-            }
+                    type: 'or',
+                },
             ],
-}
-const addChildrenMenu = (data:any) =>{
-  basicFormRef.value?.clearValidate()
-  initFormData()
-  showControls.value = true
-  editType.value = 'add'
-  formData.value.parentId = data?.id
-  formData.value.url = data?.url
-  formData.value.sortIndex = data?.children?.length + 1|| 0;
-}
-const addMenu = () =>{
-  initFormData()
-  formData.value.sortIndex = rootMenuTotal.value
-  sourceCode.value = ''
-  showControls.value = true
-  editType.value = 'add'
-}
-const editMenu = (data:any) =>{
-  basicFormRef.value?.clearValidate()
-  initFormData()
-  showControls.value = true
-  editType.value = 'edit'
-  getMenuInfo_api(data.id).then((res:any)=>{
-      formData.value = res.result
-      sourceCode.value = res.result?.code
-  })
-}
-const deleteMenu = (data:any) =>{
-  delMenuInfo_api(data.id).then((resp: any) => {
-            if (resp.status === 200) {
-                onlyMessage('操作成功');
-                queryMenu();
-            }
-        });
-}
-const initFormData = () =>{
-  formData.value = {
-    icon:'',
-    name:'',
-    code:'',
-    url:'',
-  }
-}
+        },
+    ],
+};
+const addChildrenMenu = (data: any) => {
+    basicFormRef.value?.clearValidate();
+    initFormData();
+    showControls.value = true;
+    editType.value = 'add';
+    formData.value.parentId = data?.id;
+    formData.value.url = data?.url;
+    formData.value.sortIndex = data?.children?.length + 1 || 0;
+};
+const addMenu = () => {
+    initFormData();
+    formData.value.sortIndex = rootMenuTotal.value;
+    sourceCode.value = '';
+    showControls.value = true;
+    editType.value = 'add';
+};
+const editMenu = (data: any) => {
+    basicFormRef.value?.clearValidate();
+    initFormData();
+    showControls.value = true;
+    editType.value = 'edit';
+    getMenuInfo_api(data.id).then((res: any) => {
+        formData.value = res.result;
+        sourceCode.value = res.result?.code;
+    });
+};
+const deleteMenu = (data: any) => {
+    const response = delMenuInfo_api(data.id);
+    response.then((resp: any) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功');
+            queryMenu();
+        }
+    });
+    return response;
+};
+const initFormData = () => {
+    formData.value = {
+        icon: '',
+        name: '',
+        code: '',
+        url: '',
+    };
+};
 const choseIcon = (typeStr: string) => {
     formData.value.icon = typeStr;
     uploadIcon.value?.clearValidate();
-}
-const saveMenu = () =>{
-  basicFormRef.value.validate().then(()=>{
-    const api = editType.value === 'add' ? addMenuInfo_api : saveMenuInfo_api
-    saveLoading.value = true
-    const params ={
-      ...formData.value,
-      owner: 'iot',
-      options: { show: true ,owner:props.data?.id },
-    } 
-    api(params).then((res)=>{
-      if(res.status === 200){
-        onlyMessage('操作成功')
-        queryMenu()
-      }else{
-        onlyMessage('操作失败')
-      }
-    }).finally(() => (saveLoading.value = false));
-  })
-}
+};
+const saveMenu = () => {
+    basicFormRef.value.validate().then(() => {
+        const api =
+            editType.value === 'add' ? addMenuInfo_api : saveMenuInfo_api;
+        saveLoading.value = true;
+        const params = {
+            ...formData.value,
+            owner: 'iot',
+            options: { show: true, owner: props.data?.id },
+        };
+        api(params)
+            .then((res) => {
+                if (res.status === 200) {
+                    onlyMessage('操作成功');
+                    queryMenu();
+                } else {
+                    onlyMessage('操作失败');
+                }
+            })
+            .finally(() => (saveLoading.value = false));
+    });
+};
 const checkCode = async (_rule: Rule, value: string): Promise<any> => {
-        if (!value) return Promise.reject('');
-        else if (value.length > 64) return Promise.reject('最多可输入64个字符');
-        // 编辑时不校验原本的编码
-        else if (editType.value = 'edit' && value === sourceCode.value)
-            return Promise.resolve('');
-        else {
-            const resp: any = await validCode_api({
-                code: value,
-                owner: 'iot',
-            });
-            if (resp.result.passed) return Promise.resolve();
-            else return Promise.reject('该编码重复');
-        }
-}
-const cancel = () =>{
-  emit('cancel')
-}
-const queryMenu = () =>{
-  getMenuTree_api(queryParams).then((res:any)=>{
-    treeData.value = res.result?.filter((item: { code: string }) => ![USER_CENTER_MENU_CODE,messageSubscribe].includes(item.code))
-    const lastItem = res.result[res.result.length - 1];
-    rootMenuTotal.value = lastItem ? lastItem.sortIndex + 1 : 1;
-  })
-}
-onMounted(()=>{
-  queryMenu()
-})
+    if (!value) return Promise.reject('');
+    else if (value.length > 64) return Promise.reject('最多可输入64个字符');
+    // 编辑时不校验原本的编码
+    else if ((editType.value = 'edit' && value === sourceCode.value))
+        return Promise.resolve('');
+    else {
+        const resp: any = await validCode_api({
+            code: value,
+            owner: 'iot',
+        });
+        if (resp.result.passed) return Promise.resolve();
+        else return Promise.reject('该编码重复');
+    }
+};
+const cancel = () => {
+    emit('cancel');
+};
+const queryMenu = () => {
+    getMenuTree_api(queryParams).then((res: any) => {
+        treeData.value = res.result?.filter(
+            (item: { code: string }) =>
+                ![USER_CENTER_MENU_CODE, messageSubscribe].includes(item.code),
+        );
+        const lastItem = res.result[res.result.length - 1];
+        rootMenuTotal.value = lastItem ? lastItem.sortIndex + 1 : 1;
+    });
+};
+onMounted(() => {
+    queryMenu();
+});
 </script>
 
-<style  lang="less" scoped>
-.menuList{
-  width: 35%;
-  margin-right: 20px;
+<style lang="less" scoped>
+.menuList {
+    width: 35%;
+    margin-right: 20px;
 }
-.configuration{
-  width: 60%;
+.configuration {
+    width: 60%;
 }
-.content{
-  border: .3px solid rgb(220, 220, 220);
-  position: relative;
-  .saveBtn{
-    position: absolute;
-    right: 20px;
-    top: 10px;
-  }
-  .basic-form{
-    height: 432px;
-    padding: 32px 20px;
-    :deep(.ant-form-item-control-input-content) {
-                    .icon-upload {
-                        width: 160px;
-                        height: 150px;
-                        border: 1px dashed #d9d9d9;
-                        font-size: 14px;
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        text-align: center;
-                        cursor: pointer;
-                        transition: 0.5s;
-
-                        &:hover {
-                            border-color: #415ed1;
-                        }
-                    }
-
-                    .has-icon {
-                        position: relative;
-                        text-align: center;
-
-                        .mark {
-                            position: absolute;
-                            left: 0;
-                            top: 0;
-                            display: none;
-                            background-color: rgba(0, 0, 0, 0.35);
-                            color: #fff;
-                            width: 100%;
-                            height: 100%;
-                            font-size: 16px;
-                            align-items: center;
-                            justify-content: center;
-                        }
-
-                        &:hover .mark {
-                            display: flex;
-                        }
-                    }
-
-                    .no-icon {
-                        background-color: rgba(0, 0, 0, 0.06);
-                    }
-                }
-  }
-  .treeContainer{
-    height: 400px;
-    overflow-y: auto;
-  }
-  .tree-item{
-    display: flex;
+.content {
+    border: 0.3px solid rgb(220, 220, 220);
     position: relative;
-    align-items: stretch;
-    justify-content: space-around;
-    .title {
-                flex: 1;
-                min-width: 80px;
-                margin-right: 80px;
-            }
-    .menuControls {
-      position: absolute;
-      right: 10px;
-      display: none;
-      font-size: 14px;
-      :deep(.ant-btn-link) {
-            padding: 0 4px;
-            height: 24px;
-          }
-      }
-  }
-}
+    .saveBtn {
+        position: absolute;
+        right: 20px;
+        top: 10px;
+    }
+    .basic-form {
+        height: 432px;
+        padding: 32px 20px;
+        :deep(.ant-form-item-control-input-content) {
+            .icon-upload {
+                width: 160px;
+                height: 150px;
+                border: 1px dashed #d9d9d9;
+                font-size: 14px;
+                display: flex;
+                justify-content: center;
+                align-items: center;
+                text-align: center;
+                cursor: pointer;
+                transition: 0.5s;
 
-  :deep(.ant-tree-treenode) {
-        width: 100%;
-        .ant-tree-node-content-wrapper {
-            flex: 1 1 auto;
-          }
-          .ant-tree-title {
                 &:hover {
-                    .menuControls{
-                        display: block;
-                    }
+                    border-color: #415ed1;
                 }
             }
-  }
+
+            .has-icon {
+                position: relative;
+                text-align: center;
+
+                .mark {
+                    position: absolute;
+                    left: 0;
+                    top: 0;
+                    display: none;
+                    background-color: rgba(0, 0, 0, 0.35);
+                    color: #fff;
+                    width: 100%;
+                    height: 100%;
+                    font-size: 16px;
+                    align-items: center;
+                    justify-content: center;
+                }
+
+                &:hover .mark {
+                    display: flex;
+                }
+            }
+
+            .no-icon {
+                background-color: rgba(0, 0, 0, 0.06);
+            }
+        }
+    }
+    .treeContainer {
+        height: 400px;
+        overflow-y: auto;
+    }
+    .tree-item {
+        display: flex;
+        position: relative;
+        align-items: stretch;
+        justify-content: space-around;
+        .title {
+            flex: 1;
+            min-width: 80px;
+            margin-right: 80px;
+        }
+        .menuControls {
+            position: absolute;
+            right: 10px;
+            display: none;
+            font-size: 14px;
+            :deep(.ant-btn-link) {
+                padding: 0 4px;
+                height: 24px;
+            }
+        }
+    }
+}
+
+:deep(.ant-tree-treenode) {
+    width: 100%;
+    .ant-tree-node-content-wrapper {
+        flex: 1 1 auto;
+    }
+    .ant-tree-title {
+        &:hover {
+            .menuControls {
+                display: block;
+            }
+        }
+    }
+}
 </style>
diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue
index 8990964a..06966456 100644
--- a/src/views/system/Basis/index.vue
+++ b/src/views/system/Basis/index.vue
@@ -28,9 +28,9 @@
                             </j-form-item>
                             <j-form-item>
                                 <template #label>
-                                    <span>高德API Key</span>
+                                    <span>高德地图 web服务api</span>
                                     <j-tooltip
-                                        title="配置后平台可调用高德地图GIS服务"
+                                        title="开发者可通过接口使用各类型的地理数据服务,返回结果支持JSON和XML格式"
                                     >
                                         <img
                                             class="img-style"
@@ -40,25 +40,58 @@
                                         />
                                     </j-tooltip>
                                 </template>
+                                <j-input
+                                    v-model:value="formValue.webKey"
+                                    placeholder="请输入高德WebApi Key"
+                                />
+                            </j-form-item>
+                            <j-form-item>
+                                <template #label>
+                                    <span>高德地图 JSapi</span>
+                                    <j-tooltip title="提供浏览器精准定位">
+                                        <img
+                                            class="img-style"
+                                            :src="
+                                                getImage('/init-home/mark.png')
+                                            "
+                                        />
+                                    </j-tooltip>
+                                </template>
                                 <j-input
                                     v-model:value="formValue.apiKey"
                                     placeholder="请输入高德API Key"
                                 />
                             </j-form-item>
+                            <j-form-item>
+                                <template #label>
+                                    <span>高德地图 密钥</span>
+                                    <j-tooltip title="降低明文传输被窃取的风险">
+                                        <img
+                                            class="img-style"
+                                            :src="
+                                                getImage('/init-home/mark.png')
+                                            "
+                                        />
+                                    </j-tooltip>
+                                </template>
+                                <j-input
+                                    v-model:value="formValue.secretKey"
+                                    placeholder="请输入高德API 密钥"
+                                />
+                            </j-form-item>
                             <j-form-item name="base-path">
                                 <template #label>
                                     <span>base-path</span>
-                                    <j-tooltip >
-                                      <template #title>
-                                        <div style='word-break: break-all;'>
-                                          <div>
-                                            系统后台访问的url。
-                                          </div>
-                                          <div>
-                                           格式：{http/https}: //{前端所在服务器IP地址}:{前端暴露的服务端口}/api
-                                          </div>
-                                        </div>
-                                      </template>
+                                    <j-tooltip>
+                                        <template #title>
+                                            <div style="word-break: break-all">
+                                                <div>系统后台访问的url。</div>
+                                                <div>
+                                                    格式：{http/https}:
+                                                    //{前端所在服务器IP地址}:{前端暴露的服务端口}/api
+                                                </div>
+                                            </div>
+                                        </template>
 
                                         <img
                                             class="img-style"
@@ -73,6 +106,25 @@
                                     placeholder="{http/https}: //{前端所在服务器IP地址}:{前端暴露的服务端口}/api"
                                 />
                             </j-form-item>
+                            <j-form-item
+                                name="showRecordNumber"
+                                label="展示备案号"
+                                :required="true"
+                            >
+                                <a-switch
+                                    v-model:checked="formValue.showRecordNumber"
+                                ></a-switch>
+                            </j-form-item>
+                            <j-form-item
+                                v-if="formValue.showRecordNumber"
+                                name="recordNumber"
+                                label="备案号内容"
+                                :required="true"
+                            >
+                                <a-input
+                                    v-model:value="formValue.recordNumber"
+                                ></a-input>
+                            </j-form-item>
                             <j-row :gutter="24" :span="24">
                                 <j-col>
                                     <j-form-item label="系统logo">
@@ -327,11 +379,11 @@ import { formType, uploaderType } from './typing';
 import { getImage } from '@/utils/comm.ts';
 import { BASE_API_PATH, TOKEN_KEY } from '@/utils/variable';
 import { LocalStore, onlyMessage } from '@/utils/comm';
-
 import { save_api } from '@/api/system/basis';
 import { usePermissionStore } from '@/store/permission';
 import { useSystem } from '@/store/system';
 import { settingDetail } from '@/api/login';
+import { omit } from 'lodash-es';
 const action = `${BASE_API_PATH}/file/static`;
 const headers = { [TOKEN_KEY]: LocalStore.get(TOKEN_KEY) };
 const formRef = ref();
@@ -341,7 +393,11 @@ const form = reactive<formType>({
     formValue: {
         title: '',
         headerTheme: 'light',
+        showRecordNumber: true,
+        recordNumber: '',
         apiKey: '',
+        webKey: '',
+        secretKey: '',
         'base-path': `${window.location.origin}/api`,
         logo: '',
         ico: '',
@@ -372,23 +428,28 @@ const form = reactive<formType>({
                 trigger: 'blur',
             },
             {
-            validator: (rule, value, callback) => {
-                if (value && value.includes('localhost')) {
-                    callback('输入内容不能包含 localhost');
-                        } else {
-                            callback();
+                validator: (rule, value, callback) => {
+                    if (value && value.includes('localhost')) {
+                        callback('输入内容不能包含 localhost');
+                    } else {
+                        callback();
                     }
                 },
                 trigger: 'blur',
             },
         ],
+        recordNumber: [
+            {
+                max: 64,
+                message: '最多可输入64个字符',
+            },
+        ],
     },
     logoLoading: false, // logo加载状态
     backLoading: false, // 背景图加载状态
     iconLoading: false, // 页签加载状态
     saveLoading: false,
     getDetails: async () => {
-
         // await system.getSystemConfig();
         // await settingDetail('front');
         const configInfo = system.configInfo;
@@ -397,9 +458,12 @@ const form = reactive<formType>({
             headerTheme: configInfo.front?.headerTheme,
             logo: configInfo.front?.logo || '/logo.png',
             ico: configInfo.front?.ico || '/favicon.ico',
-            background:
-                configInfo.front?.background || '/images/login.png',
+            showRecordNumber: configInfo.front?.showRecordNumber,
+            recordNumber: configInfo.front?.recordNumber,
+            background: configInfo.front?.background || '/images/login.png',
             apiKey: configInfo.amap?.apiKey,
+            webKey: configInfo.amap?.webKey,
+            secretKey: configInfo.amap?.secretKey,
             'base-path': configInfo.paths?.['base-path'],
         };
     },
@@ -412,15 +476,20 @@ const form = reactive<formType>({
                     {
                         scope: 'front',
                         properties: {
-                            ...form.formValue,
-                            apiKey: '',
-                            'base-path': '',
+                            ...omit(form.formValue, [
+                                'apiKey',
+                                'webKey',
+                                'secretKey',
+                                'base-path',
+                            ]),
                         },
                     },
                     {
                         scope: 'amap',
                         properties: {
                             apiKey: form.formValue.apiKey,
+                            webKey: form.formValue.webKey,
+                            secretKey: form.formValue.secretKey,
                         },
                     },
                     {
@@ -435,7 +504,7 @@ const form = reactive<formType>({
                     .then(async (resp) => {
                         if (resp.status === 200) {
                             onlyMessage('保存成功');
-                            await system.getSystemConfig()
+                            await system.getSystemConfig();
                             await form.getDetails();
                         }
                     })
@@ -469,7 +538,10 @@ const uploader: uploaderType = {
                 .filter((typeStr) => file.type.includes(typeStr)).length > 0;
         const sizeBool = file.size / 1024 / 1024 < 4;
         if (!typeBool) {
-            onlyMessage(`请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`, 'error');
+            onlyMessage(
+                `请上传.jpg.png.jfif.pjp.pjpeg.jpeg格式的图片`,
+                'error',
+            );
         } else if (!sizeBool) {
             onlyMessage(`图片大小必须小于4M`, 'error');
         }
diff --git a/src/views/system/Basis/typing.d.ts b/src/views/system/Basis/typing.d.ts
index 0c3a7644..2ee0c061 100644
--- a/src/views/system/Basis/typing.d.ts
+++ b/src/views/system/Basis/typing.d.ts
@@ -5,6 +5,10 @@ export interface formValueType {
     title: string | undefined; // 系统名称
     headerTheme: string | undefined; // 主题色
     apiKey: string | undefined; // 高德 API key
+    secretKey: string | undefined; // 高德 API 密钥;
+    webKey: string | undefined; //高德web API key,
+    showRecordNumber: boolean | undefined; //是否显示备案号，
+    recordNumber: string | undefined; //备案号
     'base-path': string | undefined; // 系统后台访问的URL
     logo: string | undefined;
     ico: string | undefined;
@@ -45,10 +49,24 @@ export type PathType = {
 
 export type AMapKey = {
     apiKey: string;
+    secretKey: string;
+    webKey: string
+}
+
+export type MediaType = {
+    "fix-ptz": string;
+    "fix-record": string;
+    "gb-ptz": string;
+    "gb-record":string;
+    "onvif-ptz":string;
+    "onvif-record":string;
+    "plugin-ptz":string;
+    "plugin-record":string;
 }
 
 export type ConfigInfoType = {
     paths: PathType;
     amap: AMapKey;
     front: formValueType;
+    media: MediaType
 }
\ No newline at end of file
diff --git a/src/views/system/Calendar/CalendarRight/index.vue b/src/views/system/Calendar/CalendarRight/index.vue
new file mode 100644
index 00000000..163c79ab
--- /dev/null
+++ b/src/views/system/Calendar/CalendarRight/index.vue
@@ -0,0 +1,142 @@
+<template>
+    <div class="calendarRight">
+        <div class="tips">
+            <span
+                >将左侧标签拖拽至右侧日历中，日历中的标签在场景联动中可以被引用作为执行动作的触发条件</span
+            >
+            <permissionButton
+                type="text"
+                :disabled="rapidChecked"
+                :popConfirm="{
+                    placement: 'bottomRight',
+                    title: `确认清空？`,
+                    onConfirm: clearEvent,
+                }"
+            >
+                <template #icon
+                    ><AIcon
+                        type="ClearOutlined"
+                        style="font-size: 16px" /></template
+                >清空</permissionButton
+            >
+        </div>
+        <FullCalendar
+            ref="Calendar"
+            :selectable="rapidChecked"
+            @resetRapid="resetRapid"
+            @selectDate="selectDate"
+            @rapidAction="rapidAction"
+        />
+        <div class="rapidAction">
+            <div class="rapidSwitch">
+                <a-tooltip>
+                    <template #title
+                        >开启后以周/月为最小单位制定日期模板，确认后可快速覆盖日历生效期</template
+                    >
+                    <AIcon type="QuestionCircleOutlined"></AIcon>
+                </a-tooltip>
+                快速作用：<a-switch v-model:checked="rapidChecked" />
+            </div>
+            <div class="rapidActionControl" v-if="rapidChecked">
+                <div>
+                    已选择模板
+                    <a-input
+                        style="width: 300px"
+                        v-model:value="selectedDate"
+                        :disabled="true"
+                    ></a-input>
+                </div>
+                <div style="margin-left: 10px">
+                    将模板快速作用于后续的
+                    <a-input-number
+                        style="width: 100px"
+                        v-model:value="effectDays"
+                        :min="effectMin"
+                        :max="999"
+                        :precision="0"
+                        :controls="false"
+                    ></a-input-number>
+                    日内
+                </div>
+                <div>
+                    <a-button type="text" @click="reselect">重选</a-button>
+                    <a-button type="link" @click="rapid">快速作用</a-button>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup name="Calendar">
+import FullCalendar from '../FullCalendar/index.vue';
+import { inject } from 'vue';
+import { clearAll } from '@/api/system/calendar';
+import { onlyMessage } from '@/utils/comm';
+const Calendar = ref();
+const rapidChecked = ref(false);
+const rapidOn = inject('rapidOn');
+const selectedDate = ref();
+const effectDays = ref();
+const effectMin = ref();
+const selectDate = (data) => {
+    selectedDate.value = data?.start + '~' + data?.end;
+    effectDays.value = data?.days;
+    effectMin.value = data?.days;
+};
+const reselect = () => {
+    Calendar.value.reselection();
+    selectedDate.value = '';
+    effectDays.value = undefined;
+    effectMin.value = undefined;
+};
+const resetRapid = () => {
+    reselect();
+    rapidChecked.value = false;
+};
+const rapid = () => {
+    Calendar.value.rapidAction(effectDays.value);
+};
+const clearEvent = async () => {
+    const res = await clearAll();
+    if (res.success) {
+        onlyMessage('操作成功');
+        Calendar.value?.refresh();
+    }
+};
+watch(
+    () => rapidChecked.value,
+    () => {
+        rapidOn.value = rapidChecked.value;
+    },
+    {
+        immediate: true,
+    },
+);
+</script>
+<style lang="less" scoped>
+.calendarRight {
+    width: 85%;
+    padding: 10px 20px;
+    background: #fff;
+    .tips {
+        display: flex;
+        justify-content: space-between;
+    }
+    .rapidAction {
+        margin-top: 10px;
+        display: flex;
+        align-items: center;
+        .rapidSwitch {
+            padding: 15px 0;
+        }
+        .rapidActionControl {
+            display: flex;
+            width: 70%;
+            margin-left: 20%;
+            background-color: rgb(239, 249, 254);
+            padding: 10px;
+            justify-content: space-around;
+        }
+    }
+}
+</style>
diff --git a/src/views/system/Calendar/FullCalendar/index.vue b/src/views/system/Calendar/FullCalendar/index.vue
new file mode 100644
index 00000000..8b2060b8
--- /dev/null
+++ b/src/views/system/Calendar/FullCalendar/index.vue
@@ -0,0 +1,761 @@
+<template>
+    <div class="calendarContainer" v-if="showCalendar">
+        <div class="calenderButton">
+            <a-date-picker
+                v-model:value="current"
+                :disabled="selectable"
+                format="YYYY-MM"
+                picker="month"
+                @change="changeDate"
+                valueFormat="YYYY-MM"
+            />
+            <a-button @click="handleCustomPrev" :disabled="selectable"
+                >上月</a-button
+            >
+            <a-button @click="handleCustomToday" :disabled="selectable"
+                >今天</a-button
+            >
+            <a-button @click="handleCustomNext" :disabled="selectable"
+                >下月</a-button
+            >
+        </div>
+        <a-button v-if="preview" class="skip" type="link" @click="gotoCalendar"
+            >日历维护</a-button
+        >
+        <div class="compareTip" v-if="eventChange">
+            点击确认完成本次日历维护
+        </div>
+        <div class="compareSave" v-if="eventChange">
+            <PermissionButton
+                type="primary"
+                @click="saveCalendar"
+                :disabled="selectable"
+                >确认</PermissionButton
+            >
+        </div>
+        <FullCalendar
+            ref="calendarEl"
+            class="calendar"
+            :options="calendarOptions"
+        >
+            <template v-slot:eventContent="arg">
+                <div class="event">
+                    <div
+                        class="decoration"
+                        :style="{ backgroundColor: arg.backgroundColor }"
+                    ></div>
+                    <a-tooltip>
+                        <template #title>{{ arg.event.title }}</template>
+                        <div class="event-title">{{ arg.event.title }}</div>
+                    </a-tooltip>
+                    <a-button
+                        v-if="!selectable && !preview"
+                        type="text"
+                        class="closeBtn"
+                        @click="() => deleteEvent(arg)"
+                        >x</a-button
+                    >
+                </div>
+            </template>
+        </FullCalendar>
+        <div
+            v-if="selectable && !choiceEnd && showTips"
+            class="tips"
+            :style="{ top: mouseY + 'px', left: mouseX + 20 + 'px' }"
+        >
+            {{ choiceStart ? '点击选中模板结束日期' : '点击选中模板开始日期' }}
+        </div>
+    </div>
+</template>
+
+<script setup name="FullCalendar">
+import FullCalendar from '@fullcalendar/vue3';
+import interactionPlugin from '@fullcalendar/interaction';
+import dayGridPlugin from '@fullcalendar/daygrid';
+import locale from '@fullcalendar/core/locales/zh-cn';
+import { onlyMessage } from '@/utils/comm';
+import dayjs from 'dayjs';
+import { queryEvents, saveEvents } from '@/api/system/calendar';
+import { cloneDeep, flatten } from 'lodash-es';
+import { defineExpose } from 'vue';
+import { inject } from 'vue';
+import { useMenuStore } from 'store/menu';
+import { useSystem } from '@/store/system';
+const props = defineProps({
+    selectable: {
+        type: String,
+        default: false,
+    },
+    preview: {
+        type: Boolean,
+        default: false,
+    },
+});
+const emit = defineEmits(['selectDate', 'resetRapid']);
+const menuStory = useMenuStore();
+const system = useSystem();
+const showCalendar = ref(false);
+const calendarTagColor = system.$state.calendarTagColor;
+const tagsList = inject('tagsMap');
+//请求接口的结束时间（请求过的日期就不再请求接口了）
+const queryEndDate = ref([]);
+//当前日历展示日期
+const current = ref(dayjs().format('YYYY-MM'));
+const mouseY = ref();
+const mouseX = ref();
+//是否显示提示
+const showTips = ref();
+const calendarEl = ref();
+const calendarApi = ref();
+// 最新的事件数据
+const eventsData = ref([]);
+//接口获取到的事件数据  用于对比是否有更改
+const initialData = ref([]);
+//接口获取转换为日历插件需要使用的格式
+const initialEventData = ref([]);
+//接口获取到的数据
+const interfaceData = ref([]);
+//多选开始日期
+const choiceStart = ref();
+//多选结束日期
+const choiceEnd = ref();
+//上次悬停改变过的数据
+const lastHoverDate = ref([]);
+//请求数据逻辑
+const queryEventsData = async (startDate, endDate, updateView) => {
+    const res = await queryEvents(startDate, endDate);
+    if (res.success) {
+        const data = res.result.filter((i) => {
+            const nonentity = !interfaceData.value.find((item) => {
+                return item.date === i.date;
+            });
+            if (nonentity) {
+                i.tags.forEach((item) => {
+                    eventsData.value.push({
+                        date: i.date,
+                        id: item.id,
+                        name: item.name,
+                    });
+                    initialData.value.push({
+                        date: i.date,
+                        id: item.id,
+                        name: item.name,
+                    });
+                });
+            }
+            return nonentity;
+        });
+        interfaceData.value = [...interfaceData.value, ...data];
+        if (updateView) {
+            initialEventData.value = eventsData.value.map((i) => {
+                return {
+                    id: i.id,
+                    title: i.name,
+                    start: i.date,
+                    backgroundColor: calendarTagColor.get(i.id) || '#000000',
+                };
+            });
+            calendarApi.value.removeAllEvents();
+            calendarApi.value.addEventSource(initialEventData.value);
+        }
+    }
+};
+// 事件点击删除逻辑
+const deleteEvent = (data) => {
+    const event = data.event;
+    event.remove();
+    let subscript;
+    eventsData.value.forEach((i, index) => {
+        if (i.date === event.startStr && i.id === event.id) {
+            subscript = index;
+        }
+    });
+    eventsData.value.splice(subscript, 1);
+};
+// 事件拖拽添加逻辑处理
+const handleEventAdd = ({ event }) => {
+    const thatEvent = eventsData.value.filter((i) => {
+        return i.date === event.startStr;
+    });
+    if (thatEvent?.length >= 5) {
+        event.remove();
+        onlyMessage('该日期已超出可配置标签上限', 'error');
+        return;
+    } else if (thatEvent.length) {
+        const alreadyExist = thatEvent.find((i) => {
+            return i.id === event.id;
+        });
+        if (alreadyExist) {
+            event.remove();
+        } else {
+            eventsData.value.push({
+                date: event.startStr,
+                id: event.id,
+                name: event.title,
+            });
+        }
+    } else {
+        eventsData.value.push({
+            date: event.startStr,
+            id: event.id,
+            name: event.title,
+        });
+    }
+};
+// 日历初始化后请求日历中显示的事件
+const handleViewDidMount = async (arg) => {
+    const startDate = dayjs(arg.view.activeStart).format('YYYY-MM-DD');
+    // fullcalendar插件获取当前日期截至日期会多一天
+    const endDate = dayjs(arg.view.activeEnd)
+        .subtract(1, 'day')
+        .format('YYYY-MM-DD');
+    if (queryEndDate.value.includes(endDate)) {
+        return;
+    }
+    queryEndDate.value.push(endDate);
+    if (calendarTagColor.size === 0) {
+        await system.getTagsColor();
+    }
+    queryEventsData(startDate, endDate, true);
+};
+// 事件是否发生变化
+const eventChange = computed(() => {
+    return (
+        JSON.stringify(eventsData.value) !== JSON.stringify(initialData.value)
+    );
+});
+// 自定义切换月份逻辑
+const handleCustomPrev = () => {
+    calendarApi.value.prev();
+    current.value = dayjs(current.value).subtract(1, 'month').format('YYYY-MM');
+};
+const handleCustomNext = () => {
+    current.value = dayjs(current.value).add(1, 'month').format('YYYY-MM');
+    calendarApi.value.next();
+};
+const handleCustomToday = () => {
+    current.value = dayjs().format('YYYY-MM');
+    calendarApi.value.today();
+};
+//保存编辑后的日历
+const saveCalendar = async () => {
+    let formatEventData = [];
+    let submitData = [];
+    eventsData.value.forEach((i) => {
+        const existIndex = formatEventData.findIndex((item) => {
+            return item.date === i.date;
+        });
+        if (existIndex !== -1) {
+            formatEventData[existIndex]?.tags?.push({
+                id: i.id,
+                name: i.name,
+            });
+        } else {
+            formatEventData.push({
+                date: i.date,
+                tags: [
+                    {
+                        id: i.id,
+                        name: i.name,
+                    },
+                ],
+            });
+        }
+    });
+    const formatEventDataMap = new Map();
+    formatEventData.map((i) => {
+        formatEventDataMap.set(i.date, i);
+    });
+    submitData = cloneDeep(formatEventData);
+    interfaceData.value?.forEach((i) => {
+        if (!formatEventDataMap.has(i.date)) {
+            submitData.push({
+                date: i.date,
+                tags: [],
+            });
+        }
+    });
+    const res = await saveEvents(submitData);
+    if (res.success) {
+        onlyMessage('操作成功');
+        // initialData.value = cloneDeep(eventsData.value);
+        refresh();
+    }
+};
+//获取两个时间段之间的所有日期
+const getDatesBetween = (start, end) => {
+    const dates = [];
+    let currentDate = start.clone();
+    while (currentDate.isBefore(end)) {
+        dates.push(currentDate.format('YYYY-MM-DD'));
+        currentDate = currentDate.add(1, 'day');
+    }
+    return dates;
+};
+//多选日期处理数据(原生拖拽逻辑)
+const handleSelect = (selectionInfo) => {
+    choiceStart.value = dayjs(selectionInfo.startStr);
+    choiceEnd.value = dayjs(selectionInfo.endStr);
+    emit('selectDate', {
+        start: choiceStart.value.format('YYYY.MM.DD'),
+        end: choiceEnd.value.subtract(1, 'day').format('YYYY.MM.DD'),
+        days: choiceEnd.value.diff(choiceStart.value, 'day'),
+    });
+};
+//多选日期处理数据(点击逻辑)
+const handleDateClick = (selectInfo) => {
+    if (!props.selectable) {
+        return;
+    }
+    if (!choiceStart.value) {
+        choiceStart.value = dayjs(selectInfo.dateStr);
+        const selectedDate = document.querySelector(
+            `.fc-day[data-date="${selectInfo.dateStr}"]`,
+        );
+        selectedDate.classList.add('selectedDate');
+    } else {
+        if (dayjs(selectInfo.dateStr).isBefore(choiceStart.value)) {
+            onlyMessage('结束时间必须大于开始时间');
+            return;
+        }
+        choiceEnd.value = dayjs(selectInfo.dateStr).add(1, 'day');
+        emit('selectDate', {
+            start: choiceStart.value.format('YYYY.MM.DD'),
+            end: choiceEnd.value.subtract(1, 'day').format('YYYY.MM.DD'),
+            days: choiceEnd.value.diff(choiceStart.value, 'day'),
+        });
+    }
+};
+//多选背景颜色渲染逻辑
+const handleCellDidMount = (info) => {
+    info.el.addEventListener('mouseenter', () => {
+        const currentDate = dayjs(info.date);
+        //每次移动清空之前所有的颜色
+        if (lastHoverDate.value && !choiceEnd.value) {
+            lastHoverDate.value.forEach((i) => {
+                const selectedDate = document.querySelector(
+                    `.fc-day[data-date="${i}"]`,
+                );
+                selectedDate.classList.remove('selectedDate');
+            });
+        }
+        if (
+            choiceStart.value &&
+            currentDate.isAfter(choiceStart.value) &&
+            !choiceEnd.value
+        ) {
+            const dateArr = getDatesBetween(
+                choiceStart.value,
+                currentDate.add(1, 'day'),
+            );
+            dateArr.forEach((i) => {
+                const selectedDate = document.querySelector(
+                    `.fc-day[data-date="${i}"]`,
+                );
+                selectedDate.classList.add('selectedDate');
+            });
+            lastHoverDate.value = dateArr;
+            lastHoverDate.value.shift();
+        }
+    });
+};
+//插件配置项
+const calendarOptions = {
+    plugins: [interactionPlugin, dayGridPlugin],
+    initialView: 'dayGridMonth',
+    headerToolbar: {
+        start: '',
+        center: '',
+        end: '',
+    },
+    events: initialEventData.value,
+    // selectable: props.selectable,
+    unselectAuto: false,
+    locale: locale,
+    droppable: true,
+    height: props.preview ? '600px' : '620px',
+    // select: handleSelect, //原生拖拽多选日期逻辑
+    eventReceive: handleEventAdd,
+    datesSet: handleViewDidMount,
+    dateClick: handleDateClick,
+    dayCellDidMount: handleCellDidMount,
+    //星期只显示数字
+    dayHeaderContent: function (arg) {
+        return arg.date.toLocaleDateString('default', { weekday: 'narrow' });
+    },
+    dayCellContent: function (e) {
+        return {
+            html: '<div class="custom-day-cell">' + e.date.getDate() + '</div>',
+        };
+    },
+};
+// //编辑标签后刷新日历数据
+// const refreshCalendar = () => {
+//     handleViewDidMount(calendarApi.value);
+// };
+//对比函数(判断出日期相等但是标签id不同的事件和日期事件数量少于5的)
+const compare = (effectData, eventsData, effectDates) => {
+    //获取新增的事件
+    const addEvents = effectData.filter((i) => {
+        const equality = eventsData.find((item) => {
+            return i.date === item.date && i.id === item.id;
+        });
+        const exceed =
+            eventsData.filter((item) => {
+                return i.date === item.date;
+            }).length >= 5;
+        return !equality && !exceed;
+    });
+    const filterDate = [];
+    //比对新增事件 + 原本事件 > 5 的日期
+    effectDates.forEach((i) => {
+        const addEventNumber = addEvents.filter((item) => {
+            return i === item.date;
+        }).length;
+        const eventNumber = eventsData.filter((item) => {
+            return i === item.date;
+        }).length;
+        if (addEventNumber + eventNumber > 5) {
+            filterDate.push(i);
+        }
+    });
+    // 过滤掉日期影响后 >5 的新增事件
+    const filteredEvents = addEvents.filter((i) => {
+        return !filterDate.includes(i.date);
+    });
+    return filteredEvents;
+};
+//快速作用
+const rapidAction = async (effectDays) => {
+    const dates = getDatesBetween(choiceStart.value, choiceEnd.value);
+    const effectDates = getDatesBetween(
+        choiceEnd.value,
+        choiceEnd.value.add(effectDays, 'day'),
+    );
+    //获取所选日期中所有的标签事件组成二维数组
+    const selectData = dates.map((i) => {
+        return eventsData.value.filter((item) => {
+            return i === item.date;
+        });
+    });
+    //创建一个长度为 影响天数的数组
+    const effectData = Array.from({ length: effectDays });
+    //循环数组添加日期和标签时间等数据
+    for (let i = 0; i < effectData.length; i++) {
+        effectData[i] = cloneDeep(selectData[i % selectData.length]);
+        if (effectData[i].length) {
+            effectData[i].forEach((item) => {
+                item.date = dayjs(item.date)
+                    .add(
+                        selectData.length *
+                            Math.ceil((i + 1) / selectData.length),
+                        'day',
+                    )
+                    .format('YYYY-MM-DD');
+            });
+        } else {
+            eventsData.value = eventsData.value.filter((item) => {
+                console.log(effectData[i]);
+                return item.date !== effectDates[i];
+            });
+        }
+    }
+    //二维数组扁平成一维数组
+    const effectDataArr = flatten(effectData);
+    //查询所影响的日期的数据，做对比等逻辑处理（数据是只请求了页面显示过的日期所以需要请求影响的日期，以防没有数据导致重复事件）
+    await queryEventsData(
+        dayjs(choiceEnd.value).format('YYYY-MM-DD'),
+        dayjs(choiceEnd.value)
+            .add(effectDays - 1, 'day')
+            .format('YYYY-MM-DD'),
+        false,
+    );
+    const imparity = compare(effectDataArr, eventsData.value, effectDates);
+    eventsData.value = [...eventsData.value, ...imparity];
+    initialEventData.value = eventsData.value.map((i) => {
+        return {
+            id: i.id,
+            title: i.name,
+            start: i.date,
+            backgroundColor: calendarTagColor.get(i.id) || '#000000',
+        };
+    });
+    calendarApi.value.removeAllEvents();
+    calendarApi.value.addEventSource(initialEventData.value);
+    onlyMessage('操作成功');
+    emit('resetRapid');
+};
+//取消多选(原生)
+// const reselection = () => {
+//     calendarApi.value.unselect();
+// };
+//取消多选自定义
+const reselection = () => {
+    if (choiceStart.value) {
+        lastHoverDate.value.push(dayjs(choiceStart.value).format('YYYY-MM-DD'));
+    }
+    if (choiceEnd.value) {
+        lastHoverDate.value.push(dayjs(choiceStart.value).format('YYYY-MM-DD'));
+    }
+    lastHoverDate.value.forEach((i) => {
+        const selectedDate = document.querySelector(
+            `.fc-day[data-date="${i}"]`,
+        );
+        selectedDate.classList.remove('selectedDate');
+    });
+    (choiceStart.value = ''), (choiceEnd.value = '');
+};
+//重新获取数据
+const refresh = () => {
+    eventsData.value = [];
+    initialData.value = [];
+    interfaceData.value = [];
+    queryEndDate.value = [];
+    handleViewDidMount(calendarApi.value);
+};
+//日期切换
+const changeDate = (date) => {
+    calendarApi.value.gotoDate(date);
+};
+
+const gotoCalendar = () => {
+    menuStory.jumpPage('system/Calendar');
+};
+defineExpose({
+    reselection,
+    rapidAction,
+    refresh,
+});
+watch(
+    () => props.selectable,
+    (val) => {
+        calendarApi.value.setOption('droppable', !val);
+        if (!val) {
+            emit('resetRapid');
+        }
+    },
+);
+watch(
+    () => tagsList?.value,
+    (val, oldVal) => {
+        if (val?.length <= oldVal?.length) {
+            const tagsMap = new Map();
+            tagsList.value.forEach((i) => {
+                tagsMap.set(i.id, {
+                    name: i.name,
+                    color: i.color,
+                });
+            });
+            eventsData.value = eventsData.value.filter((i) => {
+                return tagsMap.has(i.id);
+            });
+            initialEventData.value = eventsData.value.map((i) => {
+                return {
+                    id: i.id,
+                    title: tagsMap.get(i.id)?.name,
+                    start: i.date,
+                    backgroundColor: tagsMap.get(i.id)?.color || '#000000',
+                };
+            });
+            calendarApi.value.removeAllEvents();
+            calendarApi.value.addEventSource(initialEventData.value);
+        }
+    },
+    {
+        deep: true,
+    },
+);
+setTimeout(() => {
+    showCalendar.value = true;
+    nextTick(() => {
+        calendarApi.value = calendarEl.value?.getApi();
+        const calendarBody = document.querySelector(`.fc-view-harness`);
+        calendarBody?.addEventListener('mousemove', (event) => {
+            if (props.selectable) {
+                showTips.value = true;
+                mouseX.value = event.clientX;
+                mouseY.value = event.clientY;
+            }
+        });
+        calendarBody?.addEventListener('mouseout', () => {
+            if (props.selectable) {
+                showTips.value = false;
+            }
+        });
+    });
+}, 300);
+</script>
+<style lang="less" scoped>
+:deep(.fc-header-toolbar) {
+    background-color: #edebeb;
+}
+.calendarContainer {
+    position: relative;
+    padding: 0 24px;
+    padding-bottom: 0;
+    padding-top: 44px;
+    border: 1px solid #d9d9d9;
+    border-radius: 12px;
+    .compareTip {
+        position: absolute;
+        right: 20%;
+        top: 27px;
+        transform: translateX(50%);
+    }
+    .skip {
+        position: absolute;
+        right: 0;
+        top: 27px;
+    }
+    .compareSave {
+        position: absolute;
+        right: 10px;
+        top: 22px;
+    }
+    .calenderButton {
+        position: absolute;
+        top: 22px;
+    }
+    .event {
+        position: relative;
+        height: 32px;
+        padding: 6px;
+        color: #1a1a1a;
+        display: flex;
+
+        .closeBtn {
+            position: absolute;
+            right: 0;
+            top: 0;
+            color: #777777;
+            display: none;
+            font-size: 16px;
+        }
+    }
+    .event:hover {
+        .closeBtn {
+            display: inline-block;
+        }
+    }
+    .decoration {
+        width: 4px;
+        height: 16px;
+        border-radius: 2px;
+        margin: 2px 4px;
+        display: inline-block;
+    }
+    .event-title {
+        white-space: nowrap; /* 不换行 */
+        overflow: hidden; /* 超出部分隐藏 */
+        text-overflow: ellipsis; /* 显示省略号 */
+        width: calc(100% - 30px);
+        font-size: 14px;
+    }
+}
+:deep(.fc-highlight) {
+    background-color: transparent;
+}
+.tips {
+    position: fixed;
+    z-index: 99999;
+    padding: 5px 10px;
+    background-color: rgba(0, 0, 0, 0.7);
+    border-radius: 5px;
+    color: white;
+}
+:deep(.fc-theme-standard th) {
+    border: none;
+}
+:deep(.fc-theme-standard td) {
+    border: none;
+    border-top: 1px solid #cccccc;
+}
+:deep(.fc-theme-standard .fc-scrollgrid) {
+    border: none;
+}
+:deep(.fc) {
+    .fc-col-header-cell-cushion {
+        color: #777777;
+    }
+    th {
+        text-align: right;
+        color: #777777;
+    }
+    table {
+        border-collapse: separate;
+        border-spacing: 5px 0;
+    }
+    .fc-daygrid-day.fc-day-today {
+        background-color: transparent;
+        .fc-daygrid-day-number {
+            background-color: #1677ff;
+            color: white;
+            border-radius: 50%;
+            width: 30px;
+            text-align: center;
+        }
+    }
+    .fc-event {
+        border: none !important;
+    }
+    .fc-daygrid-event-harness {
+        margin: 0 4px;
+        margin-top: 4px !important;
+        border-radius: 6px;
+    }
+    .fc-daygrid-day-frame {
+        height: 155px;
+        .fc-daygrid-day-events {
+            max-height: 120px;
+            overflow-y: auto;
+            &::-webkit-scrollbar-thumb {
+                background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+                border-radius: 4px; /* 滚动条拖动部分圆角 */
+            }
+        }
+    }
+    .fc-scroller {
+        &::-webkit-scrollbar {
+            width: 5px; /* 滚动条宽度 */
+            background-color: #fff; /* 滚动条背景色 */
+        }
+        &::-webkit-scrollbar-thumb {
+            background-color: #d0d0d0; /* 滚动条拖动部分颜色 */
+            border-radius: 4px; /* 滚动条拖动部分圆角 */
+        }
+    }
+}
+:deep(.fc-scrollgrid-section-body > td) {
+    border: none !important;
+}
+:deep(.fc-daygrid-day-number) {
+    color: #1a1a1a;
+    font-weight: 600;
+}
+</style>
+<style>
+.calendarContainer {
+    .fc-event {
+        background: #edf5ff !important;
+    }
+    .fc-daygrid-day-events {
+        &::-webkit-scrollbar {
+            width: 5px; /* 滚动条宽度 */
+            background-color: #fff; /* 滚动条背景色 */
+        }
+    }
+}
+
+.selectedDate {
+    background-color: #edf5ff !important;
+    .fc-event {
+        background: #fff !important;
+    }
+    .fc-daygrid-day-events {
+        &::-webkit-scrollbar {
+            width: 5px; /* 滚动条宽度 */
+            background-color: #edf5ff; /* 滚动条背景色 */
+        }
+    }
+}
+</style>
diff --git a/src/views/system/Calendar/Tags/components/editTag.vue b/src/views/system/Calendar/Tags/components/editTag.vue
new file mode 100644
index 00000000..23e580f9
--- /dev/null
+++ b/src/views/system/Calendar/Tags/components/editTag.vue
@@ -0,0 +1,127 @@
+<template>
+    <a-modal
+        visible
+        :title="editType === 'add' ? '新增标签' : '编辑标签'"
+        @cancel="emit('closeEditTag')"
+        @ok="submit"
+        :confirmLoading="loading"
+    >
+        <a-form :model="tagInfo" ref="form">
+            <a-row :gutter="16">
+                <a-col>
+                    <a-form-item name="color">
+                        <ColorPicker
+                            type="color"
+                            :hex="tagInfo.color"
+                            :rgba="tagInfo.color"
+                            :themeColor="themeColor" 
+                            @change="changeColor"
+                        />
+                    </a-form-item>
+                </a-col>
+                <a-col :span="20">
+                    <a-form-item
+                        name="name"
+                        :rules="[
+                            {
+                                required: true,
+                                message:'请为标签命名'
+                            },
+                            {
+                                max: 16,
+                                message: '最多可输入16个字符',
+                            },
+                        ]"
+                    >
+                        <a-input
+                            v-model:value="tagInfo.name"
+                            placeholder="请为标签命名"
+                        ></a-input>
+                    </a-form-item>
+                </a-col>
+            </a-row>
+        </a-form>
+    </a-modal>
+</template>
+
+<script setup name="EditTag">
+import { saveTag, saveTagsColor, getTagsColor } from '@/api/system/calendar';
+import { onlyMessage } from '@/utils/comm';
+import { randomString } from '@/utils/utils';
+import ColorPicker from 'colorpicker-v3';
+import 'colorpicker-v3/style.css';
+const props = defineProps({
+    editType: {
+        type: String,
+        default: 'add',
+    },
+    editData: {
+        type: Object,
+        default: {},
+    },
+});
+const emit = defineEmits(['closeEditTag', 'refresh']);
+const tagInfo = reactive({
+    color: '#000000',
+    name: '',
+});
+const form = ref();
+const colorData = ref();
+const changeColor = ({rgba}) => {
+    tagInfo.color = rgba;
+};
+const loading = ref(false)
+const themeColor =  [
+    '#69B1FF',
+    '#5CDBD3',
+    '#FFAF6E',
+    '#85A5FF',
+    '#F4D160',
+    '#95DE64',
+    '#B37FEB',
+    '#FFEC3D',
+    '#FF7875',
+    '#FF85C0'
+]
+const submit = () => {
+    loading.value = true
+    form.value.validate().then(async () => {
+        let id;
+        if (props.editType === 'add') {
+            id = randomString();
+        } else {
+            id = props.editData?.id;
+        }
+        const submitData = {
+            id,
+            name: tagInfo.name,
+        };
+        const res = await saveTag(submitData);
+        if (res.success) {
+            colorData.value[id] = tagInfo.color;
+            const saveRes = await saveTagsColor(colorData.value).catch(()=>{
+                loading.value = false
+            });
+            if (saveRes.success) {
+                onlyMessage('操作成功');
+                emit('refresh');
+            }
+        }
+    });
+};
+//获取全量标签颜色 保存接口是覆盖
+const queryTagsColor = async () => {
+    const res = await getTagsColor();
+    if (res.success) {
+        colorData.value = res.result;
+    }
+};
+onMounted(() => {
+    queryTagsColor();
+    if (props.editType === 'edit') {
+        tagInfo.color = props.editData?.color || '#000000';
+        tagInfo.name = props.editData?.name || '';
+    }
+});
+</script>
+<style lang="less" scoped></style>
diff --git a/src/views/system/Calendar/Tags/index.vue b/src/views/system/Calendar/Tags/index.vue
new file mode 100644
index 00000000..d832bb0c
--- /dev/null
+++ b/src/views/system/Calendar/Tags/index.vue
@@ -0,0 +1,200 @@
+<template>
+    <div class="tagsContainer" ref="tags">
+        <PermissionButton type="primary"  hasPermission="system/Calendar:add" ghost block @click="addTag" :disabled="rapidOn" style="margin-bottom: 10px;">
+            + 新增标签
+        </PermissionButton>
+        <div v-for="i in tagsList" class="tag">
+            <div class="tagLeft">
+                <div
+                    :style="{ background: i.color }"
+                    class="colorExtractor"
+                ></div>
+                <Ellipsis
+                    class="tagName"
+                    style="
+                        width: 120px;
+                        cursor: url('/images/calendar/hover.png'), pointer;
+                    "
+                    :id="i.id"
+                    >{{ i.name }}</Ellipsis
+                >
+            </div>
+            <div class="controls">
+                <PermissionButton
+                    type="text"
+                     hasPermission="system/Calendar:update"
+                    :disabled="i.disabled || rapidOn"
+                    :tooltip="{
+                        title: '编辑'
+                    }"
+                    @click="() => editData(i)"
+                >
+                    <template #icon>
+                        <AIcon type="EditOutlined" />
+                    </template>
+                </PermissionButton>
+                <PermissionButton
+                    type="text"
+                     hasPermission="system/Calendar:delete"
+                    :disabled="i.disabled || rapidOn"
+                    :tooltip="{
+                        title: '删除'
+                    }"
+                    :popConfirm="{
+                        title: `确认删除？`,
+                        onConfirm: () => deleteData(i.id),
+                    }"
+                >
+                    <template #icon>
+                        <AIcon type="DeleteOutlined" />
+                    </template>
+                </PermissionButton>
+            </div>
+        </div>
+    </div>
+    <EditTag
+        v-if="editVisible"
+        :edit-type="editType"
+        :editData="currentTag"
+        @close-edit-tag="editVisible = false"
+        @refresh="refreshTags"
+    />
+</template>
+
+<script setup name="CalendarTags">
+import { queryTags, deleteTags, saveTagsColor } from '@/api/system/calendar';
+import { Draggable } from '@fullcalendar/interaction';
+import EditTag from './components/editTag.vue';
+import { onlyMessage } from '@/utils/comm';
+import { inject } from 'vue';
+import { omit } from 'lodash-es';
+import { useSystem } from '@/store/system';
+const system = useSystem();
+const calendarTagColor = system.$state.calendarTagColor;
+const tagsMap = inject('tagsMap');
+const rapidOn = inject('rapidOn');
+const editVisible = ref(false);
+const tags = ref();
+const tagsList = ref();
+const editType = ref();
+const currentTag = ref();
+const addTag = () => {
+    editVisible.value = true;
+    editType.value = 'add';
+};
+const buildInTag = ['weekend', 'holiday', 'workday'];
+const createDrag = () => {
+    new Draggable(tags.value, {
+        itemSelector: '.tagName',
+        eventData: function (eventEl) {
+            return {
+                id: eventEl.id,
+                title: eventEl.innerText,
+                backgroundColor: calendarTagColor.get(eventEl.id) || '#000000',
+                color: '#000',
+                editable: false,
+            };
+        },
+    });
+};
+//获取标签列表
+const queryTagsData = async () => {
+    const res = await queryTags();
+    if (res.success) {
+        //获取用户添加的标签颜色及权限
+        await system.getTagsColor();
+        tagsList.value = res.result.map((i) => {
+            let color = '#000000';
+            let disabled = false;
+            if (calendarTagColor.has(i.id)) {
+                color = calendarTagColor.get(i.id);
+            }
+            if (buildInTag.includes(i.id)) {
+                disabled = true;
+            }
+            return {
+                ...i,
+                color,
+                disabled,
+            };
+        });
+        tagsMap.value = tagsList.value.map((i) => {
+            return omit(i, ['disabled']);
+        });
+    }
+};
+
+const refreshTags = () => {
+    editVisible.value = false;
+    queryTagsData();
+};
+
+const deleteData = async (id) => {
+    const res = await deleteTags([id]);
+    if (res.success) {
+        if (calendarTagColor.has(id)) {
+            calendarTagColor.delete(id);
+            let color = new Object();
+            calendarTagColor.forEach((item, key) => {
+                color[key] = item;
+            });
+            const deleteColor = await saveTagsColor(color);
+        }
+        onlyMessage('操作成功');
+        queryTagsData();
+    }
+};
+
+const editData = (data) => {
+    editVisible.value = true;
+    editType.value = 'edit';
+    currentTag.value = data;
+};
+onMounted(() => {
+    queryTagsData();
+    createDrag();
+});
+</script>
+<style lang="less" scoped>
+.tagsContainer {
+    width: 15%;
+    background-color: #fff;
+    padding: 10px;
+    border-right: 1px solid #CCCCCC;
+    .tag {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        padding: 0 10px;
+        height: 32px;
+        .tagLeft {
+            display: flex;
+            padding-top: 6px;
+            .colorExtractor {
+                margin-top: 3px;
+                width: 16px;
+                height: 16px;
+                border-radius: 2px;
+                margin-right: 8px;
+            }
+        }
+        .controls{
+            display: none;
+            font-size: 14px;
+           
+            :deep(.ant-btn-text){
+                padding: 4px 8px;
+            }
+        }
+        &:hover{
+            .controls{
+                display: block;
+            }
+        }
+    }
+    .tag:hover{
+        background-color: rgb(242, 242, 242);
+        border-radius: 4px;
+    }
+}
+</style>
diff --git a/src/views/system/Calendar/index.vue b/src/views/system/Calendar/index.vue
new file mode 100644
index 00000000..ee84daf9
--- /dev/null
+++ b/src/views/system/Calendar/index.vue
@@ -0,0 +1,24 @@
+<template>
+    <page-container>
+        <div class="calendarContainer">
+            <CalendarTags />
+            <CalendarRight />
+        </div>
+    </page-container>
+</template>
+
+<script setup>
+import CalendarTags from './Tags/index.vue';
+import CalendarRight from './CalendarRight/index.vue';
+import { provide } from 'vue';
+const tags = ref();
+const rapidOn = ref();
+provide('tagsMap', tags);
+provide('rapidOn', rapidOn);
+</script>
+<style lang="less" scoped>
+.calendarContainer {
+    display: flex;
+    justify-content: space-around;
+}
+</style>
diff --git a/src/views/system/DataSource/Management/index.vue b/src/views/system/DataSource/Management/index.vue
index 4be27c59..a0706433 100644
--- a/src/views/system/DataSource/Management/index.vue
+++ b/src/views/system/DataSource/Management/index.vue
@@ -35,7 +35,7 @@
                                         </span>
                                         <AIcon
                                             type="PlusOutlined"
-                                            style="color: #1d39c4"
+                                            style="color: #1677ff"
                                             @click="addTable"
                                         />
                                     </div>
@@ -49,7 +49,9 @@
                 </div>
                 <div class="right">
                     <div class="btns">
-                        <j-button type="primary" @click="clickSave">保存</j-button>
+                        <j-button type="primary" @click="clickSave"
+                            >保存</j-button
+                        >
                     </div>
                     <j-form ref="formRef" :model="table">
                         <j-table
@@ -102,7 +104,9 @@
                                     </j-form-item>
                                 </template>
                                 <template v-else-if="column.key === 'length'">
-                                    <j-form-item :name="['data', index, 'length']">
+                                    <j-form-item
+                                        :name="['data', index, 'length']"
+                                    >
                                         <j-input-number
                                             v-model:value="record.length"
                                             :min="0"
@@ -112,7 +116,9 @@
                                     </j-form-item>
                                 </template>
                                 <template v-else-if="column.key === 'scale'">
-                                    <j-form-item :name="['data', index, 'scale']">
+                                    <j-form-item
+                                        :name="['data', index, 'scale']"
+                                    >
                                         <j-input-number
                                             v-model:value="record.scale"
                                             :min="0"
@@ -145,7 +151,9 @@
                                     </j-form-item>
                                 </template>
                                 <template v-else-if="column.key === 'comment'">
-                                    <j-form-item :name="['data', index, 'comment']">
+                                    <j-form-item
+                                        :name="['data', index, 'comment']"
+                                    >
                                         <j-input
                                             v-model:value="record.comment"
                                             placeholder="请输入说明"
@@ -234,8 +242,7 @@ import {
 import { onlyMessage } from '@/utils/comm';
 import { randomString } from '@/utils/utils';
 import { FormInstance } from 'ant-design-vue';
-import { DataNode } from 'ant-design-vue/lib/tree';
-import _ , { cloneDeep } from 'lodash-es';
+import _, { cloneDeep } from 'lodash-es';
 import type { dbColumnType, dictItemType, sourceItemType } from '../typing';
 
 const id = useRoute().query.id as string;
@@ -265,7 +272,7 @@ const columns = [
         title: '不能为空',
         dataIndex: 'notnull',
         key: 'notnull',
-        width: 130
+        width: 130,
     },
     {
         title: '说明',
@@ -377,13 +384,15 @@ const addRow = () => {
 
 const clickDel = (row: any, index: number) => {
     if (row.scale !== undefined) {
-        delSaveRow_api(id, leftData.selectedKeys[0], [row.name]).then(
-            (resp: any) => {
-                if (resp.status === 200) {
-                    table.data.splice(index, 1);
-                }
-            },
-        );
+        const response = delSaveRow_api(id, leftData.selectedKeys[0], [
+            row.name,
+        ]);
+        response.then((resp: any) => {
+            if (resp.status === 200) {
+                table.data.splice(index, 1);
+            }
+        });
+        return response;
     } else {
         table.data.splice(index, 1);
     }
@@ -393,8 +402,8 @@ const clickSave = () => {
     formRef.value.validate().then((_data: any) => {
         const columns = cloneDeep(table.data);
         columns.forEach((item: any) => {
-            delete item?.old_id
-            delete item?.index
+            delete item?.old_id;
+            delete item?.index;
         });
         if (!columns.length) {
             onlyMessage('请配置数据源字段', 'error');
@@ -435,6 +444,14 @@ const handleOk = () => {
             dialog.visible = false;
             addFormRef.value?.resetFields();
         });
+    saveTable_api(id, {
+        name: dialog.form.name,
+        columns: [],
+    }).then((resp) => {
+        if (resp.status === 200) {
+            onlyMessage('操作成功');
+        }
+    });
 };
 
 const handleCancel = () => {
@@ -507,9 +524,9 @@ const checkName = (_: any, value: any) =>
         flex-basis: 280px;
         padding: 0 24px;
         box-sizing: border-box;
-        width:300px;
-        height:100%;
-        .tree{
+        width: 300px;
+        height: 100%;
+        .tree {
             height: 680px;
             overflow-y: auto;
         }
diff --git a/src/views/system/DataSource/index.vue b/src/views/system/DataSource/index.vue
index cc7c2c2a..f02295f6 100644
--- a/src/views/system/DataSource/index.vue
+++ b/src/views/system/DataSource/index.vue
@@ -84,11 +84,11 @@
                                 :hasPermission="`${permission}:action`"
                                 type="link"
                                 :popConfirm="{
-                                    title: `确定要${
+                                    title: `确认${
                                         table.getRowStatus(slotProps)
                                             ? '禁用'
                                             : '启用'
-                                    }吗？`,
+                                    }？`,
                                     onConfirm: () =>
                                         table.clickChangeStatus(slotProps),
                                 }"
@@ -261,20 +261,23 @@ const table = {
     },
     // 删除
     clickDel: (row: sourceItemType) => {
-        delDataSource_api(row.id as string).then((resp: any) => {
+        const response =  delDataSource_api(row.id as string)
+        response.then((resp: any) => {
             if (resp.status === 200) {
                 tableRef.value?.reload();
                 onlyMessage('操作成功!');
             }
         });
+        return response
     },
     clickChangeStatus: (row: sourceItemType) => {
         const status = row.state.value === 'enabled' ? '_disable' : '_enable';
-
-        changeStatus_api(row.id as string, status).then(() => {
+        const response = changeStatus_api(row.id as string, status);
+        response.then(() => {
             onlyMessage('操作成功');
             table.refresh();
         });
+        return response;
     },
     // 刷新列表
     refresh: () => {
diff --git a/src/views/system/Department/components/AddDeviceOrProductDialog.vue b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
index 27045d8c..8f832006 100644
--- a/src/views/system/Department/components/AddDeviceOrProductDialog.vue
+++ b/src/views/system/Department/components/AddDeviceOrProductDialog.vue
@@ -100,7 +100,7 @@
             </template>
             <template #registryTime="slotProps">
                 <span>{{
-                    dayjs(slotProps.registryTime).format('YYYY-MM-DD YY:mm:ss')
+                    dayjs(slotProps.registryTime).format('YYYY-MM-DD HH:mm:ss')
                 }}</span>
             </template>
         </j-pro-table>
@@ -187,7 +187,7 @@ const columns = props.queryColumns.filter(
 
 const searchColumns = computed(() => {
     return props.queryColumns.map(item => {
-        if (departmentStore.productId) {    
+        if (departmentStore.productId) {
             if (item.dataIndex === 'productName') {
                 item.search.first = true
                 item.search.componentProps = {
@@ -468,14 +468,14 @@ const selectAll = (selected: Boolean, selectedRows: any,changeRows:any) => {
             const _ids: string[] = [];
             const _row: any[] = [];
             table.selectedRows.map((i: any) => {
-                if (!arr.includes(i.id)) {   
+                if (!arr.includes(i.id)) {
                     _ids.push(i.id)
                     _row.push(i)
                 }
             })
             table._selectedRowKeys.value = _ids;
             table.selectedRows = _row;
-        }     
+        }
 }
 const cancel = () => {
     departmentStore.setProductId(undefined)
diff --git a/src/views/system/Department/components/LeftTree.vue b/src/views/system/Department/components/LeftTree.vue
index 5cef11cd..da861c2d 100644
--- a/src/views/system/Department/components/LeftTree.vue
+++ b/src/views/system/Department/components/LeftTree.vue
@@ -14,7 +14,6 @@
         <div class="add-btn">
             <PermissionButton
                 type="primary"
-                class="add-btn"
                 :hasPermission="`${permission}:add`"
                 @click="openDialog()"
             >
@@ -23,67 +22,70 @@
         </div>
 
         <div class="tree">
-          <j-spin :spinning='loading'>
-              <jTree
-                  v-if="treeData.length > 0"
-                  :tree-data="treeData"
-                  v-model:selected-keys="selectedKeys"
-                  v-model:expandedKeys="expandedKeys"
-                  :fieldNames="{ key: 'id' }"
-                  :showLine="{ showLeafIcon: false }"
-                  :show-icon="true"
-              >
-                  <template #title="{ name, data }">
-                    <div class='department-tree-item-content'>
-                      <span class='title'>
-                        <j-ellipsis>
-                          {{ name }}
-                        </j-ellipsis>
-                      </span>
-                      <span class="func-btns" @click="(e) => e.stopPropagation()">
-                          <PermissionButton
-                              :hasPermission="`${permission}:update`"
-                              type="link"
-                              :tooltip="{
-                                  title: '编辑',
-                              }"
-                              @click="openDialog(data)"
-                          >
-                              <AIcon type="EditOutlined" />
-                          </PermissionButton>
-                          <PermissionButton
-                              :hasPermission="`${permission}:add`"
-                              type="link"
-                              :tooltip="{
-                                  title: '新增子组织',
-                              }"
-                              @click="
-                                  openDialog({
-                                      ...data,
-                                      id: '',
-                                      parentId: data.id,
-                                  })
-                              "
-                          >
-                              <AIcon type="PlusCircleOutlined" />
-                          </PermissionButton>
-                          <PermissionButton
-                              type="link"
-                              :hasPermission="`${permission}:delete`"
-                              :tooltip="{ title: '删除' }"
-                              :popConfirm="{
-                                  title: `确定要删除吗`,
-                                  onConfirm: () => delDepartment(data.id),
-                              }"
-                          >
-                              <AIcon type="DeleteOutlined" />
-                          </PermissionButton>
-                      </span>
-                    </div>
-                  </template>
-              </jTree>
-              <j-empty v-else description="暂无数据" />
-          </j-spin>
+            <j-spin :spinning="loading">
+                <jTree
+                    v-if="treeData.length > 0"
+                    :tree-data="treeData"
+                    v-model:selected-keys="selectedKeys"
+                    v-model:expandedKeys="expandedKeys"
+                    :fieldNames="{ key: 'id' }"
+                    :showLine="{ showLeafIcon: false }"
+                    :show-icon="true"
+                >
+                    <template #title="{ name, data }">
+                        <div class="department-tree-item-content">
+                            <span class="title">
+                                <j-ellipsis>
+                                    {{ name }}
+                                </j-ellipsis>
+                            </span>
+                            <span
+                                class="func-btns"
+                                @click="(e) => e.stopPropagation()"
+                            >
+                                <PermissionButton
+                                    :hasPermission="`${permission}:update`"
+                                    type="link"
+                                    :tooltip="{
+                                        title: '编辑',
+                                    }"
+                                    @click="openDialog(data)"
+                                >
+                                    <AIcon type="EditOutlined" />
+                                </PermissionButton>
+                                <PermissionButton
+                                    :hasPermission="`${permission}:add`"
+                                    type="link"
+                                    :tooltip="{
+                                        title: '新增子组织',
+                                    }"
+                                    @click="
+                                        openDialog({
+                                            ...data,
+                                            id: '',
+                                            parentId: data.id,
+                                        })
+                                    "
+                                >
+                                    <AIcon type="PlusCircleOutlined" />
+                                </PermissionButton>
+                                <PermissionButton
+                                    type="link"
+                                    :hasPermission="`${permission}:delete`"
+                                    :tooltip="{ title: '删除' }"
+                                    :popConfirm="{
+                                        title: `确认删除？`,
+                                        onConfirm: () => delDepartment(data.id),
+                                    }"
+                                >
+                                    <AIcon type="DeleteOutlined" />
+                                </PermissionButton>
+                            </span>
+                        </div>
+                    </template>
+                </jTree>
+                <j-empty v-else description="暂无数据" />
+            </j-spin>
         </div>
         <!-- 编辑弹窗 -->
         <EditDepartmentDialog
@@ -103,7 +105,7 @@ import { debounce, cloneDeep, omit } from 'lodash-es';
 import { ArrayToTree } from '@/utils/utils';
 import EditDepartmentDialog from './EditDepartmentDialog.vue';
 import { onlyMessage } from '@/utils/comm';
-
+const route = useRoute();
 const permission = 'system/Department';
 
 const save = useRoute().query.save;
@@ -115,6 +117,36 @@ const treeMap = new Map(); // 数据的map版本
 const treeData = ref<any[]>([]); // 展示的数据
 const selectedKeys = ref<string[]>([]); // 当前选中的项
 const expandedKeys = ref<string[] | number[]>([]);
+function findParents(tree:any, targetId:any) {
+    let parents:any = [];
+    function findAndCollectParents(node:any) {
+        if (node.id === targetId) {
+            return true;
+        }
+        // Recursively check children
+        if (node.children) {
+            for (let child of node.children) {
+                if (findAndCollectParents(child)) {
+                    // If child node found the target, add current node to parents list
+                    parents.push(node.id);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+    // Traverse the tree and find the target node
+    for (let node of tree) {
+        if (findAndCollectParents(node)) {
+            break; // Stop once we found the target node and collected all parents
+        }
+    }
+    // Reverse the array to have parents from root to immediate parent
+    parents.reverse();
+
+    return parents;
+}
 
 function getTree(cb?: Function) {
     loading.value = true;
@@ -127,7 +159,7 @@ function getTree(cb?: Function) {
             { column: 'name$LIKE', value: `%${searchValue.value}%` },
         ];
     }
-    treeMap.clear()
+    treeMap.clear();
     getTreeData_api(params)
         .then((resp: any) => {
             sourceTree.value = resp.result.sort((a: any, b: any) =>
@@ -135,7 +167,12 @@ function getTree(cb?: Function) {
                     ? b.createTime - a.createTime
                     : a.sortIndex - b.sortIndex,
             ); // 报存源数据
-            selectedKeys.value = [resp.result[0]?.id];
+            if (route.query?.id) {
+                expandedKeys.value = findParents(sourceTree.value, route.query.id);
+                selectedKeys.value = [route.query.id];
+            } else {
+                selectedKeys.value = [resp.result[0]?.id];
+            }
             handleTreeMap(resp.result); // 将树形结构转换为map结构
             treeData.value = resp.result; // 第一次不用进行过滤
             cb && cb();
@@ -155,7 +192,7 @@ const search = debounce(() => {
                 treeArray.set(item.id, item);
             }
         });
-        expandedKeys.value = []
+        expandedKeys.value = [];
         dig(searchTree);
         treeData.value = ArrayToTree(cloneDeep([...treeArray.values()]));
     } else {
@@ -171,9 +208,9 @@ const search = debounce(() => {
                 const _item = treeMap.get(item);
                 pIds.push(_item.parentId);
                 treeArray.set(item, _item);
-                expandedKeys.value.push(_item.id)
-                if(pIds.length > 0){
-                    dig(pIds)
+                expandedKeys.value.push(_item.id);
+                if (pIds.length > 0) {
+                    dig(pIds);
                 }
             }
         });
@@ -192,14 +229,16 @@ function handleTreeMap(_data: any[]) {
 }
 // 删除部门
 function delDepartment(id: string) {
-    delDepartment_api(id).then(() => {
+    const response = delDepartment_api(id);
+    response.then(() => {
         onlyMessage('操作成功');
         getTree();
     });
+    return response;
 }
 function refresh(id: string) {
     // @ts-ignore
-    if(window?.onTabSaveSuccess){
+    if (window?.onTabSaveSuccess) {
         window.onTabSaveSuccess(id);
         setTimeout(() => window.close(), 300);
     }
@@ -220,7 +259,7 @@ const openDialog = (row: any = {}) => {
             children = row.children;
         } else children = treeData.value;
         const index =
-        children?.length > 0
+            children?.length > 0
                 ? children?.map((item) => item.sortIndex)
                 : [0];
         sortIndex = Math.max(...index) + 1;
@@ -235,7 +274,7 @@ const init = () => {
     watch(selectedKeys, (n) => {
         emits('change', n[0]);
     });
-}
+};
 
 init();
 </script>
@@ -270,38 +309,37 @@ init();
         }
     }
 
-
     .tree {
-      overflow-y: auto;
-      overflow-x: auto;
-      flex: 1 1 auto;
-      .department-tree-item-content {
-        display: flex;
-        align-items: stretch;
+        overflow-y: auto;
+        overflow-x: auto;
+        flex: 1 1 auto;
+        .department-tree-item-content {
+            display: flex;
+            align-items: stretch;
 
-        .title {
+            .title {
                 flex: 1;
                 min-width: 80px;
                 margin-right: 80px;
             }
-        .func-btns {
-          display: none;
-          font-size: 14px;
-          width: 80px;
-          margin-left: -80px;
-          :deep(.ant-btn-link) {
-            padding: 0 4px;
-            height: 24px;
-          }
+            .func-btns {
+                display: none;
+                font-size: 14px;
+                width: 80px;
+                margin-left: -80px;
+                :deep(.ant-btn-link) {
+                    padding: 0 4px;
+                    height: 24px;
+                }
+            }
         }
-      }
 
-      .loading {
-        display: flex;
-        width: 100%;
-        justify-content: center;
-        margin-top: 20px;
-      }
+        .loading {
+            display: flex;
+            width: 100%;
+            justify-content: center;
+            margin-top: 20px;
+        }
     }
 }
 </style>
diff --git a/src/views/system/Department/device/index.vue b/src/views/system/Department/device/index.vue
index a03bef78..81baaa11 100644
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@@ -44,7 +44,7 @@
                                         <PermissionButton
                                             :hasPermission="`${permission}:bind`"
                                             :popConfirm="{
-                                                title: `是否批量解除绑定`,
+                                                title: `确认批量解除绑定？`,
                                                 onConfirm: () =>
                                                     table.clickUnBind(),
                                             }"
@@ -97,7 +97,7 @@
                         </template>
                         <template #content>
                             <h3 class="card-item-content-title" style='margin-bottom: 18px;'>
-                                {{ slotProps.name }}  
+                                {{ slotProps.name }}
                             </h3>
                             <j-row>
                                 <j-col :span="12">
@@ -142,7 +142,7 @@
                             <PermissionButton
                                 :hasPermission="`${permission}:bind`"
                                 :popConfirm="{
-                                    title: `是否解除绑定`,
+                                    title: `确认解除绑定？`,
                                     onConfirm: () =>
                                         table.clickUnBind(slotProps),
                                 }"
@@ -173,12 +173,12 @@
                 <template #registryTime="slotProps">
                     <span>{{
                         slotProps.registryTime ? dayjs(slotProps.registryTime).format(
-                            'YYYY-MM-DD YY:mm:ss',
+                            'YYYY-MM-DD HH:mm:ss',
                         ) : '-'
                     }}</span>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <PermissionButton
                             v-for="i in table.getActions(slotProps, 'table')"
                             :hasPermission="i.permission"
@@ -383,7 +383,7 @@ const table = {
                     key: 'unbind',
                     tooltip: { title: '解除绑定' },
                     popConfirm: {
-                        title: `是否解除绑定`,
+                        title: `确认解除绑定？`,
                         onConfirm: () => table.clickUnBind(data),
                     },
                     icon: 'DisconnectOutlined',
@@ -580,10 +580,12 @@ const table = {
                 assetIdList: ids,
             },
         ];
-        unBindDeviceOrProduct_api('device', params).then(() => {
+        const response = unBindDeviceOrProduct_api('device', params)
+        response.then(() => {
             onlyMessage('操作成功');
             table.refresh();
         });
+        return response
     },
     refresh: () => {
         nextTick(() => {
diff --git a/src/views/system/Department/product/index.vue b/src/views/system/Department/product/index.vue
index 03d7e048..ebef2da4 100644
--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@@ -41,7 +41,7 @@
                                         <PermissionButton
                                             :hasPermission="`${permission}:bind`"
                                             :popConfirm="{
-                                                title: `是否批量解除绑定`,
+                                                title: `确认批量解除绑定？`,
                                                 onConfirm: () =>
                                                     table.clickUnBind(),
                                             }"
@@ -369,7 +369,7 @@ const table = {
                     key: 'unbind',
                     tooltip: { title: '解除绑定' },
                     popConfirm: {
-                        title: `是否解除绑定`,
+                        title: `确认解除绑定？`,
                         onConfirm: () => table.clickUnBind(data),
                     },
                     icon: 'DisconnectOutlined',
@@ -573,11 +573,13 @@ const table = {
                 assetIdList: ids,
             },
         ];
-        unBindDeviceOrProduct_api('product', params).then(() => {
+        const response = unBindDeviceOrProduct_api('product', params)
+        response.then(() => {
             tableData._selectedRowKeys = [];
             onlyMessage('操作成功');
             table.refresh();
         });
+        return response
     },
     refresh: () => {
         nextTick(() => {
diff --git a/src/views/system/Department/user/index.vue b/src/views/system/Department/user/index.vue
index 52c3f800..fcd74344 100644
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@@ -4,23 +4,23 @@
             :columns="columns"
             target="category-user"
             @search="handleParams"
-            style='margin-bottom: 0;'
+            style="margin-bottom: 0"
         />
-      <FullPage :extraHeight="24">
+        <FullPage :extraHeight="24">
             <j-pro-table
                 ref="tableRef"
                 :columns="columns"
                 :request="table.requestFun"
                 :params="queryParams"
                 :scroll="{
-                    x:true,
-                    y:610,
+                    x: true,
+                    y: 610,
                 }"
                 :rowSelection="{
                     selectedRowKeys: table._selectedRowKeys,
                     onSelect: table.onSelectChange,
                     onSelectAll: selectAll,
-                    onSelectNone: () => table._selectedRowKeys = []
+                    onSelectNone: () => (table._selectedRowKeys = []),
                 }"
                 model="TABLE"
             >
@@ -30,7 +30,7 @@
                         :hasPermission="`${permission}:bind-user`"
                         @click="dialogVisible = true"
                         style="margin-right: 15px"
-                        :disabled='!parentId'
+                        :disabled="!parentId"
                     >
                         <AIcon type="PlusOutlined" />绑定用户
                     </PermissionButton>
@@ -40,7 +40,7 @@
                     <PermissionButton
                         :hasPermission="`${permission}:bind`"
                         :popConfirm="{
-                            title: `是否解除绑定`,
+                            title: `确认解除绑定？`,
                             onConfirm: () => table.unBind(),
                         }"
                     >
@@ -63,7 +63,7 @@
                             type="link"
                             :hasPermission="`${permission}:bind`"
                             :popConfirm="{
-                                title: `是否解除绑定`,
+                                title: `确认解除绑定？`,
                                 onConfirm: () => table.unBind(slotProps),
                             }"
                         >
@@ -200,23 +200,26 @@ const table = reactive({
     },
     unBind: (row?: any) => {
         const ids = row ? [row.id] : table._selectedRowKeys;
-        if (ids.length < 1) return onlyMessage('请勾选需要解绑的数据', 'warning');
+        if (ids.length < 1)
+            return onlyMessage('请勾选需要解绑的数据', 'warning');
 
-        unBindUser_api(props.parentId, ids).then(() => {
+        const response = unBindUser_api(props.parentId, ids);
+        response.then(() => {
             onlyMessage('操作成功');
-            table._selectedRowKeys = []
+            table._selectedRowKeys = [];
             table.refresh();
         });
+        return response;
     },
-    onSelectChange: (row:any,selected:Boolean) => {
+    onSelectChange: (row: any, selected: Boolean) => {
         const arr = new Set(table._selectedRowKeys);
-        console.log(row)
-        if(selected){
-            arr.add(row.id)
-        }else{
-            arr.delete(row.id)
+        console.log(row);
+        if (selected) {
+            arr.add(row.id);
+        } else {
+            arr.delete(row.id);
         }
-        table._selectedRowKeys = [...arr.values()]
+        table._selectedRowKeys = [...arr.values()];
     },
     // 刷新列表
     refresh: () => {
@@ -226,29 +229,29 @@ const table = reactive({
 
 const dialogVisible = ref(false);
 
-const selectAll = (selected: Boolean, selectedRows: any,changeRows:any) => {
+const selectAll = (selected: Boolean, selectedRows: any, changeRows: any) => {
     if (selected) {
-            changeRows.map((i: any) => {
-                if (!table._selectedRowKeys.includes(i.id)) {
-                    table._selectedRowKeys.push(i.id)
-                }
-            })
-        } else {
-            const arr = changeRows.map((item: any) => item.id)
-            const _ids: string[] = [];
-            table._selectedRowKeys.map((i: any) => {
-                if (!arr.includes(i)) {   
-                    _ids.push(i)
-                }
-            })
-            table._selectedRowKeys = _ids;
-        }     
-}
+        changeRows.map((i: any) => {
+            if (!table._selectedRowKeys.includes(i.id)) {
+                table._selectedRowKeys.push(i.id);
+            }
+        });
+    } else {
+        const arr = changeRows.map((item: any) => item.id);
+        const _ids: string[] = [];
+        table._selectedRowKeys.map((i: any) => {
+            if (!arr.includes(i)) {
+                _ids.push(i);
+            }
+        });
+        table._selectedRowKeys = _ids;
+    }
+};
 watch(
     () => props.parentId,
     () => {
         table.refresh();
-        table._selectedRowKeys = []
+        table._selectedRowKeys = [];
     },
 );
 </script>
diff --git a/src/views/system/Dictionary/components/Left/index.vue b/src/views/system/Dictionary/components/Left/index.vue
index f6ad60f6..2b2ca8dc 100644
--- a/src/views/system/Dictionary/components/Left/index.vue
+++ b/src/views/system/Dictionary/components/Left/index.vue
@@ -1,154 +1,278 @@
 <template>
     <div class="left-contain">
-        <j-input placeholder="字典名称" v-model:value="searchValue" @pressEnter="search" @change="searchChange">
+        <j-input
+            placeholder="字典名称"
+            v-model:value="searchValue"
+            @pressEnter="search"
+            @change="searchChange"
+        >
             <template #suffix>
                 <AIcon type="SearchOutlined" @click="search" />
             </template>
         </j-input>
         <div class="controls">
-            <PermissionButton type="primary" hasPermission="system/Dictionary:add" @click="showSave" style="width: 160px">
+            <PermissionButton
+                type="primary"
+                hasPermission="system/Dictionary:add"
+                @click="showSave"
+                style="width: 160px"
+            >
                 新增字典
             </PermissionButton>
-            <PermissionButton type="text" hasPermission="system/Dictionary:down" @click="downVisible = true">
+            <PermissionButton
+                type="text"
+                hasPermission="system/Dictionary:down"
+                @click="downVisible = true"
+            >
                 下载
             </PermissionButton>
-            <j-upload :before-upload="beforeUpload" accept=".json" :show-upload-list="false"
-                :disabled="!hasPermission('system/Dictionary:import')">
-                <PermissionButton type="text" hasPermission="system/Dictionary:import">
+            <j-upload
+                :before-upload="beforeUpload"
+                accept=".json"
+                :show-upload-list="false"
+                :disabled="!hasPermission('system/Dictionary:import')"
+            >
+                <PermissionButton
+                    type="text"
+                    hasPermission="system/Dictionary:import"
+                >
                     导入
                 </PermissionButton>
             </j-upload>
         </div>
         <div class="tree">
-            <j-tree :tree-data="listData" v-if="listData.length" :fieldNames="{ title: 'name', key: 'id' }" blockNode
-                :selectedKeys="selectedKeys">
+            <j-tree
+                :tree-data="listData"
+                v-if="listData.length"
+                :fieldNames="{ title: 'name', key: 'id' }"
+                blockNode
+                :selectedKeys="selectedKeys"
+            >
                 <template #title="item">
                     <div class="treeItem" @click="() => selectDic(item.data)">
                         <div class="itemText">
-                            <Ellipsis style="width: calc(100%-100px)">{{ item.name }}</Ellipsis>
+                            <Ellipsis style="width: calc(100%-100px)">{{
+                                item.name
+                            }}</Ellipsis>
                         </div>
                         <div @click="(e) => e.stopPropagation()">
-                            <j-popconfirm v-if="hasPermission('system/Dictionary:action')"
-                                :title="item.data.status === 1 ? '确定禁用？' : '确定启用？'" @confirm="() => updateDic(item.data)">
-                                <j-switch :checked="item.status" :disabled="!hasPermission('system/Dictionary:action')"
-                                    :checkedValue="1" :unCheckedValue="0"></j-switch>
-                            </j-popconfirm>
-                            <j-tooltip v-else placement="top" title="暂无权限,请联系管理员">
-                                <j-switch :checked="item.status" :disabled="!hasPermission('system/Dictionary:action')"
-                                    :checkedValue="1" :unCheckedValue="0"></j-switch>
+                            <ConfirmModal
+                                v-if="
+                                    hasPermission('system/Dictionary:action') &&
+                                    item.data.classified !== 'system'
+                                "
+                                :title="
+                                    item.data.status === 1
+                                        ? '禁用后引用该字典的页面将受到影响，确认禁用？'
+                                        : '确认启用？'
+                                "
+                                :onConfirm="() => updateDic(item.data)"
+                            >
+                                <j-switch
+                                    :checked="item.status"
+                                    :disabled="
+                                        !hasPermission(
+                                            'system/Dictionary:action',
+                                        ) || item.data.classified === 'system'
+                                    "
+                                    :checkedValue="1"
+                                    :unCheckedValue="0"
+                                ></j-switch>
+                            </ConfirmModal>
+                            <j-tooltip
+                                v-else
+                                placement="top"
+                                :title="
+                                    !hasPermission('system/Dictionary:action')
+                                        ? '暂无权限,请联系管理员'
+                                        : '内置数据不支持修改'
+                                "
+                            >
+                                <j-switch
+                                    :checked="item.status"
+                                    :disabled="
+                                        !hasPermission(
+                                            'system/Dictionary:action',
+                                        ) || item.data.classified === 'system'
+                                    "
+                                    :checkedValue="1"
+                                    :unCheckedValue="0"
+                                ></j-switch>
                             </j-tooltip>
-                            <PermissionButton type="text" hasPermission="system/Dictionary:delete" :popConfirm="{
-                                title: `确定要删除？`,
-                                onConfirm: () => deleteDic(item.id),
-                            }">
+                            <PermissionButton
+                                type="text"
+                                hasPermission="system/Dictionary:delete"
+                                :disabled="item.data.classified === 'system'"
+                                :tooltip="
+                                    item.data.classified === 'system'
+                                        ? { title: '内置数据不支持修改' }
+                                        : null
+                                "
+                                :popConfirm="{
+                                    title: `确认删除？`,
+                                    onConfirm: () => deleteDic(item.id),
+                                }"
+                            >
                                 删除
                             </PermissionButton>
-                            <PermissionButton type="text" hasPermission="system/Dictionary:update"
-                                @click="showEdit(item.data)">
+                            <PermissionButton
+                                type="text"
+                                :disabled="item.data.classified === 'system'"
+                                :tooltip="
+                                    item.data.classified === 'system'
+                                        ? { title: '内置数据不支持修改' }
+                                        : null
+                                "
+                                hasPermission="system/Dictionary:update"
+                                @click="showEdit(item.data)"
+                            >
                                 编辑
                             </PermissionButton>
                         </div>
                     </div>
                 </template>
             </j-tree>
-            <j-empty v-else style="margin-top: 100px;" />
+            <j-empty v-else style="margin-top: 100px" />
         </div>
     </div>
-    <Save v-if="saveShow" :type="addType" @close-save="saveShow = false" @success="saveSuccess" :data="editData" />
+    <Save
+        v-if="saveShow"
+        :type="addType"
+        @close-save="saveShow = false"
+        @success="saveSuccess"
+        :data="editData"
+    />
     <Export v-if="downVisible" @closeDown="closeDown" />
     <Import />
 </template>
 
 <script lang="ts" setup>
-import { getDicList, deleteDictionary, addDictionary } from '@/api/system/dictionary';
-import Save from './save/index.vue'
+import {
+    getDicList,
+    deleteDictionary,
+    addDictionary,
+} from '@/api/system/dictionary';
+import Save from './save/index.vue';
 import { onlyMessage } from '@/utils/comm';
-import Export from './Export/index.vue'
+import Export from './Export/index.vue';
 import { usePermissionStore } from '@/store/permission';
-const emit = defineEmits(['selectData'])
+const emit = defineEmits(['selectData']);
 const hasPermission = usePermissionStore().hasPermission;
-const saveShow = ref(false)
-const addType = ref('add')
-const listData = ref<any[]>([])
-const editData = ref()
-const selectedKeys: any = ref([])
+const saveShow = ref(false);
+const addType = ref('add');
+const listData = ref<any[]>([]);
+const editData = ref();
+const selectedKeys: any = ref([]);
 const showSave = () => {
-    saveShow.value = true
-    addType.value = 'add'
-}
-const downVisible = ref(false)
-const searchValue = ref()
+    saveShow.value = true;
+    addType.value = 'add';
+};
+const downVisible = ref(false);
+const searchValue = ref();
 const queryData = (first?: Boolean, searchName?: any) => {
-    const params = searchName ? { paging:false ,sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }], terms: [{ terms: [{ value: '%' + searchName + '%', termType: 'like', column: 'name' }] }] } : { sorts: [{ name: 'createTime', order: 'desc' }, { name: 'name', order: 'desc' }], paging:false  }
+    const params = searchName
+        ? {
+              paging: false,
+              sorts: [
+                  { name: 'createTime', order: 'desc' },
+                  { name: 'name', order: 'desc' },
+              ],
+              terms: [
+                  {
+                      terms: [
+                          {
+                              value: '%' + searchName + '%',
+                              termType: 'like',
+                              column: 'name',
+                          },
+                      ],
+                  },
+              ],
+          }
+        : {
+              sorts: [
+                  { name: 'createTime', order: 'desc' },
+                  { name: 'name', order: 'desc' },
+              ],
+              paging: false,
+          };
     getDicList(params).then((res: any) => {
         if (res.status === 200) {
-            listData.value = res.result
+            listData.value = res.result;
             if (first && res.result.length) {
-                selectDic(res.result[0])
+                selectDic(res.result[0]);
+            }else if(selectedKeys.value){
+                selectDic(res.result.find(i=>{
+                    return i.id = selectedKeys.value[0]
+                }))
             }
         }
-    })
-}
+    });
+};
 const search = () => {
-    queryData(true, searchValue.value)
-}
+    queryData(true, searchValue.value);
+};
 const searchChange = () => {
-    console.log(searchValue.value === '')
     if (searchValue.value === '') {
-        queryData(true)
+        queryData(true);
     }
-}
+};
 const showEdit = (data: any) => {
-    saveShow.value = true
-    addType.value = 'edit'
-    editData.value = data
-}
+    saveShow.value = true;
+    addType.value = 'edit';
+    editData.value = data;
+};
 /**
  * 重新请求数据
  */
 const reload = () => {
-    queryData()
-}
+    queryData();
+};
 const saveSuccess = () => {
-    saveShow.value = false
-    reload()
-}
+    saveShow.value = false;
+    reload();
+    
+};
 /**
- * 
+ *
  * @param id 字典id
  * 删除字典
  */
 const deleteDic = (id: string) => {
-    deleteDictionary(id).then((res: any) => {
+    const response = deleteDictionary(id);
+    response.then((res: any) => {
         if (res.status === 200) {
-            onlyMessage('操作成功!')
-            queryData(true)
+            onlyMessage('操作成功!');
+            queryData(true);
         } else {
-            onlyMessage('操作失败!', 'error')
+            onlyMessage('操作失败!', 'error');
         }
-    })
-}
+    });
+    return response;
+};
 /**
  * 更新字典
  */
 const updateDic = (data: any) => {
-    data.status = data.status === 1 ? 0 : 1
-    addDictionary(data).then((res: any) => {
+    data.status = data.status === 1 ? 0 : 1;
+    const response = addDictionary(data);
+    response.then((res: any) => {
         if (res.status === 200) {
-            onlyMessage('操作成功!')
-            reload()
+            onlyMessage('操作成功!');
+            reload();
         } else {
-            onlyMessage('操作失败!', 'error')
+            onlyMessage('操作失败!', 'error');
         }
-    })
-}
+    });
+    return response;
+};
 /**
  * 切换选中字典
  */
 const selectDic = (selectKeys: any) => {
-    selectedKeys.value = [selectKeys.id]
-    emit('selectData', selectKeys)
-}
+    selectedKeys.value = [selectKeys.id];
+    emit('selectData', selectKeys);
+};
 /**
  * 导入字典
  */
@@ -158,34 +282,34 @@ const beforeUpload = (file: any) => {
         reader.readAsText(file);
         reader.onload = async (json: any) => {
             if (json?.target?.result) {
-                const text = json.target.result
-                let data
+                const text = json.target.result;
+                let data;
                 try {
                     data = JSON.parse(text);
                 } catch {
-                    onlyMessage('请上传json格式的文件', 'error')
-                    return false
+                    onlyMessage('请上传json格式的文件', 'error');
+                    return false;
                 }
-                const res = await addDictionary(data)
+                const res = await addDictionary(data);
                 if (res.status === 200) {
-                    reload()
-                    onlyMessage('操作成功！')
+                    reload();
+                    onlyMessage('操作成功！');
                 }
             } else {
-                onlyMessage('文件内容不能为空', 'error')
+                onlyMessage('文件内容不能为空', 'error');
             }
         };
     } else {
-        onlyMessage('请上传json格式的文件', 'error')
+        onlyMessage('请上传json格式的文件', 'error');
     }
 };
 
 const closeDown = () => {
-    downVisible.value = false
-}
+    downVisible.value = false;
+};
 onMounted(() => {
-    queryData(true)
-})
+    queryData(true);
+});
 </script>
 <style lang="less" scoped>
 .left-contain {
@@ -215,4 +339,4 @@ onMounted(() => {
         max-width: 40%;
     }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/system/Dictionary/components/Right/index.vue b/src/views/system/Dictionary/components/Right/index.vue
index 49723fce..b70f9d4c 100644
--- a/src/views/system/Dictionary/components/Right/index.vue
+++ b/src/views/system/Dictionary/components/Right/index.vue
@@ -2,7 +2,7 @@
     <div class="des">
         <div class="des_head">
             <div>字典ID：<span>{{ data.id }}</span></div>
-            <div>说明：<span>{{ data.describe }}</span></div>
+            <div style="display: flex;">说明：<Ellipsis style="width: calc(100% - 200px);"><span>{{ data.describe }}</span></Ellipsis></div>
             <div>创建日期：<span> {{
                 dayjs(
                     data?.createTime,
@@ -20,7 +20,7 @@
                     </PermissionButton>
                 </template>
                 <template #action="slotProps">
-                    <j-space>
+                    <j-space :size="16">
                         <template v-for="i in getActions(slotProps, 'table')" :key="i.key">
                             <PermissionButton :disabled="i.disabled" :popConfirm="i.popConfirm" :tooltip="{
                                 ...i.tooltip,
diff --git a/src/views/system/Menu/Detail/BasicInfo.vue b/src/views/system/Menu/Detail/BasicInfo.vue
index 04ea30d1..f9e41822 100644
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@@ -484,7 +484,7 @@ type assetType = {
                 left: 0;
                 width: 4px;
                 height: calc(100% - 10px);
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 2px;
                 content: ' ';
             }
diff --git a/src/views/system/Menu/Detail/ButtonMange.vue b/src/views/system/Menu/Detail/ButtonMange.vue
index 221cc0f0..1519f5c8 100644
--- a/src/views/system/Menu/Detail/ButtonMange.vue
+++ b/src/views/system/Menu/Detail/ButtonMange.vue
@@ -137,10 +137,12 @@ const table = reactive({
             ...menuInfo.value,
             buttons,
         };
-        saveMenuInfo_api(params).then(() => {
+        const response = saveMenuInfo_api(params)
+        response.then(() => {
             onlyMessage('操作成功');
             table.getList();
         });
+        return response
     },
 });
 table.getList();
diff --git a/src/views/system/Menu/Setting/index.vue b/src/views/system/Menu/Setting/index.vue
index fc7732c9..18735aec 100644
--- a/src/views/system/Menu/Setting/index.vue
+++ b/src/views/system/Menu/Setting/index.vue
@@ -45,11 +45,11 @@
             >
         </j-card>
         <j-modal
+            modalType="message"
             :visible="visible"
+            :confirmLoading="loading"
             @ok="handleOk"
             @cancel="handleCancel"
-            modalType="message"
-            :confirmLoading="loading"
         >
             保存后当前系统菜单数据将被覆盖，确认操作？
         </j-modal>
@@ -120,7 +120,7 @@ const params = {
 let filterProtocolList: any[] = [];
 const getProvidersFn = async () => {
     if(!isNoCommunity){
-        return 
+        return
     }else{
         const res: any = await getProviders();
         filterProtocolList = protocolList.filter((item) => {
@@ -155,7 +155,7 @@ getProvidersFn();
 //     return filtered;
 // }
 /**
- * 
+ *
  * @param nodes 菜单数据
  * @param selectedKeys 选中的菜单
  * 选中和非选中改变show的值
@@ -198,6 +198,7 @@ const handleOk = async () => {
     const res = await updateMenus(_dataSorts).catch(() => {});
     if (res?.status === 200) {
         onlyMessage('操作成功', 'success');
+        location.reload()
     }
     loading.value = false;
     visible.value = false;
diff --git a/src/views/system/Menu/index.vue b/src/views/system/Menu/index.vue
index 9265d9c8..c663d72f 100644
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@@ -41,7 +41,11 @@
                     <template #action="slotProps">
                         <j-space :size="16">
                             <j-tooltip>
-                                <template #title>{{ slotProps?.options?.LowCode ? '低码创建的菜单不支持编辑' : '编辑' }}</template>
+                                <template #title>{{
+                                    slotProps?.options?.LowCode
+                                        ? '低码创建的菜单不支持编辑'
+                                        : '编辑'
+                                }}</template>
                                 <j-button
                                     style="padding: 0"
                                     type="link"
@@ -54,8 +58,16 @@
                             <PermissionButton
                                 type="link"
                                 :hasPermission="`${permission}:add`"
-                                :tooltip="{ title: slotProps.level >= 3 ? '仅支持3级菜单' :   '新增子菜单' }"
-                                :disabled="slotProps.level >= 3 || slotProps?.options?.LowCode"
+                                :tooltip="{
+                                    title:
+                                        slotProps.level >= 3
+                                            ? '仅支持3级菜单'
+                                            : '新增子菜单',
+                                }"
+                                :disabled="
+                                    slotProps.level >= 3 ||
+                                    slotProps?.options?.LowCode
+                                "
                                 @click="table.addChildren(slotProps)"
                             >
                                 <AIcon type="PlusCircleOutlined" />
@@ -84,19 +96,19 @@ import PermissionButton from '@/components/PermissionButton/index.vue';
 import { getMenuTree_api, delMenuInfo_api } from '@/api/system/menu';
 import dayjs from 'dayjs';
 import { useUserInfo } from '@/store/userInfo';
-import { USER_CENTER_MENU_CODE,messageSubscribe } from '@/utils/consts'
+import { USER_CENTER_MENU_CODE, messageSubscribe } from '@/utils/consts';
 import { storeToRefs } from 'pinia';
 import { onlyMessage } from '@/utils/comm';
 
 const permission = 'system/Menu';
 
 const router = useRouter();
-const userInfoStore = useUserInfo()
-const { userInfos } = storeToRefs(userInfoStore)
+const userInfoStore = useUserInfo();
+const { userInfos } = storeToRefs(userInfoStore);
 
 const admin = computed(() => {
-  return userInfos.value?.username === 'admin';
-})
+    return userInfos.value?.username === 'admin';
+});
 
 const columns = [
     {
@@ -196,15 +208,15 @@ const table = reactive({
                     ],
                 },
                 {
-                  type: 'or',
-                  terms:[
-                    {
-                      value:"%show\":true%",
-                      termType:"like",
-                      column:"options"
-                    }
-                  ]
-            }
+                    type: 'or',
+                    terms: [
+                        {
+                            value: '%show":true%',
+                            termType: 'like',
+                            column: 'options',
+                        },
+                    ],
+                },
             ],
         };
         const params = {
@@ -223,7 +235,12 @@ const table = reactive({
         return {
             code: resp.message,
             result: {
-                data: resp.result?.filter((item: { code: string }) => ![USER_CENTER_MENU_CODE,messageSubscribe].includes(item.code)),
+                data: resp.result?.filter(
+                    (item: { code: string }) =>
+                        ![USER_CENTER_MENU_CODE, messageSubscribe].includes(
+                            item.code,
+                        ),
+                ),
                 pageIndex: resp.pageIndex,
                 pageSize: resp.pageSize,
                 total: resp.total,
@@ -238,7 +255,6 @@ const table = reactive({
                 row.url || ''
             }&sortIndex=${sortIndex + 1}`,
         );
-
     },
     // 跳转至详情页
     toDetails: (row: any) => {
@@ -250,14 +266,14 @@ const table = reactive({
     },
     // 删除
     clickDel: (row: any) => {
-        console.log(row.id);
-
-        delMenuInfo_api(row.id).then((resp: any) => {
+        const response = delMenuInfo_api(row.id);
+        response.then((resp: any) => {
             if (resp.status === 200) {
                 tableRef.value?.reload();
                 onlyMessage('操作成功!');
             }
         });
+        return response;
     },
     // 刷新列表
     refresh: () => {
diff --git a/src/views/system/Permission/components/EditDialog.vue b/src/views/system/Permission/components/EditDialog.vue
index 024b1f5a..3f8e82cc 100644
--- a/src/views/system/Permission/components/EditDialog.vue
+++ b/src/views/system/Permission/components/EditDialog.vue
@@ -186,8 +186,8 @@ const form = reactive({
             if (!id) return Promise.reject('请输入标识(ID)');
             else if (id.length > 64)
                 return Promise.reject('最多可输入64个字符');
-            else if (!/^\w+$/.test(id))
-                return Promise.reject('内容只能为字母、数字或者下划线！');
+            else if (!/^[a-zA-Z0-9_\-]+$/.test(id))
+                return Promise.reject('请输入英文或者数字或者-或者_');
             else if (props.data?.id && props.data?.id === form.data?.id)
                 return Promise.resolve();
             else {
diff --git a/src/views/system/Permission/index.vue b/src/views/system/Permission/index.vue
index 63120bc9..d21f5cc9 100644
--- a/src/views/system/Permission/index.vue
+++ b/src/views/system/Permission/index.vue
@@ -92,9 +92,9 @@
                                 :hasPermission="`${permission}:action`"
                                 type="link"
                                 :popConfirm="{
-                                    title: `确定要${
+                                    title: `确认${
                                         slotProps.status ? '禁用' : '启用'
-                                    }吗？`,
+                                    }？`,
                                     onConfirm: () =>
                                         table.changeStatus(slotProps),
                                 }"
@@ -243,7 +243,8 @@ const table = {
             paging: false,
             ...queryParams.value,
         };
-        exportPermission_api(params).then((resp) => {
+        const response = exportPermission_api(params)
+        response.then((resp) => {
             if (resp.status === 200) {
                 downloadObject(resp.result as any, '权限数据');
                 onlyMessage('导出成功');
@@ -251,6 +252,7 @@ const table = {
                 onlyMessage('导出错误', 'error');
             }
         });
+        return response
     },
     // 修改状态
     changeStatus: (row: any) => {
@@ -258,19 +260,23 @@ const table = {
             ...row,
             status: row.status ? 0 : 1,
         };
-        editPermission_api(params).then(() => {
+        const response = editPermission_api(params)
+        response.then(() => {
             onlyMessage('操作成功');
             tableRef.value.reload();
         });
+        return response
     },
     // 删除
     clickDel: (row: any) => {
-        delPermission_api(row.id).then((resp: any) => {
+        const response = delPermission_api(row.id)
+        response.then((resp: any) => {
             if (resp.status === 200) {
                 tableRef.value?.reload();
                 onlyMessage('操作成功!');
             }
         });
+        return response
     },
     // 刷新列表
     refresh: () => {
diff --git a/src/views/system/Platforms/Api/components/ApiDoes.vue b/src/views/system/Platforms/Api/components/ApiDoes.vue
index 3731ea6b..c470604b 100644
--- a/src/views/system/Platforms/Api/components/ApiDoes.vue
+++ b/src/views/system/Platforms/Api/components/ApiDoes.vue
@@ -313,7 +313,7 @@ onMounted(() => {
                 left: 0;
                 width: 4px;
                 height: 100%;
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 0 3px 3px 0;
                 content: ' ';
             }
diff --git a/src/views/system/Platforms/Api/components/ApiTest.vue b/src/views/system/Platforms/Api/components/ApiTest.vue
index 23afd4d0..c179f43f 100644
--- a/src/views/system/Platforms/Api/components/ApiTest.vue
+++ b/src/views/system/Platforms/Api/components/ApiTest.vue
@@ -62,7 +62,7 @@
                                     <PermissionButton
                                         type="text"
                                         :popConfirm="{
-                                            title: `确定删除`,
+                                            title: `确认删除`,
                                             onConfirm: () =>
                                                 requestBody.clickDel(index),
                                         }"
@@ -316,7 +316,7 @@ const pageArr = computed(() => {
                 left: 0;
                 width: 4px;
                 height: 100%;
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 0 3px 3px 0;
                 content: ' ';
             }
diff --git a/src/views/system/Platforms/Api/components/ChooseApi.vue b/src/views/system/Platforms/Api/components/ChooseApi.vue
index 12fb384d..e91a0723 100644
--- a/src/views/system/Platforms/Api/components/ChooseApi.vue
+++ b/src/views/system/Platforms/Api/components/ChooseApi.vue
@@ -10,7 +10,7 @@
             >
                 <template #url="slotProps">
                     <span
-                        style="color: #1d39c4; cursor: pointer"
+                        style="color: #1677FF; cursor: pointer"
                         @click="emits('update:clickApi', slotProps)"
                         >{{ slotProps.url }}</span
                     >
@@ -153,7 +153,7 @@ const save = async () => {
                 emits('refresh');
             }
         } else {
-            onlyMessage('请选择API接口','error')
+            onlyMessage('与上次勾选数据一致，未执行调用操作','error')
             return
         }
     } else if (props.mode === 'appManger') {
diff --git a/src/views/system/Region/Save/GeoJsonModal.vue b/src/views/system/Region/Save/GeoJsonModal.vue
new file mode 100644
index 00000000..dffa3172
--- /dev/null
+++ b/src/views/system/Region/Save/GeoJsonModal.vue
@@ -0,0 +1,46 @@
+<template>
+  <j-modal
+    visible
+    width="650px"
+    title="上传GeoJson"
+    :maskClosable="false"
+    @ok="handleSave"
+    @cancel="handleCancel"
+  >
+    <div>
+      仅支持获取单个区域数据
+    </div>
+    <j-monaco-editor
+      language="json"
+      style="height: 400px"
+      v-model:modelValue="myValue"
+    />
+  </j-modal>
+</template>
+
+<script setup name="GeoJsonModal">
+
+const props = defineProps({
+  value: {
+    type: String,
+    default: undefined
+  }
+})
+
+const emit = defineEmits(['ok', 'cancel'])
+
+const myValue = ref(props.value ? JSON.stringify(props.value) : undefined)
+
+const handleSave = () => {
+  emit('ok', myValue.value ? JSON.parse(myValue.value) : undefined)
+}
+
+const handleCancel = () => {
+  emit('cancel')
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/system/Region/util.ts b/src/views/system/Region/util.ts
new file mode 100644
index 00000000..cc99d26e
--- /dev/null
+++ b/src/views/system/Region/util.ts
@@ -0,0 +1,31 @@
+export const MAP_TOOL = {
+    'rectangle': 'rectangle',
+    'polygon': 'polygon',
+    'circle': 'circle',
+    'tool': 'tool',
+    'district': 'district',
+    'geoJson': 'geoJson',
+}
+
+export const syncChildren = (code: string, area: any[]) => {
+    const findItem = (code: string, children: any[] = []): any[] => {
+        let _children: any[] = []
+        children.some(item => {
+            if (item.code === code ) {
+                _children = item.children
+                return true
+            } else if (item.children) {
+                _children = findItem(code, item.children)
+                return _children.length
+            }
+            return false
+        })
+
+        return _children.map(item => {
+            item.children = []
+            return item
+        })
+    }
+
+    return findItem(code, area)
+}
diff --git a/src/views/system/Relationship/index.vue b/src/views/system/Relationship/index.vue
index 7184bab3..f7b9e2d5 100644
--- a/src/views/system/Relationship/index.vue
+++ b/src/views/system/Relationship/index.vue
@@ -169,7 +169,8 @@ const table = {
     },
     // 删除
     clickDel: (row: any) => {
-        delRelation_api(row.id).then((resp: any) => {
+       const response =  delRelation_api(row.id)
+       response.then((resp: any) => {
             if (resp.status === 200) {
                 tableRef.value?.reload();
                 onlyMessage('操作成功!');
@@ -177,6 +178,7 @@ const table = {
                 onlyMessage(resp.message, 'error');
             }
         });
+        return response
     },
     // 刷新列表
     refresh: () => {
diff --git a/src/views/system/Role/Detail/Permiss/index.vue b/src/views/system/Role/Detail/Permiss/index.vue
index 519c1f52..a5df465b 100644
--- a/src/views/system/Role/Detail/Permiss/index.vue
+++ b/src/views/system/Role/Detail/Permiss/index.vue
@@ -82,7 +82,7 @@ const form = reactive({
     //         }
     //     });
     // },
-    clickSave: () => {   
+    clickSave: () => {
         // formRef.value?.validate().then(() => {
             // const updateRole = editRole_api(roleId, form.data);
           if(form.menus?.length > 0){
@@ -125,11 +125,11 @@ const form = reactive({
 
             &::before {
                 position: absolute;
-                top: 5px px;
+                top: 5px;
                 left: 0;
                 width: 4px;
                 height: calc(100% - 10px);
-                background-color: #1d39c4;
+                background-color: @primary-color;
                 border-radius: 2px;
                 content: ' ';
             }
diff --git a/src/views/system/Role/Detail/components/PermissTree.vue b/src/views/system/Role/Detail/components/PermissTree.vue
index 0f409216..c1cdca29 100644
--- a/src/views/system/Role/Detail/components/PermissTree.vue
+++ b/src/views/system/Role/Detail/components/PermissTree.vue
@@ -53,6 +53,7 @@
                     <j-checkbox
                         v-model:checked="record.granted"
                         :indeterminate="record.indeterminate"
+                        :disabled='record.code === USER_CENTER_MENU_CODE'
                         @change="menuChange(record, true)"
                         >{{ record.name }}</j-checkbox
                     >
@@ -65,6 +66,7 @@
                             v-for="button in record.buttons"
                             v-model:checked="button.granted"
                             @change="actionChange(record)"
+                            :disabled='record.code === USER_CENTER_MENU_CODE && button.id === "view"'
                             :key="button.id"
                             >{{ button.name }}</j-checkbox
                         >
@@ -239,7 +241,7 @@ const init = () => {
             const selected = cloneDeep(flatTableData).filter(
                 (item: any) =>
                     // (item.granted && item.parentId) ||
-                    (item.indeterminate && item.buttons) 
+                    (item.indeterminate && item.buttons)
                     || (item.granted), // 放开个人中心
             );
 
@@ -281,6 +283,16 @@ function getAllPermiss() {
         const _result = resp.result
         // 默认选中个人中心相关设置
         tableData.value = _result.filter((item: { code: string , buttons: any[], granted: boolean}) => {
+
+          if (item.code === USER_CENTER_MENU_CODE) {
+            item.buttons = item.buttons.map(buttonItem => {
+              if (buttonItem.id === 'view') {
+                buttonItem.granted = true
+              }
+              return buttonItem
+            })
+          }
+
           return (item.code !== NotificationSubscriptionCode)
         });
 
@@ -310,7 +322,6 @@ const hasIndirectMenus = (data: any) => {
 
   if (indirectMenus.length) {
       const ids = permissionsGranted(tableData.value)
-    console.log(ids, indirectMenus)
       const inMenu = false
   }
 
@@ -325,7 +336,6 @@ function menuChange(
     row: tableItemType,
     setButtonBool: boolean = true,
 ): undefined {
-  console.log('menuChange', row)
     // 判断是否需要对子菜单及操作权限进行选择
   // hasIndirectMenus(row)
     if (setButtonBool) {
@@ -336,8 +346,7 @@ function menuChange(
         row.children && setChildrenChecked(row.children, row.granted);
     }
     // 更新选中状态
-    if (row.buttons && row.buttons.length > 0) setStatus(row, 'buttons');
-    else setStatus(row, 'children');
+    setStatus(row, row.buttons && row.buttons.length > 0 ? 'buttons' : 'children')
     // 更新数据权限
     updateAuthority(row);
     // if (row.accessSupport && row.accessSupport.value === 'support') {
diff --git a/src/views/system/Role/RoleLeft/index.vue b/src/views/system/Role/RoleLeft/index.vue
index c78f55dc..1fd0a57c 100644
--- a/src/views/system/Role/RoleLeft/index.vue
+++ b/src/views/system/Role/RoleLeft/index.vue
@@ -54,7 +54,7 @@
                                     style="padding: 0"
                                     hasPermission="system/Role:groupDelete"
                                     :popConfirm="{
-                                        title: `确定要删除？`,
+                                        title: `确认删除？`,
                                         onConfirm: () => deleteGroup(item.id),
                                     }"
                                     :disabled="item.id === 'default_group'"
diff --git a/src/views/system/Role/RoleRight/index.vue b/src/views/system/Role/RoleRight/index.vue
index 76de9320..06224533 100644
--- a/src/views/system/Role/RoleRight/index.vue
+++ b/src/views/system/Role/RoleRight/index.vue
@@ -17,7 +17,7 @@
                     </template>
 
                     <template #action="slotProps">
-                        <j-space>
+                        <j-space :size="16">
                             <template v-for="i in getActions(slotProps, 'table')" :key="i.key">
                                 <PermissionButton :disabled="i.disabled" :popConfirm="i.popConfirm" :tooltip="{
                                     ...i.tooltip,
diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index 5c148564..66982ad1 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -74,7 +74,7 @@
             </j-row>
             <j-row :gutter="24" v-if="form.IsShow('add', 'edit')">
                 <j-col :span="12">
-                    <j-form-item name="roleIdList" label="角色" class="flex" 
+                    <j-form-item name="roleIdList" label="角色" class="flex"
                         :rules="[
                             { required: form.data.username !== 'admin', message: '请选择角色' },
                         ]"
@@ -89,7 +89,7 @@
                             :fieldNames="{ label: 'name', value: 'id', children:'children' }"
                             :disabled="form.data.username === 'admin'"
                             :filterTreeNode="
-                                (v: string, node: any) => filterSelectNode(v, node, 'name')
+                                (v, node) => filterSelectNode(v, node, 'name')
                             "
                         >
                         <template #title="{ name }">
@@ -145,10 +145,10 @@
                         :validateFirst="true"
                         :rules="[
                             { required: true, message: '请输入用户名' },
-                            {
-                                validator: checkCh,
-                                trigger: ['change', 'blur'],
-                            },
+                            // {
+                            //     validator: checkCh,
+                            //     trigger: ['change', 'blur'],
+                            // },
                             {
                                 validator: form.rules.checkUserName,
                                 trigger: 'blur',
@@ -412,7 +412,7 @@ const  dealRoleList = (data:any) =>{
         }
     })
 }
-// 组织已删除在仍显示在列表中 
+// 组织已删除在仍显示在列表中
 // const _departmentOptions = computed(() => {
 //     return uniqBy([...form.departmentOptions, ...form._departmentOptions], 'id')
 // })
@@ -468,8 +468,8 @@ type optionType = {
                 .ant-btn {
                     width: 32px;
                     height: 32px;
-                    border: 1px solid #1d39c4;
-                    color: #1d39c4;
+                    border: 1px solid @primary-color;
+                    color: @primary-color;
                     display: flex;
                     align-items: center;
                     justify-content: center;
diff --git a/src/views/user/Login/index.vue b/src/views/user/Login/index.vue
index f37bd2ea..4e6a07db 100644
--- a/src/views/user/Login/index.vue
+++ b/src/views/user/Login/index.vue
@@ -1,170 +1,172 @@
 <template>
-    <div>
-        <j-spin :spinning="loading" :delay="500">
-            <div class="container">
-                <div class="left">
-                    <img
-                        style="width: 100%; height: 100%"
-                        :src="basis.background || getImage('/login.png')"
-                    />
-                    <a
-                        href="https://beian.miit.gov.cn/#/Integrated/index"
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        class="records"
+  <div>
+    <j-spin :spinning="loading" :delay="500">
+      <div class="container">
+        <div class="left">
+          <img
+            style="width: 100%; height: 100%"
+            :src="basis.background || getImage('/login.png')"
+          />
+          <a
+            v-if="basis.showRecordNumber"
+            href="https://beian.miit.gov.cn/#/Integrated/index"
+            target="_blank"
+            rel="noopener noreferrer"
+            class="records"
+          >
+            {{ $t('Login.index.265048-0') }}{{ basis.recordNumber || $t('Login.index.265048-1') }}
+          </a>
+        </div>
+        <div class="right">
+          <div class="content">
+            <div class="top">
+              <div class="header">
+                <!-- <link to="/"> -->
+                <img
+                  alt="logo"
+                  class="logo"
+                  :src="basis.logo || getImage('/logo.png')"
+                />
+                <!-- </link> -->
+              </div>
+              <div class="desc">
+                {{ basis.title || SystemConst.SYSTEM_NAME }}
+              </div>
+              <div class="main">
+                <j-form
+                  layout="vertical"
+                  :model="form"
+                  class="login-form"
+                  @finish="onFinish"
+                  :rules="rules"
+                >
+                  <j-form-item :label="$t('Login.index.265048-2')" name="username">
+                    <j-input
+                      v-model:value="form.username"
+                      :placeholder="$t('Login.index.265048-3')"
+                      :maxlength="64"
+                    ></j-input>
+                  </j-form-item>
+                  <j-form-item :label="$t('Login.index.265048-4')" name="password">
+                    <j-input-password
+                      v-model:value="form.password"
+                      :placeholder="$t('Login.index.265048-5')"
+                      :maxlength="64"
+                    ></j-input-password>
+                  </j-form-item>
+                  <j-form-item
+                    v-if="codeConfig"
+                    class="verifyCode"
+                    :label="$t('Login.index.265048-6')"
+                    name="verifyCode"
+                  >
+                    <j-input
+                      v-model:value="form.verifyCode"
+                      autocomplete="off"
+                      :maxlength="64"
+                      :placeholder="$t('Login.index.265048-7')"
                     >
-                        备案：渝ICP备19017719号-1
-                    </a>
-                </div>
-                <div class="right">
-                    <div class="content">
-                        <div class="top">
-                            <div class="header">
-                                <!-- <link to="/"> -->
-                                <img
-                                    alt="logo"
-                                    class="logo"
-                                    :src="basis.logo || getImage('/logo.png')"
-                                />
-                                <!-- </link> -->
-                            </div>
-                            <div class="desc">
-                                {{ basis.title || SystemConst.SYSTEM_NAME }}
-                            </div>
-                            <div class="main">
-                                <j-form
-                                    layout="vertical"
-                                    :model="form"
-                                    class="login-form"
-                                    @finish="onFinish"
-                                    :rules="rules"
-                                >
-                                    <j-form-item label="账号" name="username">
-                                        <j-input
-                                            v-model:value="form.username"
-                                            placeholder="请输入账号"
-                                            :maxlength="64"
-                                        ></j-input>
-                                    </j-form-item>
-                                    <j-form-item label="密码" name="password">
-                                        <j-input-password
-                                            v-model:value="form.password"
-                                            placeholder="请输入密码"
-                                            :maxlength="64"
-                                        ></j-input-password>
-                                    </j-form-item>
-                                    <j-form-item
-                                        v-if="codeConfig"
-                                        class="verifyCode"
-                                        label="验证码"
-                                        name="verifyCode"
-                                    >
-                                        <j-input
-                                            v-model:value="form.verifyCode"
-                                            autocomplete="off"
-                                            :maxlength="64"
-                                            placeholder="请输入验证码"
-                                        >
-                                            <template #addonAfter>
-                                                <div>
-                                                    <img
-                                                        :src="codeUrl"
-                                                        @click="getCode()"
-                                                    />
-                                                </div>
-                                            </template>
-                                        </j-input>
-                                    </j-form-item>
-                                    <j-form-item
-                                        name="remember"
-                                        style="text-align: left"
-                                    >
-                                        <j-checkbox
-                                            v-model:checked="form.remember"
-                                            @change="
+                      <template #addonAfter>
+                        <div>
+                          <img
+                            :src="codeUrl"
+                            @click="getCode()"
+                          />
+                        </div>
+                      </template>
+                    </j-input>
+                  </j-form-item>
+                  <j-form-item
+                    name="remember"
+                    style="text-align: left"
+                  >
+                    <j-checkbox
+                      v-model:checked="form.remember"
+                      @change="
                                                 () =>
                                                     (form.expires =
                                                         form.remember
                                                             ? -1
                                                             : 3600000)
                                             "
-                                            >记住我</j-checkbox
-                                        >
-                                    </j-form-item>
-                                    <j-form-item>
-                                        <j-button
-                                            :loading="loading"
-                                            type="primary"
-                                            html-type="submit"
-                                            class="login-form-button"
-                                            block
-                                        >
-                                            登录
-                                        </j-button>
-                                    </j-form-item>
-                                </j-form>
-                                <div class="other" v-if="bindings.length">
-                                    <j-divider plain>
-                                        <div class="other-text">
-                                            其他登录方式
-                                        </div>
-                                    </j-divider>
-                                    <div class="other-button">
-                                        <div
-                                            class="other-button-item"
-                                            v-for="(
+                    >{{ $t('Login.index.265048-8') }}
+                    </j-checkbox
+                    >
+                  </j-form-item>
+                  <j-form-item>
+                    <j-button
+                      :loading="loading"
+                      type="primary"
+                      html-type="submit"
+                      class="login-form-button"
+                      block
+                    >
+                      {{ $t('Login.index.265048-9') }}
+                    </j-button>
+                  </j-form-item>
+                </j-form>
+                <div class="other" v-if="bindings.length">
+                  <j-divider plain>
+                    <div class="other-text">
+                      {{ $t('Login.index.265048-10') }}
+                    </div>
+                  </j-divider>
+                  <div class="other-button">
+                    <div
+                      class="other-button-item"
+                      v-for="(
                                                 item, index
                                             ) in bindings.slice(0, 4)"
-                                            :key="index"
-                                            @click="handleClickOther(item)"
-                                        >
-                                            <img
-                                                style="
+                      :key="index"
+                      @click="handleClickOther(item)"
+                    >
+                      <img
+                        style="
                                                     width: 32px;
                                                     height: 32px;
                                                 "
-                                                :alt="item.name"
-                                                :src="
+                        :alt="item.name"
+                        :src="
                                                     item.logoUrl ||
                                                     iconMap.get(
                                                         item.provider,
                                                     ) ||
                                                     defaultImg
                                                 "
-                                            />
-                                        </div>
-                                        <j-popover
-                                            trigger="click"
-                                            v-model:visible="moreVisible"
-                                            placement="bottomRight"
-                                        >
-                                            <template #content>
-                                                <j-scrollbar :max-height="120">
-                                                    <div class="more-button">
-                                                        <div
-                                                            class="more-button-item"
-                                                            v-for="(
+                      />
+                    </div>
+                    <j-popover
+                      trigger="click"
+                      v-model:visible="moreVisible"
+                      placement="bottomRight"
+                    >
+                      <template #content>
+                        <j-scrollbar :max-height="120">
+                          <div class="more-button">
+                            <div
+                              class="more-button-item"
+                              v-for="(
                                                                 item, index
                                                             ) in bindings.slice(4,bindings.length-1)"
-                                                            :key="index"
-                                                            @click="
+                              :key="index"
+                              @click="
                                                                 handleClickOther(
                                                                     item,
                                                                 )
                                                             "
-                                                        >
-                                                            <img
-                                                                style="
+                            >
+                              <img
+                                style="
                                                                     width: 32px;
                                                                     height: 32px;
                                                                 "
-                                                                :alt="item.name"
-                                                                :src="
+                                :alt="item.name"
+                                :src="
                                                                     item.logoUrl
                                                                 "
-                                                            />
-                                                            <Ellipsis
-                                                                style="
+                              />
+                              <Ellipsis
+                                style="
                                                                     margin-top: 5px;
                                                                     width: calc(
                                                                         100%
@@ -172,107 +174,100 @@
                                                                     margin: 0
                                                                         auto;
                                                                 "
-                                                            >
-                                                                {{ item.name }}
-                                                            </Ellipsis>
-                                                        </div>
-                                                    </div>
-                                                </j-scrollbar>
-                                            </template>
-                                            <div
-                                                v-if="bindings.length > 4"
-                                                class="more"
-                                            >
-                                                <AIcon
-                                                    class="moreIcon"
-                                                    type="MoreOutlined"
-                                                    style="font-size: 20px"
-                                                ></AIcon>
-                                            </div>
-                                        </j-popover>
-                                    </div>
-                                    <!-- <div class="more" v-if="bindings.length > 4" @click="moreVisible = true">
-                                        查看更多
-                                    </div> -->
-                                </div>
+                              >
+                                {{ item.name }}
+                              </Ellipsis>
                             </div>
-                        </div>
-                    </div>
-                    <div v-if="basis.recommend === 'true'" class="bottom">
-                        <div class="view">
-                            JETLINKS团队全新力作可视化大屏系统
-                        </div>
-                        <div class="url">
-                            <div style="height: 33px">
-                                <img :src="viewLogo" />
-                            </div>
-                            <a
-                                href="https://view.jetlinks.cn/"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                            >
-                                体验DEMO
-                            </a>
-                        </div>
-                    </div>
+                          </div>
+                        </j-scrollbar>
+                      </template>
+                      <div
+                        v-if="bindings.length > 4"
+                        class="more"
+                      >
+                        <AIcon
+                          class="moreIcon"
+                          type="MoreOutlined"
+                          style="font-size: 20px"
+                        ></AIcon>
+                      </div>
+                    </j-popover>
+                  </div>
+                  <!-- <div class="more" v-if="bindings.length > 4" @click="moreVisible = true">
+                      查看更多
+                  </div> -->
                 </div>
+              </div>
             </div>
-        </j-spin>
-    </div>
-    <!-- <j-modal
-        title="更多登录"
-        :visible="moreVisible"
-        @cancel="() => (moreVisible = false)"
-        :footer="null"
-        :width="800"
-    >
-        <div class="more-button">
-            <div
-                class="more-button-item"
-                v-for="(item, index) in bindings"
-                :key="index"
-                @click="handleClickOther(item)"
-            >
-                <img
-                    style="width: 100px; height: 100px"
-                    :alt="item.name"
-                    :src="item.logoUrl"
-                />
-                <Ellipsis
-                    style="
-                        margin-top: 5px;
-                        width: calc(100% - 40px);
-                        margin: 0 auto;
-                    "
-                >
-                    {{ item.name }}
-                </Ellipsis>
+          </div>
+          <div v-if="basis.recommend === 'true'" class="bottom">
+            <div class="view">
+              {{ $t('Login.index.265048-11') }}
             </div>
+            <div class="url">
+              <div style="height: 33px">
+                <img :src="viewLogo"/>
+              </div>
+              <a
+                href="https://view.jetlinks.cn/"
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {{ $t('Login.index.265048-12') }}
+              </a>
+            </div>
+          </div>
         </div>
-    </j-modal> -->
+      </div>
+    </j-spin>
+  </div>
+  <!-- <j-modal
+      title="更多登录"
+      :visible="moreVisible"
+      @cancel="() => (moreVisible = false)"
+      :footer="null"
+      :width="800"
+  >
+      <div class="more-button">
+          <div
+              class="more-button-item"
+              v-for="(item, index) in bindings"
+              :key="index"
+              @click="handleClickOther(item)"
+          >
+              <img
+                  style="width: 100px; height: 100px"
+                  :alt="item.name"
+                  :src="item.logoUrl"
+              />
+              <Ellipsis
+                  style="
+                      margin-top: 5px;
+                      width: calc(100% - 40px);
+                      margin: 0 auto;
+                  "
+              >
+                  {{ item.name }}
+              </Ellipsis>
+          </div>
+      </div>
+  </j-modal> -->
 </template>
 
 <script setup lang="ts">
-import { getImage } from '@/utils/comm';
-import {
-    config,
-    code,
-    authLogin,
-    getInitSet,
-    systemVersion,
-    bindInfo,
-    settingDetail,
-    userDetail,
-    authLoginConfig,
-} from '@/api/login';
-import { useUserInfo } from '@/store/userInfo';
-import { useSystem } from '@/store/system';
-import { LocalStore } from '@/utils/comm';
-import { BASE_API_PATH, TOKEN_KEY, Version_Code } from '@/utils/variable';
-import { SystemConst } from '@/utils/consts';
-import { encrypt } from '@/utils/encrypt';
-import { closeWs } from '@/utils/websocket';
+import {getImage, LocalStore} from '@/utils/comm';
+import {authLogin, authLoginConfig, bindInfo, code, config, getInitSet, systemVersion, userDetail,} from '@/api/login';
+import {useUserInfo} from '@/store/userInfo';
+import {useSystem} from '@/store/system';
+import {BASE_API_PATH, TOKEN_KEY, Version_Code} from '@/utils/variable';
+import {SystemConst} from '@/utils/consts';
+import {encrypt} from '@/utils/encrypt';
+import {closeWs} from '@/utils/websocket';
+import {defaultImg, iconMap} from './utils'
+import {useRequest} from '@/hook'
+import { useI18n } from 'vue-i18n'
 
+const { t: $t } = useI18n()
 const store = useUserInfo();
 const systemStore = useSystem();
 const router = useRouter();
@@ -280,197 +275,206 @@ const bgImage = getImage('/logo.png');
 const viewLogo = getImage('/view-logo.png');
 
 const LoginWarpStyle = reactive({
-    backgroundImage: `url(${bgImage})`,
+  backgroundImage: `url(${bgImage})`,
 });
 const moreVisible = ref(false);
 const screenWidth = ref(document.body.clientWidth);
 const screenHeight = ref(document.body.clientHeight);
 
 const form = reactive({
-    username: '',
-    password: '',
-    remember: false,
-    expires: 3600000,
-    verifyCode: '',
-    verifyKey: '',
+  username: '',
+  password: '',
+  remember: false,
+  expires: 3600000,
+  verifyCode: '',
+  verifyKey: '',
 });
 
 const RsaConfig = reactive<any>({
-    enabled: false, //是否加密
-    publicKey: '', //rsa公钥,使用此公钥对密码进行加密
-    id: '', //密钥ID
+  enabled: false, //是否加密
+  publicKey: '', //rsa公钥,使用此公钥对密码进行加密
+  id: '', //密钥ID
 });
 
-const rules = {
-    username: [
-        {
-            validator(_: any, value: string) {
-                if (!value) {
-                    return Promise.reject('请输入账号!');
-                }
-                return Promise.resolve();
-            },
-        },
-    ],
-    password: [
-        {
-            validator(_: any, value: string) {
-                if (!value) {
-                    return Promise.reject('请输入密码!');
-                }
-                return Promise.resolve();
-            },
-        },
-    ],
-    verifyCode: [
-        {
-            validator(_: any, value: string) {
-                if (!value) {
-                    return Promise.reject('请输入验证码!');
-                }
-                return Promise.resolve();
-            },
-        },
-    ],
-};
-
 const codeUrl = ref('');
 const codeConfig = ref(false);
 
-const loading = ref(false);
 const bindings = ref<any[]>([]);
-// const basis = ref<any>({});
 
-const defaultImg = getImage('/apply/internal-standalone.png');
-const iconMap = new Map();
-iconMap.set('dingtalk-ent-app', getImage('/bind/dingtalk.png'));
-iconMap.set('wechat-webapp', getImage('/bind/wechat-webapp.png'));
-iconMap.set('internal-standalone', getImage('/apply/internal-standalone.png'));
-iconMap.set('third-party', getImage('/apply/third-party.png'));
-iconMap.set('wechat-miniapp', getImage('/apply/wechat-miniapp.png'));
+let timer: any = null
 
-const onFinish = async () => {
-    try {
-        loading.value = true;
-
-        const data = {
-            ...form,
-            password: RsaConfig.enabled
-                ? encrypt(form.password, RsaConfig.publicKey)
-                : form.password,
-            encryptId: RsaConfig.enabled ? RsaConfig.id : undefined,
-        };
-
-        const res: any = await authLogin(data);
-        loading.value = false;
-        if (res.success) {
-            LocalStore.set(TOKEN_KEY, res?.result.token);
-            const userResp = await userDetail();
-            if (userResp.success) {
-                store.$patch({
-                    userInfos: {
-                        ...userResp.result,
-                        token: res?.result.token,
-                    },
-                    isAdmin: userResp.username === 'admin',
-                });
-
-                if (userResp.result?.username === 'admin') {
-                    const resp: any = await getInitSet();
-                    if (resp.status === 200 && !resp.result.length) {
-                        window.location.href = '/#/init-home';
-                        // router.push('/init-home')
-                        return;
-                    }
-                }
-            } else {
-                store.$patch({
-                    ...res.result,
-                });
-            }
-            window.location.href = '/';
-            // router.push('/')
+const rules = {
+  username: [
+    {
+      validator(_: any, value: string) {
+        if (!value) {
+          return Promise.reject($t('Login.index.265048-13'));
         }
-    } catch (error) {
-        form.verifyCode = '';
-        getCode();
-        loading.value = false;
-        getRsa();
-    }
+        return Promise.resolve();
+      },
+    },
+  ],
+  password: [
+    {
+      validator(_: any, value: string) {
+        if (!value) {
+          return Promise.reject($t('Login.index.265048-14'));
+        }
+        return Promise.resolve();
+      },
+    },
+  ],
+  verifyCode: [
+    {
+      validator(_: any, value: string) {
+        if (!value) {
+          return Promise.reject($t('Login.index.265048-15'));
+        }
+        return Promise.resolve();
+      },
+    },
+  ],
 };
 
-const getCode = async () => {
-    const configRes: any = await config();
-    if (!configRes.success || (configRes.success && !configRes.result.enabled))
-        return;
+const {loading, run: loginFn} = useRequest(authLogin, {
+  immediate: false,
+  onSuccess: async (resp) => {
+    LocalStore.set(TOKEN_KEY, resp.result.token);
+    const userResp = await userDetail();
 
-    codeConfig.value = true;
-    const res: any = await code();
-    if (res.success) {
-        codeUrl.value = res.result.base64;
-        form.verifyKey = res.result.key;
+    removeTimer()
+    if (userResp.success) {
+      const isAdmin = userResp.result.username === 'admin'
+      store.$patch({
+        userInfos: {
+          ...userResp.result,
+          token: resp.result.token,
+          isAdmin: userResp.result.username === 'admin'
+        },
+      })
+      if (isAdmin) {
+        const initResp = await getInitSet()
+        if (initResp.success && !initResp.result?.length) {
+          window.location.href = '/#/init-home';
+          return;
+        }
+      }
+    } else {
+      store.$patch({
+        ...resp.result,
+      });
     }
+    window.location.href = '/';
+  },
+  onError() {
+    form.verifyCode = '';
+    getCode();
+    getRsa();
+  }
+})
+// const basis = ref<any>({});
+
+const onFinish = async () => {
+
+  let passwordConfig = {}
+
+  if (RsaConfig.enabled) {
+    passwordConfig = {
+      password: encrypt(form.password, RsaConfig.publicKey),
+      encryptId: RsaConfig.id
+    }
+  }
+
+  loginFn({
+    ...form,
+    ...passwordConfig
+  })
+};
+
+const removeTimer = () => {
+  if (timer) {
+    window.clearTimeout(timer)
+    timer = null
+  }
+}
+
+const getCode = async () => {
+  const configRes: any = await config();
+  if (!configRes.success || (configRes.success && !configRes.result.enabled))
+    return;
+
+  codeConfig.value = true;
+  const res: any = await code();
+  if (res.success) {
+    codeUrl.value = res.result.base64;
+    form.verifyKey = res.result.key;
+
+    removeTimer()
+    timer = setTimeout(() => {
+      getCode()
+    }, 5 * 60 * 1000)
+  }
 };
 
 const getOpen = () => {
-    LocalStore.removeAll();
-    systemVersion().then((res: any) => {
-        if (res.success && res.result) {
-            LocalStore.set(Version_Code, res.result.edition);
-            if (res.result.edition !== 'community') {
-                bindInfo().then((res: any) => {
-                    if (res.success) {
-                        bindings.value = res.result;
-                    }
-                });
-            }
-        }
-    });
-    systemStore.getFront();
+  LocalStore.removeAll();
+  systemVersion().then((res: any) => {
+    if (res.success && res.result) {
+      LocalStore.set(Version_Code, res.result.edition);
+      if (res.result.edition !== 'community') {
+        bindInfo().then((res: any) => {
+          if (res.success) {
+            bindings.value = res.result;
+          }
+        });
+      }
+    }
+  });
+  systemStore.getFront();
 };
 
 //获取加密信息
 const getRsa = async () => {
-    const res: any = await authLoginConfig();
-    if (res.status === 200) {
-        if (res.result?.encrypt) {
-            RsaConfig.enabled = res.result?.encrypt.enabled;
-            RsaConfig.publicKey = res.result?.encrypt.publicKey;
-            RsaConfig.id = res.result?.encrypt.id;
-        }
+  const res: any = await authLoginConfig();
+  if (res.status === 200) {
+    if (res.result?.encrypt) {
+      RsaConfig.enabled = res.result?.encrypt.enabled;
+      RsaConfig.publicKey = res.result?.encrypt.publicKey;
+      RsaConfig.id = res.result?.encrypt.id;
     }
+  }
 };
 
-const basis = computed(() => {
-    return systemStore.configInfo['front'] || {};
+const basis: any = computed(() => {
+  return systemStore.configInfo['front'] || {};
 });
 const handleClickOther = (item: any) => {
-    LocalStore.set('onLogin', 'no');
-    window.open(`${BASE_API_PATH}/application/sso/${item.id}/login`);
-    window.onstorage = (e) => {
-        if (e.newValue) {
-            window.location.href = '/';
-        }
-    };
+  LocalStore.set('onLogin', 'no');
+  window.open(`${BASE_API_PATH}/application/sso/${item.id}/login`);
+  window.onstorage = (e) => {
+    if (e.newValue) {
+      window.location.href = '/';
+    }
+  };
 };
 
 const screenRotation = (width: number, height: number) => {
-    LoginWarpStyle.backgroundImage = `url(${bgImage})`;
+  LoginWarpStyle.backgroundImage = `url(${bgImage})`;
 };
 
 window.onresize = () => {
-    return (() => {
-        screenWidth.value = document.body.clientWidth;
-        screenHeight.value = document.body.clientHeight;
-    })();
+  return (() => {
+    screenWidth.value = document.body.clientWidth;
+    screenHeight.value = document.body.clientHeight;
+  })();
 };
 
 watch(
-    [() => screenWidth.value, () => screenHeight.value],
-    (value) => {
-        screenRotation(value[0], value[1]);
-    },
-    { deep: true },
+  [() => screenWidth.value, () => screenHeight.value],
+  (value) => {
+    screenRotation(value[0], value[1]);
+  },
+  {deep: true},
 );
 
 getOpen();
@@ -479,241 +483,246 @@ screenRotation(screenWidth.value, screenHeight.value);
 
 closeWs();
 onMounted(() => {
-    getRsa();
+  getRsa();
 });
 </script>
 
 <style scoped lang="less">
 .container {
+  display: flex;
+  height: 100vh;
+  overflow: auto;
+  background: @layout-body-background;
+
+  .left {
+    width: 73%;
+    height: 100%;
+
+    .records {
+      position: absolute;
+      top: 96%;
+      left: 35%;
+      color: rgba(0, 0, 0, 0.35);
+      font-size: 14px;
+    }
+  }
+
+  .right {
     display: flex;
-    height: 100vh;
-    overflow: auto;
-    background: @layout-body-background;
+    flex-direction: column;
+    justify-content: space-between;
+    width: 27%;
+    background: #fff;
 
-    .left {
-        width: 73%;
-        height: 100%;
-
-        .records {
-            position: absolute;
-            top: 96%;
-            left: 35%;
-            color: rgba(0, 0, 0, 0.35);
-            font-size: 14px;
-        }
-    }
-
-    .right {
-        display: flex;
-        flex-direction: column;
-        justify-content: space-between;
-        width: 27%;
-        background: #fff;
-
-        :deep(.ant-layout-footer) {
-            background: #fff;
-        }
-
-        .content {
-            display: flex;
-            flex-direction: row-reverse;
-            justify-content: center;
-            padding: 0 0 15% 0;
-            margin-top: 20%;
-
-            .top {
-                width: 100%;
-                // text-align: center;
-
-                .header {
-                    height: 44px;
-                    line-height: 44px;
-                    text-align: center;
-
-                    a {
-                        text-decoration: none;
-                    }
-
-                    .logo {
-                        height: 44px;
-                        margin-right: 16px;
-                        vertical-align: top;
-                    }
-
-                    .title {
-                        position: relative;
-                        top: 2px;
-                        color: @heading-color;
-                        font-weight: 600;
-                        font-size: 33px;
-                        font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
-                            sans-serif;
-                    }
-                }
-
-                .desc {
-                    margin-top: 12px;
-                    margin-bottom: 40px;
-                    // color: @heading-color;
-                    color: rgb(0 0 0 / 70%);
-                    font-weight: 600;
-                    font-size: 22px;
-                    font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
-                        sans-serif;
-                    text-align: center;
-                }
-
-                .main {
-                    width: 70%;
-                    margin: 60px auto 0;
-
-                    @media screen and (max-width: @screen-sm) {
-                        width: 95%;
-                        max-width: 328px;
-                    }
-
-                    .icon {
-                        margin-left: 16px;
-                        color: rgba(0, 0, 0, 0.2);
-                        font-size: 24px;
-                        vertical-align: middle;
-                        cursor: pointer;
-                        transition: color 0.3s;
-
-                        &:hover {
-                            color: @primary-color;
-                        }
-                    }
-
-                    .other {
-                        margin-top: 20px;
-
-                        .other-text {
-                            color: #807676d9;
-                            font-size: 12px;
-                        }
-
-                        .other-button {
-                            position: relative;
-                            bottom: 10px;
-                            text-align: center;
-                            display: flex;
-                            gap: 24px;
-                            justify-content: center;
-                            flex-wrap: wrap;
-
-                            .other-button-item {
-                                cursor: pointer;
-                                padding: 4px;
-                            }
-                        }
-                        .more {
-                            cursor: pointer;
-                            .moreIcon {
-                                transform: translateY(50%);
-                            }
-                        }
-                        .more{
-                            text-align: center;
-                            cursor: pointer;
-                        }
-                    }
-
-                    .prefixIcon {
-                        color: @primary-color;
-                        font-size: @font-size-base;
-                    }
-
-                    .remember {
-                        display: flex;
-                        flex-direction: row;
-                        margin-bottom: 30px;
-                    }
-
-                    .verifyCode {
-                        img {
-                            cursor: pointer;
-                            // vertical-align: middle;
-                        }
-                    }
-
-                    .login-form-button {
-                        width: 100%;
-                    }
-                }
-            }
-        }
-    }
-
-    .bottom {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        height: 11%;
-        border-top: 1px solid #e0e4e8;
-
-        .view {
-            width: 247px;
-            height: 20px;
-            margin-right: 10%;
-            margin-bottom: 10px;
-            padding-top: 2px;
-            color: rgba(0, 0, 0, 0.65);
-            font-size: 14px;
-            font-family: 'PingFang SC';
-        }
-
-        .url {
-            display: flex;
-            align-items: center;
-            margin-right: 10%;
-
-            img {
-                width: 100%;
-                height: 100%;
-            }
-
-            a {
-                position: relative;
-                left: 60px;
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-                justify-content: center;
-                padding: 2px 7px;
-                line-height: 20px;
-                border: 1px solid #2f54eb;
-                border-radius: 2px;
-            }
-        }
-    }
-}
-
-@media (min-width: @screen-md-min) {
-    .container {
-        //background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
-        background-repeat: no-repeat;
-        background-position: center 110px;
-        background-size: 100%;
+    :deep(.ant-layout-footer) {
+      background: #fff;
     }
 
     .content {
-        padding: 32px 0 24px !important;
-        margin-top: 12% !important;
+      display: flex;
+      flex-direction: row-reverse;
+      justify-content: center;
+      padding: 0 0 15% 0;
+      margin-top: 20%;
+
+      .top {
+        width: 100%;
+        // text-align: center;
+
+        .header {
+          height: 44px;
+          line-height: 44px;
+          text-align: center;
+
+          a {
+            text-decoration: none;
+          }
+
+          .logo {
+            height: 44px;
+            margin-right: 16px;
+            vertical-align: top;
+          }
+
+          .title {
+            position: relative;
+            top: 2px;
+            color: @heading-color;
+            font-weight: 600;
+            font-size: 33px;
+            font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
+            sans-serif;
+          }
+        }
+
+        .desc {
+          margin-top: 12px;
+          margin-bottom: 40px;
+          // color: @heading-color;
+          color: rgb(0 0 0 / 70%);
+          font-weight: 600;
+          font-size: 22px;
+          font-family: Avenir, 'Helvetica Neue', Arial, Helvetica,
+          sans-serif;
+          text-align: center;
+        }
+
+        .main {
+          width: 70%;
+          margin: 60px auto 0;
+
+          @media screen and (max-width: @screen-sm) {
+            width: 95%;
+            max-width: 328px;
+          }
+
+          .icon {
+            margin-left: 16px;
+            color: rgba(0, 0, 0, 0.2);
+            font-size: 24px;
+            vertical-align: middle;
+            cursor: pointer;
+            transition: color 0.3s;
+
+            &:hover {
+              color: @primary-color;
+            }
+          }
+
+          .other {
+            margin-top: 20px;
+
+            .other-text {
+              color: #807676d9;
+              font-size: 12px;
+            }
+
+            .other-button {
+              position: relative;
+              bottom: 10px;
+              text-align: center;
+              display: flex;
+              gap: 24px;
+              justify-content: center;
+              flex-wrap: wrap;
+
+              .other-button-item {
+                cursor: pointer;
+                padding: 4px;
+              }
+            }
+
+            .more {
+              cursor: pointer;
+
+              .moreIcon {
+                transform: translateY(50%);
+              }
+            }
+
+            .more {
+              text-align: center;
+              cursor: pointer;
+            }
+          }
+
+          .prefixIcon {
+            color: @primary-color;
+            font-size: @font-size-base;
+          }
+
+          .remember {
+            display: flex;
+            flex-direction: row;
+            margin-bottom: 30px;
+          }
+
+          .verifyCode {
+            img {
+              cursor: pointer;
+              // vertical-align: middle;
+            }
+          }
+
+          .login-form-button {
+            width: 100%;
+          }
+        }
+      }
     }
-}
-.more-button {
+  }
+
+  .bottom {
     display: flex;
-    flex-wrap: wrap;
-    cursor: pointer;
-    overflow: auto;
-    width: 300px;
-    .more-button-item {
-        width: 62px;
-        text-align: center;
-        margin-bottom: 10px;
-        margin-left: 12px;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    height: 11%;
+    border-top: 1px solid #e0e4e8;
+
+    .view {
+      width: 247px;
+      height: 20px;
+      margin-right: 10%;
+      margin-bottom: 10px;
+      padding-top: 2px;
+      color: rgba(0, 0, 0, 0.65);
+      font-size: 14px;
+      font-family: 'PingFang SC';
     }
+
+    .url {
+      display: flex;
+      align-items: center;
+      margin-right: 10%;
+
+      img {
+        width: 100%;
+        height: 100%;
+      }
+
+      a {
+        position: relative;
+        left: 60px;
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: center;
+        padding: 2px 7px;
+        line-height: 20px;
+        border: 1px solid #2f54eb;
+        border-radius: 2px;
+      }
+    }
+  }
+}
+
+@media (min-width: @screen-md-min) {
+  .container {
+    //background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
+    background-repeat: no-repeat;
+    background-position: center 110px;
+    background-size: 100%;
+  }
+
+  .content {
+    padding: 32px 0 24px !important;
+    margin-top: 12% !important;
+  }
+}
+
+.more-button {
+  display: flex;
+  flex-wrap: wrap;
+  cursor: pointer;
+  overflow: auto;
+  width: 300px;
+
+  .more-button-item {
+    width: 62px;
+    text-align: center;
+    margin-bottom: 10px;
+    margin-left: 12px;
+  }
 }
 </style>
diff --git a/src/views/user/Login/utils.ts b/src/views/user/Login/utils.ts
new file mode 100644
index 00000000..b9e3f8ea
--- /dev/null
+++ b/src/views/user/Login/utils.ts
@@ -0,0 +1,9 @@
+import {getImage} from "@/utils/comm";
+
+export const defaultImg = getImage('/apply/internal-standalone.png');
+export const iconMap = new Map();
+iconMap.set('dingtalk-ent-app', getImage('/bind/dingtalk.png'));
+iconMap.set('wechat-webapp', getImage('/bind/wechat-webapp.png'));
+iconMap.set('internal-standalone', getImage('/apply/internal-standalone.png'));
+iconMap.set('third-party', getImage('/apply/third-party.png'));
+iconMap.set('wechat-miniapp', getImage('/apply/wechat-miniapp.png'));
diff --git a/yarn.lock b/yarn.lock
index f27eeeb4..8d7e8896 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,35 +2,6 @@
 # yarn lockfile v1
 
 
-"3d-tiles-renderer@^0.3.13":
-  version "0.3.31"
-  resolved "https://registry.npmjs.org/3d-tiles-renderer/-/3d-tiles-renderer-0.3.31.tgz#ab1382b9aef467bbc9f1413b74994ed2697db2aa"
-  integrity sha512-RM8nn3EHQu6slhNjW380KflSeih0tAVN5zRpQVvGA9zhJ/7Kaavjcbp80rCHjwxNiTFRp6ThI2+zOvSzAFnRmA==
-
-"@amap/amap-jsapi-loader@^1.0.1":
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz#9ec4b4d5d2467eac451f6c852e35db69e9f9f0c0"
-  integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==
-
-"@amap/amap-jsapi-types@^0.0.10":
-  version "0.0.10"
-  resolved "https://registry.npmjs.org/@amap/amap-jsapi-types/-/amap-jsapi-types-0.0.10.tgz#0e8e69ac8921ed3dde74da209dbb7e04b830debd"
-  integrity sha512-znvqLGPBy9NRCr1/3650o9vL1aYl/f1YK0+UGn8lBUvHJXND6uMDJGJsl43cEYglw9/tblwIRxjm4pIotOvSCQ==
-
-"@amap/amap-jsapi-types@^0.0.8":
-  version "0.0.8"
-  resolved "https://registry.npmjs.org/@amap/amap-jsapi-types/-/amap-jsapi-types-0.0.8.tgz#5a807e27f33fe409be4c8ecbde73b8c35c1cb650"
-  integrity sha512-q0FyZDIJcXjsMLGc3oS9rjfJsErOvt9rcp6AgzY4k14vo7bBhdq4eKwoSdVp/pYjR/rfaKBns5v10ycZOFwf/A==
-
-"@amap/three-layer@^0.0.4":
-  version "0.0.4"
-  resolved "https://registry.npmjs.org/@amap/three-layer/-/three-layer-0.0.4.tgz#7a58d29f989c1e9296e8e566d91799ef74eb1113"
-  integrity sha512-2/0duAm0jnXHj69jRorszcUy4vQ8y9vL58lqmcCtrXXMgOBr/wZIoXSVvcAdT2jUevfmb12ViXaBMVhHKSLQFQ==
-  dependencies:
-    "@amap/amap-jsapi-types" "^0.0.8"
-    "@types/three" "0.143.0"
-    three "0.143.0"
-
 "@ampproject/remapping@^2.2.0", "@ampproject/remapping@^2.2.1":
   version "2.3.0"
   resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz#ed441b6fa600072520ce18b43d2c8cc8caecc7f4"
@@ -68,120 +39,124 @@
     "@ant-design/icons-svg" "^4.2.1"
 
 "@antfu/utils@^0.7.2":
-  version "0.7.7"
-  resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.7.tgz#26ea493a831b4f3a85475e7157be02fb4eab51fb"
-  integrity sha512-gFPqTG7otEJ8uP6wrhDv6mqwGWYZKNvAcCq6u9hOj0c+IKCEsY4L1oC9trPq2SaWIzAfHvqfBDxF591JkMf+kg==
+  version "0.7.8"
+  resolved "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.8.tgz#86cb0974bcab7e64e29b57d6d9021102307257de"
+  integrity sha512-rWQkqXRESdjXtc+7NRfK9lASQjpXJu1ayp7qi1d23zZorY+wBHVLHHoVcMsEnkqEBWTFqbztO7/QdJFzyEcLTg==
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.1", "@babel/code-frame@^7.24.2":
-  version "7.24.2"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz#718b4b19841809a58b29b68cde80bc5e1aa6d9ae"
-  integrity sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.23.5", "@babel/code-frame@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz#882fd9e09e8ee324e496bd040401c6f046ef4465"
+  integrity sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==
   dependencies:
-    "@babel/highlight" "^7.24.2"
+    "@babel/highlight" "^7.24.7"
     picocolors "^1.0.0"
 
-"@babel/compat-data@^7.23.5":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
-  integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
+"@babel/compat-data@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz#d23bbea508c3883ba8251fb4164982c36ea577ed"
+  integrity sha512-qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==
 
 "@babel/core@^7.23.3":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.4.tgz#1f758428e88e0d8c563874741bc4ffc4f71a4717"
-  integrity sha512-MBVlMXP+kkl5394RBLSxxk/iLTeVGuXTV3cIDXavPpMMqnSnt6apKgan/U8O3USWZCWZT/TbgfEpKa4uMgN4Dg==
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz#b676450141e0b52a3d43bc91da86aa608f950ac4"
+  integrity sha512-nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==
   dependencies:
     "@ampproject/remapping" "^2.2.0"
-    "@babel/code-frame" "^7.24.2"
-    "@babel/generator" "^7.24.4"
-    "@babel/helper-compilation-targets" "^7.23.6"
-    "@babel/helper-module-transforms" "^7.23.3"
-    "@babel/helpers" "^7.24.4"
-    "@babel/parser" "^7.24.4"
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-compilation-targets" "^7.24.7"
+    "@babel/helper-module-transforms" "^7.24.7"
+    "@babel/helpers" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/template" "^7.24.7"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.24.1", "@babel/generator@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz#1fc55532b88adf952025d5d2d1e71f946cb1c498"
-  integrity sha512-Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==
+"@babel/generator@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.24.7.tgz#1654d01de20ad66b4b4d99c135471bc654c55e6d"
+  integrity sha512-oipXieGC3i45Y1A41t4tAqpnEZWgB/lC6Ehh6+rOviR5XWpTtMmLN+fGjz9vOiNRt0p6RtO6DtD0pdU3vpqdSA==
   dependencies:
-    "@babel/types" "^7.24.0"
+    "@babel/types" "^7.24.7"
     "@jridgewell/gen-mapping" "^0.3.5"
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
-  integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
+"@babel/helper-annotate-as-pure@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
+  integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-compilation-targets@^7.23.6":
-  version "7.23.6"
-  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz#4d79069b16cbcf1461289eccfbbd81501ae39991"
-  integrity sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==
+"@babel/helper-compilation-targets@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz#4eb6c4a80d6ffeac25ab8cd9a21b5dfa48d503a9"
+  integrity sha512-ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==
   dependencies:
-    "@babel/compat-data" "^7.23.5"
-    "@babel/helper-validator-option" "^7.23.5"
+    "@babel/compat-data" "^7.24.7"
+    "@babel/helper-validator-option" "^7.24.7"
     browserslist "^4.22.2"
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.4.tgz#c806f73788a6800a5cfbbc04d2df7ee4d927cce3"
-  integrity sha512-lG75yeuUSVu0pIcbhiYMXBXANHrpUPaOfu7ryAzskCgKUHuAxRQI5ssrtmF0X9UXldPlvT0XM/A4F44OXRt6iQ==
+"@babel/helper-create-class-features-plugin@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz#2eaed36b3a1c11c53bdf80d53838b293c52f5b3b"
+  integrity sha512-kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
-    "@babel/helper-replace-supers" "^7.24.1"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.7"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
+    "@babel/helper-replace-supers" "^7.24.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
     semver "^6.3.1"
 
-"@babel/helper-environment-visitor@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz#96159db61d34a29dba454c959f5ae4a649ba9167"
-  integrity sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==
-
-"@babel/helper-function-name@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz#1f9a3cdbd5b2698a670c30d2735f9af95ed52759"
-  integrity sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==
+"@babel/helper-environment-visitor@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz#4b31ba9551d1f90781ba83491dd59cf9b269f7d9"
+  integrity sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==
   dependencies:
-    "@babel/template" "^7.22.15"
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-hoist-variables@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
-  integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
+"@babel/helper-function-name@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.7.tgz#75f1e1725742f39ac6584ee0b16d94513da38dd2"
+  integrity sha512-FyoJTsj/PEUWu1/TYRiXTIHc8lbw+TDYkZuoE43opPS5TrI7MyONBE1oNvfguEXAD9yhQRrVBnXdXzSLQl9XnA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-member-expression-to-functions@^7.23.0":
-  version "7.23.0"
-  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz#9263e88cc5e41d39ec18c9a3e0eced59a3e7d366"
-  integrity sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==
+"@babel/helper-hoist-variables@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.7.tgz#b4ede1cde2fd89436397f30dc9376ee06b0f25ee"
+  integrity sha512-MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==
   dependencies:
-    "@babel/types" "^7.23.0"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-module-imports@^7.22.15":
-  version "7.24.3"
-  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
-  integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
+"@babel/helper-member-expression-to-functions@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz#67613d068615a70e4ed5101099affc7a41c5225f"
+  integrity sha512-LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==
   dependencies:
-    "@babel/types" "^7.24.0"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/helper-module-imports@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz#f2f980392de5b84c3328fc71d38bd81bbb83042b"
+  integrity sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==
+  dependencies:
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-module-imports@~7.22.15":
   version "7.22.15"
@@ -190,167 +165,175 @@
   dependencies:
     "@babel/types" "^7.22.15"
 
-"@babel/helper-module-transforms@^7.23.3":
-  version "7.23.3"
-  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz#d7d12c3c5d30af5b3c0fcab2a6d5217773e2d0f1"
-  integrity sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==
+"@babel/helper-module-transforms@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz#31b6c9a2930679498db65b685b1698bfd6c7daf8"
+  integrity sha512-1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-module-imports" "^7.22.15"
-    "@babel/helper-simple-access" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-module-imports" "^7.24.7"
+    "@babel/helper-simple-access" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
 
-"@babel/helper-optimise-call-expression@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
-  integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+"@babel/helper-optimise-call-expression@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.24.7.tgz#8b0a0456c92f6b323d27cfd00d1d664e76692a0f"
+  integrity sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
-  integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
+"@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz#98c84fe6fe3d0d3ae7bfc3a5e166a46844feb2a0"
+  integrity sha512-Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==
 
-"@babel/helper-replace-supers@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz#7085bd19d4a0b7ed8f405c1ed73ccb70f323abc1"
-  integrity sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==
+"@babel/helper-replace-supers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.7.tgz#f933b7eed81a1c0265740edc91491ce51250f765"
+  integrity sha512-qTAxxBM81VEyoAY0TtLrx1oAEJc09ZK67Q9ljQToqCnA+55eNwCORaxlKyu+rNfX86o8OXRUSNUnrtsAZXM9sg==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-member-expression-to-functions" "^7.23.0"
-    "@babel/helper-optimise-call-expression" "^7.22.5"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-member-expression-to-functions" "^7.24.7"
+    "@babel/helper-optimise-call-expression" "^7.24.7"
 
-"@babel/helper-simple-access@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
-  integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+"@babel/helper-simple-access@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz#bcade8da3aec8ed16b9c4953b74e506b51b5edb3"
+  integrity sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
-  integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+"@babel/helper-skip-transparent-expression-wrappers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.24.7.tgz#5f8fa83b69ed5c27adc56044f8be2b3ea96669d9"
+  integrity sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/traverse" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-split-export-declaration@^7.22.6":
-  version "7.22.6"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
-  integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+"@babel/helper-split-export-declaration@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.7.tgz#83949436890e07fa3d6873c61a96e3bbf692d856"
+  integrity sha512-oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==
   dependencies:
-    "@babel/types" "^7.22.5"
+    "@babel/types" "^7.24.7"
 
-"@babel/helper-string-parser@^7.23.4":
-  version "7.24.1"
-  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz#f99c36d3593db9540705d0739a1f10b5e20c696e"
-  integrity sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==
+"@babel/helper-string-parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz#4d2d0f14820ede3b9807ea5fc36dfc8cd7da07f2"
+  integrity sha512-7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==
 
-"@babel/helper-validator-identifier@^7.22.20":
-  version "7.22.20"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
-  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+"@babel/helper-validator-identifier@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz#75b889cfaf9e35c2aaf42cf0d72c8e91719251db"
+  integrity sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==
 
-"@babel/helper-validator-option@^7.23.5":
-  version "7.23.5"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
-  integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
+"@babel/helper-validator-option@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz#24c3bb77c7a425d1742eec8fb433b5a1b38e62f6"
+  integrity sha512-yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==
 
-"@babel/helpers@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.4.tgz#dc00907fd0d95da74563c142ef4cd21f2cb856b6"
-  integrity sha512-FewdlZbSiwaVGlgT1DPANDuCHaDMiOo+D/IDYRFYjHOuv66xMSJ7fQwwODwRNAPkADIO/z1EoF/l2BCWlWABDw==
+"@babel/helpers@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz#aa2ccda29f62185acb5d42fb4a3a1b1082107416"
+  integrity sha512-NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==
   dependencies:
-    "@babel/template" "^7.24.0"
-    "@babel/traverse" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/template" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
-"@babel/highlight@^7.24.2":
-  version "7.24.2"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz#3f539503efc83d3c59080a10e6634306e0370d26"
-  integrity sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==
+"@babel/highlight@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz#a05ab1df134b286558aae0ed41e6c5f731bf409d"
+  integrity sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-validator-identifier" "^7.24.7"
     chalk "^2.4.2"
     js-tokens "^4.0.0"
     picocolors "^1.0.0"
 
-"@babel/parser@^7.20.15", "@babel/parser@^7.21.3", "@babel/parser@^7.23.9", "@babel/parser@^7.24.0", "@babel/parser@^7.24.1", "@babel/parser@^7.24.4":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.4.tgz#234487a110d89ad5a3ed4a8a566c36b9453e8c88"
-  integrity sha512-zTvEBcghmeBma9QIGunWevvBAp4/Qu9Bdq+2k0Ot4fVMD6v3dsC9WOcRSKk7tRRyBM/53yKMJko9xOatGQAwSg==
+"@babel/parser@^7.20.15", "@babel/parser@^7.21.3", "@babel/parser@^7.23.9", "@babel/parser@^7.24.4", "@babel/parser@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz#9a5226f92f0c5c8ead550b750f5608e766c8ce85"
+  integrity sha512-9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==
 
 "@babel/plugin-syntax-jsx@^7.23.3":
-  version "7.24.1"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
-  integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz#39a1fa4a7e3d3d7f34e2acc6be585b718d30e02d"
+  integrity sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-syntax-typescript@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.1.tgz#b3bcc51f396d15f3591683f90239de143c076844"
-  integrity sha512-Yhnmvy5HZEnHUty6i++gcfH1/l68AHnItFHnaCv6hn9dNh0hQvvQJsxpi4BMBFN5DLeHBuucT/0DgzXif/OyRw==
+"@babel/plugin-syntax-typescript@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz#58d458271b4d3b6bb27ee6ac9525acbb259bad1c"
+  integrity sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-typescript@^7.23.3":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.4.tgz#03e0492537a4b953e491f53f2bc88245574ebd15"
-  integrity sha512-79t3CQ8+oBGk/80SQ8MN3Bs3obf83zJ0YZjDmDaEZN8MqhMI760apl5z6a20kFeMXBwJX99VpKT8CKxEBp5H1g==
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz#b006b3e0094bf0813d505e0c5485679eeaf4a881"
+  integrity sha512-iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-create-class-features-plugin" "^7.24.4"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/plugin-syntax-typescript" "^7.24.1"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/helper-create-class-features-plugin" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
+    "@babel/plugin-syntax-typescript" "^7.24.7"
 
-"@babel/runtime@^7.10.5":
-  version "7.24.4"
-  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.4.tgz#de795accd698007a66ba44add6cc86542aff1edd"
-  integrity sha512-dkxf7+hn8mFBwKjs9bvBlArzLVxVbS8usaPUDd5p2a9JCL9tB8OaOVN1isD4+Xyk4ns89/xeOmbQvgdK7IIVdA==
+"@babel/runtime@^7.10.5", "@babel/runtime@^7.12.0":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz#f4f0d5530e8dbdf59b3451b9b3e594b6ba082e12"
+  integrity sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@babel/template@^7.22.15", "@babel/template@^7.23.9", "@babel/template@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz#c6a524aa93a4a05d66aaf31654258fae69d87d50"
-  integrity sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==
+"@babel/runtime@^7.15.3":
+  version "7.25.0"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.0.tgz#3af9a91c1b739c569d5d80cc917280919c544ecb"
+  integrity sha512-7dRy4DwXwtzBrPbZflqxnvfxLF8kdZXPkhymtDeFoFqE6ldzjQFgYTtYIFARcLEYDrqfBfYcZt1WqFxRoyC9Rw==
   dependencies:
-    "@babel/code-frame" "^7.23.5"
-    "@babel/parser" "^7.24.0"
-    "@babel/types" "^7.24.0"
+    regenerator-runtime "^0.14.0"
 
-"@babel/traverse@^7.23.9", "@babel/traverse@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz#d65c36ac9dd17282175d1e4a3c49d5b7988f530c"
-  integrity sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==
+"@babel/template@^7.23.9", "@babel/template@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.24.7.tgz#02efcee317d0609d2c07117cb70ef8fb17ab7315"
+  integrity sha512-jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==
   dependencies:
-    "@babel/code-frame" "^7.24.1"
-    "@babel/generator" "^7.24.1"
-    "@babel/helper-environment-visitor" "^7.22.20"
-    "@babel/helper-function-name" "^7.23.0"
-    "@babel/helper-hoist-variables" "^7.22.5"
-    "@babel/helper-split-export-declaration" "^7.22.6"
-    "@babel/parser" "^7.24.1"
-    "@babel/types" "^7.24.0"
+    "@babel/code-frame" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
+
+"@babel/traverse@^7.23.9", "@babel/traverse@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz#de2b900163fa741721ba382163fe46a936c40cf5"
+  integrity sha512-yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==
+  dependencies:
+    "@babel/code-frame" "^7.24.7"
+    "@babel/generator" "^7.24.7"
+    "@babel/helper-environment-visitor" "^7.24.7"
+    "@babel/helper-function-name" "^7.24.7"
+    "@babel/helper-hoist-variables" "^7.24.7"
+    "@babel/helper-split-export-declaration" "^7.24.7"
+    "@babel/parser" "^7.24.7"
+    "@babel/types" "^7.24.7"
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.22.15", "@babel/types@^7.22.5", "@babel/types@^7.23.0", "@babel/types@^7.23.9", "@babel/types@^7.24.0":
-  version "7.24.0"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz#3b951f435a92e7333eba05b7566fd297960ea1bf"
-  integrity sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==
+"@babel/types@^7.22.15", "@babel/types@^7.23.9", "@babel/types@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
+  integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
   dependencies:
-    "@babel/helper-string-parser" "^7.23.4"
-    "@babel/helper-validator-identifier" "^7.22.20"
+    "@babel/helper-string-parser" "^7.24.7"
+    "@babel/helper-validator-identifier" "^7.24.7"
     to-fast-properties "^2.0.0"
 
 "@codemirror/autocomplete@^6.12.0":
-  version "6.16.0"
-  resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.0.tgz#595eb30099ba91a835ed65ed8ff7497388f604b3"
-  integrity sha512-P/LeCTtZHRTCU4xQsa89vSKWecYv1ZqwzOd5topheGRf+qtacFgBeIMQi3eL8Kt/BUNvxUWkx+5qP2jlGoARrg==
+  version "6.16.2"
+  resolved "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.16.2.tgz#ac4e191cd599503e45f35e97366b432d30b8f37a"
+  integrity sha512-MjfDrHy0gHKlPWsvSsikhO1+BOh+eBHNgfH1OXs1+DAf30IonQldgMM3kxLDTG9ktE7kDLaA1j/l7KMPA4KNfw==
   dependencies:
     "@codemirror/language" "^6.0.0"
     "@codemirror/state" "^6.0.0"
@@ -358,13 +341,13 @@
     "@lezer/common" "^1.0.0"
 
 "@codemirror/commands@^6.3.3":
-  version "6.5.0"
-  resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.5.0.tgz#e7dfb7918e7af8889d5731ff4c46ffafd7687353"
-  integrity sha512-rK+sj4fCAN/QfcY9BEzYMgp4wwL/q5aj/VfNSoH1RWPF9XS/dUwBkvlL3hpWgEjOqlpdN1uLC9UkjJ4tmyjJYg==
+  version "6.6.0"
+  resolved "https://registry.npmjs.org/@codemirror/commands/-/commands-6.6.0.tgz#d308f143fe1b8896ca25fdb855f66acdaf019dd4"
+  integrity sha512-qnY+b7j1UNcTS31Eenuc/5YJB6gQOzkUoNmJQc0rznwqSRpeaWWpjkWy2C/MPTcePpsKJEM26hXrOXl1+nceXg==
   dependencies:
     "@codemirror/language" "^6.0.0"
     "@codemirror/state" "^6.4.0"
-    "@codemirror/view" "^6.0.0"
+    "@codemirror/view" "^6.27.0"
     "@lezer/common" "^1.1.0"
 
 "@codemirror/lang-json@^6.0.1":
@@ -376,9 +359,9 @@
     "@lezer/json" "^1.0.0"
 
 "@codemirror/language@^6.0.0", "@codemirror/language@^6.10.1":
-  version "6.10.1"
-  resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.1.tgz#428c932a158cb75942387acfe513c1ece1090b05"
-  integrity sha512-5GrXzrhq6k+gL5fjkAwt90nYDmjlzTIJV8THnxNFtNKWotMIlzzN+CpqxqwXOECnUdOndmSeWntVrVcv5axWRQ==
+  version "6.10.2"
+  resolved "https://registry.npmjs.org/@codemirror/language/-/language-6.10.2.tgz#4056dc219619627ffe995832eeb09cea6060be61"
+  integrity sha512-kgbTYTo0Au6dCSc/TFy7fK3fpJmgHDv1sG1KNQKJXVi+xBTEeBPY/M30YXiU6mMXeH+YIDLsbrT4ZwNRdtF+SA==
   dependencies:
     "@codemirror/state" "^6.0.0"
     "@codemirror/view" "^6.23.0"
@@ -388,9 +371,9 @@
     style-mod "^4.0.0"
 
 "@codemirror/lint@^6.5.0":
-  version "6.5.0"
-  resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.5.0.tgz#ea43b6e653dcc5bcd93456b55e9fe62e63f326d9"
-  integrity sha512-+5YyicIaaAZKU8K43IQi8TBy6mF6giGeWAH7N96Z5LC30Wm5JMjqxOYIE9mxwMG1NbhT2mA3l9hA4uuKUM3E5g==
+  version "6.8.0"
+  resolved "https://registry.npmjs.org/@codemirror/lint/-/lint-6.8.0.tgz#cf9067c7041c1f6c9f20bab411dac9323aab54f0"
+  integrity sha512-lsFofvaw0lnPRJlQylNsC4IRt/1lI4OD/yYslrSGVndOJfStc58v+8p9dgGiD90ktOfL7OhBWns1ZETYgz0EJA==
   dependencies:
     "@codemirror/state" "^6.0.0"
     "@codemirror/view" "^6.0.0"
@@ -410,10 +393,10 @@
   resolved "https://registry.npmjs.org/@codemirror/state/-/state-6.4.1.tgz#da57143695c056d9a3c38705ed34136e2b68171b"
   integrity sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==
 
-"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.24.0":
-  version "6.26.3"
-  resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.26.3.tgz#47aebd49a6ee3c8d36b82046d3bffe6056b8039f"
-  integrity sha512-gmqxkPALZjkgSxIeeweY/wGQXBfwTUaLs8h7OKtSwfbj9Ct3L11lD+u1sS7XHppxFQoMDiMDp07P9f3I2jWOHw==
+"@codemirror/view@^6.0.0", "@codemirror/view@^6.17.0", "@codemirror/view@^6.23.0", "@codemirror/view@^6.24.0", "@codemirror/view@^6.27.0":
+  version "6.28.0"
+  resolved "https://registry.npmjs.org/@codemirror/view/-/view-6.28.0.tgz#7315e8f122b76319d9b95042cde2c9875e7eeb5e"
+  integrity sha512-fo7CelaUDKWIyemw4b+J57cWuRkOu4SWCCPfNDkPvfWkGjM9D5racHQXr4EQeYCD6zEBIBxGCeaKkQo+ysl0gA==
   dependencies:
     "@codemirror/state" "^6.4.0"
     style-mod "^4.1.0"
@@ -721,6 +704,49 @@
   dependencies:
     "@fortawesome/fontawesome-common-types" "6.5.2"
 
+"@fullcalendar/core@^6.1.13":
+  version "6.1.14"
+  resolved "https://registry.npmjs.org/@fullcalendar/core/-/core-6.1.14.tgz#75cd70ab28600dec630970e1015e4e7b59cd4a94"
+  integrity sha512-hIPRBevm0aMc2aHy1hRIJgXmI1QTvQM1neQa9oxtuqUmF1+ApYC3oAdwcQMTuI7lHHw3pKJDyJFkKLPPnL6HXA==
+  dependencies:
+    preact "~10.12.1"
+
+"@fullcalendar/daygrid@^6.1.13":
+  version "6.1.14"
+  resolved "https://registry.npmjs.org/@fullcalendar/daygrid/-/daygrid-6.1.14.tgz#4afc48adbdd905b79777ff4c822c9ed0205df995"
+  integrity sha512-DSyjiA1dEM8k3bOCrZpZOmAOZu71KGtH02ze+4QKuhxkmn/zQghmmLRdfzpOrcyJg6xGKkoB4pBcO+2lXar8XQ==
+
+"@fullcalendar/interaction@^6.1.13":
+  version "6.1.14"
+  resolved "https://registry.npmjs.org/@fullcalendar/interaction/-/interaction-6.1.14.tgz#c758581419e324cf82b53a38e7941942f7f0dd14"
+  integrity sha512-rXum5XCjq+WEPNctFeYL/JKZGeU2rlxrElygocdMegcrIBJQW5hnWWVE+i4/1dOmUKF80CbGVlXUyYXoqK2eFg==
+
+"@fullcalendar/vue3@^6.1.13":
+  version "6.1.14"
+  resolved "https://registry.npmjs.org/@fullcalendar/vue3/-/vue3-6.1.14.tgz#6e98011338bea3f010eb47e769ea48793dd97636"
+  integrity sha512-cD4tGlXOoIfRn5sz/+uT+50rAuCtPEgXfG3O5LJXI4xRWztAXqkmZetcuTEDb3OOy/D03IdtpjvoayCHib7rZg==
+
+"@intlify/core-base@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.13.1.tgz#bd1f38e665095993ef9b67aeeb794f3cabcb515d"
+  integrity sha512-+bcQRkJO9pcX8d0gel9ZNfrzU22sZFSA0WVhfXrf5jdJOS24a+Bp8pozuS9sBI9Hk/tGz83pgKfmqcn/Ci7/8w==
+  dependencies:
+    "@intlify/message-compiler" "9.13.1"
+    "@intlify/shared" "9.13.1"
+
+"@intlify/message-compiler@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-9.13.1.tgz#ff8129badf77db3fb648b8d3cceee87c8033ed0a"
+  integrity sha512-SKsVa4ajYGBVm7sHMXd5qX70O2XXjm55zdZB3VeMFCvQyvLew/dLvq3MqnaIsTMF1VkkOb9Ttr6tHcMlyPDL9w==
+  dependencies:
+    "@intlify/shared" "9.13.1"
+    source-map-js "^1.0.2"
+
+"@intlify/shared@9.13.1":
+  version "9.13.1"
+  resolved "https://registry.npmjs.org/@intlify/shared/-/shared-9.13.1.tgz#202741d11ece1a9c7480bfd3f27afcf9cb8f72e4"
+  integrity sha512-u3b6BKGhE6j/JeRU6C/RL2FgyJfy6LakbtfeVF8fJXURpZZTzfh3e05J0bu0XPw447Q6/WUp3C4ajv4TMS4YsQ==
+
 "@jridgewell/gen-mapping@^0.3.5":
   version "0.3.5"
   resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz#dcce6aff74bdf6dad1a95802b69b04a2fcb1fb36"
@@ -791,16 +817,30 @@
     "@lezer/lr" "^1.0.0"
 
 "@lezer/lr@^1.0.0":
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.0.tgz#ed52a75dbbfbb0d1eb63710ea84c35ee647cb67e"
-  integrity sha512-Wst46p51km8gH0ZUmeNrtpRYmdlRHUpN1DQd3GFAyKANi8WVz8c2jHYTf1CVScFaCjQw1iO3ZZdqGDxQPRErTg==
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/@lezer/lr/-/lr-1.4.1.tgz#fe25f051880a754e820b28148d90aa2a96b8bdd2"
+  integrity sha512-CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==
   dependencies:
     "@lezer/common" "^1.0.0"
 
 "@liveqing/liveplayer-v3@^3.7.10":
-  version "3.7.22"
-  resolved "https://registry.npmjs.org/@liveqing/liveplayer-v3/-/liveplayer-v3-3.7.22.tgz#d29bf8ecad18dd8ac0ce937c7d32f9dc88754d04"
-  integrity sha512-E05IRxmZY77D5JZ7HT3VF4pYW+i+pvL4wXpf0sDRvaougtnrYGr8GaFlRfA4/bNu5pEUhEbkUyHUBpxKAfBKYA==
+  version "3.7.24"
+  resolved "https://registry.npmjs.org/@liveqing/liveplayer-v3/-/liveplayer-v3-3.7.24.tgz#7a96ec716559a4c4f47ca307e933cb76cc6874d0"
+  integrity sha512-s7/R0qd/WbuN4Hf1YlSPAsC9a08ei+71wjD+Zn6d96UKD9XTHBgMEL7GSu3hP3SCDmZOQWR0vusQRhiFcIDvLg==
+
+"@math.gl/core@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.npmjs.org/@math.gl/core/-/core-3.6.3.tgz#a6bf796ed421093099749d609de8d99a3ac20a53"
+  integrity sha512-jBABmDkj5uuuE0dTDmwwss7Cup5ZwQ6Qb7h1pgvtkEutTrhkcv8SuItQNXmF45494yIHeoGue08NlyeY6wxq2A==
+  dependencies:
+    "@babel/runtime" "^7.12.0"
+    "@math.gl/types" "3.6.3"
+    gl-matrix "^3.4.0"
+
+"@math.gl/types@3.6.3":
+  version "3.6.3"
+  resolved "https://registry.npmjs.org/@math.gl/types/-/types-3.6.3.tgz#9fa9866feabcbb76de107d78ff3a89c0243ac374"
+  integrity sha512-3uWLVXHY3jQxsXCr/UCNPSc2BG0hNUljhmOBt9l+lNFDp7zHgm0cK2Tw4kj2XfkJy4TgwZTBGwRDQgWEbLbdTA==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -824,9 +864,9 @@
     fastq "^1.6.0"
 
 "@replit/codemirror-indentation-markers@^6.5.0":
-  version "6.5.1"
-  resolved "https://registry.npmjs.org/@replit/codemirror-indentation-markers/-/codemirror-indentation-markers-6.5.1.tgz#74022021035b2e17b3777ec832d92bfadd5890ef"
-  integrity sha512-9MfwbNdARjwx0X+duBgeJJ7vnpyHWfEwk+p4FlWVs2ntvSyQmKI/FH2iEfEUOMyafIiQxzyLn0y2RS5f54hN5A==
+  version "6.5.2"
+  resolved "https://registry.npmjs.org/@replit/codemirror-indentation-markers/-/codemirror-indentation-markers-6.5.2.tgz#ff2bc875a081239409a104412790bf572388aa7d"
+  integrity sha512-D/GJ2LuPPe+3rQBJXnvDLcsjc5ej8ubyyNo+fJh8/5/D1eaku/Bb5saVt+aIw7YdWxtp14xM4hJik6bNRfzQbg==
 
 "@rollup/pluginutils@^4.1.2", "@rollup/pluginutils@^4.2.0":
   version "4.2.1"
@@ -911,10 +951,12 @@
   dependencies:
     "@turf/helpers" "^6.5.0"
 
-"@tweenjs/tween.js@^18.6.4":
-  version "18.6.4"
-  resolved "https://registry.npmjs.org/@tweenjs/tween.js/-/tween.js-18.6.4.tgz#40a3d0a93647124872dec8e0fd1bd5926695b6ca"
-  integrity sha512-lB9lMjuqjtuJrx7/kOkqQBtllspPIN+96OvTCeJ2j5FEzinoAXTdAMFnDAQT1KVPRlnYfBrqxtqP66vDM40xxQ==
+"@types/axios@^0.14.0":
+  version "0.14.0"
+  resolved "https://registry.npmjs.org/@types/axios/-/axios-0.14.0.tgz#ec2300fbe7d7dddd7eb9d3abf87999964cafce46"
+  integrity sha512-KqQnQbdYE54D7oa/UmYVMZKq7CO4l8DEENzOKc4aBRwxCXSlJXGz83flFx5L7AWrOQnmuN3kVsRdt+GZPPjiVQ==
+  dependencies:
+    axios "*"
 
 "@types/estree@*", "@types/estree@^1.0.0", "@types/estree@^1.0.1":
   version "1.0.5"
@@ -944,9 +986,9 @@
     "@types/lodash" "*"
 
 "@types/lodash@*":
-  version "4.17.0"
-  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.0.tgz#d774355e41f372d5350a4d0714abb48194a489c3"
-  integrity sha512-t7dhREVv6dbNj0q17X12j7yDG4bD/DHYX7o5/DbDxobP0HnGPgpRz2Ej77aL7TZT3DSw13fqUTj8J4mMnqa7WA==
+  version "4.17.5"
+  resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz#e6c29b58e66995d57cd170ce3e2a61926d55ee04"
+  integrity sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==
 
 "@types/marked@^4.0.8":
   version "4.3.2"
@@ -971,9 +1013,9 @@
     moment "*"
 
 "@types/node@*":
-  version "20.12.7"
-  resolved "https://registry.npmjs.org/@types/node/-/node-20.12.7.tgz#04080362fa3dd6c5822061aa3124f5c152cff384"
-  integrity sha512-wq0cICSkRLVaf3UGLMGItu/PtdY7oaXaI/RVU+xliKVOtRna3PRY57ZDfztpDL0n11vfymMUnXv8QwYCO7L1wg==
+  version "20.14.2"
+  resolved "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz#a5f4d2bcb4b6a87bffcaa717718c5a0f208f4a18"
+  integrity sha512-xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==
   dependencies:
     undici-types "~5.26.4"
 
@@ -988,9 +1030,9 @@
   integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/node@^18.14.0":
-  version "18.19.31"
-  resolved "https://registry.npmjs.org/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd"
-  integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA==
+  version "18.19.34"
+  resolved "https://registry.npmjs.org/@types/node/-/node-18.19.34.tgz#c3fae2bbbdb94b4a52fe2d229d0dccce02ef3d27"
+  integrity sha512-eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==
   dependencies:
     undici-types "~5.26.4"
 
@@ -999,23 +1041,11 @@
   resolved "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz#56e2cc26c397c038fab0e3a917a12d5c5909e901"
   integrity sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==
 
-"@types/three@0.143.0":
-  version "0.143.0"
-  resolved "https://registry.npmjs.org/@types/three/-/three-0.143.0.tgz#686f1221c4c89d797713f0533d2f129afcc3572d"
-  integrity sha512-c5PonXOt8xk5q4ygmyjOX4Ec+FA7gwfdcMT/PveE9xrJs/0DDcf2lJkWrhEcmvx2ZefQCQBcogABnGqB0P4OsA==
-  dependencies:
-    "@types/webxr" "*"
-
 "@types/web-bluetooth@^0.0.16":
   version "0.0.16"
   resolved "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.16.tgz#1d12873a8e49567371f2a75fe3e7f7edca6662d8"
   integrity sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==
 
-"@types/webxr@*":
-  version "0.5.15"
-  resolved "https://registry.npmjs.org/@types/webxr/-/webxr-0.5.15.tgz#21cd63e83a997c14ff91c7c537efabb787d1af09"
-  integrity sha512-nC9116Gd4N+CqTxqo6gvCfhAMAzgRcfS8ZsciNodHq8uwW4JCVKwhagw8yN0XmC7mHrLnWqniJpoVEiR+72Drw==
-
 "@vitejs/plugin-vue-jsx@^3.0.0":
   version "3.1.0"
   resolved "https://registry.npmjs.org/@vitejs/plugin-vue-jsx/-/plugin-vue-jsx-3.1.0.tgz#9953fd9456539e1f0f253bf0fcd1289e66c67cd1"
@@ -1095,13 +1125,13 @@
     estree-walker "^2.0.2"
     source-map-js "^1.0.2"
 
-"@vue/compiler-core@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.24.tgz#6b4a5ffddcd874a692f2acfa68981201bcd7096b"
-  integrity sha512-vbW/tgbwJYj62N/Ww99x0zhFTkZDTcGh3uwJEuadZ/nF9/xuFMC4693P9r+3sxGXISABpDKvffY5ApH9pmdd1A==
+"@vue/compiler-core@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.27.tgz#e69060f4b61429fe57976aa5872cfa21389e4d91"
+  integrity sha512-E+RyqY24KnyDXsCuQrI+mlcdW3ALND6U7Gqa/+bVwbcpcR3BRRIckFoz7Qyd4TTlnugtwuI7YgjbvsLmxb+yvg==
   dependencies:
     "@babel/parser" "^7.24.4"
-    "@vue/shared" "3.4.24"
+    "@vue/shared" "3.4.27"
     entities "^4.5.0"
     estree-walker "^2.0.2"
     source-map-js "^1.2.0"
@@ -1114,13 +1144,13 @@
     "@vue/compiler-core" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/compiler-dom@3.4.24", "@vue/compiler-dom@^3.3.0":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.24.tgz#b7335a49f095b6d35e48b6f7be8da513c1fa52b8"
-  integrity sha512-4XgABML/4cNndVsQndG6BbGN7+EoisDwi3oXNovqL/4jdNhwvP8/rfRMTb6FxkxIxUUtg6AI1/qZvwfSjxJiWA==
+"@vue/compiler-dom@3.4.27", "@vue/compiler-dom@^3.3.0":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.27.tgz#d51d35f40d00ce235d7afc6ad8b09dfd92b1cc1c"
+  integrity sha512-kUTvochG/oVgE1w5ViSr3KUBh9X7CWirebA3bezTbB5ZKBQZwR2Mwj9uoSKRMFcz4gSMzzLXBPD6KpCLb9nvWw==
   dependencies:
-    "@vue/compiler-core" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/compiler-core" "3.4.27"
+    "@vue/shared" "3.4.27"
 
 "@vue/compiler-sfc@3.3.4":
   version "3.3.4"
@@ -1138,16 +1168,16 @@
     postcss "^8.1.10"
     source-map-js "^1.0.2"
 
-"@vue/compiler-sfc@3.4.24", "@vue/compiler-sfc@^3.2.29", "@vue/compiler-sfc@^3.4.15":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.24.tgz#2872e353147ce2a145169a33ddd4d68dc95c3a18"
-  integrity sha512-nRAlJUK02FTWfA2nuvNBAqsDZuERGFgxZ8sGH62XgFSvMxO2URblzulExsmj4gFZ8e+VAyDooU9oAoXfEDNxTA==
+"@vue/compiler-sfc@3.4.27", "@vue/compiler-sfc@^3.2.29", "@vue/compiler-sfc@^3.4.15":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.27.tgz#399cac1b75c6737bf5440dc9cf3c385bb2959701"
+  integrity sha512-nDwntUEADssW8e0rrmE0+OrONwmRlegDA1pD6QhVeXxjIytV03yDqTey9SBDiALsvAd5U4ZrEKbMyVXhX6mCGA==
   dependencies:
     "@babel/parser" "^7.24.4"
-    "@vue/compiler-core" "3.4.24"
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/compiler-ssr" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/compiler-core" "3.4.27"
+    "@vue/compiler-dom" "3.4.27"
+    "@vue/compiler-ssr" "3.4.27"
+    "@vue/shared" "3.4.27"
     estree-walker "^2.0.2"
     magic-string "^0.30.10"
     postcss "^8.4.38"
@@ -1161,18 +1191,18 @@
     "@vue/compiler-dom" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/compiler-ssr@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.24.tgz#0d11fe54dabd17cbd6393a16bf7f785da1cfab46"
-  integrity sha512-ZsAtr4fhaUFnVcDqwW3bYCSDwq+9Gk69q2r/7dAHDrOMw41kylaMgOP4zRnn6GIEJkQznKgrMOGPMFnLB52RbQ==
+"@vue/compiler-ssr@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.27.tgz#2a8ecfef1cf448b09be633901a9c020360472e3d"
+  integrity sha512-CVRzSJIltzMG5FcidsW0jKNQnNRYC8bT21VegyMMtHmhW3UOI7knmUehzswXLrExDLE6lQCZdrhD4ogI7c+vuw==
   dependencies:
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/compiler-dom" "3.4.27"
+    "@vue/shared" "3.4.27"
 
 "@vue/devtools-api@^6.5.0", "@vue/devtools-api@^6.5.1":
-  version "6.6.1"
-  resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.1.tgz#7c14346383751d9f6ad4bea0963245b30220ef83"
-  integrity sha512-LgPscpE3Vs0x96PzSSB4IGVSZXZBZHpfxs+ZA1d+VEPwHdOXowy/Y2CsvCAIFrf+ssVU1pD1jidj505EpUnfbA==
+  version "6.6.3"
+  resolved "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.6.3.tgz#b23a588154cba8986bba82b6e1d0248bde3fd1a0"
+  integrity sha512-0MiMsFma/HqA6g3KLKn+AGpL1kgKhFWszC9U29NfpWK5LE7bjeXxySWJrOJ77hBz+TBrBQ7o4QJqbPbqbs8rJw==
 
 "@vue/language-core@1.8.27":
   version "1.8.27"
@@ -1207,12 +1237,12 @@
   dependencies:
     "@vue/shared" "3.3.4"
 
-"@vue/reactivity@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.24.tgz#150584316ca2acc4ed19a24f9f29863c3a17a7b2"
-  integrity sha512-nup3fSYg4i4LtNvu9slF/HF/0dkMQYfepUdORBcMSsankzRPzE7ypAFurpwyRBfU1i7Dn1kcwpYsE1wETSh91g==
+"@vue/reactivity@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.4.27.tgz#6ece72331bf719953f5eaa95ec60b2b8d49e3791"
+  integrity sha512-kK0g4NknW6JX2yySLpsm2jlunZJl2/RJGZ0H9ddHdfBVHcNzxmQ0sS0b09ipmBoQpY8JM2KmUw+a6sO8Zo+zIA==
   dependencies:
-    "@vue/shared" "3.4.24"
+    "@vue/shared" "3.4.27"
 
 "@vue/runtime-core@3.3.4":
   version "3.3.4"
@@ -1222,13 +1252,13 @@
     "@vue/reactivity" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/runtime-core@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.24.tgz#066c544dc59a07a96c12874a57b750c239124874"
-  integrity sha512-c7iMfj6cJMeAG3s5yOn9Rc5D9e2/wIuaozmGf/ICGCY3KV5H7mbTVdvEkd4ZshTq7RUZqj2k7LMJWVx+EBiY1g==
+"@vue/runtime-core@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.4.27.tgz#1b6e1d71e4604ba7442dd25ed22e4a1fc6adbbda"
+  integrity sha512-7aYA9GEbOOdviqVvcuweTLe5Za4qBZkUY7SvET6vE8kyypxVgaT1ixHLg4urtOlrApdgcdgHoTZCUuTGap/5WA==
   dependencies:
-    "@vue/reactivity" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/reactivity" "3.4.27"
+    "@vue/shared" "3.4.27"
 
 "@vue/runtime-dom@3.3.4":
   version "3.3.4"
@@ -1239,13 +1269,13 @@
     "@vue/shared" "3.3.4"
     csstype "^3.1.1"
 
-"@vue/runtime-dom@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.24.tgz#4f8e7acbe1e8ffa7c55af1366e4438729ebe9b20"
-  integrity sha512-uXKzuh/Emfad2Y7Qm0ABsLZZV6H3mAJ5ZVqmAOlrNQRf+T5mxpPGZBfec1hkP41t6h6FwF6RSGCs/gd8WbuySQ==
+"@vue/runtime-dom@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.4.27.tgz#fe8d1ce9bbe8921d5dd0ad5c10df0e04ef7a5ee7"
+  integrity sha512-ScOmP70/3NPM+TW9hvVAz6VWWtZJqkbdf7w6ySsws+EsqtHvkhxaWLecrTorFxsawelM5Ys9FnDEMt6BPBDS0Q==
   dependencies:
-    "@vue/runtime-core" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/runtime-core" "3.4.27"
+    "@vue/shared" "3.4.27"
     csstype "^3.1.3"
 
 "@vue/server-renderer@3.3.4":
@@ -1256,62 +1286,73 @@
     "@vue/compiler-ssr" "3.3.4"
     "@vue/shared" "3.3.4"
 
-"@vue/server-renderer@3.4.24":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.24.tgz#80dd546f8d6a9f5c4f8b68083fe9cc2d62299332"
-  integrity sha512-H+DLK4sQF6sRgzKyofmlEVBIV/9KrQU6HIV7nt6yIwSGGKvSwlV8pqJlebUKLpbXaNHugdSfAbP6YmXF69lxow==
+"@vue/server-renderer@3.4.27":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.4.27.tgz#3306176f37e648ba665f97dda3ce705687be63d2"
+  integrity sha512-dlAMEuvmeA3rJsOMJ2J1kXU7o7pOxgsNHVr9K8hB3ImIkSuBrIdy0vF66h8gf8Tuinf1TK3mPAz2+2sqyf3KzA==
   dependencies:
-    "@vue/compiler-ssr" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/compiler-ssr" "3.4.27"
+    "@vue/shared" "3.4.27"
 
 "@vue/shared@3.3.4":
   version "3.3.4"
   resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz#06e83c5027f464eef861c329be81454bc8b70780"
   integrity sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==
 
-"@vue/shared@3.4.24", "@vue/shared@^3.3.0":
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.4.24.tgz#278ac71f492b392b9b17fe8fc7d324db1a8842db"
-  integrity sha512-BW4tajrJBM9AGAknnyEw5tO2xTmnqgup0VTnDAMcxYmqOX0RG0b9aSUGAbEKolD91tdwpA6oCwbltoJoNzpItw==
+"@vue/shared@3.4.27", "@vue/shared@^3.3.0":
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.4.27.tgz#f05e3cd107d157354bb4ae7a7b5fc9cf73c63b50"
+  integrity sha512-DL3NmY2OFlqmYYrzp39yi3LDkKxa5vZVwxWdQ3rG0ekuWscHraeIbnI8t+aZK7qhYqEqWKTUdijadunb9pnrgA==
 
-"@vuemap/district-cluster@^0.0.4":
-  version "0.0.4"
-  resolved "https://registry.npmjs.org/@vuemap/district-cluster/-/district-cluster-0.0.4.tgz#3734ea864dd16780317b2006195f166d3031a883"
-  integrity sha512-PVbJgZeoOtu53idletLSqG8KnQ+iQKlonBy3oSKrAPljHpLtam9wCuSyCBNVgfnlJ8kdDricOkoJ0W6mCIwZiQ==
+"@vuemap/amap-jsapi-loader@1.0.4":
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/@vuemap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.4.tgz#699fc44eda74306ed489e9873d633f820cdac29a"
+  integrity sha512-s5fFHrsNkjYMovEmUJ5S23jpDtElTanDN2HdCt/amOD245a8wWVcTPjl06YEHXtxf6Ewm+z29wQByOCn209Hxg==
+
+"@vuemap/amap-jsapi-types@^0.0.16":
+  version "0.0.16"
+  resolved "https://registry.npmjs.org/@vuemap/amap-jsapi-types/-/amap-jsapi-types-0.0.16.tgz#74f9d381d519fe1ce49b0ae8fe103f7213b1e5c2"
+  integrity sha512-1B1H2IS8sT2RDubbpEY+K8j11Gb7PZY5Bo0cszRkF8Nw+9HNqpbUNeqkQ6+rxLkwIedcSkOsFDy/IyzXCUXqVw==
+
+"@vuemap/amap-jsapi-types@^0.0.17":
+  version "0.0.17"
+  resolved "https://registry.npmjs.org/@vuemap/amap-jsapi-types/-/amap-jsapi-types-0.0.17.tgz#3f21674520a97785388885a1b19c68acacaeb20e"
+  integrity sha512-FHI8OMWxJWbgyuQ0tKclvurQIVHRexMIYAOwZ/z9+G7aHHK5EFhKM13siLczNNAgXdJ2dctPEghCdlhcByl3Ag==
+
+"@vuemap/amap-xyz-layer@0.0.12":
+  version "0.0.12"
+  resolved "https://registry.npmjs.org/@vuemap/amap-xyz-layer/-/amap-xyz-layer-0.0.12.tgz#3a3677e32bb57b8f731a861f6c9a46a46428ccf7"
+  integrity sha512-eyInU8AmwXOgkCXILiQoqaCq6vZX/ZOmv7jBsWcRifDhbDOloJ1322d+3iWeIVgSl9STRFX0uPRnGduk3RvNog==
+  dependencies:
+    "@math.gl/core" "3.6.3"
+    earcut "2.2.4"
+    gl-matrix "3.4.3"
+
+"@vuemap/district-cluster@0.0.11":
+  version "0.0.11"
+  resolved "https://registry.npmjs.org/@vuemap/district-cluster/-/district-cluster-0.0.11.tgz#cdb37d621de03d73d462e47b580353f74f7c65e6"
+  integrity sha512-SY01gFe8uhP5FKjzyTe0x2yL2K5VmwD5UKlEUU4e09UUZphXCj2Ci7iunX0L29nWINkBjdfxu8dXzhIcx9T3ug==
   dependencies:
-    "@amap/amap-jsapi-types" "^0.0.10"
     "@turf/helpers" "^6.5.0"
     "@turf/intersect" "^6.5.0"
+    "@vuemap/amap-jsapi-types" "^0.0.16"
     topojson-client "3.1.0"
 
-"@vuemap/layer-3dtiles@^0.0.3":
-  version "0.0.3"
-  resolved "https://registry.npmjs.org/@vuemap/layer-3dtiles/-/layer-3dtiles-0.0.3.tgz#95d6dda1cdc8458daedba0722b35cc73507d407f"
-  integrity sha512-3ok0a7WNRBYnFdIev4JG32UTiOGac6YfsLUCyhTyAST0Y+4ZjcGZG5LqTqx4id8371i0BVy9qGwgy3D5ih64vQ==
-  dependencies:
-    "3d-tiles-renderer" "^0.3.13"
-    lodash-es "^4.17.21"
-    three "0.143.0"
-
 "@vuemap/unplugin-resolver@^1.0.4":
   version "1.0.4"
   resolved "https://registry.npmjs.org/@vuemap/unplugin-resolver/-/unplugin-resolver-1.0.4.tgz#f59aa79261b8811be61f0e8af6df9e11d457add0"
   integrity sha512-dE1s+QtkRm6QgOk+ykXc/vQeIzwALB+sF3vJV17ILtqoEnrP9n+LVKP5pUvXV5seDgC/IV13JYWyFyC/F/ucgQ==
 
-"@vuemap/vue-amap@^1.1.20":
-  version "1.1.24"
-  resolved "https://registry.npmjs.org/@vuemap/vue-amap/-/vue-amap-1.1.24.tgz#cd302be5a2ec98668f501d0ca1665e0bde683dd6"
-  integrity sha512-DAVrSZjwoRkQD7Eb5u2H1cKWKP/AEx3dil2J/i+iSJmOyCHDF4wJx2/u8S/P2iwO7P251C4Kg9INCb6Co67pkg==
+"@vuemap/vue-amap@^2.1.2":
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/@vuemap/vue-amap/-/vue-amap-2.1.2.tgz#84b14dcb980734c889e7e908464da9134ffcf85d"
+  integrity sha512-4Tn8CrmEPv822pt2pJxCtG49+GSItqDMdKHb34RtB8qyY5GpRnMeS564ZoGsZCU7S2bMLqlEw9mBneJVU5huVQ==
   dependencies:
-    "@amap/amap-jsapi-loader" "^1.0.1"
-    "@amap/three-layer" "^0.0.4"
-    "@tweenjs/tween.js" "^18.6.4"
-    "@vuemap/district-cluster" "^0.0.4"
-    "@vuemap/layer-3dtiles" "^0.0.3"
-    color "^4.2.3"
+    "@vuemap/amap-jsapi-loader" "1.0.4"
+    "@vuemap/amap-jsapi-types" "^0.0.17"
+    "@vuemap/amap-xyz-layer" "0.0.12"
+    "@vuemap/district-cluster" "0.0.11"
     lodash-es "^4.17.21"
-    three "0.143.0"
-    uppercamelcase "^1.1.0"
 
 "@vueuse/core@^7.5.5":
   version "7.7.1"
@@ -1377,14 +1418,14 @@ acorn@^8.10.0, acorn@^8.11.3, acorn@^8.4.1, acorn@^8.8.2, acorn@^8.9.0:
   integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
 
 ajv@^8.11.0, ajv@^8.12.0:
-  version "8.12.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  version "8.16.0"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.16.0.tgz#22e2a92b94f005f7e0f9c9d39652ef0b8f6f0cb4"
+  integrity sha512-F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
-    uri-js "^4.2.2"
+    uri-js "^4.4.1"
 
 ansi-align@^2.0.0:
   version "2.0.0"
@@ -1531,7 +1572,7 @@ arrify@^1.0.1:
   resolved "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
-async-validator@^4.0.0:
+async-validator@^4.0.0, async-validator@^4.2.5:
   version "4.2.5"
   resolved "https://registry.npmjs.org/async-validator/-/async-validator-4.2.5.tgz#c96ea3332a521699d0afaaceed510a54656c6339"
   integrity sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==
@@ -1558,10 +1599,10 @@ autoprefixer@^10.4.13:
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
-axios@^1.2.1:
-  version "1.6.8"
-  resolved "https://registry.npmjs.org/axios/-/axios-1.6.8.tgz#66d294951f5d988a00e87a0ffb955316a619ea66"
-  integrity sha512-v/ZHtJDU39mDpyBoFVkETcd/uNdxrWRrg3bKpOKzXFA6Bvqopts6ALSMU3y6ijYxbw2B+wPrIv46egTzJXCLGQ==
+axios@*, axios@^1.2.1:
+  version "1.7.2"
+  resolved "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz#b625db8a7051fbea61c35a3cbb3a1daa7b9c7621"
+  integrity sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==
   dependencies:
     follow-redirects "^1.15.6"
     form-data "^4.0.0"
@@ -1640,22 +1681,22 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.2, braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.22.2, browserslist@^4.23.0:
-  version "4.23.0"
-  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz#8f3acc2bbe73af7213399430890f86c63a5674ab"
-  integrity sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==
+  version "4.23.1"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz#ce4af0534b3d37db5c1a4ca98b9080f985041e96"
+  integrity sha512-TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==
   dependencies:
-    caniuse-lite "^1.0.30001587"
-    electron-to-chromium "^1.4.668"
+    caniuse-lite "^1.0.30001629"
+    electron-to-chromium "^1.4.796"
     node-releases "^2.0.14"
-    update-browserslist-db "^1.0.13"
+    update-browserslist-db "^1.0.16"
 
 buffer-from@^1.0.0:
   version "1.1.2"
@@ -1702,11 +1743,6 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-  integrity sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==
-
 camelcase@^4.0.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -1722,10 +1758,10 @@ camelcase@^6.3.0:
   resolved "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
   integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
 
-caniuse-lite@^1.0.30001587, caniuse-lite@^1.0.30001599:
-  version "1.0.30001612"
-  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001612.tgz#d34248b4ec1f117b70b24ad9ee04c90e0b8a14ae"
-  integrity sha512-lFgnZ07UhaCcsSZgWW0K5j4e69dK1u/ltrL9lTUiFOwNHs12S3UMIEYgBV0Z6C6hRDev7iRnMzzYmKabYdXF9g==
+caniuse-lite@^1.0.30001599, caniuse-lite@^1.0.30001629:
+  version "1.0.30001632"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001632.tgz#964207b7cba5851701afb4c8afaf1448db3884b6"
+  integrity sha512-udx3o7yHJfUxMLkGohMlVHCvFvWmirKh9JAH/d7WOLPetlH+LTL5cocMZ0t7oZx/mdlOWXti97xLZWc8uURRHg==
 
 capital-case@^1.0.4:
   version "1.0.4"
@@ -1943,27 +1979,11 @@ color-name@1.1.3:
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-color@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.npmjs.org/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a"
-  integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==
-  dependencies:
-    color-convert "^2.0.1"
-    color-string "^1.9.0"
-
 colorette@^1.1.0:
   version "1.4.0"
   resolved "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz#5190fbb87276259a86ad700bff2c6d6faa3fca40"
@@ -2045,6 +2065,11 @@ concat-map@0.0.1:
   resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
+concat-typed-array@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/concat-typed-array/-/concat-typed-array-1.0.2.tgz#67880c3ce19ecff110c31598b41c7f4739d47ca0"
+  integrity sha512-aC878bxeWSlrY6h60cCDwBUXpKwovZrB7+C4+VHNO1CIXW2gBLxbQ757jWtOXUscLGgYI8R84N6uy9fTJPe+0g==
+
 confbox@^0.1.7:
   version "0.1.7"
   resolved "https://registry.npmjs.org/confbox/-/confbox-0.1.7.tgz#ccfc0a2bcae36a84838e83a3b7f770fb17d6c579"
@@ -2135,9 +2160,9 @@ copy-anything@^2.0.1:
     is-what "^3.14.1"
 
 core-js@^3.15.1:
-  version "3.37.0"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.37.0.tgz#d8dde58e91d156b2547c19d8a4efd5c7f6c426bb"
-  integrity sha512-fu5vHevQ8ZG4og+LXug8ulUtVxjOcEYvifJr7L5Bfq9GOztVqsKd9/59hUk2ZSbCrS3BqUr3EpaYGIYzq7g3Ug==
+  version "3.37.1"
+  resolved "https://registry.npmjs.org/core-js/-/core-js-3.37.1.tgz#d21751ddb756518ac5a00e4d66499df981a62db9"
+  integrity sha512-Xn6qmxrQZyB0FFY8E3bgRXei3lWDJHhvI+u0q9TKIYM49G8pAr0FgnnrFRAmsbptZL1yxRADVXn+x5AGsbBfyw==
 
 core-util-is@^1.0.2:
   version "1.0.3"
@@ -2176,6 +2201,11 @@ crelt@^1.0.5:
   resolved "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz#7cc898ea74e190fb6ef9dae57f8f81cf7302df72"
   integrity sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==
 
+cronstrue@^2.50.0:
+  version "2.50.0"
+  resolved "https://registry.npmjs.org/cronstrue/-/cronstrue-2.50.0.tgz#eabba0f915f186765258b707b7a3950c663b5573"
+  integrity sha512-ULYhWIonJzlScCCQrPUG5uMXzXxSixty4djud9SS37DoNxDdkeRocxzHuAo4ImRBUK+mAuU5X9TSwEDccnnuPg==
+
 cross-spawn@^5.0.1:
   version "5.1.0"
   resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
@@ -2194,6 +2224,11 @@ cross-spawn@^7.0.3:
     shebang-command "^2.0.0"
     which "^2.0.1"
 
+crypto-es@^1.2.4:
+  version "1.2.7"
+  resolved "https://registry.npmjs.org/crypto-es/-/crypto-es-1.2.7.tgz#754a6d52319a94fb4eb1f119297f17196b360f88"
+  integrity sha512-UUqiVJ2gUuZFmbFsKmud3uuLcNP2+Opt+5ysmljycFCyhA0+T16XJmo1ev/t5kMChMqWh7IEvURNCqsg+SjZGQ==
+
 crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
@@ -2233,28 +2268,50 @@ csstype@^3.1.1, csstype@^3.1.3:
   resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz#d80ff294d114fb0e6ac500fbf85b60137d7eff81"
   integrity sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==
 
+d@1, d@^1.0.1, d@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/d/-/d-1.0.2.tgz#2aefd554b81981e7dccf72d6842ae725cb17e5de"
+  integrity sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==
+  dependencies:
+    es5-ext "^0.10.64"
+    type "^2.7.2"
+
+danmu.js@>=1.1.6:
+  version "1.1.13"
+  resolved "https://registry.npmjs.org/danmu.js/-/danmu.js-1.1.13.tgz#615aa3099c662605018724d966b1967c65d7a48b"
+  integrity sha512-knFd0/cB2HA4FFWiA7eB2suc5vCvoHdqio33FyyCSfP7C+1A+zQcTvnvwfxaZhrxsGj4qaQI2I8XiTqedRaVmg==
+  dependencies:
+    event-emitter "^0.3.5"
+
 dargs@^7.0.0:
   version "7.0.0"
   resolved "https://registry.npmjs.org/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc"
   integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg==
 
 dayjs@^1.10.5:
-  version "1.11.10"
-  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.10.tgz#68acea85317a6e164457d6d6947564029a6a16a0"
-  integrity sha512-vjAczensTgRcqDERK0SR2XMwsF/tSvnvlv6VcF2GIhg6Sx4yOIt/irsr1RDJsKiIyBzJDpCoXiWWq28MqH2cnQ==
+  version "1.11.11"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz#dfe0e9d54c5f8b68ccf8ca5f72ac603e7e5ed59e"
+  integrity sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==
 
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
   integrity sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==
 
-debug@4.3.4, debug@^4.1.0, debug@^4.3.1, debug@^4.3.4:
+debug@4.3.4:
   version "4.3.4"
   resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.1.0, debug@^4.3.1, debug@^4.3.4:
+  version "4.3.5"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e"
+  integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==
+  dependencies:
+    ms "2.1.2"
+
 decamelize-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz#04a2d523b2f18d80d0158a43b895d56dff8d19d8"
@@ -2280,6 +2337,11 @@ deep-extend@^0.6.0:
   resolved "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
   integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
 
+deepmerge@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-2.0.1.tgz#25c1c24f110fb914f80001b925264dd77f3f4312"
+  integrity sha512-VIPwiMJqJ13ZQfaCsIFnp5Me9tnjURiaIFxfz7EH0Ci0dTSQpZtSLrqOicXqEd/z2r+z+Klk9GzmnRsgpgbOsQ==
+
 defer-to-connect@^1.0.1:
   version "1.1.3"
   resolved "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
@@ -2295,7 +2357,7 @@ delayed-stream@~1.0.0:
   resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
-delegate@^3.1.2:
+delegate@^3.1.2, delegate@^3.2.0:
   version "3.2.0"
   resolved "https://registry.npmjs.org/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166"
   integrity sha512-IofjkYBZaZivn0V8nnsMJGBr4jVLxHDheKSW88PyxS5QC4Vo9ZbZVvhzlSxY87fVq3STR6r+4cGepyHkcWOQSw==
@@ -2409,6 +2471,11 @@ dotenv@^5.0.1:
   resolved "https://registry.npmjs.org/dotenv/-/dotenv-5.0.1.tgz#a5317459bd3d79ab88cff6e44057a6a3fbb1fcef"
   integrity sha512-4As8uPrjfwb7VXC+WnLCbXK7y+Ueb2B3zgNCePYfhxS1PYeaO1YTeplffTEcbfLhvFNGLAz90VvJs9yomG7bow==
 
+downloadjs@1.4.7:
+  version "1.4.7"
+  resolved "https://registry.npmjs.org/downloadjs/-/downloadjs-1.4.7.tgz#f69f96f940e0d0553dac291139865a3cd0101e3c"
+  integrity sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==
+
 driver.js@^0.9.8:
   version "0.9.8"
   resolved "https://registry.npmjs.org/driver.js/-/driver.js-0.9.8.tgz#4b327f4537b1c9b9fb19419de86174be821ae32a"
@@ -2419,6 +2486,11 @@ duplexer3@^0.1.4:
   resolved "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz#0b5e4d7bad5de8901ea4440624c8e1d20099217e"
   integrity sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==
 
+earcut@2.2.4:
+  version "2.2.4"
+  resolved "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a"
+  integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==
+
 eastasianwidth@^0.2.0:
   version "0.2.0"
   resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
@@ -2449,10 +2521,10 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.668:
-  version "1.4.747"
-  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.747.tgz#e37fa5b7b7e4c22607c5f59b5cf78f947266e77d"
-  integrity sha512-+FnSWZIAvFHbsNVmUxhEqWiaOiPMcfum1GQzlWCg/wLigVtshOsjXHyEFfmt6cFK6+HkS3QOJBv6/3OPumbBfw==
+electron-to-chromium@^1.4.796:
+  version "1.4.799"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.799.tgz#271c56654ab4dc703037e47a5af4fc8945160611"
+  integrity sha512-3D3DwWkRTzrdEpntY0hMLYwj7SeBk1138CkPE8sBDSj3WzrzOiG2rHm3luw8jucpf+WiyLBCZyU9lMHyQI9M9Q==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -2505,6 +2577,33 @@ es-module-lexer@^0.9.3:
   resolved "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
   integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==
 
+es5-ext@^0.10.35, es5-ext@^0.10.62, es5-ext@^0.10.64, es5-ext@~0.10.14:
+  version "0.10.64"
+  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz#12e4ffb48f1ba2ea777f1fcdd1918ef73ea21714"
+  integrity sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==
+  dependencies:
+    es6-iterator "^2.0.3"
+    es6-symbol "^3.1.3"
+    esniff "^2.0.1"
+    next-tick "^1.1.0"
+
+es6-iterator@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7"
+  integrity sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==
+  dependencies:
+    d "1"
+    es5-ext "^0.10.35"
+    es6-symbol "^3.1.1"
+
+es6-symbol@^3.1.1, es6-symbol@^3.1.3:
+  version "3.1.4"
+  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz#f4e7d28013770b4208ecbf3e0bf14d3bcb557b8c"
+  integrity sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==
+  dependencies:
+    d "^1.0.2"
+    ext "^1.7.0"
+
 esbuild@^0.18.10:
   version "0.18.20"
   resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz#4709f5a34801b43b799ab7d6d82f7284a9b7a7a6"
@@ -2533,7 +2632,7 @@ esbuild@^0.18.10:
     "@esbuild/win32-ia32" "0.18.20"
     "@esbuild/win32-x64" "0.18.20"
 
-escalade@^3.1.1:
+escalade@^3.1.1, escalade@^3.1.2:
   version "3.1.2"
   resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz#54076e9ab29ea5bf3d8f1ed62acffbb88272df27"
   integrity sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==
@@ -2553,6 +2652,16 @@ escape-string-regexp@^5.0.0:
   resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz#4683126b500b61762f2dbebace1806e8be31b1c8"
   integrity sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==
 
+esniff@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz#a4d4b43a5c71c7ec51c51098c1d8a29081f9b308"
+  integrity sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==
+  dependencies:
+    d "^1.0.1"
+    es5-ext "^0.10.62"
+    event-emitter "^0.3.5"
+    type "^2.7.2"
+
 esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -2575,11 +2684,24 @@ esutils@^2.0.2:
   resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
+event-emitter@^0.3.5:
+  version "0.3.5"
+  resolved "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39"
+  integrity sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==
+  dependencies:
+    d "1"
+    es5-ext "~0.10.14"
+
 event-source-polyfill@^1.0.31:
   version "1.0.31"
   resolved "https://registry.npmjs.org/event-source-polyfill/-/event-source-polyfill-1.0.31.tgz#45fb0a6fc1375b2ba597361ba4287ffec5bf2e0c"
   integrity sha512-4IJSItgS/41IxN5UVAVuAyczwZF7ZIEsM1XAoUzIHA6A+xzusEZUutdXz2Nr+MQPLxfTiCvqE79/C8HT8fKFvA==
 
+eventemitter3@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
 eventemitter3@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4"
@@ -2628,6 +2750,13 @@ execa@^5.0.0:
     signal-exit "^3.0.3"
     strip-final-newline "^2.0.0"
 
+ext@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz#0ea4383c0103d60e70be99e9a7f11027a33c4f5f"
+  integrity sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==
+  dependencies:
+    type "^2.7.2"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2649,7 +2778,7 @@ external-editor@^3.0.3:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -2686,10 +2815,10 @@ filelist@^1.0.4:
   dependencies:
     minimatch "^5.0.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -2844,6 +2973,11 @@ git-username@^1.0.0:
     parse-github-url "^1.0.2"
     remote-origin-url "^1.0.0"
 
+gl-matrix@3.4.3, gl-matrix@^3.4.0:
+  version "3.4.3"
+  resolved "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz#fc1191e8320009fd4d20e9339595c6041ddc22c9"
+  integrity sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==
+
 glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
@@ -3002,7 +3136,7 @@ header-case@^2.0.4:
     capital-case "^1.0.4"
     tslib "^2.0.3"
 
-highlight.js@^11.5.1:
+highlight.js@^11.9.0:
   version "11.9.0"
   resolved "https://registry.npmjs.org/highlight.js/-/highlight.js-11.9.0.tgz#04ab9ee43b52a41a047432c8103e2158a1b8b5b0"
   integrity sha512-fJ7cW7fQGCYAkgv4CPfwFHrfd/cLS4Hau96JuJ+ZTOWhjnhoeN1ub1tFmALm/+lW5z4WCAuAV9bm05AP0mS6Gw==
@@ -3094,9 +3228,9 @@ immutable-json-patch@6.0.1, immutable-json-patch@^6.0.0:
   integrity sha512-BHL/cXMjwFZlTOffiWNdY8ZTvNyYLrutCnWxrcKPHr5FqpAb6vsO6WWSPnVSys3+DruFN6lhHJJPHi8uELQL5g==
 
 immutable@^4.0.0:
-  version "4.3.5"
-  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.5.tgz#f8b436e66d59f99760dc577f5c99a4fd2a5cc5a0"
-  integrity sha512-8eabxkth9gZatlwl5TBuJnCsoTADlL6ftEr7A4qgdaTsPyreilDSnUk57SO+jfKcNtxPa22U5KK6DSeAYhpBJw==
+  version "4.3.6"
+  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz#6a05f7858213238e587fb83586ffa3b4b27f0447"
+  integrity sha512-Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==
 
 import-fresh@^3.0.0, import-fresh@^3.3.0:
   version "3.3.0"
@@ -3173,11 +3307,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
-
 is-binary-path@~2.1.0:
   version "2.1.0"
   resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
@@ -3378,9 +3507,9 @@ isexe@^2.0.0:
   integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 jake@^10.8.5:
-  version "10.8.7"
-  resolved "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f"
-  integrity sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==
+  version "10.9.1"
+  resolved "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz#8dc96b7fcc41cb19aa502af506da4e1d56f5e62b"
+  integrity sha512-61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==
   dependencies:
     async "^3.2.3"
     chalk "^4.0.2"
@@ -3392,18 +3521,16 @@ jetlinks-store@^0.0.3:
   resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz#7bc3c38c2e2e5d2eee6224f4878ff4d8326c978f"
   integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==
 
-jetlinks-ui-components@^1.0.38:
-  version "1.0.38"
-  resolved "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.38.tgz#aab0626caa404bd9cc55b640809bd268e36d4328"
-  integrity sha512-0ist4g1FRi/Ucy7d2wh4oIVDeUdb5K3e/F9oqxBxQnY/VqrBmIbYLhcsb1LYcDmZf+77nh9hq2HX6IQ9uqa5kQ==
+jetlinks-ui-components@^1.0.47:
+  version "1.0.47"
+  resolved "https://registry.npmjs.org/jetlinks-ui-components/-/jetlinks-ui-components-1.0.47.tgz#48c541e35a2fc7832a8e17870a4bf41445d59e8a"
+  integrity sha512-n9/Rw3xDgDshfyXv+mXUHiS95PmcMffZHz5UFoSp3ZuixWhHqchlNEEDp/DDLh4IcELay87HDF31cjuFPQrZHQ==
   dependencies:
     "@vueuse/core" "^9.12.0"
     "@vueuse/router" "^9.13.0"
-    ant-design-vue "^3.2.15"
     colorpicker-v3 "^2.10.2"
     lodash-es "^4.17.21"
     monaco-editor "^0.40.0"
-    onigasm "^2.2.5"
     sortablejs "^1.15.0"
     vuedraggable "^4.1.0"
 
@@ -3486,9 +3613,9 @@ jsonparse@^1.2.0:
   integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
 jsonrepair@^3.6.0:
-  version "3.6.1"
-  resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.6.1.tgz#a02d9c4e70100bd986b5c916303539d8e9a59c82"
-  integrity sha512-3yMISA+ma94/Sr8aDmB6mki6dKRoad4qMjddL+0gdymCnhjWPhzbNCyvx7ji7QroeicTSQW0lm77SC8Ecl/k3w==
+  version "3.8.0"
+  resolved "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.8.0.tgz#33a1b0d3630c452e9945ef07d760469cdfad8823"
+  integrity sha512-89lrxpwp+IEcJ6kwglF0HH3Tl17J08JEpYfXnvvjdp4zV4rjSoGu2NdQHxBs7yTOk3ETjTn9du48pBy8iBqj1w==
 
 keyv@^3.0.0:
   version "3.1.0"
@@ -3845,11 +3972,11 @@ markdown-it-footnote@^4.0.0:
   integrity sha512-WYJ7urf+khJYl3DqofQpYfEYkZKbmXmwxQV8c8mO/hGIhgZ1wOe7R4HLFNwqx7TjILbnC98fuyeSsin19JdFcQ==
 
 markdown-it-highlightjs@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/markdown-it-highlightjs/-/markdown-it-highlightjs-4.0.1.tgz#6b8eb6a3b971ed592db1ff160cfa5ce9f2e44232"
-  integrity sha512-EPXwFEN6P5nqR3G4KjT20r20xbGYKMMA/360hhSYFmeoGXTE6hsLtJAiB/8ID8slVH4CWHHEL7GX0YenyIstVQ==
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/markdown-it-highlightjs/-/markdown-it-highlightjs-4.1.0.tgz#29e91f88d9773d411c59fda143129fef26e55068"
+  integrity sha512-aYcgme5aYn10BHEvLZaCNgwxU2oaAX9inK9dwCv38wJdq7tal5FzZrLdQQY8MR3I1H07S3BKgYGRX2kKuPT+sA==
   dependencies:
-    highlight.js "^11.5.1"
+    highlight.js "^11.9.0"
 
 markdown-it-ins@^4.0.0:
   version "4.0.0"
@@ -3940,7 +4067,7 @@ merge2@^1.2.3, merge2@^1.3.0:
   resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@4.0.5, micromatch@^4.0.4:
+micromatch@4.0.5:
   version "4.0.5"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
   integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
@@ -3948,6 +4075,14 @@ micromatch@4.0.5, micromatch@^4.0.4:
     braces "^3.0.2"
     picomatch "^2.3.1"
 
+micromatch@^4.0.4:
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz#33e8190d9fe474a9895525f5618eee136d46c2e5"
+  integrity sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==
+  dependencies:
+    braces "^3.0.3"
+    picomatch "^2.3.1"
+
 middleearth-names@^1.1.0:
   version "1.1.0"
   resolved "https://registry.npmjs.org/middleearth-names/-/middleearth-names-1.1.0.tgz#c1d5ee48defb368128fbaebfebce8847cd18ddff"
@@ -4034,31 +4169,31 @@ minimist@^1.2.0, minimist@^1.2.6:
   resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
   integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
-mlly@^1.1.0, mlly@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz#0983067dc3366d6314fc5e12712884e6978d028f"
-  integrity sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==
+mlly@^1.1.0, mlly@^1.7.0:
+  version "1.7.1"
+  resolved "https://registry.npmjs.org/mlly/-/mlly-1.7.1.tgz#e0336429bb0731b6a8e887b438cbdae522c8f32f"
+  integrity sha512-rrVRZRELyQzrIUAVMHxP97kv+G786pHmOKzuFII8zDYahFBS7qnHh2AlYSl1GAHhaMPCz6/oHjVMcfFYgFYHgA==
   dependencies:
     acorn "^8.11.3"
     pathe "^1.1.2"
-    pkg-types "^1.0.3"
-    ufo "^1.3.2"
+    pkg-types "^1.1.1"
+    ufo "^1.5.3"
 
 moment@*, moment@^2.29.4:
   version "2.30.1"
   resolved "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz#f8c91c07b7a786e30c59926df530b4eac96974ae"
   integrity sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==
 
-monaco-editor@^0.36.0:
-  version "0.36.1"
-  resolved "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.36.1.tgz#aad528c815605307473a1634612946921d8079b5"
-  integrity sha512-/CaclMHKQ3A6rnzBzOADfwdSJ25BFoFT0Emxsc4zYVyav5SkK9iA6lEtIeuN/oRYbwPgviJT+t3l+sjFa28jYg==
-
 monaco-editor@^0.40.0:
   version "0.40.0"
   resolved "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz#d10834e15ad50a15ec61fd01892e508464ebe2fe"
   integrity sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g==
 
+monaco-editor@^0.50.0:
+  version "0.50.0"
+  resolved "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.50.0.tgz#44e62b124c8aed224e1d310bbbe6ffd6d5122413"
+  integrity sha512-8CclLCmrRRh+sul7C08BmPBP3P8wVWfBHomsTcndxg5NRCEPfu/mc2AGU8k37ajjDVXcXFc12ORAMUkmk+lkFA==
+
 mrm-core@^7.1.22:
   version "7.1.22"
   resolved "https://registry.npmjs.org/mrm-core/-/mrm-core-7.1.22.tgz#09a42f35f28d0562eb47e277bc89b7dedb3342bc"
@@ -4146,6 +4281,11 @@ needle@^3.1.0:
     iconv-lite "^0.6.3"
     sax "^1.2.4"
 
+next-tick@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz#1836ee30ad56d67ef281b22bd199f709449b35eb"
+  integrity sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==
+
 no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
@@ -4279,13 +4419,6 @@ onetime@^6.0.0:
   dependencies:
     mimic-fn "^4.0.0"
 
-onigasm@^2.2.5:
-  version "2.2.5"
-  resolved "https://registry.npmjs.org/onigasm/-/onigasm-2.2.5.tgz#cc4d2a79a0fa0b64caec1f4c7ea367585a676892"
-  integrity sha512-F+th54mPc0l1lp1ZcFMyL/jTs2Tlq4SqIHKIXGZOR/VkHkF9A7Fr5rRr5+ZG/lWeRsyrClLYRq7s/yFQ/XhWCA==
-  dependencies:
-    lru-cache "^5.1.1"
-
 open@^8.4.2:
   version "8.4.2"
   resolved "https://registry.npmjs.org/open/-/open-8.4.2.tgz#5b5ffe2a8f793dcd2aad73e550cb87b59cb084f9"
@@ -4518,10 +4651,10 @@ periscopic@^3.1.0:
     estree-walker "^3.0.0"
     is-reference "^3.0.0"
 
-picocolors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
-  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+picocolors@^1.0.0, picocolors@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
+  integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==
 
 picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
   version "2.3.1"
@@ -4551,13 +4684,13 @@ pinia@^2.0.28:
     "@vue/devtools-api" "^6.5.0"
     vue-demi ">=0.14.5"
 
-pkg-types@^1.0.1, pkg-types@^1.0.3:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.0.tgz#3ec1bf33379030fd0a34c227b6c650e8ea7ca271"
-  integrity sha512-/RpmvKdxKf8uILTtoOhAgf30wYbP2Qw+L9p3Rvshx1JZVX+XQNZQFjlbmGHEGIm4CkVPlSn+NXmIM8+9oWQaSA==
+pkg-types@^1.0.1, pkg-types@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/pkg-types/-/pkg-types-1.1.1.tgz#07b626880749beb607b0c817af63aac1845a73f2"
+  integrity sha512-ko14TjmDuQJ14zsotODv7dBlwxKhUKQEhuhmbqo1uCi9BB0Z2alo/wAXg6q1dTR5TyuqYyWhjtfe/Tsh+X28jQ==
   dependencies:
     confbox "^0.1.7"
-    mlly "^1.6.1"
+    mlly "^1.7.0"
     pathe "^1.1.2"
 
 polygon-clipping@^0.15.3:
@@ -4582,6 +4715,11 @@ postcss@^8.1.10, postcss@^8.4.27, postcss@^8.4.38:
     picocolors "^1.0.0"
     source-map-js "^1.2.0"
 
+preact@~10.12.1:
+  version "10.12.1"
+  resolved "https://registry.npmjs.org/preact/-/preact-10.12.1.tgz#8f9cb5442f560e532729b7d23d42fd1161354a21"
+  integrity sha512-l8386ixSsBdbreOAkqtrwqHwdvR35ID8c3rKPa8lCWuO86dBi32QWHV4vfsZK1utLLFMvw+Z5Ad4XLkZzchscg==
+
 prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -4928,18 +5066,18 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sass@^1.70.0:
-  version "1.75.0"
-  resolved "https://registry.npmjs.org/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c"
-  integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw==
+  version "1.77.5"
+  resolved "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
+  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
 sax@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/sax/-/sax-1.3.0.tgz#a5dbe77db3be05c9d1ee7785dbd3ea9de51593d0"
-  integrity sha512-0s+oAmw9zLl1V1cS9BtZN7JAd0cW5e0QH4W3LWEK6a4LaLEA2OTpGYWDY+6XasBLtz6wkm3u1xRw95mRuJ59WA==
+  version "1.4.1"
+  resolved "https://registry.npmjs.org/sax/-/sax-1.4.1.tgz#44cc8988377f126304d3b3fc1010c733b929ef0f"
+  integrity sha512-+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==
 
 scroll-into-view-if-needed@^2.2.25:
   version "2.2.31"
@@ -4995,11 +5133,9 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.4, semver@^7.5.4:
-  version "7.6.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
-  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
-  dependencies:
-    lru-cache "^6.0.0"
+  version "7.6.2"
+  resolved "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
+  integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==
 
 sentence-case@^3.0.4:
   version "3.0.4"
@@ -5054,13 +5190,6 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==
-  dependencies:
-    is-arrayish "^0.3.1"
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
@@ -5144,9 +5273,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.17"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz#887da8aa73218e51a1d917502d79863161a93f9c"
-  integrity sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==
+  version "3.0.18"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.18.tgz#22aa922dcf2f2885a6494a261f2d8b75345d0326"
+  integrity sha512-xxRs31BqRYHwiMzudOrpSiHtZ8i/GeionCBDSilhYRj+9gIcI8wCZTlXZKu9vZIVqViP3dcp9qE5G6AlIaD+TQ==
 
 splaytree@^3.1.0:
   version "3.1.2"
@@ -5316,9 +5445,9 @@ supports-preserve-symlinks-flag@^1.0.0:
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
 svelte@^4.2.10:
-  version "4.2.15"
-  resolved "https://registry.npmjs.org/svelte/-/svelte-4.2.15.tgz#69f5ab9730c1d80109db2ee09427063dcf6b3512"
-  integrity sha512-j9KJSccHgLeRERPlhMKrCXpk2TqL2m5Z+k+OBTQhZOhIdCCd3WfqV+ylPWeipEwq17P/ekiSFWwrVQv93i3bsg==
+  version "4.2.18"
+  resolved "https://registry.npmjs.org/svelte/-/svelte-4.2.18.tgz#33dbce74e83eb6dcc54dbea25f9758b1d8e8bb78"
+  integrity sha512-d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA==
   dependencies:
     "@ampproject/remapping" "^2.2.1"
     "@jridgewell/sourcemap-codec" "^1.4.15"
@@ -5353,9 +5482,9 @@ term-size@^2.1.0:
   integrity sha512-wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg==
 
 terser@^5.10.0:
-  version "5.30.4"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.30.4.tgz#62b4d16a819424e6317fd5ceffb4ee8dc769803a"
-  integrity sha512-xRdd0v64a8mFK9bnsKVdoNP9GQIKUAaJPTaqEQDL4w/J8WaW4sWXXoMZ+6SimPkfT5bElreXf8m9HnmPc3E1BQ==
+  version "5.31.1"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz#735de3c987dd671e95190e6b98cfe2f07f3cf0d4"
+  integrity sha512-37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==
   dependencies:
     "@jridgewell/source-map" "^0.3.3"
     acorn "^8.8.2"
@@ -5367,11 +5496,6 @@ text-extensions@^1.0.0:
   resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-three@0.143.0:
-  version "0.143.0"
-  resolved "https://registry.npmjs.org/three/-/three-0.143.0.tgz#1455bca132cc2b20beb7f41d313e10c29e5ed9df"
-  integrity sha512-oKcAGYHhJ46TGEuHjodo2n6TY2R6lbvrkp+feKZxqsUL/WkH7GKKaeu6RHeyb2Xjfk2dPLRKLsOP0KM2VgT8Zg==
-
 through2@^4.0.0:
   version "4.0.2"
   resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -5465,9 +5589,9 @@ tslib@^1.9.0:
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
 tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0:
-  version "2.6.2"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
-  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+  version "2.6.3"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0"
+  integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==
 
 type-fest@^0.18.0:
   version "0.18.1"
@@ -5494,6 +5618,11 @@ type-fest@^1.0.2:
   resolved "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1"
   integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==
 
+type@^2.7.2:
+  version "2.7.3"
+  resolved "https://registry.npmjs.org/type/-/type-2.7.3.tgz#436981652129285cc3ba94f392886c2637ea0486"
+  integrity sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==
+
 typedarray-to-buffer@^3.1.5:
   version "3.1.5"
   resolved "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
@@ -5516,7 +5645,7 @@ uc.micro@^2.0.0, uc.micro@^2.1.0:
   resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz#f8d3f7d0ec4c3dea35a7e3c8efa4cb8b45c9e7ee"
   integrity sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==
 
-ufo@^1.3.2:
+ufo@^1.5.3:
   version "1.5.3"
   resolved "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz#3325bd3c977b6c6cd3160bf4ff52989adc9d3344"
   integrity sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==
@@ -5622,13 +5751,13 @@ unzip-response@^2.0.1:
   resolved "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha512-N0XH6lqDtFH84JxptQoZYmloF4nzrQqqrAymNj+/gW60AO2AZgOcf4O/nUXJcYfyQkqvMo9lSupBZmmgvuVXlw==
 
-update-browserslist-db@^1.0.13:
-  version "1.0.13"
-  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
-  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+update-browserslist-db@^1.0.16:
+  version "1.0.16"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz#f6d489ed90fb2f07d67784eb3f53d7891f736356"
+  integrity sha512-KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==
   dependencies:
-    escalade "^3.1.1"
-    picocolors "^1.0.0"
+    escalade "^3.1.2"
+    picocolors "^1.0.1"
 
 update-notifier@^2.3.0:
   version "2.5.0"
@@ -5679,14 +5808,7 @@ upper-case@^2.0.2:
   dependencies:
     tslib "^2.0.3"
 
-uppercamelcase@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/uppercamelcase/-/uppercamelcase-1.1.0.tgz#324d98a6b3afc7e8a8953e10641509b0e4e23f97"
-  integrity sha512-C7YEMvhgrvTEKEEVqA7LXNID/1TvvIwYZqNIKLquS6y/MGSkRQAav9LnTTILlC1RqUM8eTVBOe1U/fnB652PRA==
-  dependencies:
-    camelcase "^1.2.1"
-
-uri-js@^4.2.2:
+uri-js@^4.4.1:
   version "4.4.1"
   resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
@@ -5854,14 +5976,23 @@ vite@^4.0.0:
     fsevents "~2.3.2"
 
 vue-cropper@^1.0.9:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/vue-cropper/-/vue-cropper-1.1.2.tgz#eff4437fe67989f8b9aaa74ba6046f0223a91ffa"
-  integrity sha512-S4cmvQzdNiVpNGigFwgULSwxWp55bdD1xf+RIEH+4mLDpD9/MUjNoHf970V3nFX7SerUrPZbOXG/ZBaD6pxfWQ==
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/vue-cropper/-/vue-cropper-1.1.3.tgz#0664fc115138ee60afcbb4f72419f116ef68c19b"
+  integrity sha512-U1vBk/9M9Chp6iDWaDhC32SX7c5ndJrIzYgXndJH7wjejdriE0bzJsh6waQz9CRM94savFAw8FK1Q3r+I71Xgw==
 
 vue-demi@*, vue-demi@>=0.14.5:
-  version "0.14.7"
-  resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.7.tgz#8317536b3ef74c5b09f268f7782e70194567d8f2"
-  integrity sha512-EOG8KXDQNwkJILkx/gPcoL/7vH+hORoBaKgGe+6W7VFMvCYJfmF2dGbvgDroVnI8LU7/kTu8mbjRZGBU1z9NTA==
+  version "0.14.8"
+  resolved "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.8.tgz#00335e9317b45e4a68d3528aaf58e0cec3d5640a"
+  integrity sha512-Uuqnk9YE9SsWeReYqK2alDI5YzciATE0r2SkA6iMAtuXvNTMNACJLJEXNXaEy94ECuBe4Sk6RzRU80kjdbIo1Q==
+
+vue-i18n@^9.13.1:
+  version "9.13.1"
+  resolved "https://registry.npmjs.org/vue-i18n/-/vue-i18n-9.13.1.tgz#a292c8021b7be604ebfca5609ae1f8fafe5c36d7"
+  integrity sha512-mh0GIxx0wPtPlcB1q4k277y0iKgo25xmDPWioVVYanjPufDBpvu5ySTjP5wOrSvlYQ2m1xI+CFhGdauv/61uQg==
+  dependencies:
+    "@intlify/core-base" "9.13.1"
+    "@intlify/shared" "9.13.1"
+    "@vue/devtools-api" "^6.5.0"
 
 vue-json-viewer@^3.0.4:
   version "3.0.4"
@@ -5871,9 +6002,9 @@ vue-json-viewer@^3.0.4:
     clipboard "^2.0.4"
 
 vue-router@^4.1.6:
-  version "4.3.2"
-  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.3.2.tgz#08096c7765dacc6832f58e35f7a081a8b34116a7"
-  integrity sha512-hKQJ1vDAZ5LVkKEnHhmm1f9pMiWIBNGF5AwU67PdH7TyXCj/a4hTccuUuYCAMgJK6rO/NVYtQIEN3yL8CECa7Q==
+  version "4.3.3"
+  resolved "https://registry.npmjs.org/vue-router/-/vue-router-4.3.3.tgz#7505509d429a36694b12ba1f6530016c5ce5f6bf"
+  integrity sha512-8Q+u+WP4N2SXY38FDcF2H1dUEbYVHVPtPCPZj/GTZx8RCbiB8AtJP9+YIxn4Vs0svMTNQcLIzka4GH7Utkx9xQ==
   dependencies:
     "@vue/devtools-api" "^6.5.1"
 
@@ -5929,15 +6060,15 @@ vue@3.3.4:
     "@vue/shared" "3.3.4"
 
 vue@^3.2.25, vue@^3.4.5:
-  version "3.4.24"
-  resolved "https://registry.npmjs.org/vue/-/vue-3.4.24.tgz#f269549939a6c092480f018aa0bd886ba64f4c6f"
-  integrity sha512-NPdx7dLGyHmKHGRRU5bMRYVE+rechR+KDU5R2tSTNG36PuMwbfAJ+amEvOAw7BPfZp5sQulNELSLm5YUkau+Sg==
+  version "3.4.27"
+  resolved "https://registry.npmjs.org/vue/-/vue-3.4.27.tgz#40b7d929d3e53f427f7f5945386234d2854cc2a1"
+  integrity sha512-8s/56uK6r01r1icG/aEOHqyMVxd1bkYcSe9j8HcKtr/xTOFWvnzIVTehNW+5Yt89f+DLBe4A569pnZLS5HzAMA==
   dependencies:
-    "@vue/compiler-dom" "3.4.24"
-    "@vue/compiler-sfc" "3.4.24"
-    "@vue/runtime-dom" "3.4.24"
-    "@vue/server-renderer" "3.4.24"
-    "@vue/shared" "3.4.24"
+    "@vue/compiler-dom" "3.4.27"
+    "@vue/compiler-sfc" "3.4.27"
+    "@vue/runtime-dom" "3.4.27"
+    "@vue/server-renderer" "3.4.27"
+    "@vue/shared" "3.4.27"
 
 vuedraggable@^4.1.0:
   version "4.1.0"
@@ -5976,9 +6107,9 @@ webpack-sources@^3.2.3:
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack-virtual-modules@^0.6.1:
-  version "0.6.1"
-  resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.1.tgz#ac6fdb9c5adb8caecd82ec241c9631b7a3681b6f"
-  integrity sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==
+  version "0.6.2"
+  resolved "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz#057faa9065c8acf48f24cb57ac0e77739ab9a7e8"
+  integrity sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==
 
 whatwg-url@^5.0.0:
   version "5.0.0"
@@ -6082,6 +6213,66 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xgplayer-flv@^3.0.20-beta.0:
+  version "3.0.20-beta.0"
+  resolved "https://registry.npmjs.org/xgplayer-flv/-/xgplayer-flv-3.0.20-beta.0.tgz#9c4df55b231730f27aae76da8967bd36c4ddc41e"
+  integrity sha512-mAeaiEHdSIP7dKrDvoZQKa6pUEz9rq/H7K03Jt+Z0J3DToy+wuHNjO/dzvzGGwuB+kbewVArkkEvcGq0eEbdeA==
+  dependencies:
+    eventemitter3 "^4.0.7"
+    xgplayer-streaming-shared "3.0.19"
+    xgplayer-transmuxer "3.0.19"
+
+xgplayer-hls.js@2.2.2:
+  version "2.2.2"
+  resolved "https://registry.npmjs.org/xgplayer-hls.js/-/xgplayer-hls.js-2.2.2.tgz#070bf2576208086af2267a48ccbb3c952b1dea4c"
+  integrity sha512-VVKywhCnTb9s3APklN2CZ5ySfLYNdu1qf6quNpoFum3VFtzHLs53Kz1TKiMHP+WsfL0mTD7ELXpMxm87FD0JAg==
+  dependencies:
+    deepmerge "2.0.1"
+    event-emitter "^0.3.5"
+
+xgplayer-hls@^3.0.19:
+  version "3.0.19"
+  resolved "https://registry.npmjs.org/xgplayer-hls/-/xgplayer-hls-3.0.19.tgz#0c61cd412ab17a39be4d783432199bfe35cf175d"
+  integrity sha512-xDXx+/OdCPbwwu7+zxdbedJt7UyQqHrOTX6mZrRIMtXs1oexGgCFV3ddZtICPxgINipNLUFpm67nMRDNl5PkFA==
+  dependencies:
+    eventemitter3 "^4.0.7"
+    xgplayer-streaming-shared "3.0.19"
+    xgplayer-transmuxer "3.0.19"
+
+xgplayer-streaming-shared@3.0.19:
+  version "3.0.19"
+  resolved "https://registry.npmjs.org/xgplayer-streaming-shared/-/xgplayer-streaming-shared-3.0.19.tgz#649e2c33174c096f3d193713ce16f8f968f6351b"
+  integrity sha512-dZcVDpMGQ9zquBeFnXTqsvZSPvxrxii6CpAk+Zf6aDNnd2s/whOZ043WuRHcG9Tz6GOnqSXnuLW5NRenbEdvrA==
+  dependencies:
+    eventemitter3 "^4.0.7"
+
+xgplayer-subtitles@3.0.19:
+  version "3.0.19"
+  resolved "https://registry.npmjs.org/xgplayer-subtitles/-/xgplayer-subtitles-3.0.19.tgz#bb6bcb4bf9e4cf21d1a1372cfa341e19bee0146f"
+  integrity sha512-e2k1oFq1HSbnnHaK694FREqkFyq65ze4vETTIy8ABkOXItcr9/ugyNIJ4zCjD+jExSAVppM9FAF761X4+wRCeA==
+  dependencies:
+    eventemitter3 "^4.0.7"
+
+xgplayer-transmuxer@3.0.19:
+  version "3.0.19"
+  resolved "https://registry.npmjs.org/xgplayer-transmuxer/-/xgplayer-transmuxer-3.0.19.tgz#8a817b688d30a0a13508a0f8df6cc53bb2e9457d"
+  integrity sha512-nRlpIL/N19TG61fVdhUPdSsRpAi2rXsrPUID8lDHI0FLacDCdaM7cBo902iX1iGE0TUSoJBvkO/6Hps5GsoWhg==
+  dependencies:
+    "@babel/runtime" "^7.15.3"
+    concat-typed-array "^1.0.2"
+    crypto-es "^1.2.4"
+
+xgplayer@^3.0.19:
+  version "3.0.19"
+  resolved "https://registry.npmjs.org/xgplayer/-/xgplayer-3.0.19.tgz#116e486875e561043dba7721402e65ab616cfc9d"
+  integrity sha512-yw4yinU5EtxS5YxOpctCVnHS/WW3tLTYjT+ZHivUYihlaAdudrmBmoOCcRYykGg7xz6PVIi6B79Gn1RBnGAnpg==
+  dependencies:
+    danmu.js ">=1.1.6"
+    delegate "^3.2.0"
+    downloadjs "1.4.7"
+    eventemitter3 "^4.0.7"
+    xgplayer-subtitles "3.0.19"
+
 y18n@^4.0.0:
   version "4.0.3"
   resolved "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
@@ -6113,9 +6304,9 @@ yaml@2.3.1:
   integrity sha512-2eHWfjaoXgTBC2jNM1LRef62VQa0umtvRiDSk6HSzW7RvS5YtkabJrwYLLEKWBc8a5U2PTSCs+dJjUTJdlHsWQ==
 
 yaml@^2.0.0-1:
-  version "2.4.1"
-  resolved "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz#2e57e0b5e995292c25c75d2658f0664765210eed"
-  integrity sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==
+  version "2.4.5"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-2.4.5.tgz#60630b206dd6d84df97003d33fc1ddf6296cca5e"
+  integrity sha512-aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==
 
 yargs-parser@^15.0.1:
   version "15.0.3"