Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/view/analyze.vue

@@ -1023,6 +1023,7 @@ const getData = async () => {
       
     }
   });
+  //调用借助页面的接口
   await http.get("/api/ggfwyth/succour").then((res) => {
     if (res.code == 200) {
       data.dataAnalysis.forEach((item,index)=>{
@@ -1055,7 +1056,6 @@ const getData = async () => {
         data.dataAnalysis[5].data.push(item.jzrs);
       });
     }
-    jz.value = '1';
     data.list = data.dataAnalysis[0];
   });
      showEchart.value = true;

src/view/sy_map_fb.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="module">
     <teleport to="body">
-      <div id="map" style="width: 100vw; height: 100vh" v-show="!openD"></div>
+      <div id="map" style="width: 100vw; height: 100vh" ></div>
       <div class="btns" v-if="showEdit">
         <div
           class="btnopen"
@@ -80,7 +80,7 @@
       </div>
       <div
         class="btnBj"
-        v-if="!showEdit && !dialogShow && !openD && !showEdit2"
+        v-if="!showEdit && !dialogShow && !showEdit2"
         @click="openqx()"
       >
         地图权限：
@@ -210,12 +210,6 @@ import { ElMessage, ElMessageBox } from "element-plus";
 import tools from "@/utils/tools";
 import http from "@/utils/request.js";
 import dwd from "@/assets/images/map/dwd.png";
-import b1 from "@/assets/images/map/bb1.png";
-import b2 from "@/assets/images/map/b2.png";
-import b3 from "@/assets/images/map/b3.png";
-import b4 from "@/assets/images/map/b4.png";
-import b5 from "@/assets/images/map/b5.png";
-import b6 from "@/assets/images/map/b6.png";
 import xcbg from "@/assets/images/map/xcbg.png";
 import AED from "@/assets/images/map/AED.png";
 // import gcj02towgs84 from "@/utils/gcj02towgs84.js";