Преглед изворни кода

修改地图全景和测量使用

zk пре 1 година
родитељ
комит
7f5561864c
3 измењених фајлова са 45 додато и 18 уклоњено
  1. 0 9
      package-lock.json
  2. 43 7
      src/views/home/Header.vue
  3. 2 2
      src/views/home/Home.vue

+ 0 - 9
package-lock.json

@@ -17393,15 +17393,6 @@
         "strip-ansi": "^6.0.1"
       }
     },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "strip-ansi": {
       "version": "6.0.1",
       "resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",

+ 43 - 7
src/views/home/Header.vue

@@ -62,9 +62,14 @@ export default {
   import Tools from './cpns/tools/Tools.vue'
   import LunDuMessage from './cpns/boatPanel/LunDuMessage.vue'
   import SelectForUnit from './SelectForUnit.vue'
-
   import { asideShow } from '@/store/index'
   import {ElMessage} from "element-plus";
+
+  // 地图方法
+  import {fullExtent,calculation} from "@/utils/map/ArcgisUtil"
+
+
+
   let ldData=reactive({value: ''})
   const  checkLinDu=ref(false)
   const checkSelect = ref(false)
@@ -107,14 +112,45 @@ export default {
 
   function changeImage(index,name) {
     isCheck.value.data.forEach(i=>{
-      if(i.imageName===name&&!i.click){
-        i.click=true;i.checkIoc=true
+      if(i.imageName===name) {
+        console.log(name)
+        i.click =  !i.click ;
+        i.checkIoc = !i.checkIoc;
+        if (i.click) {
+          // 选择
+          if (name == 'qj') {
+            //返回全景
+            fullExtent();
+            i.click =  !i.click ;
+            i.checkIoc = !i.checkIoc;
+          } else if (name == 'ss') {
+            togglePageAside()
+          }else if (name == 'cl') {
+            calculation('distance')
+          }else if (name == 'cm') {
+            calculation('area')
+          }
+        }else {
+
+          // 取消
+          if (name == 'qj') {
+            //返回全景
+            fullExtent();
+          } else if (name == 'ss') {
+            togglePageAside()
+          }else if (name == 'cl') {
+
+            calculation('distance')
+
+          }else if (name == 'cm') {
+
+            calculation('area')
+
+          }
+        }
 
       }
-      else {
-        i.click=false;
-        i.checkIoc=false
-      }
+
     })
   }
 

+ 2 - 2
src/views/home/Home.vue

@@ -8,9 +8,9 @@
     <HomeHeader class="header" />
     <TabSwitch class="navi"/>
 <!--    <UeVideo class="ue"/>-->
-    <Map ref="map" class="map"></Map>
     <ComPage class="common"/>
     <RouterView class="page"/>
+    <Map ref="map" class="map"></Map>
   </div>
 </template>
 
@@ -120,7 +120,7 @@ export default {
   }
 
   .map {
-    z-index: -1;
+    z-index: -100;
   }
 }
 </style>