1. 切换底图时重新触发卷帘对比；2. 属性弹窗疑点审计功能增加状态

public/static/config/config.js

@@ -43,11 +43,12 @@ var systemConfig = {
       0.13229193125052918,
     ],
     minZoom: 0,
-    maxZoom: 7,
+    maxZoom: 9,
   },
   imageryLayerSat2018s2: {
     crs: "",
-    url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2019s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
+    // url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2022s1/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
+    url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2018s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
     resolutions: [
       132.2919312505292, 52.91677250021167, 26.458386250105836,
       13.229193125052918, 5.291677250021167, 2.6458386250105836,
@@ -61,7 +62,7 @@ var systemConfig = {
 
 //地图全局变量声明
 var map2DViewer = {
-  baseMapCollection:[],
+  baseMapCollection: [],
   markers: {},
   polygons: {},
   polylines: {},

src/components/map/MapHolder.vue

@@ -465,7 +465,8 @@ export default {
         map2DViewer.jlMap = L.esri
           .tiledMapLayer({
             tileSize: 512,
-            url: systemConfig.imageryLayer.url,
+            url: systemConfig.imageryLayerSat2018s2.url,
+            maxNativeZoom:7
           })
           .addTo(map2DViewer.map);
         map2DViewer.jlControl = L.control
@@ -592,22 +593,25 @@ export default {
         .tiledMapLayer({
           tileSize: 512,
           url: systemConfig.blueBlackMap.url,
+          maxNativeZoom:7
         })
         .addTo(map2DViewer.map);
       map2DViewer.layers["darkmap"] = layer;
 
-      // 加载遥感影像sat-2022s1 -- 暂时代替宝石蓝底图
+      // 加载遥感影像sat-2022s1
       let imageryLayer = L.esri.tiledMapLayer({
         tileSize: 512,
         url: systemConfig.imageryLayer.url,
+        maxNativeZoom:7
       });
       map2DViewer.layers["imagery"] = imageryLayer;
       // 加载遥感影像sat-2018s2
-      let imageryLayer2 = L.esri.tiledMapLayer({
-        tileSize: 512,
-        url: systemConfig.imageryLayerSat2018s2.url,
-      });
-      map2DViewer.layers["imagery2"] = imageryLayer2;
+      // let imageryLayer2 = L.esri.tiledMapLayer({
+      //   tileSize: 512,
+      //   url: systemConfig.imageryLayerSat2018s2.url,
+      //   maxNativeZoom:7
+      // });
+      // map2DViewer.layers["imagery2"] = imageryLayer2;
     },
     // 传入街道参数，重新渲染区域图层
     getJSonDataToStreet(url, param) {

src/components/popup/CaseAuditPopup.vue

@@ -28,6 +28,10 @@
           <div class="leftcell">{{ key }}</div>
           <div class="rightcell">{{ value }}</div>
         </div>
+        <div class="center-table-item-special">
+          <div class="leftcell">状态</div>
+          <div class="rightcell">未标记</div>
+        </div>
         <div class="center-table-item-special">
           <div class="leftcell">疑点性质</div>
           <div class="rightcell">

src/views/ComprehensiveAnalysis.vue

@@ -89,10 +89,10 @@
       当前显示的疑点数 : &nbsp;<span>{{ currentTotal }}</span>
     </div>
     <div class="comprehensive-analysis-leftjuanlianInfo" v-show="showJLInfo">
-      sat2019-s1
+      {{ basemapName }}
     </div>
     <div class="comprehensive-analysis-rightjuanlianInfo" v-show="showJLInfo">
-      sat2022-s1
+      sat2018-s2
     </div>
     <!-- 属性弹窗 -->
     <AttributePopup
@@ -418,6 +418,7 @@ export default {
   },
   data() {
     return {
+      basemapName: "",
       satImgChecked: false,
       airImgChecked: false,
       basemapChecked: "",
@@ -941,9 +942,12 @@ export default {
         map2DViewer.layers["imagery"] = L.esri.tiledMapLayer({
           tileSize: 512,
           url: data.mapUrl,
+          maxNativeZoom: 7,
         });
         map2DViewer.map.addLayer(map2DViewer.layers["imagery"]);
+        this.basemapName = data.abbr;
       }
+      this.$bus.$emit("reJLControl");
       this.satImgChecked = false;
       this.airImgChecked = false;
     },