综合分析图层修改

public/static/config/config.js

@@ -37,9 +37,15 @@ var systemConfig = {
     crs: "",
     url: "http://aimap.pudong.sh:5236/zjmap/reproduction-service/maps/rest/services/sat-2022s2/proxy?AccessKey=lUaEMxqqhZKLSImGuP/Ergx47orYVyIqHVgxfyGpIurKAy9kdq5uU1cWuTuIXeOM",
     resolutions: [
-      132.2919312505292, 52.91677250021167, 26.458386250105836,
-      13.229193125052918, 5.291677250021167, 2.6458386250105836,
-      1.3229193125052918, 0.5291677250021167, 0.26458386250105836,
+      132.2919312505292, 
+      52.91677250021167, 
+      26.458386250105836,
+      13.229193125052918, 
+      5.291677250021167, 
+      2.6458386250105836,
+      1.3229193125052918, 
+      0.5291677250021167,
+      0.26458386250105836,
       0.13229193125052918,
     ],
     minZoom: 0,
@@ -56,7 +62,7 @@ var systemConfig = {
       0.13229193125052918,
     ],
     minZoom: 0,
-    maxZoom: 7,
+    maxZoom: 9,//7
   },
 };
 

src/components/common/BottomMenus.vue

@@ -296,11 +296,9 @@ export default {
       handler(val) {
         console.log(val);
         if (val.length === 1) {
-          console.log("当前打开了一个预设模型图层");
           this.menus[1].subMenu[0].isForbidden = false;
         }
         if (val.length > 1) {
-          console.log("当前不允许开启预设模型图层");
           this.menus[1].subMenu[0].isForbidden = true;
         }
       },

src/components/common/TopCard.vue

@@ -122,7 +122,7 @@ export default {
     isScroll: {
       handler(val) {
         if (val) {
-          console.log(val, "isScroll");
+          // console.log(val, "isScroll");
         }
       },
       immediate: true,

src/components/map/MapHolder.vue

@@ -4,6 +4,7 @@
     <CaseAuditPopup
       v-show="auditPopupShow"
       :tableObj="auditRefTableObj"
+      :defaultStatus="defaultStatus"
       ref="auditRef"
     />
     <!-- 通用地图属性弹窗 -- 无审计功能 -->
@@ -64,6 +65,7 @@ export default {
         图层构成: "--",
         性质: "--",
       },
+      defaultStatus: "未标记",
     };
   },
   created() {},
@@ -164,6 +166,10 @@ export default {
     },
   },
   methods: {
+    // 添加tiledMapLayer图层
+    addTiledMapLayer(url){
+
+    },
     // 开始标记疑点事件
     startLabelCase() {
       map2DViewer.setDrawTool({ action: "start" });
@@ -232,8 +238,9 @@ export default {
      * @str
      * @properties
      * @sourceType
+     * @defaultStatus
      */
-    createAuditDiv(str, geojsonData, sourceType) {
+    createAuditDiv(str, geojsonData, sourceType, defaultStatus) {
       // 根据ref获取组件的dom元素
       this.currentHtml = this.$refs.auditRef.$el.innerHTML;
       if (this.currentHtml) {
@@ -265,6 +272,13 @@ export default {
               $(`#${str}_id .center-table-item-special select`).val(
                 this.caseStatusMap.get(str)
               );
+              let inputStatus = "";
+              if (
+                this.caseStatusMap.has(str) &&
+                this.caseStatusMap.get(str) === "isTrue"
+              ) {
+                $(`#${str}_id .center-table-item-special input`).val("疑点");
+              }
             }
           }
 
@@ -492,8 +506,6 @@ export default {
     },
     // 疑点审计
     caseAuditEvent() {
-      console.log("当前预设模型图层数");
-
       if (this.currentHtml && this.currentCid) {
         setTimeout(() => {
           this.popup.setContent(
@@ -556,7 +568,7 @@ export default {
 
     mapInit: function () {
       // 遥感影像图层crs
-      systemConfig.imageryLayer.crs = new L.Proj.CRS(
+      let crs = new L.Proj.CRS(
         "EPSG:0986",
         "+proj=tmerc +lat_0=0 +lon_0=121.2751921 +k=1 +x_0=0 +y_0=-3457147.81 +ellps=krass +units=m +no_defs",
         {
@@ -566,20 +578,8 @@ export default {
         }
       );
 
-      // 宝石蓝底图crs
-      systemConfig.blueBlackMap.crs = new L.Proj.CRS(
-        "EPSG:0986",
-        "+proj=tmerc +lat_0=0 +lon_0=121.2751921 +k=1 +x_0=0 +y_0=-3457147.81 +ellps=krass +units=m +no_defs",
-        {
-          resolutions: systemConfig.blueBlackMap.resolutions,
-
-          origin: [-66000, 75000],
-          bounds: L.bounds([-65000, -76000], [75000, 72000]),
-        }
-      );
-
       map2DViewer.map = L.map("map2DViewer", {
-        crs: systemConfig.imageryLayer.crs,
+        crs: crs,
         zoom: 0,
         minZoom: systemConfig.imageryLayer.minZoom,
         maxZoom: systemConfig.imageryLayer.maxZoom,
@@ -603,16 +603,12 @@ export default {
       let imageryLayer = L.esri.tiledMapLayer({
         tileSize: 512,
         url: systemConfig.imageryLayer.url,
+        minZoom: 0,
+        minNativeZoom: 1,
         maxNativeZoom: 7,
+        maxZoom: 18,
       });
       map2DViewer.layers["imagery"] = imageryLayer;
-      // 加载遥感影像sat-2018s2
-      // let imageryLayer2 = L.esri.tiledMapLayer({
-      //   tileSize: 512,
-      //   url: systemConfig.imageryLayerSat2018s2.url,
-      //   maxNativeZoom:7
-      // });
-      // map2DViewer.layers["imagery2"] = imageryLayer2;
     },
     // 传入街道参数，重新渲染区域图层
     getJSonDataToStreet(url, param) {
@@ -773,8 +769,17 @@ export default {
      * @uniqueId label_columnId
      * @mainType  所有图层/预设模型
      * @sourceType 土地资源/林地资源/生态资源/水资源/全部
+     * @defaultStatus 当前疑点图斑的状态 -- 未标记，疑点，非疑点
      */
-    addSinglePolygon(geometry, cid, color, uniqueId, mainType, sourceType) {
+    addSinglePolygon(
+      geometry,
+      cid,
+      color,
+      uniqueId,
+      mainType,
+      sourceType,
+      defaultStatus
+    ) {
       let uniqueIdList = [];
       if (this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId]) {
         uniqueIdList =
@@ -817,11 +822,27 @@ export default {
               图层构成: geoProperties["图层构成"] || "--",
               性质: geoProperties["性质"] || "--",
             };
+            if (defaultStatus === false) {
+              this.defaultStatus = "未标记";
+            }
+            if (defaultStatus === true) {
+              this.defaultStatus = "疑点";
+            }
+            if (defaultStatus === null) {
+              this.defaultStatus = "非疑点";
+            }
+            console.log(defaultStatus, "defaultStatus");
+            this.defaultStatus = defaultStatus;
             this.$refs.auditRef.$nextTick(() => {
               this.currentCid = cid;
               this.currentProperties = geojsonData;
               this.currentSourceType = sourceType;
-              let domItem = this.createAuditDiv(cid, geojsonData, sourceType);
+              let domItem = this.createAuditDiv(
+                cid,
+                geojsonData,
+                sourceType,
+                defaultStatus
+              );
               this.auditPopupShow = true;
               this.popup = L.popup({ maxWidth: 700, maxHeight: 600 })
                 .setLatLng(e.latlng)
@@ -881,34 +902,7 @@ export default {
         }
       });
     },
-    // 综合分析 - 图层绘制面
-    // addPolygonLayer(data, cid, color) {
-    //   data.map(feature => {
-    //     let polygonData = JSON.parse(JSON.stringify(feature));
-    //     let coordinates = polygonData.geometry.coordinates[0];
-    //     let infos = polygonData.properties;
-    //     let polygon = L.polygon(coordinates, {
-    //       color: color,
-    //       weight: 3,
-    //       fillColor: color,
-    //       opacity: 1,
-    //       fillOpacity: 0.4
-    //     }).addTo(map2DViewer.map);
-    //     map2DViewer.polygons[`${cid}_layer`].push(polygon);
-    //     polygon.infos = infos;
-    //     polygon.on("click", e => {
-    //       // console.log(e, "polygon");
-    //       this.auditPopupShow = true;
-    //       // console.log(e.latlng, "获取当前弹窗坐标111");
 
-    //       this.popup = L.popup({ maxWidth: 700, maxHeight: 600 }).setLatLng(e.latlng).setContent(this.createAuditDiv(cid));
-    //       // .openOn(map2DViewer.map);
-    //       this.auditPopupShow = false;
-    //       this.popup.openOn(map2DViewer.map);
-    //       this.currentCid = cid;
-    //     });
-    //   });
-    // },
     deleteSinglePolygon(polygon) {
       map2DViewer.map.removeLayer(polygon);
     },

src/components/popup/CaseAuditPopup.vue

@@ -30,7 +30,7 @@
         </div>
         <div class="center-table-item-special">
           <div class="leftcell">状态</div>
-          <div class="rightcell">未标记</div>
+          <div class="rightcell"><input value="未标记" style="border:none;width:100px;text-align:center;background:transparent;color:#fff;"></div>
         </div>
         <div class="center-table-item-special">
           <div class="leftcell">疑点性质</div>
@@ -69,7 +69,7 @@ import MenuCard from "@/components/layout/MenuCard.vue";
 export default {
   name: "CaseAuditPopup",
   components: { MenuCard },
-  props: ["tableObj"],
+  props: ["tableObj","defaultStatus"],
   data() {
     return {
       status:"normal",
@@ -133,7 +133,7 @@ export default {
     .top-law {
       width: 100%;
       height: 10%;
-      font-size: 16px;
+      font-size: 15px;
       font-family: PingFang SC;
       font-weight: 300;
       font-style: italic;
@@ -144,7 +144,7 @@ export default {
     }
     .center-table {
       width: 100%;
-      height: 60%;
+      height: 65%;
       overflow-y: auto;
       overflow-x: hidden;
       // border: 1px solid #818ca4;
@@ -205,7 +205,7 @@ export default {
     .footer-btn {
       margin: 0 auto;
       width: 50%;
-      height: 20%;
+      height: 17%;
       display: flex;
       align-items: center;
       justify-content: space-around;