4.0bug修改

src/renderer/components/LeftMenu/secondMenuFun.js

@@ -995,10 +995,10 @@ const secondMenuFun = {
       //   this.$message.warning("请在图层指挥舱中选中对应图层添加");
       //   return;
       // }
-      $changeComponentShow(".modelBox", true);
-      $root_home_index.$refs.model.open("rightMenu");
-      this.$recvChanel("selectModel", (data) => {
-        this.$changeComponentShow(".modelSelectBox", false);
+      $changeComponentShow(".modelBoxg", true);
+      $root_home_index.$refs.modelg.open("rightMenu");
+      this.$recvChanel("selectModelg", (data) => {
+        this.$changeComponentShow(".modelBoxg", false);
         let url = data.model_id + ".glb";
         console.log("urlurlurlurlurlurl", url);
 
@@ -1189,12 +1189,16 @@ const secondMenuFun = {
         {},
         {
           clickSavePath: (data) => {
+            console.log(1232,data);
+            let is_show = data.repeat == "Infinity" ? true : false;
+            let source_name = data.name; 
             let source_id = this.$md5(new Date().getTime() + "漫游路径");
             let DbOption = {
               source_id,
-              source_name: "漫游路径",
+              source_name: source_name || "漫游路径",
               source_type: "roam",
               p_id: findParentId(this.treeObj),
+              is_show,
               detail: {
                 ...data,
               },

src/renderer/components/Tree/components/rightMenuOption.js

@@ -671,6 +671,7 @@ const rightMenuOption = {
 
               // 更新节点的勾选状态
               this.$parent.treeObj.checkNode(node, data, isShow);
+              
               // 触发check事件来更新数据库
               let source_ids = [node.source_id];
               if (isShow) {

src/renderer/components/myHeaderAll/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="header_top">
     <!-- <svg-icon icon-class="Head" :class-name="['headItem']"></svg-icon> -->
-    <img style="width:100%;" :src="require('@/assets/images/812/' + skinInfo + '/head.png')" alt="" />
+    <img style="width:100%;" :src="require('@/assets/images/shijingjun/' + skinInfo + '/head.png')" alt="" />
     <div class="dateTime">
       <span>{{ date.ymd }}</span>
       <span>{{ $t("headerTitles.week")[date.week] }}</span>

src/renderer/components/myHeaderAll/setTool/setTool.vue

@@ -51,14 +51,14 @@ export default {
       setList: [
         //北斗图标
         // 标准版本
-        {
-          id: 0,
-          index: 0,
-          icon: "locate",
-          className: "header_public",
-          dbcallback: this.flyTo,
-          callback: this.locate,
-        },
+        // {
+        //   id: 0,
+        //   index: 0,
+        //   icon: "locate",
+        //   className: "header_public",
+        //   dbcallback: this.flyTo,
+        //   callback: this.locate,
+        // },
         {
           id: 1,
           index: 1,

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

@@ -373,6 +373,11 @@ export default {
       this.$prompt("请输入模型类型", "修改模型类型", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
+        inputValidator: (value) => {
+          // 验证规则：不能为空（不能是纯空白字符），其他内容都允许
+          return /.*\S+.*/.test(value);
+        },
+        inputErrorMessage: '请输入模型类型',
         inputValue: type_name,
       })
         .then(({ value }) => {
@@ -586,6 +591,11 @@ export default {
       this.$prompt("", "修改军标", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
+        inputValidator: (value) => {
+          // 验证规则：不能为空（不能是纯空白字符），其他内容都允许
+          return /.*\S+.*/.test(value);
+        },
+        inputErrorMessage: '内容不能为空',
         inputValue: row.name,
       })
         .then(({ value }) => {
@@ -1305,7 +1315,9 @@ export default {
       add_default({}, (res) => {
         if (res == null) {
           this.$message.success("添加完成,2秒后，将重启系统");
+
           setTimeout(() => {
+            window.clicknum = 0;
             this.$sendElectronChanel("restart");
           }, 2000);
         }

src/renderer/views/dashboard/index.vue

@@ -79,7 +79,7 @@
       <!-- <img src="@/assets/images/81.gif" /> -->
       <!-- <img src="@/assets/images/rotation.gif" /> -->
       <!--      <img src="@/assets/images/地球.gif" />-->
-      <img :src="require('@/assets/images/812/' + skinInfo + '/logo.png')" alt="" />
+      <img :src="require('@/assets/images/shijingjun/' + skinInfo + '/logo.png')" alt="" />
       <!--      <img src="@/assets/images/3c60ff3cd2d9e0547ada43a58fa60c3.png">-->
       <!--      <img src="@/assets/images/aaaaaa.webp">-->
       <!--      <button v-for="item in optionss" @click="addMarker(item)">{{ item.source_name }}</button>-->

src/renderer/views/login/index.vue

@@ -252,7 +252,7 @@ export default {
       selectedService: "接口服务",
       serviceOptions: [
         { name: "接口服务" },
-        { name: "北斗串口" }
+        // { name: "北斗串口" }
       ],
       servVal: "单机",
       gpsVal: "",