更新

src/renderer/assets/i18n/lang/local_en.js

@@ -235,6 +235,7 @@ module.exports = {
     Engineerings: {
       import: "Road import",
       importProject: "Project import",
+      consolidated: "Consolidated import",
       cover: "cover",
       increase: "increase",
       derive: "Project derive",

src/renderer/assets/i18n/lang/local_tw.js

@@ -134,7 +134,7 @@ module.exports = {
     unLock: "鎖定",
   },
   headerTitles: {
-    systemTitle: "係統設置",
+    systemTitle: "係統面板",
     udp: "物理沙盘",
     ConcurrencyControl: "並發量控制",
     localIP: "本地IP",
@@ -210,7 +210,8 @@ module.exports = {
       cover: "覆蓋",
       increase: "增加",
       importProject: "工程導入",
-      derive: "工程導齣",
+      consolidated: "工程合并導入",
+      derive: "工程導出",
       importPOI: "導入POI",
     },
     Hikangs: {

src/renderer/assets/i18n/lang/local_zh.js

@@ -138,7 +138,7 @@ module.exports = {
   },
   headerTitles: {
     //顶部抬头以及系统设置页面文字汉语翻译
-    systemTitle: "系统设置",
+    systemTitle: "系统面板",
     udp: "物理沙盘",
     ConcurrencyControl: "并发量控制",
     localIP: "本地IP",

src/renderer/components/Tree/treeNode.js

@@ -100,6 +100,7 @@ let get_detail_text = (DetailOption) => {
     // },
     // near: 2000,
     // far: 100000,s
+    color: "rgba(255,0,0,1)",
     speed: 0,
     positions: DetailOption.positions,
   };
@@ -118,6 +119,7 @@ let get_detail_text2 = (DetailOption) => {
     // near: 2000,
     // far: 100000,
     speed: 0,
+    color: "rgba(255,0,0,1)",
     positions: DetailOption.positions,
   };
   return detail;
@@ -134,7 +136,7 @@ let get_detail_ellipse = (DetailOption) => {
     center: DetailOption.center,
     semiMajorAxis: DetailOption.semiMajorAxis,
     semiMinorAxis: DetailOption.semiMinorAxis,
-    color: "rgba(255,0,0,0.5)",
+    color: "rgba(255,0,0,1)",
   };
   return detail;
 };
@@ -150,7 +152,7 @@ let get_detail_sector = (DetailOption) => {
     center: DetailOption.center,
     startAngle: DetailOption.startAngle,
     endAngle: DetailOption.endAngle,
-    color: 'rgba(255,0,0,0.5)',
+    color: 'rgba(255,0,0,1)',
   };
   return detail;
 };

src/renderer/components/bottomMenus/bottomMenu.vue

@@ -166,6 +166,7 @@ export default {
   },
   methods: {
     addMarker(option) {
+      let bioahui_id = "2e46e3da8b72d5242e5898170a229ad7"
       if (window.checkAuthIsValid) {
         if (option.source_name == "锁定") {
           if (YJ.Global.Lock.status()) {
@@ -258,6 +259,7 @@ export default {
               addSource(node).then((res) => {
                 if ([0, 200].includes(res.code)) {
                   cusRenderNode(DbOption);
+                  // DbOption.p_id
                   cusAddNodes(this.treeObj, DbOption.p_id, [node]);
                 }
               });

src/renderer/components/dialog/junbiao.vue

@@ -11,7 +11,7 @@
       <div class="boxBody">
         <div style="display: flex;margin-bottom: 10px;">
           <el-input size="small" style="width: 100%;" placeholder="输入关键字进行过滤" @input="searchContent"
-            v-model="filterText">
+            v-model="filterText" prefix-icon="el-icon-search">
           </el-input>
           <!--<el-button type="primary" @click="searchContent('type')" size="small">搜类型</el-button>-->
           <!--<el-button type="primary" @click="searchContent('junbiao')" size="small">搜军标</el-button>-->
@@ -262,6 +262,8 @@ export default {
 
     handleClick() { },
     selectImg({ key, url, name }) {
+      // 军标库图层
+      let jun_biao_id = "3579e514a976c9aad03fde6b6198f464";
       //jun_biao_id: "67bee03d6370434d7e98bcda940e67e7"
       // name: "a常用new_37 (23)"
       //  p_id: "8277e0910d750195b448797616e091ad"
@@ -309,7 +311,8 @@ export default {
           addSource(node).then((res) => {
             if ([0, 200].includes(res.code)) {
               cusRenderNode(DbOption);
-              cusAddNodes(this.treeObj, DbOption.p_id, [node]);
+              // DbOption.p_id
+              cusAddNodes(this.treeObj, jun_biao_id, [node]);
             }
           });
         }

src/renderer/components/dialog/junbiao3d.vue

@@ -120,6 +120,7 @@ export default {
         handleClick() {
         },
         selectImg({ key, url, name, glbUrl }) {
+            let jun_biao_id = "03826cc9d84e13cb404745ebd5b3963e"
             console.log('glbUrlglbUrlglbUrl', glbUrl);
             //jun_biao_id: "67bee03d6370434d7e98bcda940e67e7"
             // name: "a常用new_37 (23)"
@@ -167,7 +168,8 @@ export default {
                     addSource(node).then((res) => {
                         if ([0, 200].includes(res.code)) {
                             // cusRenderNode(DbOption)
-                            cusAddNodes(this.treeObj, DbOption.p_id, [node])
+                            //  DbOption.p_id
+                            cusAddNodes(this.treeObj,jun_biao_id, [node])
                         }
                     });
                 }

src/renderer/components/dialog/model.vue

@@ -137,11 +137,11 @@ export default {
             detailOption.url = model.model_id + ".glb";
             let node = getNodeData(DbOption, detailOption);
             console.log(node);
-
+            let model_id = "43d570f69514904a91b5df9c5f33bc98"
             addSource(node).then((res) => {
               if ([0, 200].includes(res.code)) {
-                // cusRenderNode(DbOption)
-                cusAddNodes(this.treeObj, DbOption.p_id, [node]);
+                // cusRenderNode(DbOption) DbOption.p_id
+                cusAddNodes(this.treeObj, model_id, [node]);
               }
             });
           }

src/renderer/components/myHeaderAll/setTool/js/setTool.js

@@ -153,11 +153,11 @@ export default {
     locate(item) {
       window.clicknum++
       // 获取 localStorage.setItem("gpsCom", this.gpsVal);
-      let gpsCom = localStorage.getItem("gpsCom");
-      if (!gpsCom) {
-        this.$message.warning("请先设置串口");
-        return;
-      }
+      // let gpsCom = localStorage.getItem("gpsCom");
+      // if (!gpsCom) {
+      //   this.$message.warning("请先设置串口");
+      //   return;
+      // }
       if (window.clicknum == 1) {
         this.clickTimer = setTimeout(() => {
           let host = new URL(getIP()).host;

src/renderer/components/myHeaderAll/systemPopup/js/utilTools.js

@@ -974,18 +974,6 @@ export default {
             console.log(err);
             this.$sendChanel("updatePosterComplete", err);
           });
-        // (res) => {
-        //   console.log(123321321321, res);
-        //   // if (res.code == 0) {
-        //   // console.log(123, that.selectModel);
-        //   row.poster_url = "";
-        //   this.$nextTick(() => {
-        //     row.poster_url = res.url + "?" + Math.random();
-        //   });
-        //   this.$sendChanel("updatePosterComplete", res);
-        //   // that.selectModel(row);
-        //   // }
-        // };
       };
       if (!flag) {
         let option = {

src/renderer/components/myHeaderAll/systemPopup/systemPopup.vue

@@ -284,7 +284,7 @@
           <Air />
         </el-tab-pane>
         <!-- 模型管理 -->
-        <el-tab-pane :label="$t('headerTitles.model.title')">
+        <el-tab-pane  :label="$t('headerTitles.model.title')">
           <!-- <model></model> -->
           <div class="modelBtn custom_scroll_bar" v-if="isStandAlone">
             <el-button @click="createLib('model')" type="warning" size="small">{{
@@ -386,7 +386,7 @@
           </div>
         </el-tab-pane>
         <!-- 三维军标 -->
-        <el-tab-pane v-if="false" label="三维军标">
+        <el-tab-pane v-if="false"  label="三维军标">
           <div class="modelBtn custom_scroll_bar" v-if="isStandAlone">
             <el-button @click="createLib('model')" type="warning" size="small">{{
               $t("headerTitles.model.createModelLibrary") }}
@@ -489,7 +489,7 @@
         </el-tab-pane>
         <!-- 军标管理  -->
         <!-- v-if="false" 标准版本  -->
-        <el-tab-pane :label="$t('headerTitles.graphLabel.title')">
+        <el-tab-pane   :label="$t('headerTitles.graphLabel.title')">
           <div class="modelBtn custom_scroll_bar" v-if="isStandAlone">
             <el-button @click="createLib('graphLabel')" type="warning" size="small">{{
               $t("headerTitles.graphLabel.createGraphLabelLibrary") }}

src/renderer/components/myHeaderAll/weather/index.vue

@@ -112,11 +112,11 @@ export default {
 .my_weather {
   display: none;
   position: fixed;
-  top: 100px;
-  left: 280px;
+  top: 85px;
+  left: 260px;
   width: 300px;
   height: 300px;
-  z-index: 19;
+  z-index: 30;
   background: linear-gradient(180deg, rgba(0, 255, 255, 0) 0%, rgba(0, 255, 255, 0.2) 100%), rgba(0, 0, 0, 0.6);
   padding: 10px;
   border: 1.5px solid aqua;

src/renderer/icons/svg/firstMenu/junbiao3d.svg

@@ -1,11 +1,3 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="39.969" height="44.781" viewBox="0 0 39.969 44.781">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #962b01;
-        fill-rule: evenodd;
-      }
-    </style>
-  </defs>
   <path id="形状_16" data-name="形状 16" class="cls-1" d="M45.191,44.768c-2.291-1.3-4.652-2.712-7.084-4-2.137-1.131-4.331-2.149-6.519-3.179-5-2.353-8.283-7.061-6.4-13.539a42.676,42.676,0,0,1,1.823-4.432,21.825,21.825,0,0,0,1.656-6.146,10.262,10.262,0,0,0-2.015-7.975c0.09-.109.173-0.237,0.282-0.346,1.54-1.6,3.08-3.191,4.658-4.828A9.464,9.464,0,0,0,38,3.153,8.947,8.947,0,0,0,44.331.211a9.7,9.7,0,0,0,6.295,2.731A8.833,8.833,0,0,0,56.984,0a4.766,4.766,0,0,0,.462.659c1.489,1.618,3,3.223,4.478,4.854a0.834,0.834,0,0,1,.205.7,16.474,16.474,0,0,0,.937,15.144,10.469,10.469,0,0,1,1.341,7.617,12.612,12.612,0,0,1-4.383,7.106,25.438,25.438,0,0,1-5.017,2.891q-4.046,2.159-8.04,4.413A15.948,15.948,0,0,0,45.191,44.768ZM29.432,6.305a7.547,7.547,0,0,1,1.508,3.831,17.978,17.978,0,0,1-1.155,8.147c-0.648,1.88-1.56,3.678-2.227,5.551C25.524,29.553,28.476,34,32.91,36.07c3.17,1.484,6.308,3.012,9.375,4.681,0.886,0.48,1.771.96,2.56,1.394a13.866,13.866,0,0,1,1.624-1.222c2.695-1.439,5.383-2.891,8.136-4.221a15.7,15.7,0,0,0,4.453-2.891,9.156,9.156,0,0,0,2.8-9,13.03,13.03,0,0,0-1.347-2.9,16.456,16.456,0,0,1-.777-14.364,0.8,0.8,0,0,0,.019-0.639c-1.007-1.3-2.053-2.565-3.093-3.85-3.709,3.543-8.143,3.076-12.2-.243a8.74,8.74,0,0,1-6.038,2.724,10.625,10.625,0,0,1-6.307-2.3C31.215,4.272,30.336,5.276,29.432,6.305Zm15.1-2.6c3.952,3.045,8.245,3.524,12.114.262,0.777,1,1.553,2,2.3,3.012a0.716,0.716,0,0,1-.026.537,17.192,17.192,0,0,0,1.637,16.244,5.734,5.734,0,0,1,.591,3.038,9.245,9.245,0,0,1-5.306,8.289c-2.919,1.58-5.923,3.012-8.868,4.541-0.815.422-1.559,0.985-2.233,1.413-3.632-1.88-7.2-3.786-10.824-5.577a11.651,11.651,0,0,1-4.6-3.633,7.918,7.918,0,0,1-.705-8.193,40.683,40.683,0,0,0,3.042-9.3,11.757,11.757,0,0,0,.058-4.848,31.37,31.37,0,0,0-1.18-3.236c0.494-.531,1.129-1.228,1.8-1.957a10.672,10.672,0,0,0,6.249,2.014A8.8,8.8,0,0,0,44.536,3.7Zm-11,15.125c0.276,0.211.443,0.346,0.616,0.467C36,20.606,37.837,21.93,39.7,23.215a0.719,0.719,0,0,1,.314,1.01c-0.738,2.091-1.444,4.189-2.163,6.287-0.077.23-.148,0.467-0.218,0.7,0.038,0.019.077,0.045,0.115,0.064q3.234-2.389,6.468-4.778c2.182,1.612,4.325,3.2,6.475,4.778l0.115-.1c-0.86-2.526-1.713-5.046-2.579-7.592,2.233-1.58,4.427-3.134,6.622-4.694a1.4,1.4,0,0,0-.687-0.121c-2.316.032-4.633,0.051-6.943,0.109a0.586,0.586,0,0,1-.687-0.492c-0.424-1.433-.879-2.852-1.322-4.279-0.308-.985-0.622-1.976-0.988-3.128-0.866,2.744-1.669,5.314-2.464,7.841H33.532Z" transform="translate(-24.656)"/>
 </svg>

src/renderer/icons/svg/firstMenu/leftMenuBg(2).svg

@@ -1,24 +1,12 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="110" height="615" viewBox="0 0 110 615">
   <defs>
     <style>
-      .cls-1, .cls-2, .cls-3 {
-        fill-rule: evenodd;
-      }
-
       .cls-1 {
         opacity: 0.5;
       }
-
-      .cls-2 {
-        fill: aqua;
-      }
-
-      .cls-3 {
-        fill: #285e5d;
-      }
     </style>
   </defs>
-  <path id="形状_4" data-name="形状 4" class="cls-1" d="M102.644,1.7H7.347L1,30.569V586.5l5.461,24.858h97.065l5.461-24.763V30.569L102.644,1.7"/>
+  <path id="bg" class="cls-1" d="M102.644,1.7H7.347L1,30.569V586.5l5.461,24.858h97.065l5.461-24.763V30.569L102.644,1.7"/>
   <path id="形状_2" data-name="形状 2" class="cls-2" d="M38.779,611.389H5.444L0,587.626V29.379l0.021-.1,6.3-28.659h35.9V2.438H7.785L1.816,29.576V587.429L6.9,609.575H38.779v1.814Zm65.473,0H72.916v-1.814h29.875l5.089-22.146V29.576L101.91,2.438H69.466V0.623h33.9L109.7,29.379V587.626l-0.021.1ZM46.73,17.511V17.4H39.839V14.543h6.782v2.968H46.73v0h0.108V14.326H39.622v3.293h7.216V17.511H46.73Zm22.509,0V17.4H62.348V14.543h6.782v2.968h0.108v0h0.109V14.326H62.131v3.293h7.216V17.511H69.239Zm-15.006.175h-7V14.259h7v3.427Zm7.5,0h-7V14.259h7v3.427Zm15.006,0h-7V14.259h7v3.427ZM44.132,0H46.19l-1.5,2.982H42.61ZM48.61,0h2.059l-1.5,2.982H47.088Zm4.478,0h2.059l-1.5,2.982H51.567Zm4.478,0h2.059l-1.5,2.982H56.045Zm4.478,0H64.1L62.6,2.982H60.523Zm4.478,0h2.059l-1.5,2.982H65ZM22.838,30.067a10.184,10.184,0,1,1,10.19-10.184A10.2,10.2,0,0,1,22.838,30.067Zm0-19.451a9.267,9.267,0,1,0,9.272,9.267A9.281,9.281,0,0,0,22.838,10.616Zm0,15.879a6.611,6.611,0,1,1,6.615-6.611A6.621,6.621,0,0,1,22.838,26.494Zm0-12.764a6.153,6.153,0,1,0,6.157,6.153A6.162,6.162,0,0,0,22.838,13.73Zm4.109,4.686a2.637,2.637,0,1,1-2.637-2.636A2.636,2.636,0,0,1,26.947,18.416Zm-5.474,6.9a1.593,1.593,0,1,1,1.594-1.593A1.6,1.6,0,0,1,21.473,25.321Zm0-2.728a1.135,1.135,0,1,0,1.136,1.134A1.136,1.136,0,0,0,21.473,22.593ZM19.563,604.328a12.914,12.914,0,1,1,12.922-12.914A12.933,12.933,0,0,1,19.563,604.328Zm0-24.666a11.752,11.752,0,1,0,11.759,11.752A11.769,11.769,0,0,0,19.563,579.662Zm0,20.136a8.384,8.384,0,1,1,8.389-8.384A8.4,8.4,0,0,1,19.563,599.8Zm0-16.187a7.8,7.8,0,1,0,7.807,7.8A7.815,7.815,0,0,0,19.563,583.611Zm5.211,5.943a3.344,3.344,0,1,1-3.345-3.343A3.344,3.344,0,0,1,24.774,589.554Zm-6.942,8.755a2.02,2.02,0,1,1,2.021-2.02A2.023,2.023,0,0,1,17.833,598.309Zm0-3.459a1.439,1.439,0,1,0,1.44,1.439A1.441,1.441,0,0,0,17.833,594.85ZM38.846,606.9v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7L48.8,610.66Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7L51.8,610.66Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13L53.8,613.021v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Zm2.991,0v1.635l2.479,2.13-2.479,2.361v1.7l3.977-4.056Z"/>
   <path id="形状_3" data-name="形状 3" class="cls-3" d="M101.884,604.82H68.208v-1.456H100.65l3.612-24.234V32.668L97.7,5.621H12.025L5.636,33.367V560.409H4.183V33.2L4.2,33.12,10.869,4.165H98.764l6.951,28.278-0.01,546.864Z"/>
 </svg>

src/renderer/views/login/index.vue

@@ -12,13 +12,13 @@
         <div class="titleItem">
           <img src="../../assets/images/titleLeft.png" alt="" />
           <div>
-            <!-- <div style="font-size: 4em;font-family: 'youshe';" class="title">
+            <div style="font-size: 4em;font-family: 'youshe';" class="title">
               北斗定位+
             </div>
             <div style="font-size: 3.5em;" class="title">
               便携式应急指挥电子沙盘系统
-            </div> -->
-            <div class="title">{{ $t("title.name") }}</div>
+            </div>
+            <!-- <div class="title">{{ $t("title.name") }}</div> -->
           </div>
           <img src="../../assets/images/titleRight.png" alt="" />
         </div>