最新

src/renderer/components/LeftMenu/secondMenuFun.js

@@ -1363,7 +1363,7 @@ const secondMenuFun = {
         if (window.multiViewportMode) {
           processBase64Images(res, res2, (mergedBase64) => {
             this.downloadScreen(mergedBase64);
-            window.multiViewportMode = false;
+            // window.multiViewportMode = false;
           });
         } else {
           let doms = document.querySelectorAll(".cesium-widget");
@@ -1372,7 +1372,7 @@ const secondMenuFun = {
           combineBase64Images(res2, leftWidth, res, rightWidth)
             .then((result) => {
               this.downloadScreen(result)
-              window.splitScreen  = false;
+              // window.splitScreen  = false;
             })
             .catch((err) => console.error("拼接失败:", err));
         }

src/renderer/components/LeftMenu/test.js

@@ -191,7 +191,6 @@ const test = {
       });
     },
     map2d() {
-      console.log('window.splitScreen',window.splitScreen,'window.multiViewportMode',window.multiViewportMode);
       // 判断window.menuList是否存在
       if (window.checkAuthIsValid) {
         if (window.menuList) {
@@ -212,6 +211,7 @@ const test = {
           window.multiViewportMode = true;
           window.splitScreen = false
         } else {
+          console.log("关闭分屏",window.Earth1);
           YJ.Global.multiViewportMode.off(window.Earth1);
           window.multiViewportMode = false;
         }

src/renderer/components/Tree/index.vue

@@ -539,7 +539,7 @@ export default {
         this.value = "";
         let way = localStorage.getItem("searchWay");
         if (way == "net") {
-          treeSearchCb("");
+          // treeSearchCb("");
           this.loading = true;
           const doSearch = () => {
             this.mapModule.plugin(

src/renderer/components/Tree/renderNode.js

@@ -437,9 +437,10 @@ function renderBaseMarker(DbOption) {
   //给点标注增加更换默认图标的功能
   if (renderKey[DbOption.source_type] === "BillboardObject") {
     entity.Dialog.clickChangeDefaultImage = () => {
-      console.log("entity", entity);
+      console.log("entity11111111111111", entity);
 
       let selected = "";
+      let isUrl = false;
       if (entity.billboardDefaultImage) {
         let url = new URL(entity.billboardDefaultImage);
         console.log(url, staticPort);
@@ -450,11 +451,15 @@ function renderBaseMarker(DbOption) {
             `http://localhost:${staticPort}/`,
             ""
           );
+          console.log("selected111", selected);
         } else {
-          selected = entity.billboardImage.replace(
-            `http://localhost:${staticPort}/`,
-            ""
-          );
+          if (YJ.Global.getBillboardDefaultUrl()) {
+            selected = YJ.Global.getBillboardDefaultUrl().replace(
+              `http://localhost:${staticPort}/`,
+              ""
+            );
+            isUrl = true;
+          }
         }
         // selected = `http://localhost:${staticPort}` + url.pathname;
       } else {
@@ -465,13 +470,15 @@ function renderBaseMarker(DbOption) {
           );
         }
       }
+      console.log("selected", selected);
+      
       $sendElectronChanel("requireGEMarkerName", {
         dirName: "GEMarker",
         dirName1s: "GEMarker1s",
       });
       $recvElectronChanel("dirFiles", (e, res) => {
         $changeComponentShow(".selectImgBox", true);
-        window.$root_home_index.$refs.selectImg.init(res, selected);
+        window.$root_home_index.$refs.selectImg.init(res, selected,true,isUrl);
         window.$root_home_index.$refs.selectImg.set("billboardDefaultImage");
       });
       $recvChanel("selectedImg", (data) => {

src/renderer/components/Tree/treeNode.js

@@ -78,6 +78,7 @@ let get_detail_point = (DetailOption) => {
     },
     label: {
       text: DetailOption.name || DetailOption.source_name,
+      fontFamily:0
       // color: "#07f8e4",
       // show: true,
       // fontSize: 20,
@@ -170,13 +171,15 @@ let get_detail_line = (DetailOption) => {
     // polyline: {
     positions: DetailOption.position,
     color: "rgba(255,0,0,1)",
-    width: 3,
     type: 0,
     close: false,
     smooth: false,
     buffer: false,
     buffer_width: 1,
     buffer_color: "#efc312",
+    lineWidth:3,
+    'extend-color':'rgba(255,222,80,.3)',
+    'extend-width':10,
     // }
   };
   recurrenceSetValue(detail, DetailOption);
@@ -235,8 +238,12 @@ let get_detail_panel = (DetailOption) => {
 
     // polygon: {
     positions: DetailOption.position,
-    color: "#ff0000AF",
-    width: 5,
+    color: "rgba(255,0,0,0.5)",
+    
+    line:{
+      width: 3,
+      color: "rgba(255,0,0,1)",
+    },
     type: 0,
     // },
     show: true,

src/renderer/components/selectImg.vue

@@ -44,7 +44,8 @@
           <div style="display: flex;" class="sssssssssss">
             <el-checkbox-group v-model="checkList">
               <el-checkbox :label="item.id" v-for="item in imgList_zidingyi" :key="item.id" style="padding-left: 0;">
-                <div class="imgItem" :style="item.selected ? 'border-color:red' : ''" @click="selectImg(item)">
+                <div class="imgItem" :class="{ selectImg1: selectedId == item.id }"
+                  :style="item.selected ? 'border-color:red' : ''" @click="selectImg(item)">
                   <img :src="url + '/yjearth4.0/api/v1/icon/' + item.id + '/' + item.suffix" />
                 </div>
               </el-checkbox>
@@ -78,6 +79,7 @@ export default {
       isIndeterminate: false,
       checkAll: true,
       isAll: false,
+      selectedId: '',
     };
   },
   mounted() {
@@ -117,11 +119,19 @@ export default {
       })
     },
     //获取列表
-    getList() {
+    getList(url) {
       zidinyi({}, data => {
         this.imgList_zidingyi = data.list || []
+        if (url) {
+          this.selectedId = this.getIdFromUrl(url.pathname)
+        }
       })
     },
+    getIdFromUrl(url) {
+      const regex = /\/icon\/([^\/]+)\//;
+      const match = url.match(regex);
+      return match ? match[1] : null;
+    },
     onSuccess(file) {
       this.getList()
     },
@@ -144,10 +154,14 @@ export default {
     set(key) {
       this.flag = key
     },
-    init(obj, selected, hasGEMarker1 = true) {
-      console.log('obj, selectedobj, selectedobj, selectedobj, selected', obj, selected);
+    init(obj, selected, hasGEMarker1 = true,isUrl) {
       let selectedd
-      this.getList()
+      if (isUrl) {
+        this.getList(new URL(selected))
+      } else {
+        this.getList()
+      }
+      console.log('obj, selectedobj, selectedobj, selectedobj, selected', obj, selected, this.imgList_zidingyi);
       let arr = selected.split("/");
       if (selected.includes('/yjearth4.0/api/v1/icon/')) {
         const parts = selected.split("/");
@@ -351,6 +365,11 @@ export default {
         }
       }
     }
+
+    .selectImg1 {
+      cursor: pointer;
+      border-color: red;
+    }
   }
 }
 </style>

src/renderer/plugin/ztree/newFuzzySearch.js

@@ -150,7 +150,7 @@ window.newFuzzySearch = function(
         // node.checked = false
         zTreeObj.showNode(node);
       });
-      zTreeObj.expandAll(false);
+      // zTreeObj.expandAll(false);
     }
   };
   if (dispatch == "") {

src/renderer/views/dashboard/index.vue

@@ -35,7 +35,7 @@
     <!--左侧二级菜单-->
     <secondMenu class="absolute" ref="secondMenu"></secondMenu>
     <editor class="absolute zIndex99" ref="editor"></editor>
-    <selectImg class="selectImgBox absolute zIndex9999" ref="selectImg"></selectImg>
+    <selectImg class="selectImgBox absolute" ref="selectImg"></selectImg>
     <!--剖面分析-->
     <profileAnalysis class="profileAnalysisBox absolute zIndex99"></profileAnalysis>
     <!--土方分析-->
@@ -1099,7 +1099,9 @@ export default {
     .tufuSelect {
       display: none;
     }
-
+    .selectImgBox{
+      z-index: 9999999;
+    } 
     .scene {
       //width: 5vw;
       //height: 5vw;