From 38dc484e31723adb7b5e0869d91cc60e6590ee6a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十二月 2023 17:17:40 +0800
Subject: [PATCH] 测试结果修复

---
 src/components/map/viewer.vue |   65 +++++++++++++++++++++++---------
 1 files changed, 46 insertions(+), 19 deletions(-)

diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index a29d709..b8e0ad5 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -3,29 +3,53 @@
     <div id="sdkContainer"></div>
     <div class="listBox" v-show="viewer1Show && !isLand">
       <ul id="viewer_lsyx">
-        <li v-for="(item, index) in arr" :key="index" @click="changeLeftMap($event, item, index)">
+        <li
+          v-for="(item, index) in arr"
+          :key="index"
+          @click="changeLeftMap($event, item, index)"
+        >
           {{ item }}
         </li>
       </ul>
     </div>
     <layerTreeTwoScreen v-if="layerTreeTwoScreen" />
     <!-- <div id="bottomInfo" v-html="bottomInfo"></div> -->
-    <div id="switchImagerLayer" :style="{
-      transform: `scale(${scale}) translate(${offset},${offset})`,
-      '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
-      '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
-    }">
-      <transition name="animate__animated animate__bounce" @click="switchImagerLayerShowOrHide"
-        enter-active-class="animate__backInRight" leave-active-class="animate__backOutRight" appear>
+    <div
+      id="switchImagerLayer"
+      :style="{
+        transform: `scale(${scale}) translate(${offset},${offset})`,
+        '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
+        '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
+      }"
+    >
+      <transition
+        name="animate__animated animate__bounce"
+        @click="switchImagerLayerShowOrHide"
+        enter-active-class="animate__backInRight"
+        leave-active-class="animate__backOutRight"
+        appear
+      >
         <switchImagerLayer ref="switchImagerLayer" v-show="switchImagerLayer" />
       </transition>
 
-      <img class="swichImg" @click="switchImagerLayerShowOrHide" :src="switchImage" />
+      <img
+        class="swichImg"
+        @click="switchImagerLayerShowOrHide"
+        :src="switchImage"
+      />
       <div class="bgbox">
-        <img class="swichImg" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
-        <img class="swichImg bgbox" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
+        <img
+          class="swichImg"
+          @click="switchImagerLayerShowOrHide"
+          src="@/assets/img/new/shiliang.png"
+        />
+        <img
+          class="swichImg bgbox"
+          @click="switchImagerLayerShowOrHide"
+          src="@/assets/img/new/shiliang.png"
+        />
       </div>
     </div>
   </div>
@@ -145,7 +169,7 @@
         }
       );
       window.Viewer = sgworld._Viewer;
-
+      sgworld._Viewer.scene.moon.show = false;
       window.sgwfs = new SmartEarth.WFSTool(sgworld._Viewer, Cesium);
       Viewer.shadows = false;
       //娣卞害妫�娴�
@@ -264,7 +288,7 @@
     },
     initLSYX() {
       let ul = document.getElementById("viewer_lsyx");
-      let lis = ul.getElementsByTagName('li');
+      let lis = ul.getElementsByTagName("li");
       lis[19].click();
     },
     destroyImageLayer() {
@@ -297,14 +321,12 @@
         nLayer = null;
       }
       nLayer = this.loadBJ54ImageLayer(year);
-      if (!LWLayer||Viewer.imageryLayers.indexOf(LWLayer)<0) {
-        if(LWLayer)
-        {
+      if (!LWLayer || Viewer.imageryLayers.indexOf(LWLayer) < 0) {
+        if (LWLayer) {
           LWLayer.destroy();
         }
         LWLayer = this.loadBJ54LWLayer();
       }
-
     },
     loadBJ54LWLayer() {
       let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
@@ -452,6 +474,11 @@
           cancel: function () {
             if (cancelFn && typeof cancelFn === "function") {
               cancelFn();
+              if (window.pickFeature && window.pickFeature.primitive) {
+                window.pickFeature.primitive.image = imgUrl;
+                window.pickFeature.primitive.scale = scale;
+                window.pickFeature = null;
+              }
             }
           },
           end: function () {

--
Gitblit v1.9.3