diff --git a/src/main/index.ts b/src/main/index.ts
index 3fa7a97..abed924 100644
--- a/src/main/index.ts
+++ b/src/main/index.ts
@@ -210,16 +210,21 @@ function createWindow(): void {
     }
     * */
 
-    console.log('GetHomeDir()', GetHomeDir())
+    // console.log('GetHomeDir()', GetHomeDir())
+    let prefix =
+    process.env.NODE_ENV === "development"
+      ? "src/renderer/public"
+      : "resources/app.asar/out/renderer";
     let data = {};
     for (const objKey in obj) {
       let files = fs.readdirSync(
         path.join(
-          global.__static ? global.__static : GetHomeDir() + "/src/renderer/public",
+          GetHomeDir(),
+          prefix,
           obj[objKey]
         )
       );
-      console.log(files);
+      // console.log(files);
       for (let i = 0; i < files.length; i++) {
         files[i] = obj[objKey] + "/" + files[i];
       }
diff --git a/src/renderer/components.d.ts b/src/renderer/components.d.ts
index 9e3ef8f..cefa92b 100644
--- a/src/renderer/components.d.ts
+++ b/src/renderer/components.d.ts
@@ -9,7 +9,6 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     BaseDialog: typeof import('./src/components/dialog/baseDialog.vue')['default']
-    copy: typeof import('./src/components/dialog/directory copy.vue')['default']
     Directory: typeof import('./src/components/dialog/directory.vue')['default']
     DirectoryEdit: typeof import('./src/components/dialog/directoryEdit.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
diff --git a/src/renderer/src/common/initMapData.ts b/src/renderer/src/common/initMapData.ts
index 5ddb1f1..f0e011d 100644
--- a/src/renderer/src/common/initMapData.ts
+++ b/src/renderer/src/common/initMapData.ts
@@ -106,7 +106,7 @@ export const initMapData = async (type, data, cd) => {
       entityObject = new YJ.Obj.RadarScanStereoscopic(window.earth, data)
       break
     case 'textBox':
-      entityObject = new YJ.Obj.TextBox(window.earth, data, ()=>{})
+      entityObject = new YJ.Obj.TextBox(window.earth, data, () => { })
       break
     case 'polyhedronObject':
       entityObject = new YJ.Obj.PolyhedronObject(window.earth, data)
@@ -129,7 +129,7 @@ export const initMapData = async (type, data, cd) => {
     case 'flyLine':
       entityObject = new YJ.Obj.FlowLine(window.earth, data)
       break
-      case 'explosion':
+    case 'explosion':
       entityObject = new YJ.Obj.Explosion(window.earth, data)
       break
     default:
@@ -137,31 +137,37 @@ export const initMapData = async (type, data, cd) => {
   }
 
   if (entityObject) {
-    options = structuredClone(entityObject.options)
-    delete options.host
-    switch (type) {
-      case 'textBox':
-        delete options.name
-        break
-      case 'fountain':
-      case 'fire':
-      case 'smoke':
-      case 'waterL':
-        delete options.url
-        break
-      default:
-        break
+    function getOptions() {
+      let opt = structuredClone(entityObject.options)
+      delete opt.host
+      switch (type) {
+        case 'textBox':
+          delete opt.name
+          break
+        case 'fountain':
+        case 'fire':
+        case 'smoke':
+        case 'waterL':
+          delete opt.url
+          break
+        default:
+          break
+      }
+      return opt
     }
+    options = getOptions()
     console.log('--------------------onClick')
     //鼠标左键点击事件
     entityObject.onClick = () => {
       // console.log('onClick')
-      leftClick(options);
+      leftClick(getOptions());
     };
     //鼠标右键点击事件
     entityObject.onRightClick = () => {
-      rightClick(options);
+      rightClick(getOptions());
     };
+
+    
   }
   // options = entityObject
   return options
diff --git a/src/renderer/src/components/dialog/directoryEdit.vue b/src/renderer/src/components/dialog/directoryEdit.vue
index 2597d14..f97f192 100644
--- a/src/renderer/src/components/dialog/directoryEdit.vue
+++ b/src/renderer/src/components/dialog/directoryEdit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="adddirectory">
+  <div class="editdirectoryBox">
     <div class="box">
       <div class="boxHeader nav">
         <!-- <span></span> -->
@@ -19,7 +19,7 @@
           <el-form-item>
             <div class="btnOption">
               <el-button type="primary" @click="submitForm(ruleForm)">确定</el-button>
-              <el-button @click="cancel">取消</el-button>
+              <el-button @click="close">取消</el-button>
             </div>
           </el-form-item>
         </el-form>
@@ -34,10 +34,11 @@ import { throttle } from '@/utils/index'
 import { ElMessage, FormInstance } from 'element-plus'
 import { TreeApi } from '@/api/tree'
 import { useTreeNode } from '@/views/components/tree/hooks/treeNode'
-const { getKeyOfSelectedNode, getSelectedNode, cusAddNodes, getSameLevel } = useTreeNode()
+const { getKeyOfSelectedNode, getSelectedNode, cusUpdateNode, getSameLevel, getSelectedNodes } = useTreeNode()
 const title = ref('编辑节点')
+const sourceId = ref('')
 let form: any = reactive({
-  sourceName: '图层'
+  sourceName: ''
 })
 const ruleForm = ref()
 const rules = reactive({
@@ -47,7 +48,10 @@ const removeSpaces = (value: string) => {
   form.sourceName = value.replace(/\s/g, '')
 }
 const close = () => {
-  $changeComponentPop('.adddirectory', false)
+  $changeComponentPop('.editdirectoryBox', false)
+  sourceId.value = ''
+  form.sourceName = ''
+  ruleForm.value?.resetFields()
 }
 const submitForm = async (formEl: FormInstance | undefined) => {
   if (!formEl) return
@@ -60,41 +64,11 @@ const submitForm = async (formEl: FormInstance | undefined) => {
   })
 }
 const add = throttle(async () => {
-  let parentId = getKeyOfSelectedNode(window.treeObj, 'id')
-  let fnone = getSelectedNode(window.treeObj)
-  const res: any = await TreeApi.addDirectory({
-    id: new YJ.Tools().randomString(),
-    sourceName: form.sourceName,
-    parentId: parentId || undefined
+  const res: any = await TreeApi.updateDirectoryInfo({
+    id: sourceId.value,
+    sourceName: form.sourceName
   })
-  console.log(res)
-  if (res.code == 0 || res.code == 200) {
-    const node = {
-      ...res.data
-    }
-    let addNode = await cusAddNodes(window.treeObj, getSelectedNode(window.treeObj), [node], true) //添加节点
-    //获取该节点下的同级节点
-    const someNode: any = getSameLevel(window.treeObj, addNode[0])
-    console.log('someNode', someNode)
-    const newNode = someNode.map((item: any) => {
-      let index = item.getIndex()
-      item.treeIndex = index+1
-      return {
-        ...item,
-        treeIndex: item.getIndex()
-      }
-    })
-    ElMessage({
-      message: '添加成功',
-      type: 'success'
-    })
-    cancel()
-  } else {
-    ElMessage({
-      message: '添加失败',
-      type: 'error'
-    })
-  }
+  cusUpdateNode({ id: sourceId.value, sourceName: form.sourceName, params: undefined })
   //   console.log(res)
 }, 3000)
 // //上传或修改树的层级
@@ -123,15 +97,23 @@ const add = throttle(async () => {
 //   }
 // }
 
-const cancel = () => {
-  $changeComponentPop('.adddirectory', false)
-  form.sourceName = '图层'
-  ruleForm.value?.resetFields()
+const open = () => {
+  let selectNodes = getSelectedNodes(window.treeObj);
+  if (selectNodes && selectNodes[selectNodes.length - 1]) {
+    sourceId.value = selectNodes[selectNodes.length - 1].id
+    form.sourceName = selectNodes[selectNodes.length - 1].sourceName
+    $changeComponentPop('.editdirectoryBox', true)
+  }
 }
+
+defineExpose({
+  open,
+  close
+})
 </script>
 
 <style lang="scss">
-.adddirectory {
+.editdirectoryBox {
   user-select: none;
   width: 100vw;
   height: 100vh;
diff --git a/src/renderer/src/icons/svg/weather.svg b/src/renderer/src/icons/svg/weather.svg
new file mode 100644
index 0000000..98103e7
--- /dev/null
+++ b/src/renderer/src/icons/svg/weather.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="38" height="32.80078125" viewBox="0 0 38 32.80078125" fill="none"><g filter="url(#filter_1935_1033)"><path d="M26.2054 16.5728C26.2054 16.5728 26.2042 16.5728 26.2054 16.5728C26.2243 16.5129 26.2413 16.4525 26.2566 16.3915C26.2719 16.3306 26.2855 16.2693 26.2972 16.2076C26.3089 16.1459 26.3188 16.0839 26.3269 16.0216C26.335 15.9593 26.3412 15.8968 26.3456 15.8342C26.35 15.7715 26.3526 15.7088 26.3534 15.6459C26.3541 15.5831 26.353 15.5204 26.3501 15.4576C26.3471 15.3949 26.3424 15.3323 26.3358 15.2698C26.3292 15.2073 26.3207 15.1451 26.3105 15.0831C26.3002 15.0212 26.2882 14.9596 26.2743 14.8983C26.2604 14.837 26.2448 14.7762 26.2274 14.7159C26.21 14.6555 26.1908 14.5957 26.1698 14.5365C26.1489 14.4773 26.1263 14.4187 26.1019 14.3608C26.0776 14.3029 26.0515 14.2458 26.0238 14.1894C25.9961 14.1331 25.9668 14.0775 25.9358 14.0229C25.9049 13.9682 25.8723 13.9145 25.8382 13.8618C25.8041 13.809 25.7685 13.7573 25.7313 13.7067C25.6942 13.656 25.6556 13.6065 25.6156 13.5581C25.5755 13.5097 25.5341 13.4625 25.4913 13.4165C25.4485 13.3705 25.4044 13.3259 25.3589 13.2825C25.3135 13.2391 25.2669 13.1971 25.219 13.1564C25.1711 13.1158 25.1221 13.0765 25.0719 13.0387C25.0217 13.001 24.9705 12.9647 24.9181 12.9299C24.8658 12.8952 24.8125 12.8619 24.7583 12.8303C24.704 12.7986 24.6489 12.7686 24.5929 12.7401C24.5368 12.7117 24.48 12.685 24.4224 12.6599C24.3649 12.6348 24.3066 12.6114 24.2477 12.5897C24.1887 12.568 24.1291 12.5481 24.069 12.5299C24.0089 12.5117 23.9483 12.4953 23.8872 12.4806C23.8261 12.466 23.7646 12.4531 23.7028 12.4421C23.641 12.4311 23.5789 12.4218 23.5165 12.4144C23.4541 12.407 23.3916 12.4015 23.3288 12.3977C23.2661 12.394 23.2034 12.3921 23.1406 12.392C22.3781 12.392 21.6706 12.6582 21.1144 13.1119C21.0945 13.0305 21.0728 12.9495 21.0492 12.869C21.0256 12.7886 21.0001 12.7087 20.9728 12.6294C20.9455 12.5501 20.9163 12.4715 20.8854 12.3935C20.8544 12.3156 20.8217 12.2384 20.7872 12.162C20.7526 12.0855 20.7164 12.0099 20.6784 11.9352C20.6403 11.8604 20.6006 11.7866 20.5592 11.7137C20.5177 11.6408 20.4746 11.5689 20.4299 11.4979C20.3851 11.427 20.3387 11.3572 20.2907 11.2884C20.2655 11.2524 20.2398 11.2167 20.2137 11.1812C20.1877 11.1459 20.1611 11.1108 20.1342 11.076C20.1072 11.0413 20.0798 11.0069 20.052 10.9728C20.0242 10.9387 19.996 10.905 19.9674 10.8716C19.9387 10.8382 19.9097 10.8052 19.8802 10.7726C19.8508 10.7399 19.8209 10.7076 19.7907 10.6757C19.7604 10.6438 19.7298 10.6122 19.6988 10.581C19.6677 10.5499 19.6363 10.5191 19.6045 10.4887C19.5727 10.4583 19.5406 10.4283 19.5081 10.3987C19.4755 10.3691 19.4427 10.3399 19.4094 10.3111C19.3762 10.2823 19.3426 10.254 19.3086 10.226C19.2747 10.198 19.2404 10.1705 19.2058 10.1434C19.1711 10.1163 19.1362 10.0896 19.1009 10.0633C19.0656 10.0371 19.03 10.0113 18.9941 9.98588C18.9582 9.96051 18.9219 9.93557 18.8854 9.91109C18.8489 9.88661 18.812 9.86258 18.7749 9.839C18.7378 9.81542 18.7004 9.79231 18.6627 9.76966C18.625 9.74701 18.587 9.72484 18.5488 9.70312C18.5105 9.6814 18.472 9.66016 18.4332 9.6394C18.3945 9.61863 18.3555 9.59835 18.3162 9.57855C18.2769 9.55874 18.2374 9.53942 18.1977 9.52058C18.1579 9.50176 18.1179 9.48343 18.0777 9.46559C18.0375 9.44774 17.9971 9.43039 17.9565 9.41354C17.9159 9.3967 17.8751 9.38036 17.834 9.36453C17.793 9.34868 17.7518 9.33334 17.7104 9.31852C17.669 9.3037 17.6274 9.28939 17.5856 9.27559C17.5439 9.26179 17.5019 9.24851 17.4598 9.23575C17.4178 9.22299 17.3755 9.21075 17.3331 9.19902C17.2907 9.1873 17.2482 9.1761 17.2055 9.16543C17.1629 9.15475 17.1201 9.14461 17.0772 9.135C17.0343 9.12538 16.9912 9.11629 16.9481 9.10774C16.9049 9.09917 16.8617 9.09115 16.8184 9.08366C16.7317 9.06823 16.6447 9.05495 16.5573 9.04382C16.4699 9.03268 16.3824 9.02369 16.2946 9.01687C16.2068 9.01005 16.1189 9.00539 16.0309 9.00289C15.9429 9.00039 15.8548 9.00006 15.7668 9.00191C15.6788 9.00375 15.5908 9.00775 15.503 9.01392C15.4152 9.02009 15.3275 9.02842 15.2401 9.0389C15.1526 9.04939 15.0655 9.06203 14.9787 9.07681C14.8919 9.09158 14.8055 9.10848 14.7196 9.1275C14.6336 9.14654 14.5481 9.16767 14.4632 9.19091C14.3783 9.21415 14.294 9.23947 14.2103 9.26686C14.1266 9.29425 14.0436 9.32369 13.9614 9.35517C13.8792 9.38665 13.7977 9.42013 13.7172 9.45561C13.6366 9.4911 13.5569 9.52855 13.4782 9.56796C13.3994 9.60737 13.3217 9.64869 13.245 9.69193C13.1683 9.73517 13.0927 9.78027 13.0182 9.82723C12.9437 9.87419 12.8704 9.92296 12.7983 9.97354C12.7263 10.0241 12.6555 10.0764 12.586 10.1305C12.5164 10.1845 12.4483 10.2403 12.3816 10.2977C12.3148 10.3551 12.2495 10.4141 12.1856 10.4748C12.1218 10.5354 12.0595 10.5975 11.9987 10.6612C11.9379 10.7249 11.8787 10.7901 11.8211 10.8567C11.7635 10.9233 11.7076 10.9913 11.6534 11.0607C11.5992 11.13 11.5467 11.2007 11.4959 11.2726C11.4451 11.3446 11.3962 11.4178 11.349 11.4921C11.3019 11.5665 11.2566 11.642 11.2132 11.7186C11.1697 11.7952 11.1282 11.8728 11.0886 11.9514C11.049 12.0301 11.0113 12.1096 10.9757 12.1901C10.94 12.2706 10.9063 12.3519 10.8746 12.4341C10.8429 12.5162 10.8133 12.5991 10.7857 12.6827C10.7581 12.7663 10.7325 12.8506 10.7091 12.9354C10.6856 13.0203 10.6643 13.1057 10.645 13.1916C10.6258 13.2775 10.6087 13.3639 10.5937 13.4507C10.5874 13.4861 10.5815 13.5217 10.5759 13.5573C10.5704 13.5929 10.5652 13.6285 10.5603 13.6642C10.5555 13.6999 10.551 13.7357 10.5469 13.7715C10.5428 13.8073 10.539 13.8431 10.5357 13.879C10.5323 13.9149 10.5292 13.9508 10.5266 13.9867C10.5239 14.0226 10.5216 14.0586 10.5197 14.0946C10.5178 14.1305 10.5162 14.1665 10.515 14.2025C10.5138 14.2386 10.513 14.2746 10.5125 14.3106C10.512 14.3466 10.5119 14.3827 10.5122 14.4187C10.5125 14.4547 10.5131 14.4907 10.5141 14.5268C10.5151 14.5628 10.5164 14.5988 10.5182 14.6348C10.5199 14.6708 10.522 14.7068 10.5244 14.7427C10.5269 14.7786 10.5297 14.8146 10.5329 14.8505C10.536 14.8863 10.5396 14.9222 10.5435 14.958C10.5474 14.9938 10.5517 15.0296 10.5563 15.0653C10.5609 15.1011 10.5659 15.1368 10.5713 15.1724C10.5766 15.208 10.5823 15.2436 10.5884 15.2791C10.5945 15.3146 10.6009 15.3501 10.6077 15.3855C10.6145 15.4208 10.6217 15.4562 10.6292 15.4914C10.6367 15.5266 10.6445 15.5618 10.6528 15.5969C10.661 15.632 10.6696 15.667 10.6785 15.7019C10.6874 15.7368 10.6967 15.7716 10.7063 15.8063C10.716 15.841 10.726 15.8757 10.7363 15.9102C10.7466 15.9447 10.7573 15.9791 10.7684 16.0134C10.7794 16.0477 10.7908 16.0819 10.8025 16.1159C10.8142 16.15 10.8263 16.184 10.8387 16.2178C10.8511 16.2516 10.8639 16.2853 10.877 16.3189C10.8901 16.3524 10.9035 16.3859 10.9173 16.4191C10.9311 16.4524 10.9452 16.4856 10.9597 16.5186C10.9741 16.5516 10.9889 16.5845 11.004 16.6172C11.0191 16.6499 11.0346 16.6824 11.0503 16.7148C11.0661 16.7472 11.0822 16.7795 11.0986 16.8115L11.1036 16.809L11.1011 16.8215C11.0622 16.8399 11.0235 16.859 10.9852 16.8788C10.9469 16.8986 10.9089 16.919 10.8713 16.9401C10.8337 16.9612 10.7965 16.983 10.7597 17.0054C10.7229 17.0279 10.6865 17.0509 10.6505 17.0747C10.6145 17.0984 10.5789 17.1227 10.5437 17.1477C10.5086 17.1726 10.4739 17.1982 10.4396 17.2244C10.4054 17.2506 10.3716 17.2774 10.3383 17.3047C10.305 17.3321 10.2722 17.3601 10.2399 17.3886C10.2075 17.4172 10.1757 17.4463 10.1444 17.4759C10.1131 17.5056 10.0824 17.5358 10.0522 17.5665C10.0219 17.5973 9.99225 17.6285 9.96313 17.6603C9.934 17.6921 9.90545 17.7244 9.87747 17.7572C9.84948 17.79 9.82208 17.8233 9.79527 17.857C9.76846 17.8908 9.74225 17.925 9.71665 17.9597C9.69105 17.9944 9.66606 18.0295 9.6417 18.0651C9.61733 18.1007 9.5936 18.1367 9.57051 18.1731C9.54741 18.2095 9.52496 18.2463 9.50317 18.2835C9.48137 18.3207 9.46024 18.3583 9.43976 18.3962C9.41929 18.4341 9.39949 18.4724 9.38037 18.5111C9.36125 18.5497 9.34282 18.5887 9.32507 18.628C9.30732 18.6673 9.29027 18.7069 9.27392 18.7467C9.25757 18.7866 9.24193 18.8268 9.227 18.8673C9.21206 18.9077 9.19785 18.9484 9.18435 18.9893C9.17085 19.0303 9.15808 19.0715 9.14603 19.1129C9.13399 19.1543 9.12267 19.1959 9.1121 19.2376C9.10152 19.2794 9.09168 19.3214 9.08258 19.3636C9.07348 19.4057 9.06513 19.448 9.05752 19.4904C9.04992 19.5329 9.04306 19.5754 9.03695 19.6181C9.03085 19.6608 9.0255 19.7036 9.0209 19.7464C9.0163 19.7893 9.01246 19.8322 9.00938 19.8752C9.0063 19.9182 9.00398 19.9613 9.00241 20.0043C9.00085 20.0474 9.00004 20.0905 9 20.1336C9.00008 20.1936 9.00163 20.2536 9.00465 20.3135C9.00767 20.3734 9.01216 20.4332 9.01811 20.4929C9.02406 20.5526 9.03147 20.6121 9.04034 20.6715C9.04921 20.7308 9.05953 20.7899 9.07129 20.8487C9.08306 20.9075 9.09626 20.966 9.11089 21.0242C9.12552 21.0824 9.14157 21.1402 9.15903 21.1976C9.1765 21.255 9.19536 21.3119 9.21561 21.3684C9.23587 21.4249 9.25749 21.4808 9.28049 21.5362C9.30349 21.5916 9.32783 21.6464 9.35351 21.7006C9.3792 21.7549 9.40619 21.8084 9.4345 21.8613C9.46281 21.9142 9.4924 21.9664 9.52327 22.0178C9.55413 22.0693 9.58624 22.1199 9.61959 22.1698C9.65294 22.2197 9.68749 22.2687 9.72324 22.3168C9.75899 22.365 9.7959 22.4123 9.83397 22.4587C9.87204 22.505 9.91122 22.5505 9.95152 22.5949C9.99181 22.6393 10.0332 22.6828 10.0756 22.7252C10.118 22.7676 10.1615 22.809 10.2059 22.8493C10.2504 22.8896 10.2958 22.9287 10.3421 22.9668C10.3885 23.0049 10.4358 23.0418 10.484 23.0775C10.5321 23.1133 10.5812 23.1478 10.631 23.1812C10.6809 23.2145 10.7316 23.2466 10.783 23.2775C10.8345 23.3084 10.8866 23.3379 10.9395 23.3662C10.9924 23.3946 11.046 23.4216 11.1002 23.4472C11.1544 23.4729 11.2093 23.4973 11.2647 23.5202C11.3201 23.5433 11.376 23.5649 11.4325 23.5851C11.489 23.6054 11.5459 23.6242 11.6033 23.6417C11.6607 23.6592 11.7185 23.6752 11.7767 23.6898C11.8349 23.7045 11.8934 23.7177 11.9522 23.7294C12.011 23.7412 12.0701 23.7515 12.1295 23.7604C12.1888 23.7693 12.2483 23.7767 12.308 23.7826C12.3677 23.7886 12.4275 23.7931 12.4874 23.7961C12.5474 23.7991 12.6073 23.8006 12.6673 23.8007L25.333 23.8007C25.3929 23.8007 25.4529 23.7991 25.5128 23.7961C25.5728 23.7931 25.6326 23.7887 25.6923 23.7827C25.752 23.7768 25.8115 23.7694 25.8709 23.7605C25.9302 23.7517 25.9893 23.7414 26.0482 23.7296C26.107 23.7179 26.1655 23.7047 26.2237 23.6901C26.2819 23.6755 26.3397 23.6594 26.3971 23.642C26.4545 23.6245 26.5114 23.6057 26.5679 23.5854C26.6244 23.5652 26.6804 23.5436 26.7358 23.5206C26.7912 23.4976 26.846 23.4733 26.9003 23.4476C26.9545 23.4219 27.0081 23.3949 27.061 23.3666C27.1139 23.3383 27.166 23.3087 27.2175 23.2779C27.269 23.247 27.3196 23.2149 27.3695 23.1816C27.4194 23.1482 27.4684 23.1137 27.5166 23.0779C27.5648 23.0422 27.6121 23.0053 27.6585 22.9672C27.7048 22.9291 27.7503 22.8899 27.7947 22.8496C27.8392 22.8093 27.8826 22.768 27.9251 22.7256C27.9675 22.6832 28.0088 22.6397 28.0491 22.5953C28.0894 22.5508 28.1286 22.5054 28.1667 22.459C28.2047 22.4126 28.2417 22.3654 28.2774 22.3172C28.3132 22.269 28.3477 22.2199 28.3811 22.1701C28.4144 22.1202 28.4465 22.0695 28.4774 22.0181C28.5082 21.9666 28.5379 21.9145 28.5662 21.8615C28.5946 21.8087 28.6215 21.7551 28.6471 21.7009C28.6727 21.6467 28.6971 21.5918 28.7201 21.5364C28.743 21.481 28.7647 21.425 28.785 21.3685C28.8051 21.3121 28.824 21.2551 28.8416 21.1977C28.859 21.1403 28.875 21.0825 28.8897 21.0243C28.9043 20.9661 28.9174 20.9076 28.9291 20.8488C28.941 20.79 28.9514 20.7309 28.9602 20.6715C28.9689 20.6122 28.9764 20.5527 28.9822 20.493C28.9883 20.4333 28.9928 20.3735 28.9957 20.3135C28.9986 20.2536 29.0002 20.1936 29.0002 20.1336C29.0002 20.0828 28.999 20.0321 28.9969 19.9813C28.9947 19.9305 28.9914 19.8798 28.9871 19.8292C28.9828 19.7786 28.9775 19.7281 28.9711 19.6777C28.9646 19.6273 28.957 19.577 28.9486 19.527C28.9402 19.4769 28.9307 19.427 28.9201 19.3773C28.9096 19.3276 28.8981 19.2781 28.8854 19.2289C28.8727 19.1797 28.8592 19.1307 28.8445 19.0821C28.8299 19.0334 28.8143 18.9851 28.7977 18.9371C28.7811 18.8891 28.7633 18.8415 28.7447 18.7942C28.7262 18.7469 28.7065 18.7001 28.686 18.6536C28.6654 18.6071 28.644 18.5611 28.6215 18.5155C28.599 18.47 28.5756 18.4249 28.5512 18.3803C28.5269 18.3357 28.5016 18.2916 28.4755 18.2481C28.4493 18.2045 28.4223 18.1615 28.3943 18.1191C28.3664 18.0767 28.3375 18.0349 28.3078 17.9936C28.2782 17.9524 28.2476 17.9118 28.2163 17.8718C28.1849 17.8319 28.1527 17.7925 28.1197 17.7539C28.0867 17.7153 28.0529 17.6774 28.0183 17.6401C27.9838 17.6029 27.9484 17.5664 27.9124 17.5306C27.8763 17.4949 27.8395 17.4599 27.8019 17.4256C27.7644 17.3914 27.7262 17.3579 27.6872 17.3253C27.6483 17.2926 27.6087 17.2608 27.5685 17.2298C27.5282 17.1988 27.4874 17.1686 27.4459 17.1393C27.4044 17.11 27.3623 17.0815 27.3196 17.054C27.2769 17.0264 27.2337 16.9997 27.1899 16.974C27.1461 16.9482 27.1018 16.9233 27.057 16.8994C27.0122 16.8754 26.9669 16.8525 26.9211 16.8304C26.8754 16.8083 26.8291 16.7872 26.7825 16.7671C26.7359 16.7469 26.6888 16.7278 26.6414 16.7096C26.5939 16.6914 26.5461 16.6742 26.498 16.658C26.4498 16.6418 26.4014 16.6266 26.3526 16.6123C26.3038 16.5981 26.2547 16.585 26.2054 16.5728ZM25.3317 22.5209L12.6673 22.5209C12.6283 22.5208 12.5892 22.5198 12.5502 22.5179C12.5112 22.5159 12.4723 22.513 12.4334 22.5091C12.3945 22.5053 12.3558 22.5005 12.3171 22.4947C12.2785 22.489 12.24 22.4822 12.2017 22.4746C12.1634 22.4669 12.1253 22.4584 12.0875 22.4488C12.0496 22.4393 12.0119 22.4289 11.9746 22.4175C11.9372 22.4062 11.9002 22.3939 11.8634 22.3807C11.8266 22.3675 11.7902 22.3534 11.7541 22.3385C11.718 22.3235 11.6823 22.3077 11.647 22.291C11.6117 22.2743 11.5768 22.2567 11.5424 22.2382C11.508 22.2198 11.474 22.2006 11.4405 22.1805C11.407 22.1604 11.374 22.1395 11.3415 22.1178C11.3091 22.0961 11.2772 22.0736 11.2458 22.0503C11.2144 22.027 11.1836 22.003 11.1535 21.9782C11.1233 21.9535 11.0937 21.9279 11.0648 21.9017C11.0358 21.8755 11.0075 21.8486 10.9799 21.8209C10.9523 21.7933 10.9254 21.765 10.8991 21.7361C10.8729 21.7072 10.8474 21.6776 10.8226 21.6474C10.7978 21.6172 10.7738 21.5864 10.7505 21.5551C10.7273 21.5237 10.7048 21.4918 10.6831 21.4593C10.6613 21.4269 10.6404 21.3939 10.6204 21.3604C10.6003 21.3269 10.581 21.2929 10.5626 21.2585C10.5441 21.224 10.5266 21.1892 10.5099 21.1539C10.4931 21.1186 10.4773 21.0829 10.4623 21.0468C10.4474 21.0107 10.4333 20.9743 10.4201 20.9375C10.4069 20.9008 10.3947 20.8637 10.3833 20.8263C10.3719 20.789 10.3615 20.7513 10.352 20.7135C10.3425 20.6756 10.3339 20.6375 10.3262 20.5992C10.3186 20.5609 10.3119 20.5224 10.3061 20.4838C10.3003 20.4452 10.2955 20.4064 10.2917 20.3676C10.2878 20.3287 10.2849 20.2898 10.2829 20.2507C10.281 20.2117 10.28 20.1727 10.2799 20.1336C10.2799 19.0838 10.9612 18.1914 11.9036 17.8726L11.9024 17.8714C11.9163 17.8738 11.9303 17.8758 11.9444 17.8775C11.9584 17.8791 11.9726 17.8804 11.9867 17.8813C12.0008 17.8822 12.0149 17.8827 12.0291 17.8828C12.0433 17.8829 12.0574 17.8827 12.0715 17.882C12.0857 17.8814 12.0998 17.8804 12.1139 17.879C12.128 17.8776 12.142 17.8759 12.156 17.8737C12.17 17.8716 12.184 17.8691 12.1978 17.8662C12.2117 17.8633 12.2254 17.86 12.2391 17.8564C12.2528 17.8527 12.2664 17.8488 12.2799 17.8444C12.2933 17.8401 12.3067 17.8353 12.3199 17.8302C12.3331 17.8252 12.3462 17.8198 12.3591 17.814C12.372 17.8082 12.3848 17.8021 12.3974 17.7956C12.41 17.7892 12.4224 17.7824 12.4347 17.7752C12.4469 17.7681 12.4589 17.7607 12.4707 17.7529C12.4826 17.7451 12.4942 17.737 12.5056 17.7286C12.517 17.7202 12.5282 17.7116 12.5391 17.7025C12.55 17.6936 12.5607 17.6843 12.5712 17.6747C12.5816 17.6651 12.5918 17.6553 12.6017 17.6452C12.6116 17.6351 12.6212 17.6247 12.6305 17.614C12.6399 17.6034 12.6489 17.5925 12.6577 17.5814C12.6665 17.5703 12.6749 17.559 12.6831 17.5474C12.6912 17.5358 12.6991 17.524 12.7066 17.512C12.7141 17.5001 12.7213 17.4878 12.7282 17.4755C12.7351 17.4631 12.7416 17.4505 12.7478 17.4378C12.754 17.4251 12.7598 17.4122 12.7653 17.3991C12.7708 17.3861 12.776 17.3729 12.7808 17.3596C12.7856 17.3463 12.79 17.3328 12.7941 17.3193C12.7982 17.3057 12.8019 17.2921 12.8052 17.2783C12.8085 17.2646 12.8115 17.2507 12.8141 17.2368C12.8167 17.2229 12.8189 17.2089 12.8208 17.1949C12.8226 17.1808 12.8241 17.1668 12.8252 17.1526C12.8263 17.1385 12.827 17.1244 12.8273 17.1102L12.8273 17.0915C12.8273 17.0763 12.8268 17.0611 12.8259 17.046C12.825 17.0308 12.8237 17.0157 12.822 17.0006C12.8202 16.9856 12.818 16.9705 12.8154 16.9556C12.8128 16.9406 12.8097 16.9258 12.8062 16.911C12.8028 16.8962 12.7989 16.8816 12.7945 16.867C12.7902 16.8525 12.7855 16.838 12.7803 16.8237C12.7752 16.8095 12.7697 16.7953 12.7637 16.7814C12.7577 16.7674 12.7514 16.7536 12.7446 16.74C12.7379 16.7264 12.7308 16.7131 12.7233 16.6999C12.7157 16.6867 12.7078 16.6737 12.6996 16.6609C12.6913 16.6482 12.6827 16.6357 12.6737 16.6235C12.6648 16.6112 12.6554 16.5993 12.6458 16.5876C12.6361 16.5758 12.6261 16.5644 12.6158 16.5533C12.6055 16.5422 12.5949 16.5313 12.5839 16.5208C12.573 16.5103 12.5618 16.5001 12.5502 16.4902C12.5387 16.4803 12.5269 16.4708 12.5148 16.4616L12.5161 16.4616C12.5003 16.436 12.4847 16.4103 12.4695 16.3845C12.4542 16.3586 12.4393 16.3325 12.4247 16.3063C12.41 16.2801 12.3957 16.2537 12.3816 16.2272C12.3676 16.2006 12.3538 16.1739 12.3404 16.1471C12.327 16.1202 12.3138 16.0932 12.301 16.066C12.2882 16.0389 12.2757 16.0116 12.2635 15.9841C12.2513 15.9567 12.2394 15.9291 12.2278 15.9014C12.2163 15.8737 12.205 15.8458 12.1941 15.8179C12.1831 15.7899 12.1725 15.7618 12.1622 15.7336C12.152 15.7054 12.142 15.6771 12.1323 15.6486C12.1227 15.6202 12.1133 15.5917 12.1043 15.563C12.0953 15.5344 12.0867 15.5056 12.0783 15.4768C12.07 15.4479 12.062 15.419 12.0543 15.3899C12.0466 15.3609 12.0392 15.3318 12.0322 15.3026C12.0252 15.2734 12.0185 15.2441 12.0122 15.2148C12.0058 15.1854 11.9998 15.156 11.9941 15.1265C11.9884 15.097 11.9831 15.0675 11.9781 15.0379C11.973 15.0083 11.9684 14.9786 11.964 14.9489C11.9597 14.9192 11.9557 14.8894 11.952 14.8596C11.9484 14.8298 11.9451 14.8 11.9421 14.7701C11.9391 14.7402 11.9365 14.7103 11.9342 14.6803C11.9319 14.6504 11.9299 14.6204 11.9283 14.5904C11.9267 14.5604 11.9254 14.5305 11.9245 14.5004C11.9236 14.4704 11.923 14.4404 11.9227 14.4103C11.9225 14.3803 11.9226 14.3503 11.923 14.3203C11.9235 14.2902 11.9243 14.2602 11.9254 14.2302C11.9265 14.2002 11.9279 14.1702 11.9298 14.1402C11.9316 14.1103 11.9337 14.0803 11.9362 14.0504C11.9387 14.0205 11.9415 13.9906 11.9447 13.9607C11.9478 13.9308 11.9514 13.901 11.9552 13.8712C11.9591 13.8414 11.9632 13.8117 11.9678 13.782C11.9723 13.7523 11.9772 13.7227 11.9824 13.6931C11.9934 13.6291 12.0061 13.5655 12.0203 13.5021C12.0345 13.4387 12.0503 13.3758 12.0676 13.3132C12.0849 13.2506 12.1038 13.1885 12.1241 13.1268C12.1445 13.0651 12.1664 13.004 12.1898 12.9434C12.2131 12.8828 12.238 12.8229 12.2644 12.7635C12.2907 12.7042 12.3185 12.6455 12.3477 12.5875C12.3769 12.5295 12.4075 12.4722 12.4396 12.4158C12.4716 12.3593 12.505 12.3036 12.5398 12.2488C12.5746 12.1939 12.6107 12.14 12.6481 12.0869C12.6856 12.0338 12.7243 11.9817 12.7643 11.9306C12.8043 11.8794 12.8455 11.8293 12.888 11.7801C12.9305 11.731 12.9741 11.683 13.0189 11.636C13.0638 11.589 13.1097 11.5431 13.1568 11.4984C13.2039 11.4537 13.2521 11.4102 13.3013 11.3678C13.3505 11.3255 13.4008 11.2844 13.4521 11.2445C13.5033 11.2046 13.5555 11.166 13.6087 11.1287C13.6618 11.0914 13.7159 11.0554 13.7708 11.0208C13.8257 10.9861 13.8815 10.9528 13.938 10.9209C13.9946 10.889 14.0519 10.8585 14.11 10.8295C14.1681 10.8004 14.2268 10.7728 14.2862 10.7466C14.3457 10.7204 14.4057 10.6956 14.4663 10.6724C14.527 10.6492 14.5882 10.6274 14.6499 10.6072C14.7116 10.587 14.7738 10.5683 14.8364 10.5511C14.899 10.534 14.9621 10.5183 15.0254 10.5043C15.0889 10.4902 15.1526 10.4777 15.2166 10.4668C15.2806 10.4558 15.3448 10.4465 15.4093 10.4387C15.4738 10.431 15.5384 10.4248 15.6032 10.4202C15.668 10.4156 15.7328 10.4126 15.7978 10.4112C15.8627 10.4098 15.9276 10.41 15.9925 10.4118C16.0575 10.4136 16.1223 10.417 16.1871 10.422C16.2518 10.427 16.3164 10.4336 16.3808 10.4417C16.4452 10.4499 16.5094 10.4597 16.5734 10.471C16.6054 10.4765 16.6373 10.4824 16.6692 10.4887C16.701 10.495 16.7328 10.5017 16.7645 10.5088C16.7962 10.5159 16.8278 10.5234 16.8593 10.5313C16.8908 10.5391 16.9222 10.5474 16.9535 10.5561C16.9848 10.5647 17.016 10.5737 17.0471 10.5832C17.0782 10.5926 17.1091 10.6024 17.14 10.6126C17.1708 10.6228 17.2015 10.6333 17.2321 10.6443C17.2627 10.6552 17.2931 10.6665 17.3234 10.6782C17.3537 10.6899 17.3838 10.702 17.4138 10.7145C17.4438 10.7269 17.4737 10.7397 17.5034 10.7529C17.533 10.7661 17.5625 10.7796 17.5919 10.7936C17.6213 10.8075 17.6504 10.8218 17.6794 10.8364C17.7084 10.851 17.7372 10.866 17.7658 10.8814C17.7944 10.8967 17.8229 10.9124 17.8511 10.9285C17.8793 10.9445 17.9074 10.9609 17.9352 10.9777C17.963 10.9944 17.9906 11.0115 18.018 11.0289C18.0454 11.0464 18.0726 11.0641 18.0996 11.0822C18.1265 11.1003 18.1533 11.1188 18.1798 11.1375C18.2063 11.1563 18.2326 11.1754 18.2586 11.1948C18.2846 11.2142 18.3104 11.234 18.336 11.254C18.3615 11.2741 18.3868 11.2944 18.4119 11.3151C18.4369 11.3358 18.4617 11.3568 18.4862 11.378C18.5107 11.3993 18.535 11.4209 18.559 11.4428C18.583 11.4647 18.6067 11.4869 18.6301 11.5094C18.6536 11.5319 18.6767 11.5546 18.6996 11.5777C18.7225 11.6007 18.7451 11.6241 18.7674 11.6477C18.7897 11.6713 18.8117 11.6952 18.8334 11.7193C18.8551 11.7435 18.8765 11.7679 18.8976 11.7926C18.9187 11.8172 18.9395 11.8422 18.96 11.8674C18.9804 11.8926 19.0006 11.918 19.0205 11.9437C19.0403 11.9694 19.0599 11.9954 19.0791 12.0216C19.0983 12.0477 19.1172 12.0742 19.1358 12.1008C19.1553 12.1286 19.1746 12.1566 19.1934 12.1848C19.2123 12.2131 19.2308 12.2416 19.2489 12.2704C19.267 12.2991 19.2848 12.3281 19.3021 12.3573C19.3195 12.3865 19.3365 12.4159 19.3531 12.4455C19.3697 12.4752 19.386 12.505 19.4018 12.5351C19.4176 12.5651 19.4331 12.5954 19.4481 12.6259C19.4632 12.6563 19.4778 12.687 19.4921 12.7178C19.5064 12.7487 19.5202 12.7797 19.5337 12.8109C19.5471 12.8421 19.5602 12.8735 19.5728 12.905C19.5855 12.9365 19.5977 12.9682 19.6095 13.0001C19.6214 13.0319 19.6328 13.0639 19.6438 13.0961C19.6548 13.1282 19.6653 13.1605 19.6755 13.1929C19.6857 13.2253 19.6954 13.2579 19.7047 13.2906C19.714 13.3232 19.7229 13.356 19.7314 13.3889C19.7399 13.4218 19.7479 13.4549 19.7555 13.488C19.7631 13.5211 19.7703 13.5543 19.7771 13.5876C19.7838 13.6209 19.7902 13.6543 19.796 13.6877C19.8019 13.7212 19.8074 13.7547 19.8124 13.7883C19.8174 13.8219 19.822 13.8556 19.8262 13.8893C19.8303 13.923 19.834 13.9568 19.8373 13.9906C19.8406 14.0244 19.8434 14.0583 19.8458 14.0922C19.8482 14.1261 19.8502 14.16 19.8517 14.1939C19.8532 14.2279 19.8543 14.2619 19.8549 14.2958C19.8556 14.3298 19.8558 14.3638 19.8555 14.3977C19.8553 14.4317 19.8546 14.4657 19.8535 14.4996C19.8524 14.5336 19.8508 14.5675 19.8488 14.6014C19.8468 14.6354 19.8444 14.6692 19.8415 14.7031C19.8386 14.737 19.8354 14.7708 19.8316 14.8045C19.8279 14.8383 19.8237 14.872 19.819 14.9057C19.8144 14.9394 19.8094 14.973 19.8039 15.0065C19.7984 15.04 19.7924 15.0735 19.7861 15.1068C19.7797 15.1402 19.7729 15.1735 19.7657 15.2067C19.7642 15.2181 19.7629 15.2296 19.7619 15.241C19.7608 15.2525 19.7601 15.264 19.7596 15.2755C19.7592 15.287 19.759 15.2985 19.759 15.31C19.7591 15.3215 19.7595 15.333 19.7601 15.3445C19.7607 15.356 19.7616 15.3675 19.7628 15.3789C19.7639 15.3904 19.7654 15.4018 19.7671 15.4132C19.7688 15.4245 19.7707 15.4359 19.773 15.4472C19.7752 15.4585 19.7778 15.4697 19.7805 15.4809C19.7833 15.492 19.7864 15.5032 19.7897 15.5142C19.793 15.5252 19.7965 15.5361 19.8004 15.547C19.8042 15.5579 19.8083 15.5686 19.8126 15.5793C19.8169 15.5899 19.8215 15.6005 19.8264 15.6109C19.8312 15.6214 19.8363 15.6317 19.8416 15.6419C19.847 15.6521 19.8525 15.6622 19.8583 15.6721C19.8641 15.6821 19.8702 15.6919 19.8764 15.7015C19.8827 15.7112 19.8892 15.7207 19.8959 15.73C19.9027 15.7394 19.9096 15.7485 19.9168 15.7576C19.9239 15.7666 19.9313 15.7754 19.9388 15.7841C19.9464 15.7927 19.9542 15.8012 19.9622 15.8095C19.9702 15.8178 19.9783 15.8259 19.9867 15.8338C19.9951 15.8417 20.0036 15.8494 20.0124 15.8569C20.0211 15.8644 20.03 15.8717 20.0391 15.8788C20.0482 15.8859 20.0574 15.8928 20.0668 15.8994C20.0762 15.906 20.0857 15.9125 20.0955 15.9186C20.1052 15.9248 20.115 15.9308 20.125 15.9365C20.135 15.9422 20.1451 15.9477 20.1554 15.9529C20.1656 15.9582 20.176 15.9632 20.1865 15.9679C20.197 15.9727 20.2075 15.9772 20.2182 15.9814C20.2289 15.9857 20.2397 15.9897 20.2506 15.9934C20.2615 15.9971 20.2725 16.0006 20.2836 16.0038C20.2946 16.007 20.3057 16.01 20.3169 16.0126C20.3281 16.0153 20.3394 16.0177 20.3507 16.0199C20.362 16.022 20.3734 16.0239 20.3847 16.0255C20.3961 16.0271 20.4076 16.0285 20.419 16.0295C20.4305 16.0306 20.442 16.0314 20.4535 16.0319C20.465 16.0324 20.4765 16.0327 20.488 16.0327C20.4995 16.0326 20.511 16.0324 20.5225 16.0318C20.534 16.0312 20.5455 16.0304 20.557 16.0292C20.5684 16.0282 20.5798 16.0268 20.5912 16.0251C20.6026 16.0234 20.614 16.0215 20.6253 16.0193C20.6366 16.0171 20.6478 16.0147 20.659 16.0119C20.6702 16.0092 20.6813 16.0062 20.6923 16.0029C20.7034 15.9997 20.7143 15.9962 20.7252 15.9924C20.7361 15.9886 20.7468 15.9846 20.7575 15.9803C20.7682 15.976 20.7788 15.9715 20.7893 15.9667C20.7997 15.9619 20.8101 15.9569 20.8203 15.9516C20.8305 15.9463 20.8406 15.9408 20.8506 15.935C20.8606 15.9292 20.8704 15.9232 20.8801 15.917C20.8898 15.9108 20.8993 15.9043 20.9087 15.8976C20.918 15.891 20.9272 15.8841 20.9363 15.8769C20.9453 15.8698 20.9542 15.8625 20.9629 15.855C20.9716 15.8474 20.9801 15.8397 20.9885 15.8317C20.9968 15.8238 21.0049 15.8157 21.0129 15.8073C21.0208 15.799 21.0286 15.7905 21.0361 15.7818C21.0436 15.7731 21.051 15.7642 21.0581 15.7552C21.0652 15.7461 21.0721 15.7369 21.0788 15.7275C21.0855 15.7182 21.0919 15.7087 21.0982 15.699C21.1044 15.6893 21.1104 15.6795 21.1162 15.6695C21.1219 15.6595 21.1275 15.6494 21.1327 15.6392C21.138 15.629 21.1431 15.6186 21.1479 15.6082C21.1526 15.5977 21.1572 15.5871 21.1615 15.5765C21.1658 15.5658 21.1698 15.555 21.1736 15.5441C21.1774 15.5333 21.1809 15.5223 21.1842 15.5113C21.1874 15.5002 21.1904 15.4891 21.1932 15.4779C21.1945 15.4419 21.1983 15.406 21.2044 15.3704C21.2082 15.3375 21.2128 15.3048 21.2183 15.2721C21.2238 15.2395 21.2301 15.207 21.2372 15.1746C21.2443 15.1423 21.2523 15.1102 21.2611 15.0782C21.2698 15.0463 21.2794 15.0146 21.2898 14.9832C21.3002 14.9517 21.3114 14.9206 21.3234 14.8897C21.3353 14.8588 21.3481 14.8283 21.3616 14.7981C21.3752 14.7678 21.3895 14.738 21.4045 14.7085C21.4196 14.679 21.4354 14.6499 21.4519 14.6212C21.4685 14.5926 21.4857 14.5643 21.5037 14.5365C21.5217 14.5087 21.5404 14.4814 21.5597 14.4545C21.5791 14.4277 21.5992 14.4013 21.6199 14.3755C21.6406 14.3497 21.662 14.3244 21.684 14.2996C21.706 14.2749 21.7286 14.2507 21.7519 14.2271C21.7751 14.2036 21.7989 14.1806 21.8234 14.1582C21.8478 14.1358 21.8727 14.1141 21.8983 14.093C21.9238 14.0719 21.9498 14.0515 21.9764 14.0317C22.003 14.012 22.03 13.9929 22.0576 13.9745C22.0851 13.9561 22.1131 13.9384 22.1415 13.9215C22.17 13.9045 22.1988 13.8883 22.2281 13.8728C22.2574 13.8573 22.287 13.8426 22.317 13.8286C22.3471 13.8146 22.3774 13.8014 22.4081 13.789C22.4388 13.7766 22.4698 13.765 22.5011 13.7541C22.5324 13.7433 22.5639 13.7332 22.5957 13.724C22.6275 13.7147 22.6595 13.7063 22.6918 13.6987C22.724 13.6911 22.7564 13.6843 22.789 13.6784C22.8216 13.6724 22.8543 13.6673 22.8871 13.663C22.9199 13.6588 22.9529 13.6553 22.9859 13.6527C23.0189 13.6501 23.0519 13.6483 23.085 13.6474C23.1181 13.6465 23.1512 13.6465 23.1843 13.6472C23.2174 13.648 23.2505 13.6496 23.2835 13.6521C23.3166 13.6545 23.3495 13.6578 23.3824 13.662C23.4152 13.6661 23.4479 13.6711 23.4805 13.6769C23.5178 13.6835 23.5548 13.6912 23.5916 13.7C23.6284 13.7087 23.665 13.7186 23.7012 13.7294C23.7374 13.7403 23.7733 13.7522 23.8089 13.7652C23.8444 13.7782 23.8796 13.7921 23.9143 13.8071C23.9491 13.8221 23.9833 13.8381 24.0171 13.8551C24.0509 13.8721 24.0842 13.89 24.117 13.9089C24.1498 13.9278 24.182 13.9477 24.2136 13.9684C24.2452 13.9892 24.2762 14.0109 24.3066 14.0335C24.3369 14.056 24.3667 14.0794 24.3957 14.1037C24.4247 14.128 24.453 14.1531 24.4805 14.1791C24.5081 14.205 24.5348 14.2317 24.5609 14.2592C24.5869 14.2867 24.612 14.3149 24.6364 14.3438C24.6608 14.3727 24.6843 14.4023 24.707 14.4326C24.7297 14.4629 24.7514 14.4939 24.7723 14.5254C24.7932 14.557 24.8131 14.5891 24.8321 14.6218C24.8511 14.6545 24.8692 14.6878 24.8863 14.7215C24.9033 14.7553 24.9194 14.7895 24.9345 14.8242C24.9496 14.8589 24.9637 14.894 24.9768 14.9295C24.9898 14.965 25.0019 15.0008 25.0129 15.0371C25.0239 15.0733 25.0338 15.1098 25.0427 15.1465C25.0516 15.1833 25.0594 15.2203 25.0661 15.2575C25.0728 15.2948 25.0785 15.3322 25.0831 15.3697C25.0876 15.4073 25.0911 15.4449 25.0935 15.4827C25.0959 15.5205 25.0972 15.5582 25.0974 15.5961C25.0976 15.6339 25.0967 15.6717 25.0947 15.7095C25.0927 15.7473 25.0896 15.785 25.0854 15.8226C25.0813 15.8602 25.076 15.8976 25.0697 15.9349C25.0633 15.9722 25.0559 16.0093 25.0474 16.0462C25.0389 16.083 25.0294 16.1196 25.0188 16.156C25.0082 16.1923 24.9965 16.2283 24.9838 16.2639C24.9711 16.2995 24.9574 16.3348 24.9427 16.3696C24.9279 16.4045 24.9122 16.4389 24.8955 16.4728L24.8967 16.4728C24.8899 16.4814 24.8833 16.4901 24.8769 16.499C24.8704 16.5078 24.8642 16.5168 24.8581 16.526C24.8521 16.5351 24.8462 16.5443 24.8405 16.5537C24.8349 16.5631 24.8294 16.5726 24.8241 16.5822C24.8189 16.5918 24.8138 16.6015 24.8089 16.6113C24.8041 16.6211 24.7994 16.6311 24.795 16.6411C24.7905 16.6511 24.7863 16.6612 24.7823 16.6714C24.7783 16.6816 24.7745 16.6918 24.7709 16.7022C24.7673 16.7125 24.7639 16.723 24.7608 16.7334C24.7576 16.7439 24.7547 16.7545 24.752 16.7651C24.7493 16.7757 24.7468 16.7864 24.7446 16.7971C24.7424 16.8078 24.7403 16.8186 24.7385 16.8294C24.7367 16.8402 24.7352 16.8511 24.7338 16.8619C24.7325 16.8728 24.7314 16.8837 24.7305 16.8946C24.7296 16.9055 24.729 16.9165 24.7285 16.9274C24.7281 16.9384 24.7279 16.9493 24.728 16.9603C24.728 17.399 25.0805 17.7564 25.5179 17.7564L25.5342 17.7539L25.5292 17.7589C26.7529 17.8589 27.7191 18.8875 27.7191 20.1361C27.719 20.1752 27.7181 20.2142 27.7161 20.2532C27.7141 20.2922 27.7112 20.3311 27.7074 20.37C27.7035 20.4088 27.6987 20.4475 27.6929 20.4862C27.6872 20.5248 27.6804 20.5632 27.6728 20.6015C27.6651 20.6398 27.6565 20.6779 27.647 20.7157C27.6375 20.7536 27.6271 20.7912 27.6157 20.8286C27.6043 20.8659 27.5921 20.903 27.5789 20.9397C27.5657 20.9765 27.5516 21.0129 27.5366 21.0489C27.5217 21.085 27.5058 21.1207 27.4891 21.1559C27.4724 21.1912 27.4548 21.2261 27.4364 21.2605C27.4179 21.2949 27.3987 21.3289 27.3786 21.3623C27.3585 21.3958 27.3376 21.4288 27.3159 21.4612C27.2942 21.4937 27.2717 21.5256 27.2484 21.5569C27.2251 21.5883 27.2011 21.619 27.1763 21.6492C27.1515 21.6793 27.126 21.7089 27.0997 21.7378C27.0735 21.7667 27.0466 21.795 27.019 21.8225C26.9913 21.8501 26.963 21.877 26.9341 21.9032C26.9052 21.9295 26.8756 21.9549 26.8454 21.9797C26.8152 22.0044 26.7844 22.0284 26.7531 22.0517C26.7217 22.0749 26.6898 22.0974 26.6573 22.1191C26.6248 22.1408 26.5918 22.1616 26.5583 22.1817C26.5248 22.2017 26.4909 22.221 26.4564 22.2394C26.422 22.2578 26.3871 22.2753 26.3518 22.292C26.3165 22.3086 26.2808 22.3245 26.2447 22.3394C26.2087 22.3543 26.1722 22.3684 26.1355 22.3815C26.0987 22.3946 26.0616 22.4069 26.0243 22.4182C25.9869 22.4295 25.9493 22.4399 25.9114 22.4494C25.8736 22.4589 25.8354 22.4675 25.7971 22.4751C25.7588 22.4827 25.7204 22.4893 25.6818 22.4951C25.6432 22.5008 25.6044 22.5056 25.5656 22.5094C25.5267 22.5132 25.4878 22.5161 25.4488 22.518C25.4098 22.5199 25.3707 22.5209 25.3317 22.5209Z"   fill="#00FFFF" ></path></g><path d="M14.6614 12.0372C14.0752 12.2896 13.469 12.6133 13.1603 13.2008C12.8803 13.7332 13.009 14.3519 13.2203 14.8818C13.409 15.3555 14.184 15.1493 13.9915 14.6694C13.8465 14.3069 13.6977 13.897 13.8915 13.5257C14.1077 13.1133 14.6652 12.8996 15.0639 12.7271C15.5376 12.5246 15.1302 11.8359 14.6614 12.0372Z"   fill="#00FFFF" ></path><defs><filter id="filter_1935_1033" x="0" y="0" width="38" height="32.80078125" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feFlood flood-opacity="0" result="feFloodId_1935_1033"/><feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha_1935_1033"/><feOffset dx="0" dy="0"/><feGaussianBlur stdDeviation="4.5"/><feComposite in2="hardAlpha_1935_1033" operator="out"/><feColorMatrix type="matrix" values="0 0 0 0 0.0784313725490196 0 0 0 0 0.4627450980392157 0 0 0 0 1 0 0 0 1 0"/><feBlend mode="normal" in2="feFloodId_1935_1033" result="dropShadow_1_1935_1033"/><feBlend mode="normal" in="SourceGraphic" in2="dropShadow_1_1935_1033" result="shape_1935_1033"/></filter></defs></svg>
\ No newline at end of file
diff --git a/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue b/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue
index 603cb50..3d95a51 100644
--- a/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue
+++ b/src/renderer/src/views/components/headers/components/setPup/components/photoManage.vue
@@ -97,7 +97,7 @@
                   ref="imageRef"
                   fit="contain"
                   :preview-teleported="true"
-                  :preview-src-list="modelList.map((item) => 'http://127.0.0.1:8848' + item.data)"
+                  :preview-src-list="modelList.map((item:any) => 'http://127.0.0.1:8848' + item.data)"
                   style="width: 80px; height: 60px"
                   :src="'http://127.0.0.1:8848' + row.data"
                   :initial-index="currentIndex"
@@ -109,7 +109,7 @@
                   ref="imageRef"
                   fit="contain"
                   :preview-teleported="true"
-                  :preview-src-list="modelList.map((item) => 'http://localhost:55110/' + item.data)"
+                  :preview-src-list="modelList.map((item:any) => 'http://localhost:55110/' + item.data)"
                   style="width: 80px; height: 60px"
                   :src="'http://localhost:55110/' + row.data"
                   :initial-index="currentIndex"
@@ -772,6 +772,7 @@ const setPhotoList = () => {
     dirName1s: 'GEMarker1s'
   })
   $recvElectronChanel('dirFiles', (e, res) => {
+    console.log('dirFiles', res)
     res.GEMarker1s.forEach((item) => {
       let name = item.split('.')[0]
       name = name.split('/')[1]
diff --git a/src/renderer/src/views/components/headers/components/setTool/setTool.vue b/src/renderer/src/views/components/headers/components/setTool/setTool.vue
index cf9782d..26e03f2 100644
--- a/src/renderer/src/views/components/headers/components/setTool/setTool.vue
+++ b/src/renderer/src/views/components/headers/components/setTool/setTool.vue
@@ -110,7 +110,7 @@ const setList = ref([
   width: 15vw;
   position: absolute;
   right: 1vw;
-  top: 7%;
+  top: 0;
   border-radius: 5px;
   //   background: var(--svg-headColorbg);
   display: flex;
diff --git a/src/renderer/src/views/components/headers/index.vue b/src/renderer/src/views/components/headers/index.vue
index 5a63ab8..4d8e5fe 100644
--- a/src/renderer/src/views/components/headers/index.vue
+++ b/src/renderer/src/views/components/headers/index.vue
@@ -10,6 +10,9 @@
         <span>{{ date.ymd }}</span>
         <span>{{ t(`week.${date.week}`) }}</span>
       </div>
+      <div class="weather">
+        <svg-icon name="weather" :size="40"></svg-icon>
+      </div>
     </div>
     <setTool ref="setToolRef"></setTool>
 
@@ -101,7 +104,7 @@ onUnmounted(() => {
     position: absolute;
     left: 20px;
     //top: 15px;
-    top: 0.35vw;
+    top: 0.55vw;
     height: 50px;
     //border: 1px solid red;
     //width: 200px;
@@ -133,6 +136,14 @@ onUnmounted(() => {
         font-size: 0.8rem;
       }
     }
+
+    .weather {
+      margin-left: 15px;
+      svg {
+        fill: rgba(0, 255, 255, 1) !important;
+        cursor: pointer;
+      }
+    }
   }
 
   .headButton {
diff --git a/src/renderer/src/views/components/propertyBox/billboardObject.vue b/src/renderer/src/views/components/propertyBox/billboardObject.vue
index 89a88f4..34a597f 100644
--- a/src/renderer/src/views/components/propertyBox/billboardObject.vue
+++ b/src/renderer/src/views/components/propertyBox/billboardObject.vue
@@ -762,10 +762,14 @@ const close = () => {
 }
 
 const clickChangeImage = () => {
-  eventBus?.emit('openSelectImg', entityOptions.value.billboardImage, entityOptions.value)
+  eventBus?.emit('openPhoto', (img)=>{
+    entityOptions.value.billboardImage = img
+  })
 }
 const clickChangeDefaultImage = () => {
-  eventBus?.emit('openSelectImg', entityOptions.value.billboardDefaultImage, entityOptions.value)
+  eventBus?.emit('openPhoto', (img)=>{
+    entityOptions.value.billboardDefaultImage = img
+  })
 }
 const fontChange = (val) => {
   entityOptions.value.labelFontFamily = val
diff --git a/src/renderer/src/views/components/propertyBox/photo.vue b/src/renderer/src/views/components/propertyBox/photo.vue
index 49add7e..92bcb87 100644
--- a/src/renderer/src/views/components/propertyBox/photo.vue
+++ b/src/renderer/src/views/components/propertyBox/photo.vue
@@ -11,55 +11,29 @@
       <div class="set_detail">
         <div class="top">
           <div>
-            <el-input
-              v-model="modelName"
-              class="w-50 m-2"
-              placeholder="请输入图标名称进行搜索"
-              :suffix-icon="Search"
-            />
+            <el-input v-model="modelName" class="w-50 m-2" placeholder="请输入图标类型进行搜索" :suffix-icon="Search" />
           </div>
           <div class="typeBut">
-            <span
-              v-for="(item, index) in butList"
-              :key="index"
-              :class="{ clickButClass: butActiveIndex === index }"
-              @click="typeClick(index)"
-              >{{ item }}</span
-            >
+            <span v-for="(item, index) in butList" :key="index" :class="{ clickButClass: butActiveIndex === index }"
+              @click="typeClick(index)">{{ item }}</span>
           </div>
         </div>
         <div class="content">
           <!-- 左侧Tab导航 -->
           <div class="treeCon">
-            <el-tree
-              style="max-width: 600px"
-              :data="typeTreeData"
-              ref="treeRef"
-              node-key="id"
-              @node-click="handleTypeClick"
-              :filter-node-method="filterNode"
-            >
+            <el-tree style="max-width: 600px" :data="typeTreeData" ref="treeRef" node-key="id"
+              @node-click="handleTypeClick" :filter-node-method="filterNode">
               <template #default="{ node, data }">
                 <!-- <span> {{ node.label }}</span> -->
 
-                <span
-                  :class="{
-                    'primary-type': !(node.childNodes.length != 0),
-                    'selected-text': node.id === currentTypeId
-                  }"
-                  @click.stop="toggleExpand(node)"
-                  class="allowDrag"
-                >
-                  <svg-icon
-                    :name="node.expanded ? 'arrow' : 'more'"
-                    :size="12"
-                    color="rgba(0, 255, 255, 1)"
-                    style="margin-right: 5px; margin-left: 5px"
-                    v-if="node.childNodes.length != 0"
-                    @click.stop="toggleExpand(node)"
-                  ></svg-icon>
-                  {{ node.label }}</span
-                >
+                <span :class="{
+      'primary-type': !(node.childNodes.length != 0),
+      'selected-text': node.id === currentTypeId
+    }" @click.stop="toggleExpand(node)" class="allowDrag">
+                  <svg-icon :name="node.expanded ? 'arrow' : 'more'" :size="12" color="rgba(0, 255, 255, 1)"
+                    style="margin-right: 5px; margin-left: 5px" v-if="node.childNodes.length != 0"
+                    @click.stop="toggleExpand(node)"></svg-icon>
+                  {{ node.label }}</span>
               </template>
             </el-tree>
           </div>
@@ -68,29 +42,17 @@
             <div class="model-section" v-if="butActiveIndex === 2">
               <!-- <h2 class="section-title">{{ categories[Number(currentTypeId)].name }}</h2> -->
               <div class="model-grid">
-                <div
-                  v-for="(model, mIndex) in categories"
-                  :key="mIndex"
-                  class="model-item"
-                  @click="modelClick(mIndex, model)"
-                >
+                <div v-for="(model, mIndex) in categories" :key="mIndex" class="model-item"
+                  @click="modelClick(mIndex, model)">
                   <div class="imgbg">
-                    <el-image
-                      :src="'http://127.0.0.1:8848' + model.data"
-                      fit="contain"
-                      class="thumbnail"
-                    >
+                    <el-image :src="service + model.data" fit="contain" class="thumbnail">
                       <template #error>
                         <div class="image-error">加载失败</div>
                       </template>
                     </el-image>
                   </div>
 
-                  <div
-                    class="model-name"
-                    :class="{ isactive: activeIndex == mIndex }"
-                    :title="model.iconName"
-                  >
+                  <div class="model-name" :class="{ isactive: activeIndex == mIndex }" :title="model.iconName">
                     {{ model.iconName }}
                   </div>
                 </div>
@@ -101,38 +63,21 @@
             <div class="model-section2" v-else>
               <!-- <h2 class="section-title">{{ categories[Number(currentTypeId)].name }}</h2> -->
               <div class="typeTitltName" v-if="categories.length">
-                <svg-icon
-                  name="fk"
-                  :size="16"
-                  color="rgba(0, 255, 255, 1)"
-                  style="margin-right: 5px"
-                ></svg-icon
-                >基本类型
+                <svg-icon name="fk" :size="16" color="rgba(0, 255, 255, 1)" style="margin-right: 5px"></svg-icon>基本类型
               </div>
               <div class="model-grid">
-                <div
-                  v-for="(model, mIndex) in categories"
-                  :key="mIndex"
-                  class="model-item"
-                  @click="modelClick(mIndex, model)"
-                >
+                <div v-for="(model, mIndex) in categories" :key="mIndex" class="model-item"
+                  @click="modelClick(mIndex, model)">
                   <div class="imgbg">
-                    <el-image
-                      :src="'http://localhost:55110/' + model.data"
-                      fit="contain"
-                      class="thumbnail"
-                    >
+                    <el-image :src="'http://localhost:' + availablePort + '/' + model.data" fit="contain"
+                      class="thumbnail">
                       <template #error>
                         <div class="image-error">加载失败</div>
                       </template>
                     </el-image>
                   </div>
 
-                  <div
-                    class="model-name"
-                    :class="{ isactive: activeIndex == mIndex }"
-                    :title="model.iconName"
-                  >
+                  <div class="model-name" :class="{ isactive: activeIndex == mIndex }" :title="model.iconName">
                     {{ model.iconName }}
                   </div>
                 </div>
@@ -159,6 +104,8 @@ import {
   $recvElectronChanel,
   $changeComponentShow
 } from '@/utils/communication'
+
+const { ipcRenderer } = require('electron')
 const { t } = useI18n()
 const { findParentId, findTreeIndex, cusAddNodes } = useTreeNode()
 const isShowPup = ref(false)
@@ -166,6 +113,15 @@ const eventBus: any = inject('bus')
 const { cusUpdateNode } = useTreeNode()
 var modelName = ref('')
 
+const availablePort = ref(55110)
+const service = ref(localStorage.getItem("service"))
+
+ipcRenderer.invoke('get-available-port').then((port) => {
+  availablePort.value = port
+})
+
+let selectCallback
+
 //tab
 interface Model {
   id: string
@@ -290,6 +246,10 @@ const handleScroll = () => {
 const currentTypeId = ref<string>('')
 var activeIndex: any = ref(null)
 
+//立体图标、普通图标
+let threePhoto: any = []
+let ordinaryPhoto: any = []
+
 interface TypeNode {
   id: string
   label: string
@@ -330,14 +290,30 @@ let typeArr = {
 const modelClick = (index, row) => {
   activeIndex.value = index
   isShowPup.value = false
-  console.log(row, '点中了')
+  console.log(index, row)
+  let selectedImg
+  if(selectCallback) {
+    if(butActiveIndex.value === 0)
+    {
+      selectedImg = 'http://localhost:' + availablePort.value + '/' + (row.data.indexOf("1s/") > -1 ? row.data.replace(/1s/g, "1") : row.data)
+    }
+    else if(butActiveIndex.value === 1)
+    {
+      selectedImg = 'http://localhost:' + availablePort.value + '/' + row.data
+    }
+    else if(butActiveIndex.value === 2)
+    {
+      selectedImg = service.value + row.data
+    }
+    selectCallback(selectedImg)
+  }
 }
 
 const getModelListByType = (id) => {
   if (butActiveIndex.value === 0) {
-    categories.value = threePhoto
+    categories.value = [...threePhoto]
   } else if (butActiveIndex.value === 1) {
-    categories.value = ordinaryPhoto
+    categories.value = [...ordinaryPhoto]
   } else {
     let formData = new FormData()
     formData.append('iconTypeId', id)
@@ -356,11 +332,20 @@ const getModelList = async () => {
         parentId: null
       }
     ]
+    if(butActiveIndex.value==0) {
+      categories.value = [...threePhoto]
+    }
+    if(butActiveIndex.value==1) {
+      categories.value = [...ordinaryPhoto]
+    }
   } else {
     const res: any = await PhotoApi.modelTypeList()
     if (res.code == 0 || res.code == 200) {
       let data = transformNestedJson(res.data, 'name', 'label')
       typeTreeData.value = data
+      if(typeTreeData.value.length>0) {
+        getModelListByType(typeTreeData.value[0].id)
+      }
     }
   }
 }
@@ -389,26 +374,18 @@ onBeforeUnmount(() => {
   observer?.disconnect()
 })
 //end
-
-eventBus.on('openPhoto', (data) => {
-  isShowPup.value = data
-  if (data) {
-    getModelList()
-    getSetting()
-    setPhotoList()
-  }
+eventBus.on('openPhoto', async(cb) => {
+  isShowPup.value = true
+  selectCallback = cb
+  getModelList()
+  getSetting()
+  setPhotoList()
 })
-eventBus.on('closeModelSet', (data) => {
-  isShowPup.value = data
-  if (data) {
-    getSetting()
-  }
+eventBus.on('closePhoto', () => {
+  isShowPup.value = false
+  getSetting()
 })
 
-//立体图标、普通图标
-let threePhoto: any = []
-let ordinaryPhoto: any = []
-
 const setPhotoList = () => {
   $sendElectronChanel('requireGEMarkerName', {
     dirName: 'GEMarker',
@@ -431,6 +408,7 @@ const setPhotoList = () => {
         data: item
       })
     })
+    categories.value = [...threePhoto]
   })
 }
 
@@ -465,6 +443,7 @@ defineExpose({
 .set_pup {
   width: 40vw;
   height: 50vh;
+
   :deep(.el-dialog) {
     background:
       linear-gradient(180deg, rgba(0, 255, 255, 0.2) 0%, rgba(0, 255, 255, 0) 100%),
@@ -472,24 +451,30 @@ defineExpose({
     border: 1px solid #00c9ff;
     padding-left: 0 !important;
   }
+
   :deep(.el-dialog__body) {
     padding: 0 !important;
   }
+
   :deep(.el-dialog__headerbtn) {
     height: 30px;
     width: 30px;
     border-bottom-left-radius: 80%;
     background-color: #008989;
+
     &:hover {
       background-color: #00ffff;
+
       .el-dialog__close {
         color: rgba(0, 66, 66, 1); // 悬停时改变关闭图标为红色
       }
     }
   }
+
   :deep(.el-dialog__headerbtn .el-dialog__close) {
     color: #fff;
   }
+
   .set_pup_header {
     width: 100%;
     height: 100%;
@@ -498,6 +483,7 @@ defineExpose({
     justify-content: center;
     align-items: center;
     padding-bottom: 20px;
+
     .system_title {
       background: url('@/assets/images/titlebg.png') no-repeat;
       background-size: 100% 100%;
@@ -511,26 +497,24 @@ defineExpose({
       font-weight: 700;
     }
   }
+
   .set_detail {
     box-sizing: border-box;
+
     // height: 50vh;
-    :deep(
-      .el-tabs--left .el-tabs__active-bar.is-left,
+    :deep(.el-tabs--left .el-tabs__active-bar.is-left,
       .el-tabs--left .el-tabs__active-bar.is-right,
       .el-tabs--right .el-tabs__active-bar.is-left,
-      .el-tabs--right .el-tabs__active-bar.is-right
-    ) {
+      .el-tabs--right .el-tabs__active-bar.is-right) {
       width: 3px;
       background: rgba(0, 255, 255, 1);
       height: 40px !important;
     }
 
-    :deep(
-      .el-tabs--left .el-tabs__nav-wrap.is-left::after,
+    :deep(.el-tabs--left .el-tabs__nav-wrap.is-left::after,
       .el-tabs--left .el-tabs__nav-wrap.is-right::after,
       .el-tabs--right .el-tabs__nav-wrap.is-left::after,
-      .el-tabs--right .el-tabs__nav-wrap.is-right::after
-    ) {
+      .el-tabs--right .el-tabs__nav-wrap.is-right::after) {
       width: 3px;
     }
 
@@ -563,13 +547,16 @@ defineExpose({
       width: 5px;
       height: 5px;
     }
+
     :deep(.el-tabs__content::-webkit-scrollbar-thumb) {
       background-color: #0ff;
       border-radius: 5px;
     }
+
     :deep(.el-tabs__content::-webkit-scrollbar-track) {
       background-color: rgba(0, 255, 255, 0.2);
     }
+
     :deep(.el-tabs__item) {
       width: 8vw;
       color: #fff !important;
@@ -582,50 +569,45 @@ defineExpose({
       margin-bottom: 3px;
       box-sizing: border-box;
     }
+
     :deep(.el-tabs__item:hover) {
-      background: linear-gradient(
-        90deg,
-        rgba(0, 255, 255, 0) 0%,
-        rgba(0, 255, 255, 0.5) 48.91%,
-        rgba(0, 255, 255, 0) 100%
-      );
+      background: linear-gradient(90deg,
+          rgba(0, 255, 255, 0) 0%,
+          rgba(0, 255, 255, 0.5) 48.91%,
+          rgba(0, 255, 255, 0) 100%);
       border: 1px solid;
       box-sizing: border-box;
-      border-image: linear-gradient(
-          90deg,
+      border-image: linear-gradient(90deg,
           rgba(0, 255, 255, 0) 0%,
           rgba(0, 255, 255, 1) 55.55%,
-          rgba(0, 255, 255, 0) 100%
-        )
-        1;
+          rgba(0, 255, 255, 0) 100%) 1;
     }
+
     :deep(.el-tabs__item.is-active) {
-      background: linear-gradient(
-        90deg,
-        rgba(0, 255, 255, 0) 0%,
-        rgba(0, 255, 255, 0.5) 48.91%,
-        rgba(0, 255, 255, 0) 100%
-      ) !important;
+      background: linear-gradient(90deg,
+          rgba(0, 255, 255, 0) 0%,
+          rgba(0, 255, 255, 0.5) 48.91%,
+          rgba(0, 255, 255, 0) 100%) !important;
       border: 0.1px solid;
       // box-sizing: border-box;
-      border-image: linear-gradient(
-          90deg,
+      border-image: linear-gradient(90deg,
           rgba(0, 255, 255, 0) 0%,
           rgba(0, 255, 255, 1) 55.55%,
-          rgba(0, 255, 255, 0) 100%
-        )
-        1 !important;
+          rgba(0, 255, 255, 0) 100%) 1 !important;
     }
+
     :deep(.el-tabs__header) {
       height: 50vh !important;
       width: 8vw;
       overflow-y: auto;
       overflow-x: hidden;
     }
+
     :deep(.el-tabs__nav-next, .el-tabs__nav-prev) {
       color: #fff;
     }
   }
+
   .el-input {
     width: 300px;
     margin-left: 30px;
@@ -637,9 +619,11 @@ defineExpose({
     --el-input-hover-border-color: rgba(var(--color-sdk-base-rgb), 0.5) !important;
     --el-input-focus-border-color: rgba(var(--color-sdk-base-rgb), 0.5) !important;
   }
+
   ::v-deep .el-input__wrapper {
     background-color: rgba(0, 0, 0, 0.5) !important;
   }
+
   .btn {
     float: right;
     height: 32px;
@@ -650,9 +634,11 @@ defineExpose({
     color: #fff !important;
     padding: 0 15px;
   }
+
   .btn:hover {
     color: rgba(var(--color-sdk-base-rgb), 1) !important;
     border: 1px solid rgba(var(--color-sdk-base-rgb), 1) !important;
+
     .setIcon {
       color: rgba(var(--color-sdk-base-rgb), 1) !important;
     }
@@ -670,17 +656,20 @@ defineExpose({
   display: flex;
   height: 100vh;
 }
+
 .model-tabs {
   width: 130px;
   height: 100%;
   float: left;
 }
+
 .treeCon {
   width: 140px;
   height: 100%;
   float: left;
   border-right: 1px solid rgba(204, 204, 204, 0.2);
 }
+
 .model-gallery {
   flex: 1;
   /* padding: 20px; */
@@ -690,16 +679,19 @@ defineExpose({
   float: left;
   margin-left: 10px;
 }
+
 .model-section {
   min-height: 10vh;
   margin-bottom: 40px;
 }
+
 .model-grid {
   display: flex;
   flex-wrap: wrap;
   /* justify-content: space-around; */
   gap: 20px;
 }
+
 .model-name {
   width: 100%;
   height: 30px;
@@ -711,18 +703,22 @@ defineExpose({
 
   color: rgba(255, 255, 255, 1);
 }
+
 .isactive {
   color: rgba(var(--color-sdk-base-rgb), 1) !important;
 }
+
 .model-item {
   border-radius: 8px;
   overflow: hidden;
   width: 70px;
   /* box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1); */
 }
+
 .model-item:hover {
   cursor: pointer !important;
   color: rgba(var(--color-sdk-base-rgb), 1) !important;
+
   .model-name {
     color: rgba(var(--color-sdk-base-rgb), 1) !important;
   }
@@ -734,17 +730,20 @@ defineExpose({
   background: url('@/assets/images/model-bg.png') no-repeat;
   background-size: 100% 100%;
 }
+
 .model-section2 {
   .imgbg {
     background: unset;
   }
 }
+
 .thumbnail {
   width: 64px;
   height: 64px;
   margin-left: 3px;
   margin-top: 3px;
 }
+
 .loading-more {
   text-align: center;
   padding: 20px;
@@ -753,10 +752,12 @@ defineExpose({
 ::v-deep .el-tabs__content {
   display: none !important;
 }
+
 /* 修改滚动条轨道的颜色 */
 ::v-deep ::-webkit-scrollbar-track {
   background: rgba(var(--color-sdk-base-rgb), 0.1) !important;
 }
+
 /* 修改滚动条滑块的样式 */
 ::v-deep ::-webkit-scrollbar-thumb {
   background: rgba(var(--color-sdk-base-rgb), 1) !important;
@@ -773,11 +774,13 @@ defineExpose({
   width: 5px;
   height: 5px;
 }
+
 /* 定义背景颜色和圆角 */
 ::-webkit-scrollbar-thumb {
   border-radius: 1em;
   background-color: rgba(50, 50, 50, 0.3);
 }
+
 /* //定义滚动条轨道 内阴影+圆角 */
 ::-webkit-scrollbar-track {
   border-radius: 1em;
@@ -785,9 +788,10 @@ defineExpose({
 }
 
 /* tree */
-.el-tree-node__content > .el-tree-node__expand-icon {
+.el-tree-node__content>.el-tree-node__expand-icon {
   display: none !important;
 }
+
 .el-tree {
   background: transparent !important;
   --el-tree-node-hover-bg-color: rgba(var(--color-sdk-base-rgb), 0.2) !important;
@@ -797,16 +801,21 @@ defineExpose({
   float: left;
   margin-left: 10px;
 }
+
 ::v-deep .el-text {
   color: rgba(255, 255, 255, 1) !important;
   font-size: 12px !important;
 }
+
 .selected-text {
-  color: rgba(var(--color-sdk-base-rgb), 1) !important; /* Element UI主色，可自定义 */
+  color: rgba(var(--color-sdk-base-rgb), 1) !important;
+  /* Element UI主色，可自定义 */
 }
-::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+
+::v-deep .el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
   border-right: 1px solid rgba(var(--color-sdk-base-rgb), 0.2) !important;
 }
+
 .typeBut {
   left: 527px;
   top: 3764px;
@@ -816,6 +825,7 @@ defineExpose({
   display: flex;
   justify-content: flex-start;
   align-items: flex-start;
+
   span {
     display: block;
     width: 90px;
@@ -835,21 +845,25 @@ defineExpose({
     cursor: pointer;
     color: #fff;
   }
+
   span:hover {
     color: rgba(var(--color-sdk-base-rgb), 1);
     border: 1px solid rgba(var(--color-sdk-base-rgb), 1);
     border-radius: 4px;
   }
 }
+
 .clickButClass {
   color: rgba(var(--color-sdk-base-rgb), 1);
   border: 1px solid rgba(var(--color-sdk-base-rgb), 1) !important;
   border-radius: 4px;
 }
+
 .top {
   display: flex;
   justify-content: space-between;
 }
+
 .typeTitltName {
   font-size: 16px;
   font-weight: 400;
diff --git a/src/renderer/src/views/components/tree/hooks/tree.ts b/src/renderer/src/views/components/tree/hooks/tree.ts
index 684cd54..3f10dc2 100644
--- a/src/renderer/src/views/components/tree/hooks/tree.ts
+++ b/src/renderer/src/views/components/tree/hooks/tree.ts
@@ -6,7 +6,7 @@ import { initMapData } from '../../../../common/initMapData'
 export const useTree = () => {
   const rightMenuRef: any = ref() //右键菜单的实例
   const treeObj = ref() //树形的实例
-  const { getSelectedNodes, showRightMenu, cusSelectNode, getSameLevel, cusNodeIcon } = useTreeNode() //树上一系列的方法hooks
+  const { getSelectedNodes, showRightMenu, cusSelectNode, getSameLevel, cusNodeIcon, nodeType } = useTreeNode() //树上一系列的方法hooks
   const nodes: any = ref([])
   /**
    * 用于捕获zTree上鼠标按键按下后的事件回调函数
@@ -100,14 +100,14 @@ export const useTree = () => {
       item.treeIndex = index
       return {
         ...item,
-        treeIndex: item.getIndex()+1
+        treeIndex: item.getIndex() + 1
       }
     })
     const list = newNode.map((item: any) => {
       return {
         id: item.id,
         treeIndex: item.treeIndex,
-        parentId: item.parentId
+        parentId: item.parentId || ''
       }
     })
     const res = await TreeApi.updateTreeIndex(list)
@@ -190,29 +190,26 @@ export const useTree = () => {
    * @returns {boolean} 返回 false，zTree 将恢复被拖拽的节点，也无法触发 onDrop 事件回调函数
    */
   const beforeDrop = (
-    event: DragEvent,
     treeId: any,
     treeNodes: any,
     targetNode: any,
     moveType: any
   ) => {
-    console.log('开始拖拽之前')
-
-    // if (
-    //   ['prev', 'next', 'inner'].includes(moveType) &&
-    //   ['pressModel', 'terrainDig'].includes(treeNodes[0].sourceType)
-    // ) {
-    //   return false
-    // }
-    // if (['prev', 'next'].includes(moveType)) {
-    //   let parent = this.treeObj.getNodeByParam('id', targetNode.parentId, null)
-    //   if (parent && !treeNodeOption.nodeType[parent.sourceType].allowChildren) return false
-    // }
-    // if (targetNode) {
-    //   if (moveType == 'inner' && !treeNodeOption.nodeType[targetNode.sourceType].allowChildren) {
-    //     return false
-    //   }
-    // }
+    if (
+      ['prev', 'next', 'inner'].includes(moveType) &&
+      ['pressModel', 'terrainDig'].includes(treeNodes[0].sourceType)
+    ) {
+      return false
+    }
+    if (['prev', 'next'].includes(moveType)) {
+      let parent = treeObj.value.getNodeByParam('id', targetNode.parentId, null)
+      if (parent && !nodeType[parent.sourceType].allowChildren) return false
+    }
+    if (targetNode) {
+      if (moveType == 'inner' && !nodeType[targetNode.sourceType].allowChildren) {
+        return false
+      }
+    }
   }
   /**
    * 捕获 checkbox / radio 被勾选 或 取消勾选的事件回调函数
@@ -544,7 +541,7 @@ export const useTree = () => {
       "GDSLImagery",
       "layer",
     ];
-    let layers:any = []
+    let layers: any = []
     if (window.earth) {
       for (let i = 0; i < zNodes.value.length; i++) {
         if (zNodes.value[i].sourceType === 'directory') {
@@ -560,7 +557,7 @@ export const useTree = () => {
         if (!params.name) {
           params.name = zNodes.value[i].sourceName
         }
-        if(arr.includes(zNodes.value[i].sourceType)) {
+        if (arr.includes(zNodes.value[i].sourceType)) {
           layers.push(
             {
               sourceType: zNodes.value[i].sourceType,
@@ -575,7 +572,7 @@ export const useTree = () => {
       layers.sort((obj1, obj2) => {
         return obj1.params.layerIndex - obj2.params.layerIndex;
       });
-      for(let i = 0; i < layers.length; i++) {
+      for (let i = 0; i < layers.length; i++) {
         initMapData(layers[i].sourceType, layers[i].params, null)
       }
     }
diff --git a/src/renderer/src/views/components/tree/hooks/treeNode.ts b/src/renderer/src/views/components/tree/hooks/treeNode.ts
index 90ce6e9..651a45b 100644
--- a/src/renderer/src/views/components/tree/hooks/treeNode.ts
+++ b/src/renderer/src/views/components/tree/hooks/treeNode.ts
@@ -661,6 +661,7 @@ export const useTreeNode = () => {
   }
 
   return {
+    nodeType,
     showRightMenu,
     cusNodeIcon,
     getSelectedNodes,
diff --git a/src/renderer/src/views/home/index.vue b/src/renderer/src/views/home/index.vue
index f27f8c7..c740cfa 100644
--- a/src/renderer/src/views/home/index.vue
+++ b/src/renderer/src/views/home/index.vue
@@ -11,14 +11,8 @@
   <firstMenu class="absolute zIndex9" ref="firstMenuRef"></firstMenu>
   <!--底部菜单-->
   <bottomMenu class="absolute zIndex9" ref="bottomMenuRef"></bottomMenu>
-  <input
-    type="file"
-    id="fileInputlink"
-    style="display: none"
-    multiple
-    accept=".jpeg,.png,.jpg,.mp4,.pdf"
-    @input="uploadFile"
-  />
+  <input type="file" id="fileInputlink" style="display: none" multiple accept=".jpeg,.png,.jpg,.mp4,.pdf"
+    @input="uploadFile" />
 
   <!-- 多点视线分析 -->
   <Visibility ref="visibility"></Visibility>
@@ -135,6 +129,7 @@ let dynamicComponentRef = ref()
 let addStandTextRef = ref()
 let tree = ref()
 let selectImgRef = ref()
+let editdirectoryBox = ref()
 eventBus.on('openDialog', async (sourceType: any, id: any) => {
   console.log(sourceType, id)
   if (dynamicComponentRef.value && dynamicComponentRef.value.close) {
@@ -142,7 +137,7 @@ eventBus.on('openDialog', async (sourceType: any, id: any) => {
   }
   switch (sourceType) {
     case 'directory':
-    $changeComponentPop('.editdirectoryBox', true)
+      editdirectoryBox.value.open()
       // currentComponent.value = addDirectory
       // await nextTick()
       // dynamicComponentRef.value?.open()
@@ -422,9 +417,9 @@ const getStatus = (time) => {
   const currentTimestamp = Date.now()
 
   if (timestamp > currentTimestamp) {
-    ;(window as any).checkAuthIsValid = true
+    ; (window as any).checkAuthIsValid = true
   } else {
-    ;(window as any).checkAuthIsValid = false
+    ; (window as any).checkAuthIsValid = false
   }
 }
 
@@ -441,7 +436,8 @@ onMounted(async () => {
   height: 100%;
 }
 
-.adddirectoryBox, .editdirectoryBox {
+.adddirectoryBox,
+.editdirectoryBox {
   display: none;
 }
 </style>