From 77b35d339569c4c6724b22f2647105819059b4ba Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Tue, 14 Oct 2025 19:44:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=BF=E6=B5=81?=
 =?UTF-8?q?=E5=8A=A8=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mt-edit/components/add-element/index.vue  | 11 ++++++--
 .../layout/left-aside-list/index.vue          |  9 ++++++-
 .../components/layout/left-aside/index.vue    |  8 +++++-
 .../layout/right-aside/json-edit.vue          |  2 +-
 .../select-item-bind-setting/index.vue        |  2 --
 .../select-item-event-setting/index.vue       |  7 ++++-
 src/components/mt-edit/index.vue              | 14 ++++++++--
 src/components/mt-preview/index.vue           | 27 +++++++++++++++----
 8 files changed, 65 insertions(+), 15 deletions(-)

diff --git a/src/components/mt-edit/components/add-element/index.vue b/src/components/mt-edit/components/add-element/index.vue
index 4220d6f..4234dc9 100644
--- a/src/components/mt-edit/components/add-element/index.vue
+++ b/src/components/mt-edit/components/add-element/index.vue
@@ -1,6 +1,13 @@
 <template>
     <div class="add-element">
-        <el-dialog v-model="open" title="新增图元" width="500px" destroy-on-close @close="closeDialog">
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="open"
+            title="新增图元"
+            width="500px"
+            destroy-on-close
+            @close="closeDialog"
+        >
             <el-form :model="element" ref="ruleFormRef" :rules="rules" label-width="120px">
                 <el-form-item label="图元分类:" prop="elementSonType">
                     <el-select v-model="element.elementSonType" placeholder="请选择图元分类" style="width: 100%">
@@ -93,7 +100,7 @@
                     >
                         <el-button type="primary">上传</el-button>
                     </el-upload>
-                    <el-dialog v-model="dialogVisible">
+                    <el-dialog :close-on-click-modal="false" v-model="dialogVisible">
                         <img w-full :src="dialogImageUrl" alt="Preview Image" />
                     </el-dialog>
                 </el-form-item>
diff --git a/src/components/mt-edit/components/layout/left-aside-list/index.vue b/src/components/mt-edit/components/layout/left-aside-list/index.vue
index 369a5e6..541eb0f 100644
--- a/src/components/mt-edit/components/layout/left-aside-list/index.vue
+++ b/src/components/mt-edit/components/layout/left-aside-list/index.vue
@@ -36,7 +36,14 @@
             </el-table-column>
         </el-table>
         <!-- 新增/修改 -->
-        <el-dialog draggable v-model="dialogFormVisible" :title="dialog_title" width="500px" destroy-on-close>
+        <el-dialog
+            :close-on-click-modal="false"
+            draggable
+            v-model="dialogFormVisible"
+            :title="dialog_title"
+            width="500px"
+            destroy-on-close
+        >
             <el-form :model="form" ref="formRef" :rules="rules">
                 <el-form-item label="图纸名称" :label-width="formLabelWidth" prop="name">
                     <el-input v-model="form.name" autocomplete="off" placeholder="请输入图纸名称" />
diff --git a/src/components/mt-edit/components/layout/left-aside/index.vue b/src/components/mt-edit/components/layout/left-aside/index.vue
index 22ce7f6..bc128f1 100644
--- a/src/components/mt-edit/components/layout/left-aside/index.vue
+++ b/src/components/mt-edit/components/layout/left-aside/index.vue
@@ -64,7 +64,13 @@
         <div class="h-[calc(10%-1px)] flex justify-center items-center ct-border" style="padding-top: 10px">
             <el-button class="w-80/100" @click="onManageClick">管理</el-button>
         </div>
-        <el-dialog v-model="manage_dialog_visiable" title="图库管理" width="50%" destroy-on-close>
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="manage_dialog_visiable"
+            title="图库管理"
+            width="50%"
+            destroy-on-close
+        >
             <div class="flex">
                 <div>
                     <div>
diff --git a/src/components/mt-edit/components/layout/right-aside/json-edit.vue b/src/components/mt-edit/components/layout/right-aside/json-edit.vue
index 2cfec85..e68ae59 100644
--- a/src/components/mt-edit/components/layout/right-aside/json-edit.vue
+++ b/src/components/mt-edit/components/layout/right-aside/json-edit.vue
@@ -1,7 +1,7 @@
 <template>
     <div>
         <el-button type="primary" plain round @click="dialogVisible = true">点击编辑</el-button>
-        <el-dialog v-model="dialogVisible" title="配置编辑" width="60%">
+        <el-dialog :close-on-click-modal="false" v-model="dialogVisible" title="配置编辑" width="60%">
             <v-ace-editor
                 v-model:value="content"
                 lang="json"
diff --git a/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue b/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
index a050675..240ab92 100644
--- a/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
+++ b/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
@@ -342,7 +342,6 @@ const handleSelectUID = (uid: []) => {
         let nodes = []
         if (indexRef.value) {
             nodes = indexRef.value.getCheckedNodes()
-            console.log('🚀 ~ handleSelectUID ~ indexRef.value.getCheckedNodes():', indexRef.value.getCheckedNodes())
             name = nodes[0]?.pathLabels || []
         }
         if (selectItemSettingProps.itemJson) {
@@ -354,7 +353,6 @@ const handleSelectUID = (uid: []) => {
                 selectItemSettingProps.itemJson.UIDName = name.join('/')
             }
 
-
             if (is2DArray(uid)) {
                 selectItemSettingProps.itemJson.UIDNames = name.join(' / ')
             } else {
diff --git a/src/components/mt-edit/components/layout/right-aside/select-item-event-setting/index.vue b/src/components/mt-edit/components/layout/right-aside/select-item-event-setting/index.vue
index 2b27851..e2e7703 100644
--- a/src/components/mt-edit/components/layout/right-aside/select-item-event-setting/index.vue
+++ b/src/components/mt-edit/components/layout/right-aside/select-item-event-setting/index.vue
@@ -222,7 +222,12 @@
                 </div>
             </el-form>
         </el-drawer>
-        <el-dialog v-model="dialog_visiable" :title="dialog_title" :before-close="onDialogClose">
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="dialog_visiable"
+            :title="dialog_title"
+            :before-close="onDialogClose"
+        >
             <v-ace-editor
                 v-model:value="dialog_code"
                 lang="javascript"
diff --git a/src/components/mt-edit/index.vue b/src/components/mt-edit/index.vue
index 674b359..43bab3a 100644
--- a/src/components/mt-edit/index.vue
+++ b/src/components/mt-edit/index.vue
@@ -72,13 +72,23 @@
                 <footer-panel></footer-panel>
             </el-footer>
         </el-container>
-        <el-dialog v-model="import_visible" title="数据导入" @close="mainPanelRef?.beginListenerKeyDown()">
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="import_visible"
+            title="数据导入"
+            @close="mainPanelRef?.beginListenerKeyDown()"
+        >
             <import-json ref="importJsonRef"></import-json>
             <template #footer>
                 <el-button type="primary" @click="onImportYes">确定</el-button>
             </template>
         </el-dialog>
-        <el-dialog v-model="export_visible" title="数据导出" @close="mainPanelRef?.beginListenerKeyDown()">
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="export_visible"
+            title="数据导出"
+            @close="mainPanelRef?.beginListenerKeyDown()"
+        >
             <export-json
                 :done-json="objectDeepClone(globalStore.done_json)"
                 :canvas-cfg="globalStore.canvasCfg"
diff --git a/src/components/mt-preview/index.vue b/src/components/mt-preview/index.vue
index e1ca99c..2f1f97d 100644
--- a/src/components/mt-preview/index.vue
+++ b/src/components/mt-preview/index.vue
@@ -92,6 +92,8 @@ const tableData = [
     // }
 ]
 
+const targetKeywords = ['开关', '器', '阀门', '控制']
+
 const showDetail = ref(false)
 
 const showDetailClick = () => {
@@ -581,7 +583,7 @@ const setImportJson = (exportJson: IExportJson) => {
         addClickEventsToElements()
 
         // 首页初始化的时候
-        setTimeout(() => {
+        nextTick(() => {
             done_json.value.forEach(item => {
                 //报警设备闪烁
                 if (findTransmissionDeviceIdsByKeyList(list.value).includes(item.id)) {
@@ -644,7 +646,7 @@ const setImportJson = (exportJson: IExportJson) => {
                 //      item.props.ani_color.val = '#8c0ae2'
                 // }
             })
-        }, 1000)
+        })
     }
 
     if (!useData.loading) {
@@ -691,7 +693,7 @@ const findSwitchByLineEndpoint = (lineId: string): string | null => {
     const startId = bindAnchors.start?.id
     if (startId) {
         const startElement = savedExportJson.value.json.find(item => item.id === startId)
-        if (startElement && startElement.title?.includes('开关')) {
+        if (startElement && targetKeywords.some(keyword => startElement.title?.includes(keyword))) {
             return startElement.id!
         }
     }
@@ -700,7 +702,7 @@ const findSwitchByLineEndpoint = (lineId: string): string | null => {
     const endId = bindAnchors.end?.id
     if (endId) {
         const endElement = savedExportJson.value.json.find(item => item.id === endId)
-        if (endElement && endElement.title?.includes('开关')) {
+        if (endElement && targetKeywords.some(keyword => endElement.title?.includes(keyword))) {
             return endElement.id!
         }
     }
@@ -777,6 +779,7 @@ const handleElementClick = (elementId: string) => {
         )
     }
 }
+const bindList = ref<string[]>([])
 const searchDevicesConnect = (transmissionDeviceIds: string[]) => {
     // 确保 savedExportJson.value 存在
     if (!savedExportJson.value?.json) {
@@ -786,9 +789,23 @@ const searchDevicesConnect = (transmissionDeviceIds: string[]) => {
 
     // 查找所有连线元素
     const lineElements = savedExportJson.value.json.filter(item => item.type === 'sys-line' && item.props?.bind_anchors)
+    bindList.value = [
+        ...new Set(
+            lineElements
+                .map(item => {
+                    return [item.props?.bind_anchors.start?.id, item.props?.bind_anchors.end?.id]
+                })
+                .flat()
+        )
+    ]
 
     // 查找所有开关元素
-    const switchElements = savedExportJson.value.json.filter(item => item.title?.includes('开关'))
+    const switchElements = savedExportJson.value.json.filter(item => targetKeywords.some(keyword =>
+        item.title?.includes(keyword)
+    ))
+    // const switchElements = savedExportJson.value.json.filter(item =>
+    //     bindList.value.some(keyword => item.id?.includes(keyword) && item.lineId=='')
+    // )
 
     // 存储连接线的ID
     const connectedLineIds: string[] = []

From 78a4b1685c17add1e5b7c8231b3f0faaee07387d Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Tue, 14 Oct 2025 20:38:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mt-edit/index.vue    | 111 ++++++++++------------------
 src/components/mt-preview/index.vue |   6 +-
 2 files changed, 42 insertions(+), 75 deletions(-)

diff --git a/src/components/mt-edit/index.vue b/src/components/mt-edit/index.vue
index 43bab3a..8c2f4b7 100644
--- a/src/components/mt-edit/index.vue
+++ b/src/components/mt-edit/index.vue
@@ -1,66 +1,40 @@
 <template>
     <div id="mt-edit" class="relative flex-auto w-1/1 h-1/1 dark">
         <el-container class="h-1/1">
-            <el-header
-                height="45px"
-                class="dark:bg-myDarkBgColor cb-border p-0 select-none"
-                @mousedown="mainPanelRef?.stopListenerKeyDown()"
-            >
-                <header-panel
-                    v-model:leftAside="aside_state.left_show"
-                    v-model:rightAside="aside_state.right_show"
-                    v-model:lock-state="globalStore.lock"
-                    :selected-items-id="globalStore.selected_items_id"
-                    :group-enabled="header_group_enabled"
-                    :un-group-enabled="header_un_group_enabled"
-                    :align-enabled="header_align_enabled"
-                    :delete-enabled="header_delete_enabled"
+            <el-header height="45px" class="dark:bg-myDarkBgColor cb-border p-0 select-none"
+                @mousedown="mainPanelRef?.stopListenerKeyDown()">
+                <header-panel v-model:leftAside="aside_state.left_show" v-model:rightAside="aside_state.right_show"
+                    v-model:lock-state="globalStore.lock" :selected-items-id="globalStore.selected_items_id"
+                    :group-enabled="header_group_enabled" :un-group-enabled="header_un_group_enabled"
+                    :align-enabled="header_align_enabled" :delete-enabled="header_delete_enabled"
                     :undo-enabled="cacheStore.historyIndex > 0"
                     :redo-enabled="cacheStore.historyIndex < cacheStore.history.length - 1"
-                    :real-time-data="globalStore.real_time_data"
-                    :use-thumbnail="mtEidtProps.useThumbnail"
-                    @on-group-click="mainPanelRef?.createGroupItem"
-                    @on-ungroup-click="mainPanelRef?.onUngroup"
-                    @on-delete-click="onDeleteClick"
-                    @on-export-click="onExportClick"
-                    @on-tree-click="done_json_tree_visiable = true"
-                    @on-help-click="onHelpClick"
-                    @align-selected="onAlignSelected"
-                    @on-redo-click="onRedoClick"
-                    @on-undo-click="onUndoClick"
-                    @on-import-click="onImportClick"
-                    @on-return-click="emits('onReturnClick')"
-                    @on-save-click="onSaveClick"
-                    @on-preview-click="onPreviewClick"
-                    @on-thumbnail-click="onThumbnailClick"
-                    @on-draw-line-click="onDrawLineClick"
-                    @on-save-all="onSaveAll"
-                ></header-panel>
+                    :real-time-data="globalStore.real_time_data" :use-thumbnail="mtEidtProps.useThumbnail"
+                    @on-group-click="mainPanelRef?.createGroupItem" @on-ungroup-click="mainPanelRef?.onUngroup"
+                    @on-delete-click="onDeleteClick" @on-export-click="onExportClick"
+                    @on-tree-click="done_json_tree_visiable = true" @on-help-click="onHelpClick"
+                    @align-selected="onAlignSelected" @on-redo-click="onRedoClick" @on-undo-click="onUndoClick"
+                    @on-import-click="onImportClick" @on-return-click="emits('onReturnClick')"
+                    @on-save-click="onSaveClick" @on-preview-click="onPreviewClick"
+                    @on-thumbnail-click="onThumbnailClick" @on-draw-line-click="onDrawLineClick"
+                    @on-save-all="onSaveAll"></header-panel>
             </el-header>
             <el-container class="h-[calc(100%-45px-40px)]">
-                <el-aside
-                    :width="aside_state.left_show ? '300px' : '0px'"
+                <el-aside :width="aside_state.left_show ? '300px' : '0px'"
                     class="dark:bg-myDarkBgColor cr-border mt-edit-aside h-1/1 select-none mt-edit-aside-left"
-                    @mousedown="mainPanelRef?.stopListenerKeyDown()"
-                >
+                    @mousedown="mainPanelRef?.stopListenerKeyDown()">
                     <tabs></tabs>
 
                     <!-- <left-aside :leftAsideConfig="leftAsideStore.config"></left-aside> -->
                 </el-aside>
                 <el-main class="dark:bg-myMainDarkBgColor" @mousedown="mainPanelRef?.beginListenerKeyDown()">
-                    <main-panel
-                        ref="mainPanelRef"
-                        :group-enabled="header_group_enabled"
-                        :un-group-enabled="header_un_group_enabled"
-                        :delete-enabled="header_delete_enabled"
-                        :line-append-enable="line_append_enable"
-                    ></main-panel>
+                    <main-panel ref="mainPanelRef" :group-enabled="header_group_enabled"
+                        :un-group-enabled="header_un_group_enabled" :delete-enabled="header_delete_enabled"
+                        :line-append-enable="line_append_enable"></main-panel>
                 </el-main>
-                <el-aside
-                    :width="aside_state.right_show ? '300px' : '0px'"
+                <el-aside :width="aside_state.right_show ? '300px' : '0px'"
                     class="dark:bg-myDarkBgColor cl-border mt-edit-aside select-none"
-                    @mousedown="mainPanelRef?.stopListenerKeyDown()"
-                >
+                    @mousedown="mainPanelRef?.stopListenerKeyDown()">
                     <right-aside>
                         <template v-if="hasDeviceBindSlot" #deviceBind="{ item }">
                             <slot name="deviceBind" :item="item" />
@@ -72,36 +46,22 @@
                 <footer-panel></footer-panel>
             </el-footer>
         </el-container>
-        <el-dialog
-            :close-on-click-modal="false"
-            v-model="import_visible"
-            title="数据导入"
-            @close="mainPanelRef?.beginListenerKeyDown()"
-        >
+        <el-dialog :close-on-click-modal="false" v-model="import_visible" title="数据导入"
+            @close="mainPanelRef?.beginListenerKeyDown()">
             <import-json ref="importJsonRef"></import-json>
             <template #footer>
                 <el-button type="primary" @click="onImportYes">确定</el-button>
             </template>
         </el-dialog>
-        <el-dialog
-            :close-on-click-modal="false"
-            v-model="export_visible"
-            title="数据导出"
-            @close="mainPanelRef?.beginListenerKeyDown()"
-        >
-            <export-json
-                :done-json="objectDeepClone(globalStore.done_json)"
-                :canvas-cfg="globalStore.canvasCfg"
-                :grid-cfg="globalStore.gridCfg"
-            ></export-json>
+        <el-dialog :close-on-click-modal="false" v-model="export_visible" title="数据导出"
+            @close="mainPanelRef?.beginListenerKeyDown()">
+            <export-json :done-json="objectDeepClone(globalStore.done_json)" :canvas-cfg="globalStore.canvasCfg"
+                :grid-cfg="globalStore.gridCfg"></export-json>
         </el-dialog>
         <el-drawer v-model="done_json_tree_visiable" title="图形结构树" direction="ltr" size="30%">
-            <done-tree
-                :done-json="globalStore.done_json"
-                :selected-items-id="globalStore.selected_items_id"
+            <done-tree :done-json="globalStore.done_json" :selected-items-id="globalStore.selected_items_id"
                 @update-selected-items-id="onTreeUpdateSelectedItemsId"
-                @update-selected-id-hide="onDoneTreeUpdateSelectedIdHide"
-            ></done-tree>
+                @update-selected-id-hide="onDoneTreeUpdateSelectedIdHide"></done-tree>
         </el-drawer>
     </div>
 </template>
@@ -229,9 +189,15 @@ const onSaveClick = () => {
 }
 
 const useData = useDataStore()
-const onSaveAll = () => {
+const onSaveAll = async () => {
+    let data: any = await useData.dataTree.map((item, ind) => {
+        item.sort = ind
+        return item
+    })
+
+
     let form = new FormData()
-    let blob = new Blob([JSON.stringify(useData.dataTree)], {
+    let blob = new Blob([JSON.stringify(data)], {
         type: 'application/json'
     })
     form.append('multipartFile', blob)
@@ -261,6 +227,7 @@ defineExpose({
 .mt-edit-aside {
     transition: width 0.3s;
 }
+
 .mt-edit-aside-left {
     padding-left: 5px;
 }
diff --git a/src/components/mt-preview/index.vue b/src/components/mt-preview/index.vue
index 2f1f97d..2ef58d4 100644
--- a/src/components/mt-preview/index.vue
+++ b/src/components/mt-preview/index.vue
@@ -800,9 +800,9 @@ const searchDevicesConnect = (transmissionDeviceIds: string[]) => {
     ]
 
     // 查找所有开关元素
-    const switchElements = savedExportJson.value.json.filter(item => targetKeywords.some(keyword =>
-        item.title?.includes(keyword)
-    ))
+    const switchElements = savedExportJson.value.json.filter(item =>
+        targetKeywords.some(keyword => item.title?.includes(keyword))
+    )
     // const switchElements = savedExportJson.value.json.filter(item =>
     //     bindList.value.some(keyword => item.id?.includes(keyword) && item.lineId=='')
     // )

From e10b451e687070c369f52a700b87c56bd782467e Mon Sep 17 00:00:00 2001
From: guanj <guan0550>
Date: Wed, 22 Oct 2025 08:50:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=AA=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../select-item-bind-setting/index.vue        |   9 +-
 .../mt-edit/composables/thumbnail.ts          |   8 +-
 src/components/mt-edit/index.vue              | 101 ++++++++++++------
 src/utils/mqtt.ts                             |   4 +-
 4 files changed, 85 insertions(+), 37 deletions(-)

diff --git a/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue b/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
index 240ab92..1e1568b 100644
--- a/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
+++ b/src/components/mt-edit/components/layout/right-aside/select-item-bind-setting/index.vue
@@ -289,7 +289,13 @@ const fetchData_wx = async () => {
 // 指标数据
 const indexList = async () => {
     try {
-        const lineId = deptIds.value[deptIds.value.length - 1]
+        let lineId = ''
+        if (typeof deptIds.value === 'string') {
+            lineId = deptIds.value
+        } else {
+            lineId = deptIds.value[deptIds.value.length - 1]
+        }
+
         {
             const response = await targetList({ lineId: lineId })
             if (response.data) {
@@ -304,6 +310,7 @@ const indexList = async () => {
 const handleDeptChange = (deptId: []) => {
     // labelString.value = fileRef.value.getCheckedNodes().pathLabels.join(" / ");
     item_uid.value = []
+    indexString.value = ''
     nextTick(() => {
         //fileRef.value.getCheckedNodes()[0]?.label   最后一层的值
         let name = []
diff --git a/src/components/mt-edit/composables/thumbnail.ts b/src/components/mt-edit/composables/thumbnail.ts
index 4aea344..c5a5746 100644
--- a/src/components/mt-edit/composables/thumbnail.ts
+++ b/src/components/mt-edit/composables/thumbnail.ts
@@ -10,6 +10,7 @@ export const useGenThumbnail = async (canvas_id: string = 'mtCanvasArea') => {
     // //记录要移除的svg元素
     const shouldRemoveSvgNodes = []
     // 获取到所有的SVG 得到一个数组 目前只有自定义连线需要特殊处理 别的元素直接使用html2canvas就可以
+    
     const svgElements: NodeListOf<HTMLElement> = document.body.querySelectorAll(`#${canvas_id} .mt-line-render`)
     // 遍历这个数组
     for (const item of svgElements) {
@@ -40,13 +41,14 @@ export const useGenThumbnail = async (canvas_id: string = 'mtCanvasArea') => {
 
     const width = el.offsetWidth
     const height = el.offsetHeight
+    
     const canvas = await html2canvas(el, {
         useCORS: true,
         scale: 2,
-        width,
-        height,
+        // width,
+        // height,
         allowTaint: true,
-        windowHeight: height,
+        // windowHeight: height,
         logging: false,
         ignoreElements: element => {
             if (element.classList.contains('mt-line-render')) {
diff --git a/src/components/mt-edit/index.vue b/src/components/mt-edit/index.vue
index 8c2f4b7..2c385ef 100644
--- a/src/components/mt-edit/index.vue
+++ b/src/components/mt-edit/index.vue
@@ -1,40 +1,66 @@
 <template>
     <div id="mt-edit" class="relative flex-auto w-1/1 h-1/1 dark">
         <el-container class="h-1/1">
-            <el-header height="45px" class="dark:bg-myDarkBgColor cb-border p-0 select-none"
-                @mousedown="mainPanelRef?.stopListenerKeyDown()">
-                <header-panel v-model:leftAside="aside_state.left_show" v-model:rightAside="aside_state.right_show"
-                    v-model:lock-state="globalStore.lock" :selected-items-id="globalStore.selected_items_id"
-                    :group-enabled="header_group_enabled" :un-group-enabled="header_un_group_enabled"
-                    :align-enabled="header_align_enabled" :delete-enabled="header_delete_enabled"
+            <el-header
+                height="45px"
+                class="dark:bg-myDarkBgColor cb-border p-0 select-none"
+                @mousedown="mainPanelRef?.stopListenerKeyDown()"
+            >
+                <header-panel
+                    v-model:leftAside="aside_state.left_show"
+                    v-model:rightAside="aside_state.right_show"
+                    v-model:lock-state="globalStore.lock"
+                    :selected-items-id="globalStore.selected_items_id"
+                    :group-enabled="header_group_enabled"
+                    :un-group-enabled="header_un_group_enabled"
+                    :align-enabled="header_align_enabled"
+                    :delete-enabled="header_delete_enabled"
                     :undo-enabled="cacheStore.historyIndex > 0"
                     :redo-enabled="cacheStore.historyIndex < cacheStore.history.length - 1"
-                    :real-time-data="globalStore.real_time_data" :use-thumbnail="mtEidtProps.useThumbnail"
-                    @on-group-click="mainPanelRef?.createGroupItem" @on-ungroup-click="mainPanelRef?.onUngroup"
-                    @on-delete-click="onDeleteClick" @on-export-click="onExportClick"
-                    @on-tree-click="done_json_tree_visiable = true" @on-help-click="onHelpClick"
-                    @align-selected="onAlignSelected" @on-redo-click="onRedoClick" @on-undo-click="onUndoClick"
-                    @on-import-click="onImportClick" @on-return-click="emits('onReturnClick')"
-                    @on-save-click="onSaveClick" @on-preview-click="onPreviewClick"
-                    @on-thumbnail-click="onThumbnailClick" @on-draw-line-click="onDrawLineClick"
-                    @on-save-all="onSaveAll"></header-panel>
+                    :real-time-data="globalStore.real_time_data"
+                    :use-thumbnail="mtEidtProps.useThumbnail"
+                    @on-group-click="mainPanelRef?.createGroupItem"
+                    @on-ungroup-click="mainPanelRef?.onUngroup"
+                    @on-delete-click="onDeleteClick"
+                    @on-export-click="onExportClick"
+                    @on-tree-click="done_json_tree_visiable = true"
+                    @on-help-click="onHelpClick"
+                    @align-selected="onAlignSelected"
+                    @on-redo-click="onRedoClick"
+                    @on-undo-click="onUndoClick"
+                    @on-import-click="onImportClick"
+                    @on-return-click="emits('onReturnClick')"
+                    @on-save-click="onSaveClick"
+                    @on-preview-click="onPreviewClick"
+                    @on-thumbnail-click="onThumbnailClick"
+                    @on-draw-line-click="onDrawLineClick"
+                    @on-save-all="onSaveAll"
+                ></header-panel>
             </el-header>
             <el-container class="h-[calc(100%-45px-40px)]">
-                <el-aside :width="aside_state.left_show ? '300px' : '0px'"
+                <el-aside
+                    :width="aside_state.left_show ? '300px' : '0px'"
                     class="dark:bg-myDarkBgColor cr-border mt-edit-aside h-1/1 select-none mt-edit-aside-left"
-                    @mousedown="mainPanelRef?.stopListenerKeyDown()">
+                    @mousedown="mainPanelRef?.stopListenerKeyDown()"
+                >
                     <tabs></tabs>
 
                     <!-- <left-aside :leftAsideConfig="leftAsideStore.config"></left-aside> -->
                 </el-aside>
                 <el-main class="dark:bg-myMainDarkBgColor" @mousedown="mainPanelRef?.beginListenerKeyDown()">
-                    <main-panel ref="mainPanelRef" :group-enabled="header_group_enabled"
-                        :un-group-enabled="header_un_group_enabled" :delete-enabled="header_delete_enabled"
-                        :line-append-enable="line_append_enable"></main-panel>
+                    <main-panel
+                        ref="mainPanelRef"
+                        :group-enabled="header_group_enabled"
+                        :un-group-enabled="header_un_group_enabled"
+                        :delete-enabled="header_delete_enabled"
+                        :line-append-enable="line_append_enable"
+                    ></main-panel>
                 </el-main>
-                <el-aside :width="aside_state.right_show ? '300px' : '0px'"
+                <el-aside
+                    :width="aside_state.right_show ? '300px' : '0px'"
                     class="dark:bg-myDarkBgColor cl-border mt-edit-aside select-none"
-                    @mousedown="mainPanelRef?.stopListenerKeyDown()">
+                    @mousedown="mainPanelRef?.stopListenerKeyDown()"
+                >
                     <right-aside>
                         <template v-if="hasDeviceBindSlot" #deviceBind="{ item }">
                             <slot name="deviceBind" :item="item" />
@@ -46,22 +72,36 @@
                 <footer-panel></footer-panel>
             </el-footer>
         </el-container>
-        <el-dialog :close-on-click-modal="false" v-model="import_visible" title="数据导入"
-            @close="mainPanelRef?.beginListenerKeyDown()">
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="import_visible"
+            title="数据导入"
+            @close="mainPanelRef?.beginListenerKeyDown()"
+        >
             <import-json ref="importJsonRef"></import-json>
             <template #footer>
                 <el-button type="primary" @click="onImportYes">确定</el-button>
             </template>
         </el-dialog>
-        <el-dialog :close-on-click-modal="false" v-model="export_visible" title="数据导出"
-            @close="mainPanelRef?.beginListenerKeyDown()">
-            <export-json :done-json="objectDeepClone(globalStore.done_json)" :canvas-cfg="globalStore.canvasCfg"
-                :grid-cfg="globalStore.gridCfg"></export-json>
+        <el-dialog
+            :close-on-click-modal="false"
+            v-model="export_visible"
+            title="数据导出"
+            @close="mainPanelRef?.beginListenerKeyDown()"
+        >
+            <export-json
+                :done-json="objectDeepClone(globalStore.done_json)"
+                :canvas-cfg="globalStore.canvasCfg"
+                :grid-cfg="globalStore.gridCfg"
+            ></export-json>
         </el-dialog>
         <el-drawer v-model="done_json_tree_visiable" title="图形结构树" direction="ltr" size="30%">
-            <done-tree :done-json="globalStore.done_json" :selected-items-id="globalStore.selected_items_id"
+            <done-tree
+                :done-json="globalStore.done_json"
+                :selected-items-id="globalStore.selected_items_id"
                 @update-selected-items-id="onTreeUpdateSelectedItemsId"
-                @update-selected-id-hide="onDoneTreeUpdateSelectedIdHide"></done-tree>
+                @update-selected-id-hide="onDoneTreeUpdateSelectedIdHide"
+            ></done-tree>
         </el-drawer>
     </div>
 </template>
@@ -195,7 +235,6 @@ const onSaveAll = async () => {
         return item
     })
 
-
     let form = new FormData()
     let blob = new Blob([JSON.stringify(data)], {
         type: 'application/json'
diff --git a/src/utils/mqtt.ts b/src/utils/mqtt.ts
index 7d89e32..1d5948c 100644
--- a/src/utils/mqtt.ts
+++ b/src/utils/mqtt.ts
@@ -54,9 +54,9 @@ class MQTT {
         try {
             // const mqttUrl = 'ws://192.168.1.103:8083/mqtt'
             const mqttUrl =
-                localStorage.getItem('MqttUrl') == 'null'
+                localStorage.getItem('MQTTZUTAI') == 'null'
                     ? 'ws://192.168.1.24:8085/mqtt'
-                    : localStorage.getItem('MqttUrl')
+                    : localStorage.getItem('MQTTZUTAI')
             console.log('🚀 ~ MQTT ~ init ~ mqttUrl:', mqttUrl)
             this.client = mqtt.connect(mqttUrl, this.defaultOptions as IClientOptions)
             this.setupEventListeners()