diff --git a/src/main/index.ts b/src/main/index.ts
index eb297f0..5b43c3e 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -128,6 +128,19 @@ function createWindow(): void {
       allowRunningInsecureContent: true
     }
   })
+  mainWindow.webContents.on('before-input-event', (event, input) => {
+    // 条件：仅按了 Alt 键（无其他键组合、不是组合键、不是重复按键）
+    if (
+      input.key === 'Alt' &&          // 按键是 Alt
+      !input.ctrl &&                 // 未按 Ctrl
+      !input.shift &&                // 未按 Shift
+      !input.meta &&                 // 未按 Meta（Win/Mac）
+      !input.isComposing &&          // 非输入法组合态
+      input.type === 'keyDown'       // 仅拦截按下事件
+    ) {
+      event.preventDefault(); // 阻止 Alt 键的默认行为（激活菜单）
+    }
+  });
   let ymlBatPath = process.env.NODE_ENV === 'development' ? path.resolve(app.getAppPath(), 'resources', 'java', 'app', 'application.yml') : path.join(process.resourcesPath, 'app.asar.unpacked', 'resources', 'java', 'app', 'application.yml')
   ymlBatPath = process.platform === 'win32' ? ymlBatPath.replace(/^(\w:)/, '/$1') : ymlBatPath
   let ymlPath = ymlBatPath.substring(1, 200)
@@ -389,6 +402,19 @@ function createWindow(): void {
           // closeCB(newWindow.id)
         });
       }
+      newWindow.webContents.on('before-input-event', (event, input) => {
+        // 条件：仅按了 Alt 键（无其他键组合、不是组合键、不是重复按键）
+        if (
+          input.key === 'Alt' &&          // 按键是 Alt
+          !input.ctrl &&                 // 未按 Ctrl
+          !input.shift &&                // 未按 Shift
+          !input.meta &&                 // 未按 Meta（Win/Mac）
+          !input.isComposing &&          // 非输入法组合态
+          input.type === 'keyDown'       // 仅拦截按下事件
+        ) {
+          event.preventDefault(); // 阻止 Alt 键的默认行为（激活菜单）
+        }
+      });
       _winMap.set(id, newWindow.id);
       return _winMap
     } catch (error) {
@@ -594,7 +620,10 @@ if (!gotTheLock) {
       let string = data.toString().trim()
       // console.log(`批处理输出: ${string}`);
       // 临时处理：应用启动失败或项目文档地址出现时，认为服务初始化完成；后续需后端配合
-      if (string.indexOf('APPLICATION FAILED TO START') !== -1 || string.indexOf('项目文档地址') !== -1) {
+      if (string.indexOf('APPLICATION FAILED TO START') !== -1) {
+        mainWindow.webContents.send('program-init', '后端服务未正常启动，尝试更换地址或端口')
+      }
+      else if (string.indexOf('项目文档地址') !== -1) {
         if (!isSeverInit) {
           isSeverInit = true
           if (isAppInit) {
diff --git a/src/renderer/public/sdk/custom/css/index.css b/src/renderer/public/sdk/custom/css/index.css
index 04faf54..5749e5a 100644
--- a/src/renderer/public/sdk/custom/css/index.css
+++ b/src/renderer/public/sdk/custom/css/index.css
@@ -178,6 +178,7 @@
   color: rgba(var(--color-base1), 1) !important;
   cursor: pointer;
 }
+
 .YJ-custom-base-dialog button:not(button[disabled]):hover svg {
   fill: rgba(var(--color-base1), 1) !important;
 }
@@ -341,7 +342,7 @@
 
 .YJ-custom-base-dialog>.content input,
 .YJ-custom-base-dialog>.content textarea {
-  font-size: 16px;
+  font-size: 14px;
   background-color: rgba(0, 0, 0, 0.5);
   border: 1px solid rgba(var(--color-base1), 0.5);
   border-radius: 5px;
@@ -2534,8 +2535,8 @@
 .YJ-custom-base-dialog.polygon>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.polygon>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.polygon>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
-  width: 165px;
+  flex: 0 0 175px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2618,8 +2619,8 @@
 .YJ-custom-base-dialog.assemble>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.assemble>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.assemble>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
-  width: 165px;
+  flex: 0 0 175px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2678,8 +2679,8 @@
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog.pincerArrow>.content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 165px;
-  width: 165px;
+  flex: 0 0 175px;
+  width: 175px;
   justify-content: center;
 }
 
@@ -2761,7 +2762,7 @@
 
 /* 折线 */
 .YJ-custom-base-dialog.polyline>.content {
-  width: 580px;
+  width: 600px;
 }
 
 .YJ-custom-base-dialog.polyline>.content>div #dashTextureDom {
@@ -3796,7 +3797,7 @@
 .yj-custom-icon {
   display: inline-block;
   width: 22px;
-  height: 10px;
+  height: 18px;
   margin-right: 5px;
 }
 
diff --git a/src/renderer/public/tree/newFuzzySearch.js b/src/renderer/public/tree/newFuzzySearch.js
index 1b4a813..978db79 100644
--- a/src/renderer/public/tree/newFuzzySearch.js
+++ b/src/renderer/public/tree/newFuzzySearch.js
@@ -80,16 +80,16 @@ window.newFuzzySearch = function (
     hideAllNode(allNodes)
     nodeChildren.forEach((item) => {
       if (item.oldname) {
-        item.sourceName = item.oldname
+        item.sourceName = item.oldname + ''
         zTreeObj.updateNode(item)
       }
       if (contrast) {
-        if ((item.sourceName || '').indexOf(contrast) > -1) {
+        if (((item.sourceName || '')+'').indexOf(contrast) > -1) {
           console.log('sourceName包含关键字')
           console.log(item)
           console.log(item.sourceName)
 
-          item.oldname = item.sourceName
+          item.oldname = item.sourceName + ''
           item.highlight = true
           let F = new RegExp(contrast, 'gi')
           item.sourceName = item.oldname.replace(F, function (h) {
diff --git a/src/renderer/src/I18n/zh-CN.ts b/src/renderer/src/I18n/zh-CN.ts
index ef51b9e..5d1ca3a 100644
--- a/src/renderer/src/I18n/zh-CN.ts
+++ b/src/renderer/src/I18n/zh-CN.ts
@@ -263,6 +263,8 @@ export default {
     rtmp: 'rtmp',
     物资: '物资',
     编辑内容: '编辑内容',
+    请输入设备名称进行搜索: '请输入设备名称进行搜索',
+    请输入物资名称进行搜索: '请输入物资名称进行搜索',
     打开文本编辑器: '打开文本编辑器',
     添加链接: '添加链接',
     名称: '名称',
diff --git a/src/renderer/src/I18n/zh-EN.ts b/src/renderer/src/I18n/zh-EN.ts
index 77eeebf..4569f7b 100644
--- a/src/renderer/src/I18n/zh-EN.ts
+++ b/src/renderer/src/I18n/zh-EN.ts
@@ -47,16 +47,16 @@ export default {
     excel: 'Excel'
   },
   firstMenu: {
-    measure: 'measure',
-    tool: 'tool',
-    effect: 'effect',
+    measure: 'Measure',
+    tool: 'Tool',
+    effect: 'Special effects',
     bigData: 'bigData',
-    modelLibrary: 'modelLibrary',
-    situation: 'situationLibrary',
+    modelLibrary: 'Model',
+    situation: 'Scheme',
     onlinePictureSource: 'onlinePictureSource',
-    analysis: 'analysis',
+    analysis: 'Analyze',
     militaryMark: 'militaryMark',
-    ersanwei: 'two and three-dimensional',
+    ersanwei: '2D/3D',
     junbiao3d: '3D military logo'
   },
   effect: {
@@ -155,7 +155,8 @@ export default {
     authorize: 'Authorization Information',
     setting: 'System settings',
     project: 'Engineering Information',
-    device: 'device management',
+    device: 'Device management',
+    materials: 'Materials management',
     modelManage: 'Model management',
     graphLabelManage: 'Military Icon Management',
     photoManage: 'Icon Management',
@@ -262,6 +263,8 @@ export default {
     rtmp: 'rtmp',
     物资: 'Materials',
     编辑内容: 'Edit content',
+    请输入设备名称进行搜索: 'Please enter the device name to search',
+    请输入物资名称进行搜索: 'Please enter the materials name to search',
     打开文本编辑器: 'Open the editor',
     添加链接: 'Add Link',
     名称: 'Name',
diff --git a/src/renderer/src/I18n/zh-TW.ts b/src/renderer/src/I18n/zh-TW.ts
index 23816a9..a36e7a6 100644
--- a/src/renderer/src/I18n/zh-TW.ts
+++ b/src/renderer/src/I18n/zh-TW.ts
@@ -155,6 +155,7 @@ export default {
     setting: '系統設置',
     project: '工程管理',
     device: '設備管理',
+    materials: '物資管理',
     modelManage: '模型管理',
     graphLabelManage: '軍標管理',
     photoManage: '圖標管理',
@@ -261,6 +262,8 @@ export default {
     rtmp: 'rtmp',
     物资: '物資',
     编辑内容: '編輯內容',
+    请输入设备名称进行搜索: '請輸入設備名稱進行搜索',
+    请输入物资名称进行搜索: '請輸入物資名稱進行搜索',
     打开文本编辑器: '打開文本編輯器',
     添加链接: '添加鏈接',
     名称: '名稱',
diff --git a/src/renderer/src/api/tree/index.ts b/src/renderer/src/api/tree/index.ts
index 0ff8f0f..2ca78a4 100644
--- a/src/renderer/src/api/tree/index.ts
+++ b/src/renderer/src/api/tree/index.ts
@@ -27,6 +27,7 @@ export const TreeApi = {
       url: `/source/addOtherSource`,
       data
     }).then((res) => {
+      ElMessage.closeAll()
       ElMessage({
         message: '添加成功',
         type: 'success'
@@ -50,6 +51,7 @@ export const TreeApi = {
       url: `/source/update`,
       data
     }).then((res) => {
+      ElMessage.closeAll()
       ElMessage({
         message: '操作成功',
         type: 'success'
diff --git a/src/renderer/src/axios/index.ts b/src/renderer/src/axios/index.ts
index 8eb1166..1c441ae 100644
--- a/src/renderer/src/axios/index.ts
+++ b/src/renderer/src/axios/index.ts
@@ -44,12 +44,12 @@ service.interceptors.request.use(
     const key = getRequestKey(config)
 
     // 检查是否有相同请求正在进行
-    if (pendingRequests.has(key)) {
-      ElMessage({
-        message: '当前请求已存在，请稍后再试',
-        type: 'warning'
-      })
-    }
+    // if (pendingRequests.has(key)) {
+    //   ElMessage({
+    //     message: '当前请求已存在，请稍后再试',
+    //     type: 'warning'
+    //   })
+    // }
 
     const controller = new AbortController()
     config.signal = controller.signal
diff --git a/src/renderer/src/common/addMapSource.ts b/src/renderer/src/common/addMapSource.ts
index d225190..bab941c 100644
--- a/src/renderer/src/common/addMapSource.ts
+++ b/src/renderer/src/common/addMapSource.ts
@@ -1,13 +1,13 @@
-import {TreeApi} from '@/api/tree'
-import {useTreeNode} from '../views/components/tree/hooks/treeNode'
-import {initMapData} from './initMapData'
+import { TreeApi } from '@/api/tree'
+import { useTreeNode } from '../views/components/tree/hooks/treeNode'
+import { initMapData } from './initMapData'
 
-export const addMapSource = async ({type, id, sourceName = '未命名对象', opt = {}}) => {
-  const {cusAddNodes} = useTreeNode()
+export const addMapSource = async ({ type, id, sourceName = '未命名对象', opt = {} }, cd:any = null) => {
+  const { cusAddNodes } = useTreeNode()
   if (!id) {
     id = new YJ.Tools().randomString()
   }
-  let options: any = await initMapData(type, opt, null)
+  let options: any = await initMapData(type, opt, cd)
   let selectedNodes = window.treeObj.getSelectedNodes()
   let node = selectedNodes && selectedNodes[selectedNodes.length - 1]
   function getParentId(nd: any) {
@@ -15,7 +15,7 @@ export const addMapSource = async ({type, id, sourceName = '未命名对象', op
       return nd.id
     } else {
       let parentNode = window.treeObj.getNodeByParam("id", nd.parentId, null);
-      if(parentNode) {
+      if (parentNode) {
         return getParentId(parentNode)
       }
       else {
@@ -28,7 +28,7 @@ export const addMapSource = async ({type, id, sourceName = '未命名对象', op
     parentId = getParentId(node)
   }
   delete options.host
-  if(options.attribute && options.attribute.rtmp) {
+  if (options.attribute && options.attribute.rtmp) {
     delete options.attribute.rtmp
   }
   switch (type) {
diff --git a/src/renderer/src/common/initMapData.ts b/src/renderer/src/common/initMapData.ts
index b082221..4e08fad 100644
--- a/src/renderer/src/common/initMapData.ts
+++ b/src/renderer/src/common/initMapData.ts
@@ -20,6 +20,7 @@ export const initMapData = async (type, data, cd) => {
     case 'vrImage':
       console.log(data, 'dataccccc')
       entityObject = new YJ.Obj.BillboardObject(window.earth, data)
+      cd && cd(entityObject)
       console.log('entityObject', entityObject)
       // entityObject.options.billboard.defaultImage = ''
       break
@@ -62,11 +63,12 @@ export const initMapData = async (type, data, cd) => {
     case 'terrain':
       data.host = baseURL
       entityObject = new YJ.Obj.Terrain(window.earth, data)
+      cd && cd(entityObject)
       break
     case 'layer':
       data.host = baseURL
-      console.log('layer', data)
       entityObject = new YJ.Obj.Layer(window.earth, data)
+      cd && cd(entityObject)
       break
     case 'gdslImagery':
       data.host = baseURL
@@ -177,11 +179,14 @@ export const initMapData = async (type, data, cd) => {
       break
     case 'geojson':
       entityObject = new YJ.Obj.GeoJson(window.earth, data)
-      entityObject.on()
+      entityObject.on().then(()=>{
+        cd && cd(entityObject)
+      })
       break
     case 'vector':
       let node = window.treeObj.getNodeByParam("id", data.id, null);
       entityObject = renderVector(node, false)
+      cd && cd(entityObject)
       break
     default:
       break
diff --git a/src/renderer/src/components/dialog/baseDialog.vue b/src/renderer/src/components/dialog/baseDialog.vue
index 366539a..f64d9d7 100644
--- a/src/renderer/src/components/dialog/baseDialog.vue
+++ b/src/renderer/src/components/dialog/baseDialog.vue
@@ -201,8 +201,8 @@ const moveDiv = () => {
           newLeft = windowWidth - oMoveDivWidth
         }
 
-        if (newTop <= 0) {
-          newTop = 0
+        if (newTop <= 97) {
+          newTop = 97
         } else if (newTop + oMoveDivHeight > windowHeight) {
           newTop = windowHeight - oMoveDivHeight
         }
diff --git a/src/renderer/src/icons/svg/mbtiles.svg b/src/renderer/src/icons/svg/mbtiles.svg
index 849baa7..ba44d46 100644
--- a/src/renderer/src/icons/svg/mbtiles.svg
+++ b/src/renderer/src/icons/svg/mbtiles.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M6.96316 12.4681C7.17613 12.2541 7.17613 11.8261 6.96316 11.6121L5.90029 10.5421L6.43222 9.90009L7.49509 10.9701C7.70807 11.1841 8.13301 11.1841 8.34499 10.9701L10.7907 8.50812C11.0027 8.29412 11.0027 7.86613 10.7907 7.65213L9.72782 6.58215L10.2588 6.04716L10.2588 5.94016L11.3216 7.01014C11.5346 7.22414 11.9596 7.22414 12.1715 7.01014L15.1492 4.01319C15.3611 3.79919 15.3611 3.3712 15.1492 3.1572L12.1725 0.161247C11.9596 -0.0537492 11.5346 -0.0537492 11.3226 0.161247L8.45098 3.1572C8.4419 3.16281 8.43301 3.16868 8.42431 3.17486C8.41561 3.18103 8.40712 3.18748 8.39883 3.19418C8.39053 3.20089 8.38245 3.20786 8.37461 3.21509C8.36675 3.22231 8.35914 3.22978 8.35177 3.23748C8.3444 3.24518 8.33727 3.25312 8.33041 3.26129C8.32354 3.26945 8.31693 3.27782 8.3106 3.2864C8.30428 3.29498 8.29821 3.30376 8.29243 3.31273C8.28665 3.3217 8.28117 3.33084 8.27597 3.34015C8.27076 3.34948 8.26587 3.35895 8.26128 3.36857C8.25669 3.3782 8.25241 3.38796 8.24844 3.39787C8.24445 3.40776 8.2408 3.41777 8.23747 3.42792C8.23414 3.43806 8.23113 3.44827 8.22844 3.4586C8.22575 3.46893 8.22339 3.47932 8.22138 3.48979C8.21936 3.50027 8.21768 3.5108 8.21632 3.52138C8.21496 3.53196 8.21394 3.54259 8.21327 3.55323C8.2126 3.56387 8.21226 3.57452 8.21226 3.58519C8.21226 3.59587 8.2126 3.60652 8.21327 3.61716C8.21394 3.6278 8.21496 3.63843 8.21632 3.64901C8.21768 3.65958 8.21936 3.67011 8.22138 3.6806C8.22339 3.69107 8.22575 3.70146 8.22844 3.71179C8.23113 3.72211 8.23414 3.73233 8.23747 3.74247C8.2408 3.75261 8.24445 3.76263 8.24844 3.77252C8.25241 3.78243 8.25669 3.79219 8.26128 3.80182C8.26587 3.81146 8.27076 3.82092 8.27597 3.83024C8.28117 3.83955 8.28665 3.84869 8.29243 3.85766C8.29821 3.86663 8.30428 3.87541 8.3106 3.88399C8.31693 3.89256 8.32354 3.90094 8.33041 3.9091C8.33727 3.91727 8.3444 3.9252 8.35177 3.93291C8.35914 3.94061 8.36675 3.94808 8.37461 3.9553C8.38245 3.96253 8.39053 3.9695 8.39883 3.9762C8.40712 3.98291 8.41561 3.98936 8.42431 3.99553C8.43301 4.0017 8.4419 4.00758 8.45098 4.01319L9.51385 5.08317L8.98191 5.61916L5.26236 1.97922C5.04939 1.76622 4.62444 1.76622 4.41147 1.97922L1.96776 4.44218C1.75479 4.65718 1.75479 5.08517 1.96776 5.29917L5.58032 8.93611L5.04939 9.5791L5.04939 9.6861L3.98652 8.61612C3.77354 8.40112 3.34859 8.40112 3.13662 8.61612L0.158981 11.6111C-0.0529936 11.8251 -0.0529936 12.2531 0.158981 12.4671L3.13562 15.464C3.34859 15.678 3.77354 15.678 3.98552 15.464L6.96216 12.4671L6.96316 12.4681ZM11.8526 1.44523L13.9793 3.58519L11.9596 5.61916L9.83381 3.4792L11.8536 1.44523L11.8526 1.44523ZM3.24461 4.87017L4.83841 3.2642L5.90029 4.33418L4.30648 5.94016L3.24361 4.87017L3.24461 4.87017ZM4.83841 6.47515L6.43222 4.87017L9.62183 8.08012L7.92004 9.6861L4.83741 6.47515L4.83841 6.47515ZM3.56257 14.074L1.43683 11.9341L3.45658 9.7931L5.58232 11.9331L3.56257 14.073L3.56257 14.074ZM14.9372 6.68915C14.8312 6.47515 14.6172 6.47515 14.4053 6.58215C14.1933 6.68915 14.1933 6.90314 14.2993 7.11714C14.8312 7.97313 15.1492 8.93711 15.1492 10.0071C15.1492 10.7561 15.0432 11.3981 14.7242 12.0401C14.7074 12.0802 14.69 12.12 14.6722 12.1597C14.6544 12.1994 14.6362 12.2389 14.6174 12.2781C14.5987 12.3173 14.5794 12.3563 14.5597 12.3951C14.5401 12.4339 14.5199 12.4724 14.4993 12.5107C14.4787 12.549 14.4576 12.587 14.4361 12.6248C14.4146 12.6626 14.3926 12.7001 14.3702 12.7374C14.3477 12.7747 14.3249 12.8116 14.3015 12.8483C14.2782 12.8851 14.2545 12.9215 14.2303 12.9576C14.2061 12.9938 14.1815 13.0296 14.1564 13.0652C14.1314 13.1007 14.1059 13.136 14.08 13.1709C14.0541 13.2058 14.0278 13.2404 14.0011 13.2747C13.9743 13.3091 13.9472 13.343 13.9197 13.3767C13.8921 13.4103 13.8642 13.4437 13.8358 13.4766C13.8075 13.5096 13.7788 13.5423 13.7496 13.5746C13.7205 13.6069 13.691 13.6388 13.6611 13.6704C13.6312 13.702 13.6009 13.7332 13.5703 13.764C13.5397 13.7949 13.5087 13.8254 13.4773 13.8555C13.4459 13.8856 13.4142 13.9153 13.3821 13.9447C13.35 13.9741 13.3176 14.003 13.2848 14.0316C13.252 14.0602 13.2189 14.0883 13.1854 14.1161C13.152 14.1439 13.1182 14.1713 13.0841 14.1982C13.05 14.2252 13.0155 14.2518 12.9808 14.2779C12.946 14.304 12.911 14.3298 12.8756 14.3551C12.8402 14.3804 12.8045 14.4052 12.7686 14.4297C12.7326 14.4541 12.6964 14.4781 12.6598 14.5017C12.6233 14.5253 12.5865 14.5484 12.5494 14.5711C12.5123 14.5938 12.4749 14.616 12.4373 14.6378C12.3996 14.6596 12.3617 14.6809 12.3236 14.7018C12.2854 14.7227 12.2471 14.7431 12.2084 14.7631C12.1698 14.783 12.1309 14.8025 12.0918 14.8215C12.0527 14.8406 12.0134 14.8591 11.9738 14.8772C11.9343 14.8953 11.8945 14.9129 11.8546 14.93C11.2166 15.144 10.5227 15.219 9.77782 15.219C9.03391 15.219 8.34699 15.144 7.60208 14.823L6.96416 14.502C6.75218 14.395 6.53921 14.395 6.43322 14.609C6.32723 14.823 6.32723 15.037 6.53921 15.144C6.84617 15.271 7.08114 15.464 7.4001 15.572C8.25 15.893 9.0899 16.0001 9.9408 16.0001C10.7907 16.0001 11.5356 15.786 12.2805 15.572C12.3264 15.5523 12.372 15.532 12.4173 15.5111C12.4627 15.4903 12.5078 15.469 12.5526 15.447C12.5975 15.4251 12.6421 15.4027 12.6864 15.3797C12.7307 15.3567 12.7747 15.3332 12.8185 15.3092C12.8622 15.2852 12.9057 15.2607 12.9489 15.2356C12.992 15.2105 13.0349 15.1849 13.0774 15.1589C13.12 15.1328 13.1622 15.1062 13.2041 15.0791C13.2461 15.052 13.2876 15.0244 13.3289 14.9963C13.3702 14.9682 13.4111 14.9396 13.4517 14.9105C13.4922 14.8815 13.5325 14.8519 13.5723 14.8219C13.6122 14.7919 13.6517 14.7614 13.6908 14.7304C13.73 14.6994 13.7688 14.668 13.8071 14.6361C13.8455 14.6042 13.8835 14.5718 13.9212 14.539C13.9588 14.5062 13.996 14.4729 14.0328 14.4392C14.0696 14.4055 14.1061 14.3714 14.1421 14.3368C14.1781 14.3023 14.2137 14.2673 14.2488 14.2319C14.284 14.1964 14.3187 14.1606 14.3531 14.1244C14.3874 14.0881 14.4213 14.0515 14.4547 14.0144C14.4881 13.9773 14.5211 13.9399 14.5537 13.902C14.5862 13.8642 14.6183 13.8259 14.6499 13.7873C14.6816 13.7487 14.7127 13.7097 14.7434 13.6704C14.7741 13.631 14.8043 13.5913 14.8341 13.5512C14.8638 13.5111 14.8931 13.4707 14.9219 13.4299C14.9507 13.3891 14.979 13.348 15.0068 13.3065C15.0346 13.2651 15.0619 13.2233 15.0887 13.1812C15.1155 13.1391 15.1418 13.0967 15.1676 13.0539C15.1934 13.0112 15.2186 12.9681 15.2434 12.9248C15.2682 12.8815 15.2924 12.8378 15.3161 12.7939C15.3398 12.75 15.363 12.7058 15.3857 12.6613C15.4084 12.6168 15.4305 12.5721 15.4521 12.5271C15.4737 12.4821 15.4947 12.4368 15.5152 12.3913C15.5357 12.3458 15.5557 12.3 15.5751 12.2541C15.894 11.5051 15.9999 10.7561 15.9999 9.90009C15.9999 9.04311 15.6811 8.18712 15.3621 7.43813C15.2289 7.18368 15.0873 6.93403 14.9372 6.68915ZM11.0037 12.5751C10.3657 12.896 9.62183 12.7891 8.87792 12.5751C8.66495 12.4681 8.45298 12.5751 8.34699 12.7891C8.24 13.003 8.34699 13.217 8.55896 13.324C8.77194 13.431 8.77194 13.431 9.1089 13.497C9.44486 13.562 10.4727 13.645 11.2166 13.324C11.6416 13.11 12.0665 12.896 12.3865 12.5751C12.7045 12.2551 12.9164 11.9281 13.1304 11.5001C13.3424 11.0721 13.4154 10.6001 13.4494 10.1951L13.4494 9.7931C13.4494 9.5791 13.3424 9.04311 13.2364 8.82911C13.1304 8.61512 12.9164 8.35612 12.5985 8.46312C12.2795 8.57012 12.3485 8.82911 12.3855 8.93611C12.4235 9.04311 12.5985 9.5861 12.5985 10.0061C12.5985 10.4281 12.4925 10.7561 12.3855 11.0761C12.3715 11.116 12.3564 11.1556 12.3403 11.1947C12.3241 11.2339 12.3069 11.2726 12.2887 11.3108C12.2704 11.349 12.2511 11.3867 12.2308 11.4239C12.2105 11.461 12.1892 11.4976 12.1669 11.5336C12.1446 11.5696 12.1213 11.605 12.0971 11.6397C12.0729 11.6744 12.0477 11.7085 12.0216 11.7418C11.9955 11.7752 11.9686 11.8078 11.9407 11.8397C11.9128 11.8716 11.8841 11.9027 11.8546 11.9331C11.6416 12.1471 11.3226 12.3611 11.0047 12.5751L11.0037 12.5751Z"   fill="#00FFFF" ></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16" fill="none"><path d="M15.307 4.15404L15.304 4.15404C15.2545 3.95911 15.1737 3.78821 15.0663 3.63777C15.1852 4.66165 14.9255 5.3861 14.4959 5.97903C14.4581 6.03654 14.4032 6.10885 14.3314 6.19594L14.3314 13.8662C14.3313 14.1577 14.2159 14.4221 14.0283 14.6161C13.8208 14.8151 13.5462 14.9293 13.2735 14.9293L2.73156 14.9293C2.4409 14.9287 2.17825 14.809 1.98951 14.6164C1.78338 14.41 1.66956 14.1437 1.66956 13.8674L1.66956 4.77262C1.6696 4.48464 1.78865 4.22451 1.98009 4.03898L1.98852 4.03072L1.99653 4.02252C2.18263 3.82959 2.44315 3.70979 2.73159 3.70965L7.66038 3.70965C7.66696 3.30827 7.73515 2.92511 7.85586 2.56614L2.73154 2.63879C2.14412 2.63924 1.61343 2.88219 1.23368 3.27316C0.843 3.65358 0.600435 4.18506 0.600098 4.77335L0.600098 13.8662C0.600098 14.4564 0.846406 14.9852 1.23377 15.3732C1.61668 15.7599 2.14708 15.9995 2.73333 16L13.2728 16C13.8578 16 14.3948 15.7539 14.7834 15.3732C15.1645 14.9862 15.3999 14.4542 15.3999 13.8671C15.3999 13.8668 15.3999 13.8665 15.3999 13.8661L15.3999 4.77262C15.4001 4.76498 15.4001 4.75593 15.4001 4.74686C15.4001 4.535 15.366 4.33113 15.3031 4.14042L15.307 4.15404ZM11.4277 1.96739C11.4256 1.96738 11.4231 1.96738 11.4207 1.96738C10.9196 1.96738 10.4665 2.1728 10.1405 2.50422C9.80399 2.83492 9.59548 3.29489 9.59529 3.80367C9.59529 4.30734 9.80527 4.76407 10.1403 5.10048C10.4711 5.43103 10.9276 5.6354 11.4318 5.6354C12.4419 5.6354 13.2607 4.8151 13.2612 3.80302C13.2606 2.78907 12.4403 1.96738 11.4284 1.96738C11.4282 1.96738 11.4279 1.96738 11.4277 1.96738L11.4277 1.96739ZM12.221 4.59433C12.0194 4.79774 11.7402 4.92367 11.4316 4.92367C11.1239 4.92367 10.8453 4.7984 10.6439 4.59598C10.4268 4.37785 10.3073 4.09623 10.3073 3.803C10.3079 3.49254 10.4358 3.21215 10.6415 3.0114L10.6453 3.00754L10.6496 3.00308C10.8504 2.80406 11.1267 2.68114 11.4316 2.68114C11.7381 2.68114 12.0157 2.80537 12.2169 3.00633L12.2222 3.01167C12.4238 3.21185 12.5486 3.48941 12.5486 3.79619C12.5486 3.79859 12.5486 3.80099 12.5486 3.80337C12.5486 3.80307 12.5486 3.80318 12.5486 3.80325C12.5486 4.11232 12.4234 4.39207 12.2209 4.59433L12.221 4.59433ZM7.65956 3.77871C7.65956 3.77978 7.65956 3.78104 7.65956 3.78231C7.65956 4.58142 7.90598 5.32292 8.32681 5.93455L8.32582 5.93233C8.75824 6.54538 9.33633 7.00709 10.0031 7.27337L10.8742 8.34671C11.0057 8.50778 11.2039 8.60985 11.4259 8.61013L11.4268 8.61013C11.4269 8.61013 11.4269 8.61013 11.4269 8.61013C11.6482 8.61013 11.8459 8.50903 11.9766 8.35041L12.8586 7.27353C13.6392 6.95241 14.2699 6.39774 14.6788 5.69722C14.518 5.94223 14.4694 6.01804 14.533 5.92461C14.947 5.3373 15.1974 4.60832 15.2048 3.82111C15.2039 3.84129 15.2052 3.80988 15.2052 3.77831C15.2052 3.7761 15.2052 3.77349 15.2052 3.77087C15.2052 2.73152 14.783 1.79102 14.1012 1.11212C13.5994 0.602422 12.9526 0.237691 12.228 0.0850851C12.4694 0.109619 11.964 0 11.4329 0C10.9088 0 10.4095 0.106827 9.95556 0.299931C9.28185 0.587489 8.70697 1.06171 8.29545 1.65783C8.70632 1.15524 8.64401 1.25183 8.60695 1.36019C8.22587 1.66668 7.88313 2.29796 7.73993 3.00198C7.83794 2.64726 7.8694 2.52599 7.83425 2.63819C7.72545 2.97256 7.66213 3.35736 7.66087 3.75683C7.66008 3.73242 7.65954 3.75542 7.65954 3.77863L7.65956 3.77871ZM13.9464 5.52024C13.5218 6.13797 12.8857 6.58334 12.1448 6.7528C12.4489 6.67568 12.3973 6.70867 12.3602 6.75742L11.4275 7.89626L10.5034 6.75742C10.4588 6.70387 10.4061 6.6757 10.3543 6.6432C9.7648 6.42903 9.26793 6.02979 8.90815 5.52026C8.57232 5.03316 8.37172 4.43001 8.37172 3.77989C8.37172 3.77948 8.37172 3.77905 8.37172 3.77864C8.3717 3.77439 8.37168 3.76929 8.37168 3.76421C8.37168 2.92386 8.71432 2.16375 9.26723 1.61646L9.28018 1.59187C9.84099 1.05039 10.6002 0.713961 11.4277 0.713961C11.4313 0.713943 11.4356 0.713926 11.4398 0.713926C13.126 0.713926 14.493 2.08373 14.493 3.77349C14.493 4.42713 14.2884 5.03287 13.94 5.52998L13.9464 5.52024ZM12.7923 9.29531L10.6167 11.4727L8.66243 9.51716L9.60331 8.57125C9.66524 8.50977 9.70358 8.42453 9.70358 8.33032C9.70358 8.23612 9.66524 8.15087 9.60334 8.08941C9.54129 8.0273 9.45562 7.98888 9.36101 7.98888C9.2664 7.98888 9.18073 8.02728 9.11871 8.08938L8.17818 9.03298L6.32919 7.18134L6.32919 7.17314L6.31654 7.16868L6.30889 7.16135L4.42357 5.26953C4.28216 5.1364 4.06879 5.1364 3.93897 5.26953C3.80166 5.40696 3.80166 5.61755 3.93897 5.75142L5.59811 7.41264L2.97776 10.0389C2.91783 10.1019 2.88097 10.1874 2.88097 10.2815C2.88097 10.3756 2.91783 10.4611 2.9779 10.5243C3.03907 10.5878 3.12497 10.6273 3.22006 10.6273C3.31516 10.6273 3.40106 10.5878 3.46227 10.5242L6.08286 7.89633L7.70248 9.51723L3.77741 13.434C3.64865 13.5746 3.64865 13.7936 3.77741 13.9182C3.91472 14.0558 4.1336 14.0558 4.25826 13.9182L8.17815 10.0028L10.3545 12.172L10.3618 12.1898L10.3704 12.1969L10.3745 12.1969L10.3787 12.2055L10.3861 12.2132L10.3987 12.2173L11.3471 13.1753C11.409 13.2356 11.4936 13.2728 11.5869 13.2728C11.6802 13.2728 11.7648 13.2356 11.8268 13.1753C11.8902 13.1139 11.9296 13.0279 11.9296 12.9325C11.9296 12.8372 11.8902 12.7512 11.8268 12.6898L11.1011 11.9589L13.2769 9.78043C13.3387 9.71844 13.3769 9.63284 13.3769 9.53833C13.3769 9.44382 13.3387 9.35821 13.2769 9.29623C13.2155 9.23241 13.1295 9.19278 13.0342 9.19278C12.9393 9.19278 12.8536 9.23207 12.7924 9.29527L12.7923 9.29531Z"   fill="#00FFFF" ></path></svg>
\ No newline at end of file
diff --git a/src/renderer/src/views/components/bottomSide/bottomSide.vue b/src/renderer/src/views/components/bottomSide/bottomSide.vue
index e577989..d26508d 100644
--- a/src/renderer/src/views/components/bottomSide/bottomSide.vue
+++ b/src/renderer/src/views/components/bottomSide/bottomSide.vue
@@ -2,22 +2,25 @@
   <div class="bottomMenuBox zIndex9" ref="bottomMenuBox">
     <div class="animate__animated bottomMenu">
       <div class="bottom_box" v-for="(item, i) of bottomMenuList" :key="i">
-        <div class="bottom_box_content" @click="addMarker(item, $event)" :title="t('bottomMenu.' + item.sourceType)">
-          <svg class="bottom_box_bg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
-            width="117.030029296875" height="44" viewBox="0 0 117.030029296875 44" fill="none"
-            preserveAspectRatio="none">
-            <path fill="#000000" fill-opacity="0.5"
-              d="M117.03 12.08L109.78 44L7.18002 44L1.52588e-05 31.57L7.18002 0L109.78 0L117.03 12.08" />
-            <path fill-rule="evenodd" fill="url(#linear_border_2442_315_0)"
-              d="M117.03 12.08L109.78 44L7.18002 44L1.52588e-05 31.57L7.18002 0L109.78 0L117.03 12.08ZM108.931 1.5L115.434 12.3353L108.583 42.5L8.04583 42.5L1.59311 31.3291L8.37717 1.5L108.931 1.5Z" />
-            <defs>
-              <linearGradient id="linear_border_2442_315_0" x1="117.030029296875" y1="-1.7520751953125"
-                x2="15.7401123046875" y2="40.47381591796875" gradientUnits="userSpaceOnUse">
-                <stop offset="0.0625" stop-color="rgba(var(--color-base1), 1)" />
-                <stop offset="1" stop-color="var(--color-border1)" />
-              </linearGradient>
-            </defs>
-          </svg>
+        <div class="bottom_box_content" @click="addMarker(item, $event)">
+          <el-tooltip :content="t('bottomMenu.' + item.sourceType)" effect="customized" placement="top" :hide-after="0">
+            <svg class="bottom_box_bg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+              width="117.030029296875" height="44" viewBox="0 0 117.030029296875 44" fill="none"
+              preserveAspectRatio="none">
+              <path fill="#000000" fill-opacity="0.5"
+                d="M117.03 12.08L109.78 44L7.18002 44L1.52588e-05 31.57L7.18002 0L109.78 0L117.03 12.08" />
+              <path fill-rule="evenodd" fill="url(#linear_border_2442_315_0)"
+                d="M117.03 12.08L109.78 44L7.18002 44L1.52588e-05 31.57L7.18002 0L109.78 0L117.03 12.08ZM108.931 1.5L115.434 12.3353L108.583 42.5L8.04583 42.5L1.59311 31.3291L8.37717 1.5L108.931 1.5Z" />
+              <defs>
+                <linearGradient id="linear_border_2442_315_0" x1="117.030029296875" y1="-1.7520751953125"
+                  x2="15.7401123046875" y2="40.47381591796875" gradientUnits="userSpaceOnUse">
+                  <stop offset="0.0625" stop-color="rgba(var(--color-base1), 1)" />
+                  <stop offset="1" stop-color="var(--color-border1)" />
+                </linearGradient>
+              </defs>
+            </svg>
+          </el-tooltip>
+
           <svg class="bottom_box_bg bottom_box_bg_hover" style="opacity: 0;" xmlns="http://www.w3.org/2000/svg"
             xmlns:xlink="http://www.w3.org/1999/xlink" width="118.09130859375" height="45"
             viewBox="0 0 118.09130859375 45" fill="none" preserveAspectRatio="none">
@@ -39,16 +42,16 @@
           </div>
         </div>
         <div class="bottom_children" v-if="item.children" v-show="item.childrenShow">
-          <div class="bottom_childre_box" v-for="(item2, m) of item.children" :key="m"
-            @click="addMarker(item2, $event)" :title="t('bottomMenu.' + item2.sourceType)">
-            <svg class="bottom_childre_box_bg" xmlns="http://www.w3.org/2000/svg"
+          <div class="bottom_childre_box" v-for="(item2, m) of item.children" :key="m" @click="addMarker(item2, $event)">
+            <el-tooltip :content="t('bottomMenu.' + item2.sourceType)" effect="customized" placement="top" :hide-after="0">
+              <svg class="bottom_childre_box_bg" xmlns="http://www.w3.org/2000/svg"
               xmlns:xlink="http://www.w3.org/1999/xlink" width="6vw" height="44.5" viewBox="0 0 119 35.5" fill="none"
               preserveAspectRatio="none">
               <path d="M11 0.5L108 0.5L118 35.5L1 35.5L11 0.5Z" stroke="url(#linear_border_2485_3)" stroke-width="1"
                 fill="#000000" fill-opacity="0.5" />
-              <path d="M118 34.5L1 34.5L0 36.5L119 36.5L118 34.5Z" fill-rule="evenodd"
-                fill="url(#linear_fill_2485_4)" />
+              <path d="M118 34.5L1 34.5L0 36.5L119 36.5L118 34.5Z" fill-rule="evenodd" fill="url(#linear_fill_2485_4)" />
             </svg>
+            </el-tooltip>
             <svg class="bottom_childre_box_bg bottom_childre_box_bg_hover" style="opacity: 0;"
               xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="118.32568359375"
               height="36" viewBox="0 0 118.32568359375 36" fill="none" preserveAspectRatio="none">
@@ -195,28 +198,28 @@ const bottomMenuList = ref([
         let id = new YJ.Tools().randomString()
         let name = t(`default.point`)
         let defaultStyle = (JSON.parse(localStorage.getItem('defaultStyle') || '{}').point) || {}
-        if(!defaultStyle) {
+        if (!defaultStyle) {
           defaultStyle = {}
         }
-        if(!defaultStyle.billboard) {
+        if (!defaultStyle.billboard) {
           defaultStyle.billboard = {}
         }
-        if(!defaultStyle.label) {
+        if (!defaultStyle.label) {
           defaultStyle.label = {}
         }
-        if(defaultStyle.billboard.image) {
+        if (defaultStyle.billboard.image) {
           try {
             let urlObject = new URL(defaultStyle.billboardimage)
             let pathname = urlObject.pathname
             let folderName = pathname.split('/')[1]
-            if(folderName === 'iconLibrary') {
+            if (folderName === 'iconLibrary') {
               let ip = localStorage.getItem('ip') || ''
               let ipObject = new URL(ip)
               urlObject.port = ipObject.port
               defaultStyle.billboard.image = urlObject.href
             }
             else {
-              urlObject.port = availablePort.value+''
+              urlObject.port = availablePort.value + ''
               defaultStyle.billboard.image = urlObject.href
             }
           } catch (error) {
@@ -233,7 +236,7 @@ const bottomMenuList = ref([
             billboard: {
               show: defaultStyle.billboard.show || true,
               image:
-              defaultStyle.billboard.image || "http://localhost:" +
+                defaultStyle.billboard.image || "http://localhost:" +
                 availablePort.value +
                 "/" +
                 "GEMarker1/A-ablu-blank.png",
@@ -659,6 +662,14 @@ document.addEventListener('click', (e: any) => {
   height: 44px;
   bottom: 1em;
   left: 13vw;
+  :deep(.el-tooltip__trigger) {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    left: 0;
+    top: 0;
+    pointer-events: all;
+  }
 }
 
 .bottomMenu {
diff --git a/src/renderer/src/views/components/headers/components/setPup/setPup.vue b/src/renderer/src/views/components/headers/components/setPup/setPup.vue
index 0739831..09124d0 100644
--- a/src/renderer/src/views/components/headers/components/setPup/setPup.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/setPup.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="set_pup">
+  <div class="set_pup" :class="{'dialog-en': isEN}">
     <el-dialog
       v-model="isShowPup"
       :modal="true"
@@ -135,10 +135,11 @@ import photoManage from './components/photoManage.vue'
 import { useI18n } from 'vue-i18n'
 
 const eventBus: any = inject('bus')
-const { t } = useI18n()
+const { t, locale } = useI18n()
 const tabPosition = ref('left')
 const activeName = ref('authorize')
 const isShowPup = ref(false)
+const isEN = ref(false)
 const open = (data) => {
   isShowPup.value = true
   if (data !== 'current') {
@@ -163,6 +164,25 @@ const close = () => {
   isShowPup.value = false
 }
 
+onMounted(() => {
+  // 可以在这里添加初始化逻辑
+  if(locale.value === 'zh-EN') {
+    isEN.value = true
+  }
+  else {
+    isEN.value = false
+  }
+})
+
+watch(locale, ()=>{
+  if(locale.value === 'zh-EN') {
+    isEN.value = true
+  }
+  else {
+    isEN.value = false
+  }
+})
+
 defineExpose({
   open,
   close
@@ -182,6 +202,7 @@ defineExpose({
       ),
       rgba(0, 0, 0, 0.6);
     border: 1px solid var(--color-border1);
+    padding-left: 0px;
     // padding-left: 0 !important;
   }
 
@@ -308,14 +329,18 @@ defineExpose({
     :deep(.el-tabs__item) {
       width: 8vw;
       color: #fff !important;
-      font-size: 1.1rem;
-      font-family: 黑体;
+      font-size: 0.9rem;
+      font-family: SourceHanSansTi;
       font-weight: 500;
-      display: flex;
+      line-height: 38px;
+      display: block;
       align-items: center;
-      justify-content: center;
+      text-align: center;
       margin-bottom: 3px;
       box-sizing: border-box;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
     }
 
     :deep(.el-tabs__item:hover) {
@@ -366,4 +391,10 @@ defineExpose({
     }
   }
 }
+
+.set_pup.dialog-en {
+  :deep(.el-tabs__item) {
+      text-align: left;
+    }
+}
 </style>
diff --git a/src/renderer/src/views/components/leftSide/leftSideFirst.vue b/src/renderer/src/views/components/leftSide/leftSideFirst.vue
index 35d97f5..d3799d9 100644
--- a/src/renderer/src/views/components/leftSide/leftSideFirst.vue
+++ b/src/renderer/src/views/components/leftSide/leftSideFirst.vue
@@ -2,9 +2,10 @@
   <div class="leftBox" ref="leftBoxRef">
     <div class="left animate__animated">
       <div class="menus">
-        <div class="menus_itemBox" v-for="(item, index) in menuList" :title="t(`firstMenu.${item.name}`)">
-          <div class="item_icon" @click="(e) => {
-          handleClick(item, e)
+        <div class="menus_itemBox" v-for="(item, index) in menuList">
+          <el-tooltip :content="t(`firstMenu.${item.name}`)" effect="customized" placement="top" :hide-after="0">
+            <div class="item_icon" @click="(e) => {
+          handleClick(item, index, e)
         }
           ">
             <!-- <svg class="item_icon_bg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -56,6 +57,8 @@
               {{ t(`firstMenu.${item.name}`) }}
             </div>
           </div>
+          </el-tooltip>
+          
         </div>
         <leftSideSecond class="absolute zIndex99 leftSideSecond" ref="leftSideSecondRef"></leftSideSecond>
       </div>
@@ -264,10 +267,12 @@ onMounted(() => {
   document.addEventListener('click', handleClickOutside, true);
 })
 const leftSideSecondRef = ref()
-const handleClick = (item: any, e) => {
-  console.log('点击了', item, e)
+const handleClick = (item: any, index, e) => {
+  console.log('点击了', item, e, index)
   $('.leftSideSecond')[0].style.left = '100%'
-  $('.leftSideSecond')[0].style.top = e.layerY - 120 + 'px'
+  // $('.leftSideSecond')[0].style.top = e.layerY + 120 + 'px'
+  $('.leftSideSecond')[0].style.top = `calc(${index} * 6.32vh)`
+  $('.leftSideSecond')[0].style.transform = 'translateY(calc(2.6vh - 50%))';
   $('.leftSideSecond')[0].style.display = 'none'
   if (item.children.length) {
     $('.leftSideSecond')[0].style.display = 'block'
diff --git a/src/renderer/src/views/components/propertyBox/CircleObject.vue b/src/renderer/src/views/components/propertyBox/CircleObject.vue
index b7fe636..bb5eee2 100644
--- a/src/renderer/src/views/components/propertyBox/CircleObject.vue
+++ b/src/renderer/src/views/components/propertyBox/CircleObject.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog ref="baseDialog" :title="title+'属性'" left="180px" top="100px" className="circle" :closeCallback="closeCallback">
+  <Dialog ref="baseDialog" :title="title + '属性'" left="180px" top="100px" className="circle" :closeCallback="closeCallback">
     <template #content>
       <span class="custom-divider"></span>
       <div class="div-item">
@@ -14,11 +14,11 @@
                 <span class="label" style="margin-right: 0px;">投影面积:</span>
                 <input class="input input-text" readonly type="text" v-model="area">
                 <el-select v-model="areaUnit">
-                    <el-option label="平方米" value="m2"></el-option>
-                    <el-option label="平方千米" value="km2"></el-option>
-                    <el-option label="亩" value="mu"></el-option>
-                    <el-option label="公顷" value="ha"></el-option>
-                  </el-select>
+                  <el-option label="平方米" value="m2"></el-option>
+                  <el-option label="平方千米" value="km2"></el-option>
+                  <el-option label="亩" value="mu"></el-option>
+                  <el-option label="公顷" value="ha"></el-option>
+                </el-select>
               </div>
             </div>
           </div>
@@ -31,54 +31,59 @@
               <attribute :entityOptions="entityOptions"></attribute>
             </el-tab-pane>
             <el-tab-pane label="空间信息" name="2">
-              <div class="row">
-                <div class="col height-mode-box">
-                  <span class="label" style="flex: 0 0 56px;">高度模式</span>
-                  <el-select class="input input-select height-mode-scelect" style="width: 155px;margin-left: 20px"
-                    v-model="heightMode" @change="heightModeChange" placeholder="请选择">
-                    <el-option v-for="item in heightModeData" :key="item.key" :label="item.name" :value="item.key">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div class="col">
-                  <span class="label">Z值统一增加</span>
-                  <div class="input-number input-number-unit-1 height-box" :class="{ 'disabled': heightMode == 2 }">
-                    <input class="input height" type="number" title="" min="-9999999" max="999999999" v-model="height" @input="$handleInputLimit">
-                    <span class="unit">m</span>
-                    <span class="arrow"></span>
+              <div class="div-item">
+                <div class="row">
+                  <div class="col height-mode-box">
+                    <span class="label" style="flex: 0 0 56px;">高度模式</span>
+                    <el-select class="input input-select height-mode-scelect" style="width: 155px;margin-left: 20px"
+                      v-model="heightMode" @change="heightModeChange" placeholder="请选择">
+                      <el-option v-for="item in heightModeData" :key="item.key" :label="item.name" :value="item.key">
+                      </el-option>
+                    </el-select>
                   </div>
-                  <button class="confirm height-confirm" style="margin-left: 5px;" @click="heightConfirm"
-                    :disabled="heightMode == 2">应用</button>
-                </div>
-              </div>
-              <div class="row">
-                <div class="table spatial-info-table">
-                  <div class="table-head">
-                    <div class="tr">
-                      <div class="th"></div>
-                      <div class="th">经度（X）</div>
-                      <div class="th">纬度（Y）</div>
-                      <div class="th">高度（Z）</div>
+                  <div class="col">
+                    <span class="label">Z值统一增加</span>
+                    <div class="input-number input-number-unit-1 height-box" :class="{ 'disabled': heightMode == 2 }">
+                      <input class="input height" type="number" title="" min="-9999999" max="999999999" v-model="height"
+                        @input="$handleInputLimit">
+                      <span class="unit">m</span>
+                      <span class="arrow"></span>
                     </div>
+                    <button class="confirm height-confirm" style="margin-left: 5px;" @click="heightConfirm"
+                      :disabled="heightMode == 2">应用</button>
                   </div>
-                  <div class="table-body">
-                    <div class="tr">
-                      <div class="td">圆心坐标</div>
-                      <div class="td lng align-center" @dblclick="inputDblclick($event, 1, 'lng')">
-                        <input class="input" @blur="inputBlurCallBack($event, 1, 'lng', 8)" type="number"
-                          v-model="entityOptions.center.lng" min="-180" max="180" v-if="activeTd.index == 1 && activeTd.name == 'lng'" @input="$handleInputLimit">
-                        <span style="pointer-events: none;" v-else>{{ entityOptions.center.lng.toFixed(8) }}</span>
+                </div>
+                <div class="row">
+                  <div class="table spatial-info-table">
+                    <div class="table-head">
+                      <div class="tr">
+                        <div class="th"></div>
+                        <div class="th">经度（X）</div>
+                        <div class="th">纬度（Y）</div>
+                        <div class="th">高度（Z）</div>
                       </div>
-                      <div class="td lat align-center" @dblclick="inputDblclick($event, 1, 'lat')">
-                        <input class="input" @blur="inputBlurCallBack($event, 1, 'lat', 8)" type="number"
-                          v-model="entityOptions.center.lat" min="-180" max="180" v-if="activeTd.index == 1 && activeTd.name == 'lat'" @input="$handleInputLimit">
-                        <span style="pointer-events: none;" v-else>{{ entityOptions.center.lat.toFixed(8) }}</span>
-                      </div>
-                      <div class="td alt align-center" @dblclick="inputDblclick($event, 1, 'alt')">
-                        <input class="input" @blur="inputBlurCallBack($event, 1, 'alt', 2)" type="number"
-                          v-model="entityOptions.height" min="-9999999" max="999999999"
-                          v-if="activeTd.index == 1 && activeTd.name == 'alt'" @input="$handleInputLimit">
-                        <span style="pointer-events: none;" v-else>{{ entityOptions.height.toFixed(2) }}</span>
+                    </div>
+                    <div class="table-body">
+                      <div class="tr">
+                        <div class="td">圆心坐标</div>
+                        <div class="td lng align-center" @dblclick="inputDblclick($event, 1, 'lng')">
+                          <input class="input" @blur="inputBlurCallBack($event, 1, 'lng', 8)" type="number"
+                            v-model="entityOptions.center.lng" min="-180" max="180"
+                            v-if="activeTd.index == 1 && activeTd.name == 'lng'" @input="$handleInputLimit">
+                          <span style="pointer-events: none;" v-else>{{ entityOptions.center.lng.toFixed(8) }}</span>
+                        </div>
+                        <div class="td lat align-center" @dblclick="inputDblclick($event, 1, 'lat')">
+                          <input class="input" @blur="inputBlurCallBack($event, 1, 'lat', 8)" type="number"
+                            v-model="entityOptions.center.lat" min="-180" max="180"
+                            v-if="activeTd.index == 1 && activeTd.name == 'lat'" @input="$handleInputLimit">
+                          <span style="pointer-events: none;" v-else>{{ entityOptions.center.lat.toFixed(8) }}</span>
+                        </div>
+                        <div class="td alt align-center" @dblclick="inputDblclick($event, 1, 'alt')">
+                          <input class="input" @blur="inputBlurCallBack($event, 1, 'alt', 2)" type="number"
+                            v-model="entityOptions.height" min="-9999999" max="999999999"
+                            v-if="activeTd.index == 1 && activeTd.name == 'alt'" @input="$handleInputLimit">
+                          <span style="pointer-events: none;" v-else>{{ entityOptions.height.toFixed(2) }}</span>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -98,7 +103,8 @@
                 <div class="col">
                   <span class="label">描边宽度</span>
                   <div class="input-number input-number-unit-2">
-                    <input class="input" type="number" title="" min="0" max="99" v-model="entityOptions.lineWidth" @input="$handleInputLimit">
+                    <input class="input" type="number" title="" min="0" max="99" v-model="entityOptions.lineWidth"
+                      @input="$handleInputLimit">
                     <span class="unit">px</span>
                     <span class="arrow"></span>
                   </div>
@@ -124,7 +130,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
@@ -186,13 +192,13 @@ let originalOptions: any
 let that: any
 
 const open = async (id: any, type: any) => {
-  if(type && type === 'circle') {
+  if (type && type === 'circle') {
     title.value = '圆'
   }
-  else if(type && type === 'ellipse') {
+  else if (type && type === 'ellipse') {
     title.value = '椭圆'
   }
-  else if(type && type === 'sector') {
+  else if (type && type === 'sector') {
     title.value = '扇形'
   }
   that = window.earth.entityMap.get(id)
@@ -273,7 +279,7 @@ const heightConfirm = () => {
   }
 }
 const inputDblclick = async (event, i, anme) => {
-  if(heightMode.value == 2) {
+  if (heightMode.value == 2) {
     return
   }
   activeTd.value = {
@@ -335,31 +341,31 @@ const close = () => {
 const remove = () => {
   close()
   ElMessageBox.confirm('此操作将永久删除节点及所有子节点, 是否继续?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-      .then(async () => {
-        let node = window.treeObj.getNodeByParam('id', that.options.id, null)
-        let source_ids = cusRemoveNode(window.treeObj, [node])
-        const res = await TreeApi.removeDirectory({ ids: source_ids })
-        if (res.code == 0 || res.code == 200) {
-          ElMessage({
-            message: '删除成功',
-            type: 'success'
-          })
-          that.remove()
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      let node = window.treeObj.getNodeByParam('id', that.options.id, null)
+      let source_ids = cusRemoveNode(window.treeObj, [node])
+      const res = await TreeApi.removeDirectory({ ids: source_ids })
+      if (res.code == 0 || res.code == 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success'
+        })
+        that.remove()
           (window as any)._entityMap.delete(source_ids[0])
-        } else {
-          ElMessage({
-            message: res.msg || '删除失败',
-            type: 'error'
-          })
-        }
-      })
-      .catch(() => {
-        // 用户点击取消，不执行任何操作
-      })
+      } else {
+        ElMessage({
+          message: res.msg || '删除失败',
+          type: 'error'
+        })
+      }
+    })
+    .catch(() => {
+      // 用户点击取消，不执行任何操作
+    })
 }
 
 watch(
@@ -378,4 +384,15 @@ defineExpose({
 })
 </script>
 
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss">
+.circle.dialog-en {
+  ::v-deep>.content {
+
+    .attribute-content-link .table .tr .td.operation button,
+    .attribute-content-vr .table .tr .td.operation button,
+    .attribute-content-rtmp .table .tr .td.operation button {
+      width: 76px !important;
+      flex: 0 0 76px !important;
+    }
+  }
+}</style>
\ No newline at end of file
diff --git a/src/renderer/src/views/components/propertyBox/Profile.vue b/src/renderer/src/views/components/propertyBox/Profile.vue
index 6cf0ca9..12a6faf 100644
--- a/src/renderer/src/views/components/propertyBox/Profile.vue
+++ b/src/renderer/src/views/components/propertyBox/Profile.vue
@@ -15,7 +15,7 @@
       <button @click="draw">
         <svg class="icon-edit"><use xlink:href="#yj-icon-edit"></use></svg>重新绘制
       </button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/ProjConvert.vue b/src/renderer/src/views/components/propertyBox/ProjConvert.vue
index 08b28bf..0ce06ff 100644
--- a/src/renderer/src/views/components/propertyBox/ProjConvert.vue
+++ b/src/renderer/src/views/components/propertyBox/ProjConvert.vue
@@ -251,7 +251,7 @@
       <span class="custom-divider" style="order: 10; margin-top: 12px"></span>
     </template>
     <template #footer>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/ProjectionConvert.vue b/src/renderer/src/views/components/propertyBox/ProjectionConvert.vue
index 961c42b..1829279 100644
--- a/src/renderer/src/views/components/propertyBox/ProjectionConvert.vue
+++ b/src/renderer/src/views/components/propertyBox/ProjectionConvert.vue
@@ -103,7 +103,7 @@
       <span class="custom-divider"></span>
     </template>
     <template #footer>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/TerrainExcavation.vue b/src/renderer/src/views/components/propertyBox/TerrainExcavation.vue
index c4781fc..5a15fe3 100644
--- a/src/renderer/src/views/components/propertyBox/TerrainExcavation.vue
+++ b/src/renderer/src/views/components/propertyBox/TerrainExcavation.vue
@@ -43,7 +43,7 @@
       </div>
     </template>
     <!-- <template #footer>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template> -->
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/ViewShed.vue b/src/renderer/src/views/components/propertyBox/ViewShed.vue
index cfdf2ee..81a58d9 100644
--- a/src/renderer/src/views/components/propertyBox/ViewShed.vue
+++ b/src/renderer/src/views/components/propertyBox/ViewShed.vue
@@ -90,7 +90,7 @@
         </button>
       </div>
 
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/attackArrow.vue b/src/renderer/src/views/components/propertyBox/attackArrow.vue
index a2c5924..f4fec57 100644
--- a/src/renderer/src/views/components/propertyBox/attackArrow.vue
+++ b/src/renderer/src/views/components/propertyBox/attackArrow.vue
@@ -147,7 +147,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
@@ -401,4 +401,15 @@ defineExpose({
 })
 </script>
 
-<style scoped lang="scss"></style>
\ No newline at end of file
+<style scoped lang="scss">
+.attackArrow.dialog-en {
+  ::v-deep>.content {
+    .attribute-content-link .table .tr .td.operation button,
+    .attribute-content-vr .table .tr .td.operation button,
+    .attribute-content-rtmp .table .tr .td.operation button {
+      width: 76px !important;
+      flex: 0 0 76px !important;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/renderer/src/views/components/propertyBox/attribute.vue b/src/renderer/src/views/components/propertyBox/attribute.vue
index da935bc..c615427 100644
--- a/src/renderer/src/views/components/propertyBox/attribute.vue
+++ b/src/renderer/src/views/components/propertyBox/attribute.vue
@@ -47,15 +47,15 @@
             </div>
             <div class="td" v-else>{{ item.url }}</div>
             <div class="td operation" v-if="linkEditActive.index === index">
-              <button style="width: 76px;flex: 0 0 76px" @click="linkConfirmEdit(index)">{{
+              <button @click="linkConfirmEdit(index)">{{
                   t('general.确认')
                 }}
               </button>
-              <button style="width: 76px;flex: 0 0 76px" @click="linkCancelEdit">{{ t('general.取消') }}</button>
+              <button @click="linkCancelEdit">{{ t('general.取消') }}</button>
             </div>
             <div class="td operation" v-else>
-              <button style="width: 76px;flex: 0 0 76px" @click="linkEdit(index, item)">{{ t('general.编辑') }}</button>
-              <button style="width: 76px;flex: 0 0 76px" @click="linkDelete(index)">{{ t('general.删除') }}</button>
+              <button @click="linkEdit(index, item)">{{ t('general.编辑') }}</button>
+              <button @click="linkDelete(index)">{{ t('general.删除') }}</button>
             </div>
           </div>
         </div>
@@ -69,7 +69,7 @@
       <div class="row">
         <div class="col">
           <span class="label">{{ t('general.编辑内容') }}</span>
-          <input class="input" type="text" v-model="cameraParams.keyWord" style="width: 180px;margin-right: 10px;"/>
+          <input class="input" type="text" :placeholder="t('general.请输入设备名称进行搜索')" v-model="cameraParams.keyWord" style="width: 180px;margin-right: 10px;"/>
           <button class="select btn" @click="cameraSelect({page: 1, limit: cameraParams.pageSize })">
             {{ t('general.搜索') }}
           </button>
@@ -244,7 +244,7 @@
         <div class="row">
           <div class="col">
             <span class="label">{{ t('general.编辑内容') }}</span>
-            <input class="input goods-select-input" type="text" placeholder="请输入关键字" style="width: 180px;margin-right: 10px;"
+            <input class="input goods-select-input" type="text" :placeholder="t('general.请输入物资名称进行搜索')" style="width: 180px;margin-right: 10px;"
               v-model="goodsKeywords">
             <button class="select btn" @click="goodsFilter">{{ t('general.搜索') }}</button>
           </div>
@@ -388,8 +388,8 @@ const cameraSelect = ({page, limit}) => {
     if (res.code === 0 || res.code === 200) {
       if (res.data) {
         cameraParams.value.total = res.data.total
+        cameraList.value = res.data.records
         if (res.data.records && res.data.records.length > 0) {
-          cameraList.value = res.data.records
           for (let i = 0; i < cameraList.value.length; i++) {
             cameraList.value[i].checked = false
             for (let j = 0; j < props.entityOptions.attributeCamera.length; j++) {
@@ -724,8 +724,8 @@ const changeAttributeCamera = (e) => {
 .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td:nth-child(1),
 .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .th:nth-child(1),
 .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .td:nth-child(1) {
-  width: 164px;
-  flex: 0 0 164px;
+  width: 150px;
+  flex: 0 0 150px;
 }
 
 .YJ-custom-base-dialog > .content .attribute-content-link .table .tr .th:nth-child(2),
@@ -744,21 +744,21 @@ const changeAttributeCamera = (e) => {
 .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td:nth-child(3),
 .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .th:nth-child(3),
 .YJ-custom-base-dialog > .content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 150px;
-  width: 150px;
+  flex: 0 0 175px;
+  width: 175px;
   justify-content: center;
 }
 
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .th:nth-child(3),
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .td:nth-child(3),
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .th:nth-child(3),
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .td:nth-child(3),
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .th:nth-child(3),
-.YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .td:nth-child(3) {
-  flex: 0 0 190px;
-  width: 190px;
-  justify-content: center;
-}
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .th:nth-child(3),
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-link .table .tr .td:nth-child(3),
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .th:nth-child(3),
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-vr .table .tr .td:nth-child(3),
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .th:nth-child(3),
+// .YJ-custom-base-dialog.dialog-en > .content .attribute-content-rtmp .table .tr .td:nth-child(3) {
+//   flex: 0 0 190px;
+//   width: 190px;
+//   justify-content: center;
+// }
 
 .YJ-custom-base-dialog > .content .attribute-content-link .table .tr .td .input-group .input,
 .YJ-custom-base-dialog > .content .attribute-content-vr .table .tr .td .input-group .input,
diff --git a/src/renderer/src/views/components/propertyBox/billboardObject.vue b/src/renderer/src/views/components/propertyBox/billboardObject.vue
index c58fe61..8750cc4 100644
--- a/src/renderer/src/views/components/propertyBox/billboardObject.vue
+++ b/src/renderer/src/views/components/propertyBox/billboardObject.vue
@@ -3,147 +3,197 @@
     :closeCallback="closeCallback">
     <template #content>
       <span class="custom-divider"></span>
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane :label="t('general.基础信息')" name="1">
-            <div class="div-item">
-              <div class="row">
-                <div class="col">
-                  <span class="label" style="flex: unset">{{ t('general.名称') }}</span>
-                  <input class="input" type="text" v-model="entityOptions.labelText" @change="changeName" />
-                </div>
-                <div class="col"></div>
+      <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane :label="t('general.基础信息')" name="1">
+          <div class="div-item">
+            <div class="row">
+              <div class="col">
+                <span class="label" style="flex: unset">{{ t('general.名称') }}</span>
+                <input class="input" type="text" v-model="entityOptions.labelText" @change="changeName" />
               </div>
+              <div class="col"></div>
             </div>
-            <span class="custom-divider"></span>
-            <div class="div-item">
-              <div class="row">
-                <div class="title1">
-                  <div class="row">
-                    <p class="lable-left-line">{{ t('dialog.point.WGS84') }}</p>
-                  </div>
-                </div>
-                <div class="title2">
-                  <div class="row coordinate-select-box">
-                    <div class="lable-left-line">
-                      {{ t('dialog.point.转换坐标选择') }}
-                      <el-select class="input input-select coordinate-select" style="width: 155px; margin-left: 20px"
-                        v-model="coordinate" @change="coordinateChange" placeholder="请选择">
-                        <el-option v-for="item in epsg_map" :key="item.epsg" :label="item.name" :value="item.epsg">
-                        </el-option>
-                      </el-select>
-                    </div>
-                  </div>
+          </div>
+          <span class="custom-divider"></span>
+          <div class="div-item">
+            <div class="row">
+              <div class="title1">
+                <div class="row">
+                  <p class="lable-left-line">{{ t('dialog.point.WGS84') }}</p>
                 </div>
               </div>
-              <div class="row" style="padding-left: 12px;">
-                <div style="width: 46%;">
-                  <div class="row" style="margin-bottom: 5px">
-                    <div class="col">
-                      <span class="label">{{ t('general.经度') }}</span>
-                      <input class="input" type="number" title="" min="-180" max="180" v-model="entityOptions.lng"
-                        @change="changLng" @input="$handleInputLimit" />
-                    </div>
-                  </div>
-                  <div class="row" style="margin-bottom: 5px">
-                    <div class="col">
-                      <span class="label">{{ t('general.纬度') }}</span>
-                      <input class="input" type="number" title="" min="-90" max="90" v-model="entityOptions.lat"
-                        @change="changLat" @input="$handleInputLimit" />
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="col">
-                      <span class="label">{{ t('general.海拔高度') }}</span>
-                      <div class="input-number input-number-unit-1 alt-box"
-                        :class="{ disabled: heightMode == 2 || heightMode === 3 }">
-                        <input class="input" type="number" title="" min="-9999999" max="999999999"
-                          v-model="entityOptions.alt" @change="changAlt" @input="$handleInputLimit" />
-                        <span class="unit">m</span>
-                        <span class="arrow"></span>
+              <div class="title2">
+                <div class="row coordinate-select-box">
+                  <div class="lable-left-line">
+                    {{ t('dialog.point.转换坐标选择') }}
+                    <el-select style="width: 155px; margin-left: 20px;" v-model="coordinate" @change="coordinateChange">
+                      <div class="group-header" :class="name_map1.filter((item) => {
+                        return item.epsg == coordinate
+                      }).length > 0
+                        ? 'arrowActive'
+                        : ''
+                        " @click="toggleGroup('hot')">
+                        地理坐标系
+                        <svg-icon v-if="isHotGroupOpen" name="arrow2" :size="10" :color="name_map1.filter((item) => {
+                          return item.epsg == coordinate
+                        }).length > 0
+                          ? 'rgba(0, 255, 255, 1)'
+                          : 'rgba(255, 255, 255, 1)'
+                          " style="margin-left: 10px"></svg-icon>
+                        <svg-icon v-else name="arrow1" :size="10" :color="name_map1.filter((item) => {
+                          return item.epsg == coordinate
+                        }).length > 0
+                          ? 'rgba(0, 255, 255, 1)'
+                          : 'rgba(255, 255, 255, 1)'
+                          " style="margin-left: 10px"></svg-icon>
                       </div>
-                    </div>
-                  </div>
-                </div>
-                <div style="width: 50%;">
-                  <div class="row" style="margin-bottom: 5px">
-                    <div class="col">
-                      <span class="label">{{ t('dialog.point.XAxis') }}:</span>
-                      <input style="border: none; background: none" class="input convert-x" readonly v-model="x" />
-                    </div>
-                  </div>
-                  <div class="row" style="margin-bottom: 5px">
-                    <div class="col">
-                      <span class="label">{{ t('dialog.point.YAxis') }}:</span>
-                      <input style="border: none; background: none" class="input convert-y" readonly v-model="y" />
-                    </div>
-                  </div>
-                  <div class="row">
-                    <div class="col">
-                      <span class="label">{{ t('dialog.point.ZAxis') }}:</span>
-                      <input style="border: none; background: none" class="input convert-z" readonly v-model="z" />
-                    </div>
+                      <div v-show="isHotGroupOpen">
+                        <el-option v-for="item in name_map1" :key="item.epsg" :label="item.name"
+                          :value="item.epsg"></el-option>
+                      </div>
+                      <div class="group-header" :class="name_map2.filter((item) => {
+                        return item.epsg == coordinate
+                      }).length > 0
+                        ? 'arrowActive'
+                        : ''
+                        " @click="toggleGroup('ty')">
+                        投影坐标系
+                        <svg-icon v-if="isHotGroupOpen2" name="arrow2" :size="10" :color="name_map2.filter((item) => {
+                          return item.epsg == coordinate
+                        }).length > 0
+                          ? 'rgba(0, 255, 255, 1)'
+                          : 'rgba(255, 255, 255, 1)'
+                          " style="margin-left: 10px"></svg-icon>
+                        <svg-icon v-else name="arrow1" :size="10" :color="name_map2.filter((item) => {
+                          return item.epsg == coordinate
+                        }).length > 0
+                          ? 'rgba(0, 255, 255, 1)'
+                          : 'rgba(255, 255, 255, 1)'
+                          " style="margin-left: 10px"></svg-icon>
+                      </div>
+                      <div v-show="isHotGroupOpen2">
+                        <el-option v-for="item in name_map2" :key="item.epsg" :label="item.name"
+                          :value="item.epsg"></el-option>
+                      </div>
+                    </el-select>
+                    <!-- <el-select class="input input-select coordinate-select" style="width: 155px; margin-left: 20px"
+                      v-model="coordinate" @change="coordinateChange" placeholder="请选择">
+                      <el-option v-for="item in epsg_map" :key="item.epsg" :label="item.name" :value="item.epsg">
+                      </el-option>
+                    </el-select> -->
                   </div>
                 </div>
               </div>
             </div>
-            <span class="custom-divider"></span>
-            <div class="div-item">
-              <setStyle type="点" :sourceType="sourceType" :entityOptions="entityOptions"></setStyle>
-              <div class="row" style="padding-left: 12px;">
-                <div class="col">
-                  <span class="label" style="flex: none">{{ t('dialog.point.icon.show') }}</span>
-                  <input class="btn-switch" type="checkbox" v-model="entityOptions.billboardShow" />
-                </div>
-              </div>
-              <div class="row" style="padding-left: 12px;">
-                <div class="col">
-                  <span class="label" style="flex: none">{{ t('dialog.point.icon.current') }}</span>
-                  <div class="image-box" @click="clickChangeImage">
-                    <img class="image" :src="entityOptions.billboardImage" alt="" />
+            <div class="row" style="padding-left: 12px;">
+              <div style="width: 46%;">
+                <div class="row" style="margin-bottom: 5px">
+                  <div class="col">
+                    <span class="label">{{ t('general.经度') }}</span>
+                    <input class="input" type="number" title="" min="-180" max="180" v-model="entityOptions.lng"
+                      @change="changLng" @input="$handleInputLimit" />
                   </div>
                 </div>
-                <div class="col">
-                  <span class="label" style="flex: none">{{ t('dialog.point.icon.multiple') }}</span>
-                  <div class="input-number input-number-unit-2">
-                    <input class="input" type="number" title="" min="0.1" max="99" v-model="entityOptions.billboardScale"
-                      @input="$handleInputLimit" />
-                    <span class="unit">{{ t('general.times') }}</span>
-                    <span class="arrow"></span>
+                <div class="row" style="margin-bottom: 5px">
+                  <div class="col">
+                    <span class="label">{{ t('general.纬度') }}</span>
+                    <input class="input" type="number" title="" min="-90" max="90" v-model="entityOptions.lat"
+                      @change="changLat" @input="$handleInputLimit" />
                   </div>
                 </div>
-                <div class="col"></div>
-              </div>
-              <div class="row" style="padding-left: 12px;">
-                <div class="col" style="flex: 0 0 80px;">
-                  <span class="label" style="flex: none;">{{ t('dialog.point.text.show') }}</span>
-                  <input class="btn-switch" type="checkbox" v-model="entityOptions.labelShow" />
-                </div>
-              </div>
-              <div class="row" style="padding-left: 12px;">
-                <div class="col">
-                  <span class="label" style="flex: none;">{{ t('general.text.color') }}</span>
-                  <div class="labelColor" ref="labelColorRef"></div>
-                </div>
-                <div class="col">
-                  <span class="label" style="flex: none;">{{ t('general.text.size') }}</span>
-                  <div class="input-number input-number-unit-2">
-                    <input class="input" type="number" title="" min="1" max="99" v-model="entityOptions.labelFontSize"
-                      style="min-width: 70px;" @input="$handleInputLimit" />
-                    <span class="unit">px</span>
-                    <span class="arrow"></span>
+                <div class="row">
+                  <div class="col">
+                    <span class="label">{{ t('general.海拔高度') }}</span>
+                    <div class="input-number input-number-unit-1 alt-box"
+                      :class="{ disabled: heightMode == 2 || heightMode === 3 }">
+                      <input class="input" type="number" title="" min="-9999999" max="999999999"
+                        v-model="entityOptions.alt" @change="changAlt" @input="$handleInputLimit" />
+                      <span class="unit">m</span>
+                      <span class="arrow"></span>
+                    </div>
                   </div>
                 </div>
-                <div class="col font-select-box">
-                  <span class="label" style="flex: none;">{{ t('general.text.font') }}</span>
-                  <el-select class="input input-select font-select" style="width: 100px"
-                    v-model="entityOptions.labelFontFamily">
-                    <el-option v-for="item in fontList" :key="item.key" :label="t('general.' + item.name)"
-                      :value="item.key">
-                    </el-option>
-                  </el-select>
+              </div>
+              <div style="width: 50%;">
+                <div class="row" style="margin-bottom: 5px">
+                  <div class="col">
+                    <span class="label">{{ t('dialog.point.XAxis') }}:</span>
+                    <input style="border: none; background: none" class="input convert-x" readonly v-model="x" />
+                  </div>
+                </div>
+                <div class="row" style="margin-bottom: 5px">
+                  <div class="col">
+                    <span class="label">{{ t('dialog.point.YAxis') }}:</span>
+                    <input style="border: none; background: none" class="input convert-y" readonly v-model="y" />
+                  </div>
+                </div>
+                <div class="row">
+                  <div class="col">
+                    <span class="label">{{ t('dialog.point.ZAxis') }}:</span>
+                    <input style="border: none; background: none" class="input convert-z" readonly v-model="z" />
+                  </div>
                 </div>
               </div>
-              <!-- <div class="row" style="padding-left: 12px;">
+            </div>
+          </div>
+          <span class="custom-divider"></span>
+          <div class="div-item">
+            <setStyle type="点" :sourceType="sourceType" :entityOptions="entityOptions"></setStyle>
+            <div class="row" style="padding-left: 12px;">
+              <div class="col">
+                <span class="label" style="flex: none">{{ t('dialog.point.icon.show') }}</span>
+                <input class="btn-switch" type="checkbox" v-model="entityOptions.billboardShow" />
+              </div>
+            </div>
+            <div class="row" style="padding-left: 12px;">
+              <div class="col">
+                <span class="label" style="flex: none">{{ t('dialog.point.icon.current') }}</span>
+                <div class="image-box" @click="clickChangeImage">
+                  <img class="image" :src="entityOptions.billboardImage" alt="" />
+                </div>
+              </div>
+              <div class="col">
+                <span class="label" style="flex: none">{{ t('dialog.point.icon.multiple') }}</span>
+                <div class="input-number input-number-unit-2">
+                  <input class="input" type="number" title="" min="0.1" max="99" v-model="entityOptions.billboardScale"
+                    @input="$handleInputLimit" />
+                  <span class="unit">{{ t('general.times') }}</span>
+                  <span class="arrow"></span>
+                </div>
+              </div>
+              <div class="col"></div>
+            </div>
+            <div class="row" style="padding-left: 12px;">
+              <div class="col" style="flex: 0 0 80px;">
+                <span class="label" style="flex: none;">{{ t('dialog.point.text.show') }}</span>
+                <input class="btn-switch" type="checkbox" v-model="entityOptions.labelShow" />
+              </div>
+            </div>
+            <div class="row" style="padding-left: 12px;">
+              <div class="col">
+                <span class="label" style="flex: none;">{{ t('general.text.color') }}</span>
+                <div class="labelColor" ref="labelColorRef"></div>
+              </div>
+              <div class="col">
+                <span class="label" style="flex: none;">{{ t('general.text.size') }}</span>
+                <div class="input-number input-number-unit-2">
+                  <input class="input" type="number" title="" min="1" max="99" v-model="entityOptions.labelFontSize"
+                    style="min-width: 70px;" @input="$handleInputLimit" />
+                  <span class="unit">px</span>
+                  <span class="arrow"></span>
+                </div>
+              </div>
+              <div class="col font-select-box">
+                <span class="label" style="flex: none;">{{ t('general.text.font') }}</span>
+                <el-select class="input input-select font-select" style="width: 100px"
+                  v-model="entityOptions.labelFontFamily">
+                  <el-option v-for="item in fontList" :key="item.key" :label="t('general.' + item.name)"
+                    :value="item.key">
+                  </el-option>
+                </el-select>
+              </div>
+            </div>
+            <!-- <div class="row" style="padding-left: 12px;">
           <div class="col">
             <div class="customized-tip"></div>
             <span class="label" style="flex: none;">{{ t('general.text.style') }}</span>
@@ -187,41 +237,41 @@
           </div>
           <div class="col"></div>
         </div> -->
-            </div>
-            <span class="custom-divider"></span>
-            <div class="div-item">
-              <div class="row">
-                <div class="col" style="flex: 0 0 120px">
-                  <span class="label">{{ t('general.视野缩放') }}</span>
-                  <input class="btn-switch" type="checkbox" v-model="entityOptions.scaleByDistance" />
+          </div>
+          <span class="custom-divider"></span>
+          <div class="div-item">
+            <div class="row">
+              <div class="col" style="flex: 0 0 120px">
+                <span class="label">{{ t('general.视野缩放') }}</span>
+                <input class="btn-switch" type="checkbox" v-model="entityOptions.scaleByDistance" />
+              </div>
+              <div class="col">
+                <span class="label">{{ t('general.最近距离') }}</span>
+                <div class="input-number input-number-unit-1">
+                  <input class="input" type="number" title="" min="1" max="99999999" v-model="entityOptions.near"
+                    @input="$handleInputLimit" />
+                  <span class="unit">m</span>
+                  <span class="arrow"></span>
                 </div>
-                <div class="col">
-                  <span class="label">{{ t('general.最近距离') }}</span>
-                  <div class="input-number input-number-unit-1">
-                    <input class="input" type="number" title="" min="1" max="99999999" v-model="entityOptions.near"
-                      @input="$handleInputLimit" />
-                    <span class="unit">m</span>
-                    <span class="arrow"></span>
-                  </div>
-                </div>
-                <div class="col">
-                  <span class="label">{{ t('general.最远距离') }}</span>
-                  <div class="input-number input-number-unit-1">
-                    <input class="input" type="number" title="" min="1" max="99999999" v-model="entityOptions.far"
-                      @input="$handleInputLimit" />
-                    <span class="unit">m</span>
-                    <span class="arrow"></span>
-                  </div>
+              </div>
+              <div class="col">
+                <span class="label">{{ t('general.最远距离') }}</span>
+                <div class="input-number input-number-unit-1">
+                  <input class="input" type="number" title="" min="1" max="99999999" v-model="entityOptions.far"
+                    @input="$handleInputLimit" />
+                  <span class="unit">m</span>
+                  <span class="arrow"></span>
                 </div>
               </div>
             </div>
-          </el-tab-pane>
-          <el-tab-pane :label="t('general.属性信息')" name="2">
-            <attribute :entityOptions="entityOptions"></attribute>
-          </el-tab-pane>
-          <el-tab-pane :label="t('general.空间信息')" name="3">
-            <div class="div-item">
-              <div class="row">
+          </div>
+        </el-tab-pane>
+        <el-tab-pane :label="t('general.属性信息')" name="2">
+          <attribute :entityOptions="entityOptions"></attribute>
+        </el-tab-pane>
+        <el-tab-pane :label="t('general.空间信息')" name="3">
+          <div class="div-item">
+            <div class="row">
               <div class="col height-mode-box">
                 <span class="label" style="flex: 0 0 56px">{{ t('general.高度模式') }}</span>
                 <el-select class="input input-select height-mode-scelect" style="width: 155px; margin-left: 20px"
@@ -336,9 +386,9 @@
                 </div>
               </div>
             </div>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
       <span class="custom-divider"></span>
     </template>
     <template #footer>
@@ -352,7 +402,7 @@
       </div>
       <button @click="remove">{{ t('general.删除') }}</button>
       <button @click="confirm">{{ t('general.确定') }}</button>
-      <button @click="close">{{ t('general.关闭') }}</button>
+      <button @click="close">{{ t('general.取消') }}</button>
     </template>
   </Dialog>
 </template>
@@ -375,6 +425,31 @@ const { cusUpdateNode, getSelectedNodes, cusRemoveNode } = useTreeNode()
 const baseDialog: any = ref(null)
 const eventBus: any = inject('bus')
 
+const name_map: any = ref([])
+const name_map1: any = ref([])
+const name_map2: any = ref([
+  {
+    epsg: 'EPSG:32601',
+    name: 'WGS84 通用横轴墨卡托投影'
+  },
+  {
+    epsg: 'EPSG:4534',
+    name: '2000 坐标 3 度不带代号'
+  },
+  {
+    epsg: 'EPSG:4513',
+    name: '2000 坐标 3 度带代号'
+  },
+  {
+    epsg: 'EPSG:4502',
+    name: '2000 坐标 6 度不带代号'
+  },
+  {
+    epsg: 'EPSG:4491',
+    name: '2000 坐标 6 度带代号'
+  }
+])
+
 const epsg_map = ref([
   {
     name: 'WGS 84 / UTM zone 3N',
@@ -390,6 +465,10 @@ for (const [key, value] of window.earth.proj.epsg_map) {
 }
 epsg_map.value = array
 
+let tool = new YJ.Tools(window.earth)
+name_map.value = Array.from(tool.name_map.values())
+name_map1.value = name_map.value.splice(0, 2)
+
 const format1 = ref(true)
 const format2 = ref(false)
 const format3 = ref(false)
@@ -434,6 +513,9 @@ const x = ref()
 const y = ref()
 const z = ref()
 const coordinate = ref('EPSG:4326')
+const isHotGroupOpen: any = ref(true)
+const isHotGroupOpen2: any = ref(false)
+const showPosiType: any = ref(false)
 const heightMode = ref(0)
 const labelColorRef = ref(null)
 const sourceType = ref('')
@@ -454,6 +536,13 @@ const open = async (id, type) => {
   baseDialog.value?.open()
 
   await nextTick()
+  let data = name_map1.value.filter((item) => item.epsg === coordinate.value)
+  showPosiType.value = data.length
+  if (data.length) {
+    isHotGroupOpen.value = true
+  } else {
+    isHotGroupOpen2.value = true
+  }
   let labelColorPicker = new window.YJColorPicker({
     el: labelColorRef.value,
     size: 'mini', //颜色box类型
@@ -519,6 +608,11 @@ const closeCallback = () => {
   eventBus?.emit('destroyComponent')
 }
 
+const toggleGroup = (type: string) => {
+  if (type === 'hot') isHotGroupOpen.value = !isHotGroupOpen.value
+  if (type === 'ty') isHotGroupOpen2.value = !isHotGroupOpen2.value
+}
+
 const changeName = (e) => {
   entityOptions.value.labelText = e.target.value
 }
@@ -771,7 +865,7 @@ defineExpose({
   }
 
   ::v-deep>.content {
-    width: 590px;
+    width: 600px;
 
     .title1 {
       width: 46%;
@@ -802,7 +896,7 @@ defineExpose({
 
 .billboard-object.dialog-en {
   ::v-deep>.content {
-    width: 690px;
+    width: 660px;
 
     .title1 {
       width: 40%;
diff --git a/src/renderer/src/views/components/propertyBox/circleDiffuse.vue b/src/renderer/src/views/components/propertyBox/circleDiffuse.vue
index 2c984a8..9dc8a27 100644
--- a/src/renderer/src/views/components/propertyBox/circleDiffuse.vue
+++ b/src/renderer/src/views/components/propertyBox/circleDiffuse.vue
@@ -103,7 +103,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/curvelineObject.vue b/src/renderer/src/views/components/propertyBox/curvelineObject.vue
index 3797927..4a5f54b 100644
--- a/src/renderer/src/views/components/propertyBox/curvelineObject.vue
+++ b/src/renderer/src/views/components/propertyBox/curvelineObject.vue
@@ -59,13 +59,13 @@
         <div class="row">
           <div class="col">
             <span class="label">线段缓冲</span>
-            <input class="btn-switch" type="checkbox" v-model="entityOptions.extend" @change="lineExtendchange"/>
+            <input class="btn-switch" type="checkbox" v-model="entityOptions.extend" @change="lineExtendchange" />
           </div>
           <div class="col" style="flex: 0 0 33%">
             <span class="label">缓冲宽度</span>
             <div class="input-number input-number-unit-1" style="width: 80px">
-              <input class="input" type="number" title="" min="0" data-min="0.01" max="999999"
-                @input="$handleInputLimit" v-model="entityOptions.extendWidth" />
+              <input class="input" type="number" title="" min="0" data-min="0.01" max="999999" @input="$handleInputLimit"
+                v-model="entityOptions.extendWidth" />
               <span class="unit">m</span>
               <span class="arrow"></span>
             </div>
@@ -190,7 +190,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
@@ -383,7 +383,7 @@ const open = async (id, type) => {
 const heightModeChange = (val) => {
   that.heightMode = heightMode.value
   // @ts-ignore
-  if(heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') {
+  if (heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') {
     entityOptions.value.extend = false
   }
 }
@@ -425,8 +425,8 @@ const changeWordsName = (val) => {
 
 
 const lineTypechange = () => { }
-const lineExtendchange = (e)=>{
-  if(e.target.checked) {
+const lineExtendchange = (e) => {
+  if (e.target.checked) {
     heightMode.value = 2
   }
 }
@@ -554,4 +554,14 @@ defineExpose({
     }
   }
 }
+.polyline.dialog-en {
+  ::v-deep>.content {
+    .attribute-content-link .table .tr .td.operation button,
+    .attribute-content-vr .table .tr .td.operation button,
+    .attribute-content-rtmp .table .tr .td.operation button {
+      width: 76px !important;
+      flex: 0 0 76px !important;
+    }
+  }
+}
 </style>
\ No newline at end of file
diff --git a/src/renderer/src/views/components/propertyBox/explosion.vue b/src/renderer/src/views/components/propertyBox/explosion.vue
index 0a3a3ab..db40481 100644
--- a/src/renderer/src/views/components/propertyBox/explosion.vue
+++ b/src/renderer/src/views/components/propertyBox/explosion.vue
@@ -56,7 +56,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/flat.vue b/src/renderer/src/views/components/propertyBox/flat.vue
index c826e19..5567587 100644
--- a/src/renderer/src/views/components/propertyBox/flat.vue
+++ b/src/renderer/src/views/components/propertyBox/flat.vue
@@ -36,7 +36,7 @@
     </template>
     <template #footer>
       <button @click="sure">确认</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/flyLine.vue b/src/renderer/src/views/components/propertyBox/flyLine.vue
index 9e94e7a..ee92e96 100644
--- a/src/renderer/src/views/components/propertyBox/flyLine.vue
+++ b/src/renderer/src/views/components/propertyBox/flyLine.vue
@@ -76,7 +76,7 @@
     <template #footer>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/graphObject.vue b/src/renderer/src/views/components/propertyBox/graphObject.vue
index 7aed28d..6ce760c 100644
--- a/src/renderer/src/views/components/propertyBox/graphObject.vue
+++ b/src/renderer/src/views/components/propertyBox/graphObject.vue
@@ -194,7 +194,7 @@
       <button @click="returnY"><svg-icon name="yaxis" :size="12"></svg-icon>Y轴翻转</button>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/graphSetting.vue b/src/renderer/src/views/components/propertyBox/graphSetting.vue
index d06fa09..b6808b1 100644
--- a/src/renderer/src/views/components/propertyBox/graphSetting.vue
+++ b/src/renderer/src/views/components/propertyBox/graphSetting.vue
@@ -74,7 +74,7 @@
     </template>
     <template #footer>
       <button @click="save">保存</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/groundText.vue b/src/renderer/src/views/components/propertyBox/groundText.vue
index e428f5a..f2264a3 100644
--- a/src/renderer/src/views/components/propertyBox/groundText.vue
+++ b/src/renderer/src/views/components/propertyBox/groundText.vue
@@ -1,6 +1,5 @@
 <template>
-    <Dialog ref="baseDialog" title="贴地文字属性" left="180px" top="100px" className="ground-text"
-        :closeCallback="closeCallback">
+    <Dialog ref="baseDialog" title="贴地文字属性" left="180px" top="100px" className="ground-text" :closeCallback="closeCallback">
         <template #content>
             <span class="custom-divider"></span>
             <div class="div-item">
@@ -11,8 +10,7 @@
                     </div>
                     <div class="col">
                         <span class="label">颜色</span>
-                        <div class="color" ref="colorRef" </div>
-                        </div>
+                        <div class="color" ref="colorRef"></div>
                     </div>
                 </div>
                 <span class="custom-divider"></span>
@@ -25,7 +23,8 @@
                         </div>
                         <div class="col">
                             <span class="label">纬度</span>
-                            <input class="input" type="number" title="" min="-90" max="90" v-model="entityOptions.lat" @input="$handleInputLimit">
+                            <input class="input" type="number" title="" min="-90" max="90" v-model="entityOptions.lat"
+                                @input="$handleInputLimit">
                         </div>
                     </div>
                 </div>
@@ -37,8 +36,8 @@
                             <input type="range" max="360" min="0" step="1" v-model="entityOptions.angle">
                             <div class="input-number input-number-unit"
                                 style="width: 100px;flex: 0 0 100px;margin-left: 10px;">
-                                <input class="input" type="number" title="" min="0" max="360" step="1" @input="$handleInputLimit"
-                                    v-model="entityOptions.angle">
+                                <input class="input" type="number" title="" min="0" max="360" step="1"
+                                    @input="$handleInputLimit" v-model="entityOptions.angle">
                                 <span class="unit">°</span>
                                 <span class="arrow"></span>
                             </div>
@@ -60,14 +59,15 @@
                             <span class="label">滚动速度</span>
                             <input type="range" max="100" min="0" step="1" v-model="entityOptions.speed">
                             <div class="input-number" style="width: 100px;flex: 0 0 100px;margin-left: 10px;">
-                                <input class="input" type="number" title="" min="0" max="100" step="1" @input="$handleInputLimit"
-                                    v-model="entityOptions.speed">
+                                <input class="input" type="number" title="" min="0" max="100" step="1"
+                                    @input="$handleInputLimit" v-model="entityOptions.speed">
                                 <span class="arrow"></span>
                             </div>
                         </div>
                     </div>
                 </div>
                 <span class="custom-divider"></span>
+            </div>
         </template>
         <template #footer>
             <div style="position: absolute; left: 24px; display: flex;">
@@ -77,7 +77,7 @@
             </div>
             <button @click="remove">删除</button>
             <button @click="confirm">确定</button>
-            <button @click="close">关闭</button>
+            <button @click="close">取消</button>
         </template>
     </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/imagePop.vue b/src/renderer/src/views/components/propertyBox/imagePop.vue
index 48449d8..4d61ad0 100644
--- a/src/renderer/src/views/components/propertyBox/imagePop.vue
+++ b/src/renderer/src/views/components/propertyBox/imagePop.vue
@@ -32,7 +32,7 @@
         </button>
       </div>
       <button @click="save">保存</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/labelStyle.vue b/src/renderer/src/views/components/propertyBox/labelStyle.vue
index e12ecee..9ae19b0 100644
--- a/src/renderer/src/views/components/propertyBox/labelStyle.vue
+++ b/src/renderer/src/views/components/propertyBox/labelStyle.vue
@@ -38,7 +38,7 @@
     <div class="row"></div>
     <div class="row">
       <div class="col">
-        <span class="label">字体样式</span>
+        <span class="label">字体风格</span>
       </div>
     </div>
     <div class="row">
@@ -63,7 +63,7 @@
         </el-select>
       </div>
     </div>
-    <div class="row">
+    <!-- <div class="row">
       <div class="col">
         <div class="customized-tip"></div>
         <span class="label" style="flex: none;">{{ t('general.text.style') }}</span>
@@ -106,7 +106,7 @@
         </div>
       </div>
       <div class="col"></div>
-    </div>
+    </div> -->
     <span class="custom-divider"></span>
     <div class="row"></div>
     <div class="row">
@@ -124,13 +124,6 @@
         <div class="labelBackgroundColorStart" ref="labelBackgroundColorStartRef" style="margin-right: 10px;"></div>
         <div class="labelBackgroundColorEnd" ref="labelBackgroundColorEndRef"></div>
       </div>
-      <!-- <div class="col font-select-box">
-        <span class="label" style="flex: none">字体选择</span>
-        <el-select class="input input-select font-select" v-model="entityOptions.labelFontFamily">
-          <el-option v-for="item in fontList" :key="item.key" :label="item.name" :value="item.key">
-          </el-option>
-        </el-select>
-      </div> -->
     </div>
     <div class="row">
       <div class="col">
diff --git a/src/renderer/src/views/components/propertyBox/layer.vue b/src/renderer/src/views/components/propertyBox/layer.vue
index 033cae8..1fe7c46 100644
--- a/src/renderer/src/views/components/propertyBox/layer.vue
+++ b/src/renderer/src/views/components/propertyBox/layer.vue
@@ -31,7 +31,7 @@
     <template #footer>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/modelObject.vue b/src/renderer/src/views/components/propertyBox/modelObject.vue
index a0a8d05..edfa448 100644
--- a/src/renderer/src/views/components/propertyBox/modelObject.vue
+++ b/src/renderer/src/views/components/propertyBox/modelObject.vue
@@ -524,7 +524,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/modelSetting.vue b/src/renderer/src/views/components/propertyBox/modelSetting.vue
index 14a0a45..b3b5971 100644
--- a/src/renderer/src/views/components/propertyBox/modelSetting.vue
+++ b/src/renderer/src/views/components/propertyBox/modelSetting.vue
@@ -74,7 +74,7 @@
     </template>
     <template #footer>
       <button @click="save">保存</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/particleEffects.vue b/src/renderer/src/views/components/propertyBox/particleEffects.vue
index 337c0f5..b186329 100644
--- a/src/renderer/src/views/components/propertyBox/particleEffects.vue
+++ b/src/renderer/src/views/components/propertyBox/particleEffects.vue
@@ -183,7 +183,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/polygonObject.vue b/src/renderer/src/views/components/propertyBox/polygonObject.vue
index 25d8c22..9352831 100644
--- a/src/renderer/src/views/components/propertyBox/polygonObject.vue
+++ b/src/renderer/src/views/components/propertyBox/polygonObject.vue
@@ -1,5 +1,6 @@
 <template>
-  <Dialog ref="baseDialog" :title="title+'属性'" left="180px" top="100px" className="polygon" :closeCallback="closeCallback">
+  <Dialog ref="baseDialog" :title="title + '属性'" left="180px" top="100px" className="polygon"
+    :closeCallback="closeCallback">
     <template #content>
       <span class="custom-divider"></span>
       <div class="div-item">
@@ -14,11 +15,11 @@
                 <span class="label" style="margin-right: 0px;">投影面积:</span>
                 <input class="input input-text" readonly type="text" v-model="area">
                 <el-select v-model="areaUnit">
-                    <el-option label="平方米" value="m2"></el-option>
-                    <el-option label="平方千米" value="km2"></el-option>
-                    <el-option label="亩" value="mu"></el-option>
-                    <el-option label="公顷" value="ha"></el-option>
-                  </el-select>
+                  <el-option label="平方米" value="m2"></el-option>
+                  <el-option label="平方千米" value="km2"></el-option>
+                  <el-option label="亩" value="mu"></el-option>
+                  <el-option label="公顷" value="ha"></el-option>
+                </el-select>
               </div>
             </div>
           </div>
@@ -43,7 +44,8 @@
                 <div class="col">
                   <span class="label">Z值统一增加</span>
                   <div class="input-number input-number-unit-1 height-box" :class="{ 'disabled': heightMode == 2 }">
-                    <input class="input height" type="number" title="" min="-9999999" max="999999999" v-model="height" @input="$handleInputLimit" />
+                    <input class="input height" type="number" title="" min="-9999999" max="999999999" v-model="height"
+                      @input="$handleInputLimit" />
                     <span class="unit">m</span>
                     <span class="arrow"></span>
                   </div>
@@ -66,15 +68,18 @@
                       <div class="td">{{ i + 1 }}</div>
                       <div class="td lng align-center" @dblclick="inputDblclick($event, i, 'lng')">
                         <input class="input" @blur="inputBlurCallBack($event, i, 'lng', 8)" type="number"
-                          v-model="item.lng" min="-180" max="180" v-if="activeTd.index == i && activeTd.name == 'lng'" @input="$handleInputLimit" />
+                          v-model="item.lng" min="-180" max="180" v-if="activeTd.index == i && activeTd.name == 'lng'"
+                          @input="$handleInputLimit" />
                         <span style="pointer-events: none;" v-else>{{ (item.lng).toFixed(8) }}</span>
                       </div>
                       <div class="td lat align-center" @dblclick="inputDblclick($event, i, 'lat')">
                         <input class="input" @blur="inputBlurCallBack($event, i, 'lat', 8)" type="number"
-                          v-model="item.lat" min="-180" max="180" v-if="activeTd.index == i && activeTd.name == 'lat'" @input="$handleInputLimit">
+                          v-model="item.lat" min="-180" max="180" v-if="activeTd.index == i && activeTd.name == 'lat'"
+                          @input="$handleInputLimit">
                         <span style="pointer-events: none;" v-else>{{ (item.lat).toFixed(8) }}</span>
                       </div>
-                      <div class="td alt align-center" @dblclick="inputDblclick($event, i, 'alt')" @input="$handleInputLimit">
+                      <div class="td alt align-center" @dblclick="inputDblclick($event, i, 'alt')"
+                        @input="$handleInputLimit">
                         <input class="input" @blur="inputBlurCallBack($event, i, 'alt', 2)" type="number"
                           v-model="entityOptions.height" min="-9999999" max="999999999"
                           v-if="activeTd.index == i && activeTd.name == 'alt'">
@@ -98,7 +103,8 @@
                 <div class="col">
                   <span class="label">描边宽度</span>
                   <div class="input-number input-number-unit-2">
-                    <input class="input" type="number" title="" min="0" max="99" v-model="entityOptions.lineWidth" @input="$handleInputLimit">
+                    <input class="input" type="number" title="" min="0" max="99" v-model="entityOptions.lineWidth"
+                      @input="$handleInputLimit">
                     <span class="unit">px</span>
                     <span class="arrow"></span>
                   </div>
@@ -124,7 +130,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
@@ -186,10 +192,10 @@ let originalOptions: any
 let that: any
 
 const open = async (id: any, type: any) => {
-  if(type && type === 'rectangle') {
+  if (type && type === 'rectangle') {
     title.value = '矩形'
   }
-  else if(type && type === 'rendezvous') {
+  else if (type && type === 'rendezvous') {
     title.value = '集结地'
   }
   that = window.earth.entityMap.get(id)
@@ -270,7 +276,7 @@ const heightConfirm = () => {
   }
 }
 const inputDblclick = async (event, i, anme) => {
-  if(heightMode.value == 2) {
+  if (heightMode.value == 2) {
     return
   }
   activeTd.value = {
@@ -333,31 +339,31 @@ const close = () => {
 const remove = () => {
   close()
   ElMessageBox.confirm('此操作将永久删除节点及所有子节点, 是否继续?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning'
-    })
-      .then(async () => {
-        let node = window.treeObj.getNodeByParam('id', that.options.id, null)
-        let source_ids = cusRemoveNode(window.treeObj, [node])
-        const res = await TreeApi.removeDirectory({ ids: source_ids })
-        if (res.code == 0 || res.code == 200) {
-          ElMessage({
-            message: '删除成功',
-            type: 'success'
-          })
-          that.remove()
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
+  })
+    .then(async () => {
+      let node = window.treeObj.getNodeByParam('id', that.options.id, null)
+      let source_ids = cusRemoveNode(window.treeObj, [node])
+      const res = await TreeApi.removeDirectory({ ids: source_ids })
+      if (res.code == 0 || res.code == 200) {
+        ElMessage({
+          message: '删除成功',
+          type: 'success'
+        })
+        that.remove()
           (window as any)._entityMap.delete(source_ids[0])
-        } else {
-          ElMessage({
-            message: res.msg || '删除失败',
-            type: 'error'
-          })
-        }
-      })
-      .catch(() => {
-        // 用户点击取消，不执行任何操作
-      })
+      } else {
+        ElMessage({
+          message: res.msg || '删除失败',
+          type: 'error'
+        })
+      }
+    })
+    .catch(() => {
+      // 用户点击取消，不执行任何操作
+    })
 }
 
 watch(
@@ -376,4 +382,16 @@ defineExpose({
 })
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.polygon.dialog-en {
+  ::v-deep>.content {
+
+    .attribute-content-link .table .tr .td.operation button,
+    .attribute-content-vr .table .tr .td.operation button,
+    .attribute-content-rtmp .table .tr .td.operation button {
+      width: 76px !important;
+      flex: 0 0 76px !important;
+    }
+  }
+}
+</style>
diff --git a/src/renderer/src/views/components/propertyBox/polyhedronObject.vue b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue
index 8c13bbf..fd351ef 100644
--- a/src/renderer/src/views/components/propertyBox/polyhedronObject.vue
+++ b/src/renderer/src/views/components/propertyBox/polyhedronObject.vue
@@ -64,7 +64,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/polylineObject.vue b/src/renderer/src/views/components/propertyBox/polylineObject.vue
index 35616c9..038376b 100644
--- a/src/renderer/src/views/components/propertyBox/polylineObject.vue
+++ b/src/renderer/src/views/components/propertyBox/polylineObject.vue
@@ -75,8 +75,8 @@
           <div class="col" style="flex: 0 0 33%">
             <span class="label">缓冲宽度</span>
             <div class="input-number input-number-unit-1" style="width: 80px">
-              <input class="input" type="number" title="" min="0" data-min="0.01" max="999999"
-                @input="$handleInputLimit" v-model="entityOptions.extendWidth" />
+              <input class="input" type="number" title="" min="0" data-min="0.01" max="999999" @input="$handleInputLimit"
+                v-model="entityOptions.extendWidth" />
               <span class="unit">m</span>
               <span class="arrow"></span>
             </div>
@@ -111,13 +111,13 @@
           </div>
         </div>
       </div>
-      <div class="div-item">
-        <div class="row">
-          <el-tabs v-model="activeName">
-            <el-tab-pane label="属性信息" name="1">
-              <attribute :entityOptions="entityOptions"></attribute>
-            </el-tab-pane>
-            <el-tab-pane label="空间信息" name="2">
+      <div class="row">
+        <el-tabs v-model="activeName">
+          <el-tab-pane label="属性信息" name="1">
+            <attribute :entityOptions="entityOptions"></attribute>
+          </el-tab-pane>
+          <el-tab-pane label="空间信息" name="2">
+            <div class="div-item">
               <div class="row">
                 <div class="col height-mode-box">
                   <span class="label" style="flex: 0 0 56px">高度模式</span>
@@ -176,12 +176,14 @@
                   </div>
                 </div>
               </div>
-            </el-tab-pane>
-            <el-tab-pane label="标签风格" name="3">
+            </div>
+          </el-tab-pane>
+          <el-tab-pane label="标签风格" name="3">
+            <div class="div-item">
               <labelStyle type="线" :entityOptions="entityOptions"></labelStyle>
-            </el-tab-pane>
-          </el-tabs>
-        </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
       </div>
       <span class="custom-divider"></span>
     </template>
@@ -200,7 +202,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
@@ -391,7 +393,7 @@ const open = async (id: any, type) => {
 const heightModeChange = (val) => {
   that.heightMode = heightMode.value
   // @ts-ignore
-  if(heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') {
+  if (heightMode.value === 0 || heightMode.value === '0' || heightMode.value === 1 || heightMode.value === '1') {
     entityOptions.value.extend = false
   }
 }
@@ -433,8 +435,8 @@ const changeWordsName = (val) => {
 }
 
 const lineTypechange = () => { }
-const lineExtendchange = (e)=>{
-  if(e.target.checked) {
+const lineExtendchange = (e) => {
+  if (e.target.checked) {
     heightMode.value = 2
   }
 }
@@ -562,4 +564,16 @@ defineExpose({
     }
   }
 }
+
+.polyline.dialog-en {
+  ::v-deep>.content {
+
+    .attribute-content-link .table .tr .td.operation button,
+    .attribute-content-vr .table .tr .td.operation button,
+    .attribute-content-rtmp .table .tr .td.operation button {
+      width: 76px !important;
+      flex: 0 0 76px !important;
+    }
+  }
+}
 </style>
diff --git a/src/renderer/src/views/components/propertyBox/radarScan.vue b/src/renderer/src/views/components/propertyBox/radarScan.vue
index ceecef7..a33713e 100644
--- a/src/renderer/src/views/components/propertyBox/radarScan.vue
+++ b/src/renderer/src/views/components/propertyBox/radarScan.vue
@@ -66,7 +66,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue
index c30b960..21551fd 100644
--- a/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue
+++ b/src/renderer/src/views/components/propertyBox/radarScanStereoscopic.vue
@@ -82,7 +82,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/richText.vue b/src/renderer/src/views/components/propertyBox/richText.vue
index 4978f2b..f3d6d71 100644
--- a/src/renderer/src/views/components/propertyBox/richText.vue
+++ b/src/renderer/src/views/components/propertyBox/richText.vue
@@ -24,7 +24,7 @@ import { GisApi } from '@/api/gisApi'
 const props = defineProps({
 });
 
-const host = window.location.host
+const host = localStorage.getItem('ip')
 const visible = ref(false)
 const baseDialog:any = ref(null);
 const eventBus:any = inject("bus");
diff --git a/src/renderer/src/views/components/propertyBox/standText.vue b/src/renderer/src/views/components/propertyBox/standText.vue
index a744a00..977e32f 100644
--- a/src/renderer/src/views/components/propertyBox/standText.vue
+++ b/src/renderer/src/views/components/propertyBox/standText.vue
@@ -39,7 +39,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/terrain.vue b/src/renderer/src/views/components/propertyBox/terrain.vue
index 1e4ec0b..15665a2 100644
--- a/src/renderer/src/views/components/propertyBox/terrain.vue
+++ b/src/renderer/src/views/components/propertyBox/terrain.vue
@@ -14,7 +14,7 @@
     <template #footer>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/tileset.vue b/src/renderer/src/views/components/propertyBox/tileset.vue
index 6e9cfb6..9d87d72 100644
--- a/src/renderer/src/views/components/propertyBox/tileset.vue
+++ b/src/renderer/src/views/components/propertyBox/tileset.vue
@@ -49,7 +49,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue b/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue
index 3f27958..96f2ff7 100644
--- a/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue
+++ b/src/renderer/src/views/components/propertyBox/trajectoryMotion.vue
@@ -233,7 +233,7 @@
     <template #footer>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/vector.vue b/src/renderer/src/views/components/propertyBox/vector.vue
index b3e9f14..fb024fb 100644
--- a/src/renderer/src/views/components/propertyBox/vector.vue
+++ b/src/renderer/src/views/components/propertyBox/vector.vue
@@ -21,7 +21,7 @@
     </template>
     <template #footer>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/vectorAttr.vue b/src/renderer/src/views/components/propertyBox/vectorAttr.vue
index 29227bb..fe19fc8 100644
--- a/src/renderer/src/views/components/propertyBox/vectorAttr.vue
+++ b/src/renderer/src/views/components/propertyBox/vectorAttr.vue
@@ -12,18 +12,18 @@
       <div class="div-item" style="display: flex">
         <button @click="importHeader" style="margin-right: 15px">
           <svg class="icon-updateheigh">
-            <use xlink:href="#icon-importHeader"></use></svg
-          >{{ t('vector.导入表头') }}
+            <use xlink:href="#icon-importHeader"></use>
+          </svg>{{ t('vector.导入表头') }}
         </button>
         <button @click="downloadHeader">
           <svg>
-            <use xlink:href="#icon-download"></use></svg
-          >{{ t('vector.下载字典模板') }}
+            <use xlink:href="#icon-download"></use>
+          </svg>{{ t('vector.下载字典模板') }}
         </button>
         <button @click="exportExcel" style="position: absolute; right: 25px">
           <svg>
-            <use xlink:href="#icon-export"></use></svg
-          >{{ t('vector.导出') }}
+            <use xlink:href="#icon-export"></use>
+          </svg>{{ t('vector.导出') }}
         </button>
       </div>
       <span class="custom-divider"></span>
@@ -113,9 +113,10 @@ const maxPageNum: any = ref(0)
 const filterData: any = ref([])
 const title = ref('')
 const closeCallback = () => {
-  entityOptions.value.originalOptions = structuredClone(originalOptions)
-  entityOptions.value.reset()
-  eventBus.emit('destroyComponent')
+  // entityOptions.value.originalOptions = structuredClone(originalOptions)
+  // console.log('entityOptions--------------', entityOptions.value)
+  // entityOptions.value.reset()
+  // eventBus.emit('destroyComponent')
 }
 const getKeys = () => {
   keyData.value = []
@@ -140,9 +141,8 @@ let features
 const open = async (id: any) => {
   // that = window.earth.entityMap.get(id)
   node = window.treeObj.getNodeByParam('id', id, null)
-  entityOptions.value.field = JSON.parse(node.params).field
   that = getThat(node)
-  console.log(node, that, entityOptions.field, 'yyyyyyyyyyyyyy')
+  entityOptions.value.field = that.field
   if (that.options.id === id) {
     features = that.geojson.features
   } else {
@@ -157,7 +157,7 @@ const open = async (id: any) => {
   let spliceData = arrSplice(arr, pageSize.value)
   maxPageNum.value = spliceData.length
   tableData.value = spliceData[pageNum.value - 1]
-  title.value = node.sourceName
+  title.value = node.title || node.sourceName
   getKeys()
   originalOptions = structuredClone(that.options)
   entityOptions.value = that
@@ -227,8 +227,8 @@ const getTableList = ({ page, limit }) => {
   tableData.value = spliceData[pageNum.value - 1]
 }
 const changeFieId = async (e) => {
-  console.log(e, 'eeeeeeeee')
-  let data = JSON.parse(node.params)
+  let fNode = window.treeObj.getNodeByParam('id', that.options.id, null)
+  let data = JSON.parse(fNode.params)
   data.field = e
   let params2 = {
     id: data.id,
diff --git a/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue b/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue
index aa2115a..ff52f13 100644
--- a/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue
+++ b/src/renderer/src/views/components/propertyBox/wallRealStereoscopic.vue
@@ -98,7 +98,7 @@
       </div>
       <button @click="remove">删除</button>
       <button @click="confirm">确定</button>
-      <button @click="close">关闭</button>
+      <button @click="close">取消</button>
     </template>
   </Dialog>
 </template>
diff --git a/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue b/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue
index 8017a7f..f6b9098 100644
--- a/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue
+++ b/src/renderer/src/views/components/propertyBox/wallStereoscopic.vue
@@ -31,12 +31,16 @@
             <span class="label">材质样式</span>
             <el-select class="input input-select input-select-line-type" v-model="entityOptions.material">
               <template #label="{ label, value }">
-                <i class="yj-custom-icon" :class="material[value].icon"></i>
+                <i class="yj-custom-icon" :class="material[value].icon"
+                  :style="`background: url(${material[value].icon}) 100% 100% no-repeat;background-size: 100% 100%;`">
+                </i>
                 {{ label }}
               </template>
               <el-option v-for="item in material" :key="item.key" :label="item.name" :value="item.key">
                 <div style="display: flex; align-items: center;">
-                  <i class="yj-custom-icon" :class="item.icon"></i>
+                  <i class="yj-custom-icon" :class="item.icon"
+                    :style="`background: url(${item.icon}) 100% 100% no-repeat;background-size: 100% 100%;`"
+                  ></i>
                   {{ item.name }}
                 </div>
               </el-option>
@@ -99,25 +103,25 @@ const material = ref([
     name: '纯色墙',
     value: '纯色墙',
     key: 0,
-    icon: 'icon-wall'
+    icon: '../sdk/custom/img/icon-wall.png',
   },
   {
     name: '上升墙',
     value: '上升墙',
     key: 1,
-    icon: 'icon-wall-gradient'
+    icon: '../sdk/custom/img/icon-wall-gradient.png'
   },
   {
     name: '箭头墙',
     value: '箭头墙',
     key: 2,
-    icon: 'icon-wall-arrow'
+    icon: '../sdk/img/material/arrow.png'
   },
   {
     name: '警戒墙',
     value: '警戒墙',
     key: 3,
-    icon: 'icon-wall-warn'
+    icon: '../sdk/img/material/warn.png'
   }
 ])
 eventBus.on("openStandTextAdd", () => {
diff --git a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts
index 3f8e516..09f398e 100644
--- a/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts
+++ b/src/renderer/src/views/components/tree/components/hooks/rightOperate.ts
@@ -98,6 +98,7 @@ export const useRightOperate = () => {
             params.params = JSON.stringify(params.params)
             cusAddNodes(window.treeObj, params.parentId, [params])
             let entityObject = renderVector(params, true);
+            entityObject.flyTo();
             (window as any)._entityMap.set(id, entityObject)
           } else if (["geojson"].includes(sourceType)) {
             let baseURL = localStorage.getItem('ip')
@@ -113,6 +114,8 @@ export const useRightOperate = () => {
                 width: 1,
                 color: "rgb(239, 6, 6, 1)",
               }
+            }, (entity:any) => {
+              entity?.flyTo()
             })
           } else {
             // 获取最后一个点的位置
@@ -683,7 +686,9 @@ export const useRightOperate = () => {
       })
       for (let i = 0; i < res.data.length; i++) {
         let item = res.data[i]
-        initMapData(type, JSON.parse(item.params), null)
+        initMapData(type, JSON.parse(item.params), (entity: any) => {
+          entity.flyTo()
+        })
       }
       cusAddNodes(window.treeObj, parentId, res.data)
     }
diff --git a/src/renderer/src/views/components/tree/hooks/treeNode.ts b/src/renderer/src/views/components/tree/hooks/treeNode.ts
index bb33d8a..9d525d4 100644
--- a/src/renderer/src/views/components/tree/hooks/treeNode.ts
+++ b/src/renderer/src/views/components/tree/hooks/treeNode.ts
@@ -595,6 +595,7 @@ export const useTreeNode = () => {
     node.sourceName = sourceName;
     node.oldname = sourceName;
     node.params = params;
+    delete node.title
     window.treeObj.updateNode(node);
   }
 
diff --git a/src/renderer/src/views/login/index.vue b/src/renderer/src/views/login/index.vue
index 0443a65..df00208 100644
--- a/src/renderer/src/views/login/index.vue
+++ b/src/renderer/src/views/login/index.vue
@@ -1,13 +1,7 @@
 <template>
-  <div
-    class="login-container"
-    style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0"
-  >
-    <transition
-      name="video-fade"
-      mode="out-in"
-      style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; object-fit: cover"
-    >
+  <div class="login-container" style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0">
+    <transition name="video-fade" mode="out-in"
+      style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; object-fit: cover">
       <!-- 第一个视频，播放一次 -->
       <!-- <video v-if="!isFirstVideoPlayed" ref="firstVideoRef" key="first-video" muted @ended="onFirstVideoEnded"
         src="../../assets/video/login_front.mp4"
@@ -15,14 +9,8 @@
       <!-- 第二个视频，循环播放 -->
       <!-- <video v-else key="second-video" autoplay loop muted src="../../assets/video/login_feature.mp4"
         style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; object-fit: cover"></video> -->
-      <video
-        key="second-video"
-        autoplay
-        loop
-        muted
-        src="../../assets/video/author_video.mp4"
-        style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; object-fit: cover"
-      ></video>
+      <video key="second-video" autoplay loop muted src="../../assets/video/author_video.mp4"
+        style="position: fixed; width: 100vw; height: 100vh; left: 0; top: 0; object-fit: cover"></video>
     </transition>
     <!-- 登录页面 -->
     <div class="rightBox" v-if="isDesktop">
@@ -39,95 +27,45 @@
             </div>
           </div>
         </div>
-        <el-form
-          class="login-form"
-          autoComplete="on"
-          :model="loginForm"
-          :rules="loginRules"
-          ref="loginFormRef"
-          label-position="left"
-        >
+        <el-form class="login-form" autoComplete="on" :model="loginForm" :rules="loginRules" ref="loginFormRef"
+          label-position="left">
           <el-form-item prop="username">
-            <el-input
-              name="username"
-              type="text"
-              v-model="loginForm.username"
-              autoComplete="on"
-              placeholder="请输入用户名"
-              :prefix-icon="User"
-            />
+            <el-input name="username" type="text" v-model="loginForm.username" autoComplete="on" placeholder="请输入用户名"
+              :prefix-icon="User" />
           </el-form-item>
           <el-form-item prop="password">
-            <el-input
-              type="password"
-              @keyup.enter.native="handleLogin(loginFormRef)"
-              v-model="loginForm.password"
-              autoComplete="on"
-              placeholder="请输入密码"
-              :prefix-icon="Unlock"
-              show-password
-            ></el-input>
+            <el-input type="password" @keyup.enter.native="handleLogin(loginFormRef)" v-model="loginForm.password"
+              autoComplete="on" placeholder="请输入密码" :prefix-icon="Unlock" show-password></el-input>
           </el-form-item>
           <el-form-item class="rememberForget">
             <!-- justify-content: space-around;align-items: center; -->
             <div style="display: flex">
-              <svg
-                class="checkbox-svg"
-                v-show="checkboxVModel"
-                style="pointer-events: none"
-                xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                width="14"
-                height="14"
-                viewBox="0 0 14 14"
-                fill="none"
-              >
-                <path
-                  fill="rgba(var(--color-base1), 1)"
-                  d="M7.34788e-16 2L-2.20436e-15 12C-2.40727e-15 13.1046 0.895431 14 2 14L12 14C13.1046 14 14 13.1046 14 12L14 2C14 0.895431 13.1046 -1.46958e-15 12 -1.46958e-15L2 -1.46958e-15C0.895431 -1.60485e-15 8.02424e-16 0.895431 7.34788e-16 2Z"
-                ></path>
+              <svg class="checkbox-svg" v-show="checkboxVModel" style="pointer-events: none"
+                xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14"
+                viewBox="0 0 14 14" fill="none">
+                <path fill="rgba(var(--color-base1), 1)"
+                  d="M7.34788e-16 2L-2.20436e-15 12C-2.40727e-15 13.1046 0.895431 14 2 14L12 14C13.1046 14 14 13.1046 14 12L14 2C14 0.895431 13.1046 -1.46958e-15 12 -1.46958e-15L2 -1.46958e-15C0.895431 -1.60485e-15 8.02424e-16 0.895431 7.34788e-16 2Z">
+                </path>
                 <path
                   d="M5.47283 8.3039L3.10764 6.12807C3.06194 6.08647 2.99525 6.08647 2.94955 6.12946L2.04424 6.98093C1.98989 7.03224 1.98495 7.12376 2.03312 7.18201L6.03602 11.9566C6.09778 12.0301 6.20647 12.0065 6.24105 11.9136C7.03644 9.69343 9.25835 5.63439 11.9619 2.69585C11.999 2.65564 12.0101 2.59601 11.9904 2.54331L11.8211 2.08568C11.7915 2.00525 11.7038 1.97474 11.6396 2.02328C8.63587 4.21019 6.45966 6.92546 5.47283 8.3039Z"
-                  fill="#004242"
-                ></path>
+                  fill="#004242"></path>
               </svg>
-              <svg
-                class="checkbox-svg"
-                v-show="!checkboxVModel"
-                style="pointer-events: none"
-                xmlns="http://www.w3.org/2000/svg"
-                xmlns:xlink="http://www.w3.org/1999/xlink"
-                width="14"
-                height="14"
-                viewBox="0 0 14 14"
-                fill="none"
-              >
-                <path
-                  fill-rule="evenodd"
-                  fill="url(#linear_border_2442_533_0)"
-                  d="M0 12L0 2C0 0.895431 0.895431 0 2 0L12 0C13.1046 0 14 0.895431 14 2L14 12C14 13.1046 13.1046 14 12 14L2 14C0.895431 14 0 13.1046 0 12ZM2 12.5C1.72386 12.5 1.5 12.2761 1.5 12L1.5 2C1.5 1.72386 1.72386 1.5 2 1.5L12 1.5C12.2761 1.5 12.5 1.72386 12.5 2L12.5 12C12.5 12.2761 12.2761 12.5 12 12.5L2 12.5Z"
-                ></path>
+              <svg class="checkbox-svg" v-show="!checkboxVModel" style="pointer-events: none"
+                xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="14" height="14"
+                viewBox="0 0 14 14" fill="none">
+                <path fill-rule="evenodd" fill="url(#linear_border_2442_533_0)"
+                  d="M0 12L0 2C0 0.895431 0.895431 0 2 0L12 0C13.1046 0 14 0.895431 14 2L14 12C14 13.1046 13.1046 14 12 14L2 14C0.895431 14 0 13.1046 0 12ZM2 12.5C1.72386 12.5 1.5 12.2761 1.5 12L1.5 2C1.5 1.72386 1.72386 1.5 2 1.5L12 1.5C12.2761 1.5 12.5 1.72386 12.5 2L12.5 12C12.5 12.2761 12.2761 12.5 12 12.5L2 12.5Z">
+                </path>
                 <defs>
-                  <linearGradient
-                    id="linear_border_2442_533_0"
-                    x1="0"
-                    y1="-0.5574798583984375"
-                    x2="12.1173095703125"
-                    y2="12.878036499023438"
-                    gradientUnits="userSpaceOnUse"
-                  >
+                  <linearGradient id="linear_border_2442_533_0" x1="0" y1="-0.5574798583984375" x2="12.1173095703125"
+                    y2="12.878036499023438" gradientUnits="userSpaceOnUse">
                     <stop offset="0.0625" stop-color="rgba(var(--color-base1), 1)" />
                     <stop offset="1" stop-color="var(--color-border1)" />
                   </linearGradient>
                 </defs>
               </svg>
-              <el-checkbox
-                :disabled="loading"
-                v-model="checkboxVModel"
-                @change="rememberpwd"
-                label="string"
-                >记住密码</el-checkbox
-              >
+              <el-checkbox :disabled="loading" v-model="checkboxVModel" @change="rememberpwd"
+                label="string">记住密码</el-checkbox>
               <!-- <div style="cursor: pointer;">忘记密码？</div> -->
             </div>
           </el-form-item>
@@ -150,24 +88,15 @@
         <h2 class="greet"><span>欢迎您使用</span>实景三维电子沙盘系统</h2>
         <div class="serviceContent">
           <el-tabs v-model="selectedService" class="demo-tabs" @tab-click="handleSelect">
-            <el-tab-pane
-              v-for="item in serviceOptions"
-              :label="item.name"
-              :name="item.name"
-            ></el-tab-pane>
+            <el-tab-pane v-for="item in serviceOptions" :label="item.name" :name="item.name"></el-tab-pane>
           </el-tabs>
           <div class="tabPanel">
             <template v-if="selectedService == '接口服务'">
               <div class="item">
                 <span class="itemLabel">服务选择</span>
                 <el-select class="select" popper-class="login-select-popper" v-model="servVal">
-                  <el-option
-                    size="mini"
-                    v-for="item in servOptions"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.name"
-                  >
+                  <el-option size="mini" v-for="item in servOptions" :key="item.value" :label="item.name"
+                    :value="item.name">
                   </el-option>
                 </el-select>
               </div>
@@ -188,23 +117,23 @@
                 <template v-if="servVal == '单机'">
                   <span class="itemLabel">端口</span>
                   <el-form-item prop="localport" :rules="[
-      {
-        validator: validateLocalportRange,
-        trigger: 'blur'
-      }
-    ]">
+                    {
+                      validator: validateLocalportRange,
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input-number v-model="localport" :controls="false" />
                   </el-form-item>
                 </template>
                 <template v-if="servVal == '网络'">
                   <span class="itemLabel">端口</span>
                   <el-form-item prop="port" :rules="[
-      {
-        validator: validatePortRange,
-        message: '端口号必须在 1024–65535 之间',
-        trigger: 'blur'
-      }
-    ]">
+                    {
+                      validator: validatePortRange,
+                      message: '端口号必须在 1024–65535 之间',
+                      trigger: 'blur'
+                    }
+                  ]">
                     <el-input-number v-model="port" :controls="false" />
                   </el-form-item>
                 </template>
@@ -214,13 +143,8 @@
               <div class="item">
                 <span class="itemLabel">串口选择</span>
                 <el-select class="select" popper-class="login-select-popper" v-model="gpsVal">
-                  <el-option
-                    size="mini"
-                    v-for="item in gpsOptions"
-                    :key="item.value"
-                    :label="item.Product"
-                    :value="item.Name"
-                  >
+                  <el-option size="mini" v-for="item in gpsOptions" :key="item.value" :label="item.Product"
+                    :value="item.Name">
                   </el-option>
                 </el-select>
               </div>
@@ -235,14 +159,8 @@
       </div>
     </div>
     <!-- 授权页面 -->
-    <Dialog
-      ref="baseDialog"
-      class="graffiti"
-      title="系统授权"
-      :closeCallback="closeCallBack"
-      left="calc(50vw - 188px)"
-      top="calc(50vh - 191px)"
-    >
+    <Dialog ref="baseDialog" class="graffiti" title="系统授权" :closeCallback="closeCallBack" left="calc(50vw - 188px)"
+      top="calc(50vh - 191px)">
       <template #content>
         <div class="auth_info custom_scroll_bar content_h">
           <div class="auth_info_box">
@@ -250,12 +168,7 @@
               <span class="fankuai"></span>
               {{ t('auths.authCode') }}
             </div>
-            <div
-              class="auth_info_text"
-              @click="copy(authInfo.license_code)"
-              style="cursor: pointer"
-              title="点击可复制"
-            >
+            <div class="auth_info_text" @click="copy(authInfo.license_code)" style="cursor: pointer" title="点击可复制">
               {{ authInfo.license_code || '' }}
               <svg-icon name="copy" :size="20" style="margin-left: 30px"></svg-icon>
             </div>
@@ -278,22 +191,13 @@
               <span class="fankuai"></span>
               {{ t('auths.authType') }}
             </div>
-            <div
-              v-if="authInfo.status != null"
-              class="auth_info_text"
-              style="font-size: 16px"
-              :style="{
-                color: authInfo.status ? 'rgba(27, 248, 195, 1)' : 'rgba(255, 161, 69, 1)'
-              }"
-            >
+            <div v-if="authInfo.status != null" class="auth_info_text" style="font-size: 16px" :style="{
+              color: authInfo.status ? 'rgba(27, 248, 195, 1)' : 'rgba(255, 161, 69, 1)'
+            }">
               {{ authInfo.status ? t('auths.authTempExpire') : t('auths.authexpire') }}
             </div>
             <!-- <div v-else class="auth_info_text">{{ authInfo.message || '无' }}</div> -->
-            <div
-              v-else
-              class="auth_info_text"
-              style="font-size: 16px; color: rgba(241, 108, 85, 1)"
-            >
+            <div v-else class="auth_info_text" style="font-size: 16px; color: rgba(241, 108, 85, 1)">
               {{ t('auths.noAuthexpire') }}
             </div>
           </div>
@@ -313,6 +217,14 @@
 import { User, Unlock, Setting, SwitchButton } from '@element-plus/icons-vue'
 import { useLogin } from './useLogin'
 import { useSetUp } from './useSetUp'
+import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
+import useClipboard from 'vue-clipboard3'
+import { ipcMain } from 'electron'
+import { AuthApi } from '@/api/setting/auth'
+import Dialog from '@/components/dialog/baseDialog.vue'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { $sendElectronChanel } from '@/utils/communication'
 
 const {
   loginFormRef,
@@ -371,26 +283,18 @@ onMounted(() => {
     }
   }
   else {
-    ipcRenderer.once('program-init', () => {
+    ipcRenderer.once('program-init', (error, e) => {
       if (!router.currentRoute.value.query.type) {
-        getAuthCode()
-        getAuthInfo()
-      } else {
-        isAuth.value = false
-      }
+          getAuthCode()
+          getAuthInfo()
+        } else {
+          isAuth.value = false
+        }
     })
   }
 })
 
 //授权判断
-import { useI18n } from 'vue-i18n'
-import { useRouter } from 'vue-router'
-import useClipboard from 'vue-clipboard3'
-import { ipcMain } from 'electron'
-import { AuthApi } from '@/api/setting/auth'
-import Dialog from '@/components/dialog/baseDialog.vue'
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { $sendElectronChanel } from '@/utils/communication'
 
 let isAuth = ref(true)
 
@@ -840,7 +744,7 @@ const validatePortRange = (rule, value, callback) => {
           border-radius: 0 0 0 90%;
           background: rgba(var(--color-base1), 1);
 
-          & > span {
+          &>span {
             font-size: 1rem;
             position: absolute;
             right: 0px;
@@ -1041,8 +945,7 @@ const validatePortRange = (rule, value, callback) => {
   z-index: 99;
   background: linear-gradient(0deg, #00ffff33 0%, #00ffff00 100%), rgba(0, 0, 0, 0.6);
   border: 1.5px solid;
-  border-image: linear-gradient(to bottom, rgba(var(--color-base1), 1) 6.25%, rgb(0, 200, 255) 100%)
-    1;
+  border-image: linear-gradient(to bottom, rgba(var(--color-base1), 1) 6.25%, rgb(0, 200, 255) 100%) 1;
   text-align: left;
   font-family: 'sy-boldface';
 }
@@ -1088,11 +991,11 @@ const validatePortRange = (rule, value, callback) => {
   position: relative;
 }
 
-::v-deep .title-box > .close-box {
+::v-deep .title-box>.close-box {
   display: none;
 }
 
-::v-deep .title-box > .title {
+::v-deep .title-box>.title {
   font-family: 'Ali-mother-counts-bold';
   font-size: 18px;
   font-weight: 400;
@@ -1115,7 +1018,7 @@ const validatePortRange = (rule, value, callback) => {
   justify-content: center;
 }
 
-::v-deep .foot > button {
+::v-deep .foot>button {
   margin-left: 10px;
   border-radius: 4px;
   background: rgba(var(--color-base1), 0.2);
@@ -1127,12 +1030,12 @@ const validatePortRange = (rule, value, callback) => {
   cursor: pointer;
 }
 
-::v-deep .foot > button:hover {
+::v-deep .foot>button:hover {
   border: 1px solid rgba(var(--color-base1), 1);
   color: rgba(var(--color-base1), 1);
 }
 
-::v-deep .foot > .show > .label {
+::v-deep .foot>.show>.label {
   margin: 0px 10px;
 }
 
@@ -1207,7 +1110,7 @@ const validatePortRange = (rule, value, callback) => {
           border-radius: 0 0 0 90%;
           background: rgba(var(--color-base1), 1);
 
-          & > span {
+          &>span {
             font-size: 1rem;
             position: absolute;
             right: 0px;
@@ -1304,8 +1207,7 @@ const validatePortRange = (rule, value, callback) => {
             align-items: center;
             margin: 15px 0;
 
-            .select {
-            }
+            .select {}
           }
         }
       }
@@ -1358,6 +1260,7 @@ const validatePortRange = (rule, value, callback) => {
   .el-message-box__headerbtn {
     display: none !important;
   }
+
   .el-message-box__btns {
     .el-button {
       --el-button-text-color: #fff;