11-28

electron-builder.yml

@@ -7,6 +7,11 @@ files:
   - 'out/**/*'
   - 'package.json'
   - 'resources/**/*'
+  - '!resources/java/app/license/*'
+  - '!resources/java/app/lib/*'
+  - '!resources/java/app/logs/*'
+  - '!resources/java/app/poi/*'
+  - '!resources/java/app/upload/*'
   - '!node_modules/**/*'
   - '!**/.vscode/*'
   - '!src/*'
@@ -41,6 +46,7 @@ nsis:
   perMachine: true
   allowToChangeInstallationDirectory: true
   language: "2052"
+  deleteAppDataOnUninstall: true
 mac:
   entitlementsInherit: build/entitlements.mac.plist
   extendInfo:

install.txt

@@ -7,3 +7,17 @@
     WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "installurl"
     WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "installurl"
 !macroend
+
+!macro customUnInstall
+    SetRegView 64
+    DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}" ;
+    DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}" ;
+    SetRegView 32
+    DeleteRegKey HKLM "${INSTALL_REGISTRY_KEY}"
+    DeleteRegKey HKCU "${INSTALL_REGISTRY_KEY}"
+
+    Delete "$APPDATA\${APP_ID}\*.*"
+    RMDir /r "$APPDATA\${APP_ID}"
+    Delete "$LOCALAPPDATA\${APP_ID}\*.*"
+    RMDir /r "$LOCALAPPDATA\${APP_ID}"
+!macroend

installer.nsh

@@ -1,9 +1,9 @@
 !macro preInit
     SetRegView 64
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}"
     #writeUninstaller $INSTDIR\uninstaller.exe
     SetRegView 32
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "D:\ProgramFiles\dzsp_shijingjun_offline_Y_save"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$PROGRAMFILES\${APP_ID}"
 !macroend

resources/java/app/application.yml

@@ -1,7 +1,7 @@
 server:
   host: 127.0.0.1
   port: 8848
-  path: C:\Users\Administrator\AppData\Roaming\dzsp_shijingjun_offline_Y_save
+  path: C:\Users\takeshita\AppData\Roaming\dzsp_shijingjun_offline_Y_save
 poi:
   global:
     enabled: false

src/renderer/components.d.ts

@@ -20,10 +20,13 @@ declare module 'vue' {
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
+    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSlider: typeof import('element-plus/es')['ElSlider']

src/renderer/public/sdk/custom/css/index.css

@@ -49,6 +49,10 @@
   --color-text-shadow: rgba(20, 118, 255, 1);
 }
 
+/* .cesium-viewer.\32 d{
+  opacity: 0;
+} */
+
 .cesium-viewer-cesiumWidgetContainer {
   position: relative;
 }
@@ -171,8 +175,12 @@
 
 .YJ-custom-base-dialog button:not(button[disabled]):hover {
   border-color: rgba(var(--color-base1), 1) !important;
+  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;
+}
 
 .YJ-custom-base-dialog button:focus-visible {
   outline: none;
@@ -279,6 +287,10 @@
   padding: 0px 24px;
 }
 
+.YJ-custom-base-dialog>.content .el-tabs .el-tabs__header {
+  margin-bottom: 0;
+}
+
 .YJ-custom-base-dialog>.content .div-item {
   /* border-top: 1px solid rgba(204, 204, 204, 0.2); */
   padding: 12px 0;
@@ -473,6 +485,9 @@
 .YJ-custom-base-dialog>.content .table .table-body .tr:first-child {
   border-top: none;
 }
+.YJ-custom-base-dialog>.content .table .table-body .tr:last-child {
+  border-bottom: 1px solid rgba(var(--color-base1), 0.5);
+}
 
 .YJ-custom-base-dialog>.content .table .table-empty {
   display: flex;
@@ -1773,7 +1788,7 @@
 
 /* 轨迹运动 */
 .YJ-custom-base-dialog.trajectory-motion>.content {
-  width: 550px;
+  width: 562px;
 }
 
 .YJ-custom-base-dialog.trajectory-motion>.content .div-item>.row>.col {
@@ -1802,6 +1817,10 @@
 
 .YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active {
   border-color: rgba(var(--color-base1));
+  color: rgba(var(--color-base1));
+}
+.YJ-custom-base-dialog.trajectory-motion>.content .btn.is-active svg {
+  fill: rgba(var(--color-base1));
 }
 
 .YJ-custom-base-dialog.trajectory-motion>.content .btn-group .btn.is-active>span {
@@ -1827,7 +1846,6 @@
 .YJ-custom-base-dialog.trajectory-motion>.content .icon-rubric {
   width: 16px;
   height: 16px;
-  margin-left: 12px;
 }
 
 .YJ-custom-base-dialog.trajectory-motion>.content .custom__popper__arrow::after {

src/renderer/public/tree/jquery.ztree.core.js

@@ -1492,7 +1492,6 @@
         html.push('</a>')
       },
       makeDOMNodeNameBefore: function (html, setting, node) {
-        console.log('=================', setting, node)
         var title = data.nodeTitle(setting, node),
           url = view.makeNodeUrl(setting, node),
           fontcss = view.makeNodeFontCss(setting, node),

src/renderer/src/I18n/zh-CN.ts

@@ -21,7 +21,7 @@ export default {
     pictureLocation: '带定位照片',
     importPanorama: '带定位全景',
     addBIM: '添加BIM',
-    edit: '编辑节点',
+    edit: '图层属性',
     del: '删除节点',
     setView: '设置视角',
     resetView: '重置视角',
@@ -249,6 +249,7 @@ export default {
     视野缩放: '视野缩放',
     最近距离: '最近距离',
     最远距离: '最远距离',
+    基础信息: '基础信息',
     属性信息: '属性信息',
     空间信息: '空间信息',
     标注风格: '标注风格',

src/renderer/src/I18n/zh-EN.ts

@@ -20,7 +20,7 @@ export default {
     pictureLocation: 'add photo data',
     importPanorama: 'add panoramic data',
     addBIM: 'add BIM',
-    edit: 'edit Node',
+    edit: 'Properties',
     del: 'delete Node',
     setView: 'set View',
     resetView: 'reset View',
@@ -248,6 +248,7 @@ export default {
     视野缩放: 'Field of view zoom',
     最近距离: 'Shortest distance',
     最远距离: 'Farthest distance',
+    基础信息: 'Basic info',
     属性信息: 'Attribute',
     空间信息: 'Spatial info',
     标注风格: 'Mark style',

src/renderer/src/I18n/zh-TW.ts

@@ -20,7 +20,7 @@ export default {
     pictureLocation: '帶定位照片',
     importPanorama: '帶定位全景',
     addBIM: '添加BIM',
-    edit: '編輯節點',
+    edit: '圖層屬性',
     del: '刪除節點',
     setView: '設置視角',
     resetView: '重置視角',
@@ -247,6 +247,7 @@ export default {
     视野缩放: '視野縮放',
     最近距离: '最近距離',
     最远距离: '最遠距離',
+    基础信息: '基礎信息',
     属性信息: '屬性信息',
     空间信息: '空間信息',
     标注风格: '標注風格',

src/renderer/src/assets/styles/global.css

@@ -426,7 +426,6 @@ img {
 .ztree li span.button.switch {
   margin-right: 5px;
 }
-
 #app {
   .ztree * {
     font-size: 14px;
@@ -438,6 +437,9 @@ img {
     margin-bottom: 6px;
   }
 
+  .ztree .checkbox_false_full + a,.ztree .checkbox_false_full_focus + a {
+    color: #d7d7d7;
+  }
   .ztree li a.curSelectedNode {
     background-color: #ffffff00;
     border: none;
@@ -654,6 +656,18 @@ img {
   }
 }
 
+@media (max-width: 1640px) {
+  #app .left .menus .menus_itemBox .item_text {
+    font-size: 1rem;
+  }
+}
+
+@media (max-width: 1450px) {
+  #app .left .menus .menus_itemBox .item_text {
+    font-size: 0.9rem;
+  }
+}
+
 
 /* 提示 */
 /* .el-message--info {

src/renderer/src/common/initMapData.ts

@@ -1,5 +1,8 @@
 import { leftClick, rightClick } from '../../src/views/components/tree/entityClick'
 import { renderVector } from '../views/components/tree/components/hooks/renderVector'
+import { TreeApi } from '@/api/tree'
+import { useTreeNode } from '@/views/components/tree/hooks/treeNode'
+const { cusUpdateNode } = useTreeNode()
 
 export const initMapData = async (type, data, cd) => {
   let entityObject
@@ -115,6 +118,18 @@ export const initMapData = async (type, data, cd) => {
       })
       break
     case 'path':
+      data.customView = {
+        "orientation": {
+          "heading": 0.7281022757737154,
+          "pitch": -40.42354263534561,
+          "roll": 0.00021604950860490326
+        },
+        "relativePosition": {
+          "lng": 0.0002095400000001746,
+          "lat": -0.000447990000001397,
+          "alt": 45.65
+        }
+      }
       entityObject = new YJ.Obj.TrajectoryMotion(window.earth, data)
       break
     case 'wallStereoscopic':
@@ -196,7 +211,7 @@ export const initMapData = async (type, data, cd) => {
     console.log('--------------------onClick')
     //鼠标左键点击事件
     entityObject.onClick = () => {
-      // console.log('onClick')
+      console.log('onClick')
       leftClick(getOptions());
     };
     //鼠标右键点击事件
@@ -204,6 +219,24 @@ export const initMapData = async (type, data, cd) => {
       rightClick(getOptions());
     };
 
+    // 文本框回调
+    if(type === 'textBox') {
+      entityObject.callback = (options) => {
+        let params = structuredClone(options)
+        let sourceName = '文本框'
+        delete params.name
+        delete params.host
+        let params2 = {
+          id: params.id,
+          sourceName:sourceName,
+          params: params,
+          isShow: params.show ? 1 : 0
+        }
+        TreeApi.updateDirectoryInfo(params2)
+        cusUpdateNode({ id: params.id, sourceName: sourceName, params: JSON.stringify(params) })
+      }
+    }
+
     if (entityObject.options.id) {
       (window as any)._entityMap.set(entityObject.options.id, entityObject)
     }

src/renderer/src/icons/svg/direction.svg

@@ -0,0 +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="M8.77035 10.6C9.90075 10.6 10.8204 11.512 10.8204 12.64L10.8204 13.96C10.8204 15.088 9.90075 16 8.77035 16L7.41035 16C6.27995 16 5.36035 15.088 5.36035 13.96L5.36035 12.64C5.36035 11.512 6.27995 10.6 7.41035 10.6L8.77035 10.6ZM8.77035 0C9.90075 0 10.8204 0.911954 10.8204 2.04L10.8204 3.4C10.8204 4.52805 9.90075 5.45 8.77035 5.45L7.41035 5.45C6.27995 5.45 5.36035 4.52805 5.36035 3.4L5.36035 2.04C5.36035 0.911954 6.27995 0 7.41035 0L8.77035 0Z"   fill="#00FFFF" ></path><path d="M3.99 12.74C4.1482 12.4836 4.07175 12.143 3.82 11.98L3.81 11.97C2.2704 11.0239 1.56065 9.71384 1.64 8.23C1.69917 7.1236 2.20671 5.97564 3.04 4.99L3.04 6.81C3.04 7.11113 3.2799 7.36 3.58 7.36L3.59 7.36C3.89177 7.36 4.14 7.11947 4.14 6.82L4.14 6.81L4.14 3.78C4.14 3.47885 3.9001 3.23 3.6 3.23L3.59 3.23L0.55 3.23C0.243841 3.23 0 3.47448 0 3.78C0 4.08113 0.239902 4.34 0.54 4.34L0.55 4.34L2.14 4.34C1.18673 5.4895 0.601475 6.83373 0.53 8.17C0.428738 10.0636 1.34897 11.7641 3.23 12.92C3.49069 13.0802 3.82946 13.0001 3.99 12.74Z"   fill="#00FFFF" ></path><path d="M12.01 3.48754C11.8518 3.74391 11.9282 4.08456 12.18 4.24754L12.19 4.25754C13.7296 5.20361 14.4394 6.5137 14.36 7.99754C14.3008 9.10394 13.7933 10.2519 12.96 11.2375L12.96 9.41754C12.96 9.11641 12.7201 8.86754 12.42 8.86754L12.41 8.86754C12.1082 8.86754 11.86 9.10807 11.86 9.40754L11.86 9.41754L11.86 12.4475C11.86 12.7487 12.0999 12.9975 12.4 12.9975L12.41 12.9975L15.45 12.9975C15.7562 12.9975 16 12.7531 16 12.4475C16 12.1464 15.7601 11.8875 15.46 11.8875L15.45 11.8875L13.86 11.8875C14.8133 10.738 15.3985 9.39381 15.47 8.05754C15.5713 6.16393 14.651 4.46342 12.77 3.30754C12.5093 3.14735 12.1705 3.2274 12.01 3.48754Z"   fill="#00FFFF" ></path></svg>

src/renderer/src/icons/svg/edit.svg

@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="10.5" height="10.5" viewBox="0 0 10.5 10.5" fill="none">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><g  clip-path="url(#clip-path-2256_333)"><path d="M3.74078 6.58137C3.73295 6.59133 3.72512 6.60176 3.72163 6.61434L3.11787 8.8213C3.0826 8.94978 3.11874 9.08822 3.21408 9.18586C3.28548 9.2553 3.3795 9.29351 3.47962 9.29351C3.5127 9.29351 3.54579 9.2896 3.57843 9.2809L5.77629 8.68328C5.77979 8.68328 5.78154 8.68631 5.78414 8.68631C5.80937 8.68631 5.83421 8.6772 5.85294 8.65807L11.73 2.79937C11.9046 2.62513 12.0004 2.38772 12.0004 2.12947C12.0004 1.83674 11.8759 1.54422 11.6578 1.32742L11.1027 0.773191C10.8851 0.555745 10.5913 0.431396 10.2979 0.431396C10.0389 0.431396 9.80075 0.526895 9.62573 0.700699L3.74948 6.56097C3.74341 6.56659 3.74515 6.57485 3.74078 6.58137ZM11.155 2.22562L10.5712 2.8072L9.62485 1.84869L10.2004 1.27491C10.2913 1.18379 10.4676 1.19703 10.5721 1.3016L11.1275 1.85585C11.1855 1.91358 11.2185 1.99038 11.2185 2.06633C11.2181 2.12862 11.1959 2.18505 11.155 2.22562ZM4.78596 6.67338L9.02674 2.44501L9.97356 3.40418L5.74061 7.62428L4.78596 6.67338ZM4.01329 8.38773L4.31975 7.26623L5.13725 8.08132L4.01329 8.38773Z"   fill="#FFFFFF" ></path><path d="M11.5268 4.54734C11.3043 4.54734 11.1219 4.72766 11.1211 4.95248L11.1211 10.4147C11.1211 10.7012 10.8878 10.9338 10.6 10.9338L1.33227 10.9338C1.04496 10.9338 0.810751 10.7012 0.810751 10.4147L0.810751 1.49926C0.810751 1.21257 1.04496 0.979735 1.33227 0.979735L7.30122 0.979735C7.52496 0.979735 7.70653 0.798549 7.70653 0.575451C7.70653 0.352806 7.52496 0.171387 7.30122 0.171387L1.27046 0.171387C0.570049 0.171387 0 0.739297 0 1.43806L0 10.4764C0 11.1751 0.570049 11.7428 1.27046 11.7428L10.6614 11.7428C11.3623 11.7428 11.9321 11.1751 11.9321 10.4764L11.9321 4.94988C11.9312 4.72766 11.7492 4.54734 11.5268 4.54734Z"   fill="#FFFFFF" ></path></g><defs><clipPath id="clip-path-2256_333"><path d="M0 12L12 12L12 0L0 0L0 12Z" fill="white"/></clipPath></defs></svg>
-<path d="M8.25 5.39063L7.4625 4.59844C7.3875 4.52344 7.27031 4.52344 7.19531 4.59844L6.92812 4.86563C6.85312 4.94063 6.85312 5.05782 6.92812 5.13282L8.47031 6.675C8.55937 6.74532 8.68125 6.74532 8.77031 6.675L10.3125 5.13282C10.3875 5.0625 10.3922 4.94063 10.3172 4.86563L10.05 4.59844C9.975 4.52344 9.85781 4.52344 9.78281 4.59844L9 5.39063L9 1.6875C9 1.58438 8.91562 1.5 8.8125 1.5L3.75 1.5L3.75 0.1875C3.75 0.0843751 3.66562 0 3.5625 0L0.1875 0C0.084375 0 0 0.0843751 0 0.1875L0 3.5625C0 3.66563 0.084375 3.75 0.1875 3.75L3.5625 3.75C3.66562 3.75 3.75 3.66563 3.75 3.5625L3.75 2.25L8.25 2.25L8.25 5.39063ZM3 3L0.75 3L0.75 0.75L3 0.75L3 3ZM10.3125 6.75L6.9375 6.75C6.83437 6.75 6.75 6.83438 6.75 6.9375L6.75 10.3125C6.75 10.4156 6.83437 10.5 6.9375 10.5L10.3125 10.5C10.4156 10.5 10.5 10.4156 10.5 10.3125L10.5 6.9375C10.5 6.83438 10.4156 6.75 10.3125 6.75ZM9.75 9.75001L7.5 9.75001L7.5 7.5L9.75 7.5L9.75 9.75001Z"   fill="#FFFFFF" >
-</path>
-</svg>

src/renderer/src/icons/svg/gdb.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="20" height="20" viewBox="0 0 20 20" fill="none"><path d="M17.9272 15.5452C17.5565 15.5452 17.2107 15.6426 16.91 15.8124L15.3662 14.4856L15.3662 8.65075L10.6148 6.12617L10.6148 4.67709C11.5054 4.40086 12.1542 3.5699 12.1542 2.58724C12.1542 1.38042 11.1754 0.400024 9.97061 0.400024C8.76582 0.400024 7.78707 1.38042 7.78707 2.58724C7.78707 3.54273 8.4019 4.35784 9.25633 4.65445L9.25633 6.16014L4.57278 8.65075L4.57278 14.4901L3.19168 15.8735C2.86844 15.6652 2.48418 15.5452 2.07278 15.5452C0.929024 15.5452 0 16.4781 0 17.6215C0 18.7649 0.931284 19.6978 2.07278 19.6978C3.21655 19.6978 4.14557 18.7649 4.14557 17.6215C4.14557 17.386 4.10714 17.1596 4.03481 16.949L5.82052 15.1603L9.96835 17.3679L14.0868 15.1784L16.0104 16.8313C15.9087 17.0758 15.8544 17.343 15.8544 17.6238C15.8544 18.7694 16.7857 19.7 17.9272 19.7C19.0687 19.7 20 18.7672 20 17.6238C20 16.4803 19.071 15.5452 17.9272 15.5452ZM9.85986 10.7746L6.92586 9.19416L9.97061 7.57526L12.8323 9.0968L9.85986 10.7746ZM10.6148 11.9067L13.7816 10.118L13.7816 13.5437L10.6148 15.2282L10.6148 11.9067ZM9.97288 1.75854C10.4295 1.75854 10.8002 2.12987 10.8002 2.58724C10.8002 3.0446 10.4295 3.41593 9.97288 3.41593C9.51627 3.41593 9.14557 3.0446 9.14557 2.58724C9.14557 2.13213 9.51627 1.75854 9.97288 1.75854ZM2.07278 18.3415C1.67722 18.3415 1.35624 18.02 1.35624 17.6238C1.35624 17.2275 1.67722 16.906 2.07278 16.906C2.46835 16.906 2.78933 17.2275 2.78933 17.6238C2.78933 18.02 2.46835 18.3415 2.07278 18.3415ZM6.15506 10.324L9.25859 11.9927L9.25859 15.1943L6.15506 13.5459L6.15506 10.324ZM17.9272 18.3415C17.5316 18.3415 17.2107 18.02 17.2107 17.6238C17.2107 17.2275 17.5316 16.906 17.9272 16.906C18.3228 16.906 18.6438 17.2275 18.6438 17.6238C18.6438 18.02 18.3228 18.3415 17.9272 18.3415Z"   fill="#00FFFF" ></path></svg>

src/renderer/src/icons/svg/layerRaise.svg

@@ -1,4 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="9.857177734375" viewBox="0 0 12 9.857177734375" fill="none">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M3.71958 2.71666L0.414964 2.71666C0.188621 2.71666 0 2.52837 0 2.30241C0 2.07646 0.188621 1.88816 0.414964 1.88816L3.71958 1.88816C3.94592 1.88816 4.13455 2.07646 4.13455 2.30241C4.13455 2.5359 3.95348 2.71666 3.71958 2.71666ZM3.71958 6.01556L0.414964 6.01556C0.188621 6.01556 0 5.82726 0 5.60131C0 5.37536 0.188621 5.18706 0.414964 5.18706L3.71958 5.18706C3.94592 5.18706 4.13455 5.37536 4.13455 5.60131C4.13455 5.8348 3.95348 6.01556 3.71958 6.01556ZM3.71958 9.31445L0.414964 9.31445C0.188621 9.31445 0 9.12616 0 8.90021C0 8.67425 0.188621 8.48596 0.414964 8.48596L3.71958 8.48596C3.94592 8.48596 4.13455 8.67425 4.13455 8.90021C4.13455 9.13369 3.95348 9.31445 3.71958 9.31445ZM4.76832 4.36611L8.02013 1.2329C8.18611 1.07475 8.45773 1.07475 8.62371 1.2329L11.8755 4.36611C12.0415 4.52428 12.0415 4.78788 11.8755 4.94605C11.7926 5.0289 11.6794 5.06656 11.5737 5.06656C11.4681 5.06656 11.3549 5.0289 11.2719 4.94605L8.75197 2.51331L8.75197 10.5572C8.75197 10.7831 8.56335 10.9714 8.32946 10.9714C8.09558 10.9714 7.89941 10.7907 7.89941 10.5572L7.89941 2.51331L5.37944 4.94605C5.21346 5.10422 4.94184 5.10422 4.77586 4.94605C4.60232 4.78788 4.60232 4.52428 4.76832 4.36611Z"   fill="#FFFFFF" ></path></svg>
-<path d="M8.28042 1.6024L11.585 1.6024C11.8114 1.6024 12 1.41411 12 1.18816C12 0.962208 11.8114 0.773909 11.585 0.773909L8.28042 0.773909C8.05408 0.773909 7.86545 0.962208 7.86545 1.18816C7.86545 1.42164 8.04652 1.6024 8.28042 1.6024ZM8.28042 4.9013L11.585 4.9013C11.8114 4.9013 12 4.713 12 4.48705C12 4.26111 11.8114 4.07281 11.585 4.07281L8.28042 4.07281C8.05408 4.07281 7.86545 4.26111 7.86545 4.48705C7.86545 4.72054 8.04652 4.9013 8.28042 4.9013ZM8.28042 8.20019L11.585 8.20019C11.8114 8.20019 12 8.0119 12 7.78595C12 7.55999 11.8114 7.37171 11.585 7.37171L8.28042 7.37171C8.05408 7.37171 7.86545 7.55999 7.86545 7.78595C7.86545 8.01943 8.04652 8.20019 8.28042 8.20019ZM7.23168 3.25185L3.97987 0.118647C3.81389 -0.0395079 3.54227 -0.0395079 3.37629 0.118647L0.124492 3.25185C-0.0414896 3.41002 -0.0414896 3.67363 0.124492 3.83179C0.207422 3.91464 0.320646 3.9523 0.42627 3.9523C0.531894 3.9523 0.64507 3.91464 0.728061 3.83179L3.24803 1.39905L3.24803 9.44293C3.24803 9.66888 3.43665 9.85718 3.67054 9.85718C3.90442 9.85718 4.10059 9.67642 4.10059 9.44293L4.10059 1.39905L6.62056 3.83179C6.78654 3.98996 7.05816 3.98996 7.22414 3.83179C7.39768 3.67363 7.39768 3.41002 7.23168 3.25185Z"   fill="#FFFFFF" >
-</path>
-</svg>

src/renderer/src/icons/svg/preview.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M6 7.49998C5.175 7.49998 4.5 6.82499 4.5 5.99999C4.5 5.175 5.175 4.5 6 4.5C6.825 4.5 7.5 5.175 7.5 5.99999C7.5 6.82499 6.825 7.49998 6 7.49998ZM6 6.37499C6.22499 6.37499 6.375 6.22499 6.375 5.99999C6.375 5.775 6.22499 5.625 6 5.625C5.775 5.625 5.625 5.775 5.625 5.99999C5.625 6.22499 5.775 6.37499 6 6.37499Z"   fill="#00FFFF" ></path><path d="M5.96252 9.75C2.1 9.75 0 6 0 6C0 6 2.13751 2.25 6.00002 2.25C9.90004 2.25 12 6 12 6C12 6 9.86254 9.7125 5.96252 9.75C6.00002 9.75 5.96252 9.75 5.96252 9.75ZM6.00002 8.625C8.32504 8.625 9.93753 6.9 10.65 6C9.97504 5.1 8.36253 3.375 6.00002 3.375C3.67501 3.375 2.06251 5.1 1.35001 6C2.02501 6.9 3.63752 8.625 6.00002 8.625Z"   fill="#00FFFF" ></path></svg>

src/renderer/src/icons/svg/third-party.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="12" height="12" viewBox="0 0 12 12" fill="none"><path d="M9.39102 4.01717C9.54555 4.27468 9.44253 4.58369 9.23649 4.7382L6.5064 6.43778L6.5064 9.52791C6.5064 9.83691 6.30035 10.0429 5.99129 10.0429C5.68222 10.0429 5.47618 9.83691 5.47618 9.52791L5.47618 6.48928L2.64307 4.7897C2.38552 4.6352 2.334 4.32618 2.48854 4.06868C2.64307 3.81116 2.95213 3.75967 3.20969 3.86267L6.0428 5.51074L8.72138 3.81116C8.92742 3.70816 9.23649 3.81116 9.39102 4.01717Z"   fill="#FFFFFF" ></path><path d="M10.885 2.62661L6.55806 0.154507C6.24899 -0.0515022 5.83689 -0.0515022 5.52783 0.154507L1.2009 2.62661C0.891835 2.83262 0.685791 3.14164 0.685791 3.50214L0.685791 8.49786C0.685791 8.85838 0.891835 9.21888 1.2009 9.37339L5.52783 11.8455C5.83689 12.0515 6.24899 12.0515 6.55806 11.8455L10.885 9.37339C11.1941 9.16739 11.4001 8.85838 11.4001 8.49786L11.4001 3.55365C11.4001 3.14164 11.1941 2.83262 10.885 2.62661ZM10.3699 8.49786L6.04294 11.0215L1.71601 8.54936L1.71601 3.55365L6.04294 1.03004L10.3699 3.50214L10.3699 8.49786Z"   fill="#FFFFFF" ></path></svg>

src/renderer/src/utils/index.ts

@@ -67,7 +67,7 @@ export function getNamefromPath(path) {
 }
 
 export function handleInputLimit(e) {
-  if (e.data === '-') {
+  if (e.data === '-' || e.data === '.') {
   }
   else {
     e.target.value = e.target.value || 0

src/renderer/src/views/components/headers/components/tufu_select.vue

@@ -61,7 +61,7 @@ eventBus.on('tufuInput', (data) => {
   // align-items: center;
   // justify-content: center;
   position: absolute;
-  top: 14%;
+  top: 130px;
   right: 15px;
 }
 .el-range-editor.is-active .el-range-editor.is-active:hover,

src/renderer/src/views/components/propertyBox/CircleObject.vue

@@ -10,7 +10,7 @@
           </div>
           <div class="col" style="flex: 0 0 60%;">
             <div class="row">
-              <div class="col input-select-unit-box">
+              <div class="col">
                 <span class="label" style="margin-right: 0px;">投影面积:</span>
                 <input class="input input-text" readonly type="text" v-model="area">
                 <el-select v-model="areaUnit">

src/renderer/src/views/components/propertyBox/FlyRoam.vue

@@ -276,6 +276,7 @@ const draw = (data) => {
 }
 
 const startVideo = () => {
+  //@ts-ignore
   document.getElementById('earthContainer').style.zIndex = 100
   $sendElectronChanel('startRecoder')
   ElMessage({
@@ -287,6 +288,7 @@ const startVideo = () => {
     if (e.key === 'Escape') {
       $sendElectronChanel('endRecoder')
       window.removeEventListener('keydown', handleKeyDown)
+      //@ts-ignore
       document.getElementById('earthContainer').style.zIndex = ''
     }
   }

src/renderer/src/views/components/propertyBox/RoutePlanning.vue

@@ -207,7 +207,7 @@ const open = () => {
           routePlanning.createRoute(res.data.routes[0]?.points)
         }
       } catch (error) {
-        document.getElementById('clearRoute').click()
+        document.getElementById('clearRoute')?.click()
       }
     }
   }, 100)

src/renderer/src/views/components/propertyBox/attackArrow.vue

@@ -11,7 +11,7 @@
           </div>
           <div class="col" style="flex: 0 0 60%;">
             <div class="row">
-              <div class="col input-select-unit-box">
+              <div class="col">
                 <span class="label" style="margin-right: 0px;">投影面积:</span>
                 <input class="input input-text" readonly type="text" v-model="area">
                 <el-select v-model="areaUnit">
@@ -277,6 +277,7 @@ const open = async (id: any, type: any) => {
 
 const heightModeChange = (val) => {
   that.heightMode = heightMode.value
+  entityOptions.value.spreadState = false
 }
 
 const heightConfirm = () => {

src/renderer/src/views/components/propertyBox/attribute.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="attribute">
+  <div class="div-item attribute">
     <div class="row">
       <div class="col attribute-select-box">
         <span class="label" style="line-height: 32px">{{ t('general.内容类型') }}</span>
@@ -237,7 +237,7 @@
         <div class="row">
           <div class="col">
             <span class="label">{{ t('general.编辑内容') }}</span>
-            <input class="input goods-select-input" type="text" style="width: 180px;margin-right: 10px;"
+            <input class="input goods-select-input" type="text" placeholder="请输入关键字" style="width: 180px;margin-right: 10px;"
               v-model="goodsKeywords">
             <button class="select btn" @click="goodsFilter">{{ t('general.搜索') }}</button>
           </div>
@@ -319,7 +319,6 @@ const goodsFilter = () => {
       for (let m = 0; m < goodsList.value.length; m++) {
         if ('id' in goodsList.value[m]) {
           if (goodsList.value[m].id === props.entityOptions.attributeGoods[i].id) {
-            goodsList.value[m].name = props.entityOptions.attributeGoods[i].name
             goodsList.value[m].cnt = props.entityOptions.attributeGoods[i].cnt
             break
           }
@@ -634,7 +633,7 @@ const _addRtmp = () => {
   }
 }
 
-const rtmpEdit = (index: any, item: { name: any; url: any; }) => {
+const rtmpEdit = (index: any, item: { name: any; url: any; id: any; }) => {
   let active = {
     index: index,
     name: item.name,

src/renderer/src/views/components/propertyBox/billboardObject.vue

@@ -3,6 +3,8 @@
     :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">
@@ -54,8 +56,8 @@
                       <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"
+                        <input class="input" type="number" title="" min="-9999999" max="999999999"
-                    @change="changAlt" @input="$handleInputLimit" />
+                          v-model="entityOptions.alt" @change="changAlt" @input="$handleInputLimit" />
                         <span class="unit">m</span>
                         <span class="arrow"></span>
                       </div>
@@ -135,7 +137,8 @@
                   <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 v-for="item in fontList" :key="item.key" :label="t('general.' + item.name)"
+                      :value="item.key">
                     </el-option>
                   </el-select>
                 </div>
@@ -212,14 +215,12 @@
                 </div>
               </div>
             </div>
-      <span class="custom-divider"></span>
+          </el-tab-pane>
-      <div class="div-item">
+          <el-tab-pane :label="t('general.属性信息')" name="2">
-        <div class="row">
-          <el-tabs v-model="activeName" @tab-click="handleClick">
-            <el-tab-pane :label="t('general.属性信息')" name="1">
             <attribute :entityOptions="entityOptions"></attribute>
           </el-tab-pane>
-            <el-tab-pane :label="t('general.空间信息')" name="2">
+          <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>
@@ -335,10 +336,9 @@
                 </div>
               </div>
             </div>
+            </div>
           </el-tab-pane>
         </el-tabs>
-        </div>
-      </div>
       <span class="custom-divider"></span>
     </template>
     <template #footer>
@@ -821,6 +821,7 @@ defineExpose({
       width: 284px;
       flex: 0 0 284px;
     }
+
     .attribute-content-link .table .tr .td.operation button,
     .attribute-content-vr .table .tr .td.operation button,
     .attribute-content-rtmp .table .tr .td.operation button {

src/renderer/src/views/components/propertyBox/curvelineObject.vue

@@ -59,7 +59,7 @@
         <div class="row">
           <div class="col">
             <span class="label">线段缓冲</span>
-            <input class="btn-switch" type="checkbox" v-model="entityOptions.extend" />
+            <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>
@@ -382,6 +382,10 @@ 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') {
+    entityOptions.value.extend = false
+  }
 }
 const heightConfirm = () => {
   that.positionEditing = false
@@ -421,11 +425,16 @@ const changeWordsName = (val) => {
 
 
 const lineTypechange = () => { }
+const lineExtendchange = (e)=>{
+  if(e.target.checked) {
+    heightMode.value = 2
+  }
+}
 const nodeEdit = () => {
   entityOptions.value.positionEditing = false
   entityOptions.value.noseToTail = false
-  heightMode.value = 0
+  // heightMode.value = 0
-  that.heightMode = 0
+  // that.heightMode = 0
   that.nodeEdit((positions, lenByMeter) => {
     entityOptions.value.options.positions = structuredClone(positions)
     if (lengthUnit.value == 'km') {

src/renderer/src/views/components/propertyBox/model.vue

@@ -87,7 +87,7 @@
             placeholder="请输入模型类型进行搜索"
             :suffix-icon="Search"
           />
-          <button @click="setting" class="btn">
+          <button @click="setting" class="btn" v-if="addType !== 'trajectoryMotion'">
             <svg-icon
               name="sys_set"
               class="setIcon"