打包

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

@@ -193,9 +193,12 @@ export default {
     speedUnit: '速度单位',
     administrativeArea: '行政区划',
     skinList: {
-      yingguangse: '荧光色',
-      gonganlan: '科技蓝',
-      hong: '烈日红'
+      color1: '标准蓝',
+      color2: '军队绿',
+      color3: '湖光绿',
+      color4: '科技蓝',
+      color5: '骄阳红',
+      color6: '活力橙',
     }
   },
   searchWay: {

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

@@ -193,9 +193,12 @@ export default {
     speedUnit: 'speed',
     administrativeArea: 'administrativeArea',
     skinList: {
-      yingguangse: 'Fluorescent',
-      gonganlan: 'Tech Blue',
-      hong: 'Sun Red'
+      color1: 'Standard Blue',
+      color2: 'Army Green',
+      color3: 'Lake Green',
+      color4: 'Technology Blue',
+      color5: 'Sun Red',
+      color6: 'Vibrant Orange',
     }
   },
   searchWay: {

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

@@ -193,10 +193,13 @@ export default {
     speedUnit: '速度單位',
     administrativeArea: '行政區劃',
     skinList: {
-      yingguangse: '熒光色',
-      gonganlan: '科技藍',
-      hong: '烈日紅'
-    },
+      color1: '標准藍',
+      color2: '軍隊綠',
+      color3: '湖光綠',
+      color4: '科技藍',
+      color5: '驕陽紅',
+      color6: '活力橙',
+    }
   },
   searchWay: {
     title: '搜索方式',

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

@@ -3,7 +3,7 @@
     <div class="head_box">
       <!-- <span class="head_title">实景三维电子沙盘系统</span> -->
       <!-- <headSvg style="width: 100%;height: 100%;"></headSvg> -->
-      <img width="100%" height="100%" :src="`../../../src/assets/images/theme/${skinInfo}/head.png`" alt="" />
+      <img width="100%" height="100%" :src="headImg" alt="" />
     </div>
     <div class="dateTime">
       <span>{{ date.hms }}</span>
@@ -27,6 +27,32 @@ import { useI18n } from 'vue-i18n'
 import setTool from './components/setTool/setTool.vue'
 import weather from './components/weather/index.vue'
 import headSvg from './components/head_svg.vue'
+import color1 from '@/assets/images/theme/color1/head.png'
+import color2 from '@/assets/images/theme/color2/head.png'
+import color3 from '@/assets/images/theme/color3/head.png'
+import color4 from '@/assets/images/theme/color4/head.png'
+import color5 from '@/assets/images/theme/color5/head.png'
+import color6 from '@/assets/images/theme/color6/head.png'
+
+const headImg = computed(() => {
+  switch (skinInfo.value) {
+    case 'color1':
+      return color1
+    case 'color2':
+      return color2
+    case 'color3':
+      return color3
+    case 'color4':
+      return color4
+    case 'color5':
+      return color5
+    case 'color6':
+      return color6
+    default:
+      return color1
+  }
+})
+
 
 const skinInfo = ref(JSON.parse(localStorage.getItem("systemSetting") || '{}').skinInfo || 'color1')
 

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

@@ -93,7 +93,7 @@
               <div class="td" style="width: 80px; flex: 0 80px; min-width: 80px">{{ item.type }}</div>
               <div class="td" style="width: 126px; flex: 0 126px; min-width: 126px">{{ item.ip }}</div>
               <div class="td" style="width: 80px; flex: 0 80px; min-width: 80px">{{ item.port }}</div>
-              <div class="td" style="width: 80px; flex: 0 80px; min-width: 80px">{{ item.userName }}</div>
+              <div class="td" style="width: 80px; flex: 0 80px; min-width: 80px">{{ item.username }}</div>
               <div class="td">{{ item.password }}</div>
             </div>
           </div>

src/renderer/src/views/components/tree/hooks/tree.ts

@@ -571,7 +571,7 @@ export const useTree = () => {
 
     let res = await TreeApi.getTreeList()
     if ([0, 200].includes(res.code)) {
-      res.data.sort((a: any, b: any) => {
+      res.data.list.sort((a: any, b: any) => {
         if (a.treeIndex && b.treeIndex) {
           return a.treeIndex - b.treeIndex
         }
@@ -586,28 +586,28 @@ export const useTree = () => {
       //将模型压平
       (window as any).pressModelMap = new Map();
       (window as any).pressModelEntities = new Map();
-      for (let i = res.data.length - 1; i >= 0; i--) {
-        if (!res.data[i].id) {
-          // res.data.splice(i, 1);
-          res.data[i].id = generateRandomString(20, false)
+      for (let i = res.data.list.length - 1; i >= 0; i--) {
+        if (!res.data.list[i].id) {
+          // res.data.list.splice(i, 1);
+          res.data.list[i].id = generateRandomString(20, false)
         }
-        if (res.data[i].sourceType == "pressModel") {
-          const obj = JSON.parse(res.data[i].params);
-          (window as any).pressModelMap.set(res.data[i].id + "_" + obj.modelId, res.data[i]);
+        if (res.data.list[i].sourceType == "pressModel") {
+          const obj = JSON.parse(res.data.list[i].params);
+          (window as any).pressModelMap.set(res.data.list[i].id + "_" + obj.modelId, res.data.list[i]);
         }
-        if (arr.includes(res.data[i].sourceType) && !res.data[i].params) {
-          res.data[i].params = JSON.stringify({
-            id: res.data[i].id,
-            name: res.data[i].sourceName,
-            show: res.data[i].isShow,
+        if (arr.includes(res.data.list[i].sourceType) && !res.data.list[i].params) {
+          res.data.list[i].params = JSON.stringify({
+            id: res.data.list[i].id,
+            name: res.data.list[i].sourceName,
+            show: res.data.list[i].isShow,
             alpha: 1,
             brightness: 1
           })
         }
-        res.data[i].svg = await cusNodeIcon(res.data[i]);
+        res.data.list[i].svg = await cusNodeIcon(res.data.list[i]);
       }
     }
-    zNodes.value = res.data
+    zNodes.value = res.data.list
     treeObj.value = $.fn.zTree.init($(selector), setting, zNodes.value);
     window.treeObj = treeObj.value;
     window.AllNodes = treeObj.value.getNodes();