法律法规 && 同屏对比

public/static/config/config.js

@@ -25,13 +25,14 @@ var map2DViewer = {
   polylines: {},
   circles: {},
   map: null,
+  maps: [],
   jlMap: null,
   jlControl: {},
   layers: {},
   groups: {},
   // 我的标记
   myLabels: {},
-  overlay:{}
+  overlay:{},
 };
 
 // 存放tree中图层node id

src/api/url.js

@@ -30,4 +30,7 @@ export default {
   updateAudit: "/dms/content/updateAudit",
   // 叠置分析接口 - get
   overlayAnalysis: "/audit/audit/overlayAnalysis",
+  // 频发问题排序
+  // 参数 field = c_wtfl,columnId = 24
+  selectGroupByCountOrderBy:"/dms/content/selectGroupByCountOrderBy"
 };

src/components/common/BottomForm/CustomModelDialog.vue

@@ -213,7 +213,7 @@ export default {
     this.checkedKeysArr = [];
     this.getColumnList();
     // DMS - 任务类型
-    // 水资源 - 2；林地资源 - 3；生态资源 - 4； 土地资源 - 1
+    // 水资源审计 - 2；林地资源审计 - 3；生态资源审计 - 4； 土地资源审计 - 1
     this.classDictQuery("0", "c_task_type", "任务类型");
     // DMS - 浦东行政区划
     this.classDictQuery("0", "浦东新区行政区划", "浦东新区行政区划");
@@ -413,8 +413,9 @@ export default {
             };
             searchParam.push(paramType);
             let params = new FormData();
+            // dms - 我的任务
             params = {
-              columnId: 61,
+              columnId: 48,
               states: "2,3",
               pageSize: 10,
               page: 0,
@@ -465,8 +466,8 @@ export default {
       this.createModelParams.c_bind_layer = JSON.stringify(newData);
       let params = new FormData();
       params = {
-        columnId: 89,
-        modelId: 94,
+        columnId: 49,
+        modelId: 53,
         content: JSON.stringify(this.createModelParams),
       };
       this.$Post(this.urlsCollection.addContent, params)

src/components/common/BottomForm/SameScreenComparison.vue

@@ -45,10 +45,18 @@
           已选择<span class="checkLength">{{ checkedCities.length }}</span
           >个
         </div>
-        <el-checkbox-group id="mapCheckBox" v-model="checkedCities" @change="handleCheckedCitiesChange" :min="2" :max="6">
+        <el-checkbox-group
+          id="mapCheckBox"
+          v-model="checkedCities"
+          @change="handleCheckedCitiesChange"
+          :min="2"
+          :max="6"
+        >
           <el-checkbox
             class="mapCheckBox"
-            :disabled="checkedCities.length >= 6 && checkedCities.indexOf(index) == -1"
+            :disabled="
+              checkedCities.length >= 6 && checkedCities.indexOf(index) == -1
+            "
             v-for="(city, index) in mapList"
             :checked="city.active"
             :label="index"
@@ -62,12 +70,26 @@
     <div id="textareaBox">
       <div class="doPrintInfo">地址：xxxxxxxx 时间：{{ newTime }}</div>
       <div class="textareaTitle">描述记录:</div>
-      <el-input type="textarea" :autosize="{ minRows: 3, maxRows: 4 }" placeholder="请输入内容" v-model="textarea1"> </el-input>
+      <el-input
+        type="textarea"
+        :autosize="{ minRows: 3, maxRows: 4 }"
+        placeholder="请输入内容"
+        v-model="textarea1"
+      >
+      </el-input>
     </div>
     <!-- 打印区域 -->
     <div id="imgBox">
       <span>基本农田被侵占</span>
-      <img src="" id="imgOut" style="width: 1240px; background-repeat: no-repeat; background-size: 100% 100%" />
+      <img
+        src=""
+        id="imgOut"
+        style="
+          width: 1240px;
+          background-repeat: no-repeat;
+          background-size: 100% 100%;
+        "
+      />
       <div class="doPrintInfo2">地址：xxxxxxxx 时间：{{ newTime }}</div>
       <span><div>描述记录:</div></span>
       <div>{{ textarea1 }}</div>
@@ -113,109 +135,12 @@ export default {
       textarea1: "",
       // 地图底图列表
       mapList: [
-        {
-          mapName: "2018年航空影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: true
-        },
-        {
-          mapName: "2019年航空影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2020年航空影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2021年航空影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2022年航空影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2018年卫星影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2019年卫星影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2020年卫星影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2021年卫星影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2022年卫星影像图（春季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2018年航空影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2019年航空影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2020年航空影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2021年航空影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2022年航空影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2018年卫星影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2019年卫星影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2020年卫星影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2021年卫星影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        },
-        {
-          mapName: "2022年卫星影像图（秋季）",
-          mapUrl: "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d",
-          active: false
-        }
-      ]
+      ],
     };
   },
+  created() {
+    this.getBaseMap();
+  },
   mounted() {
     // 同屏对比事件监听
     this.$bus.$off("tpdb");
@@ -239,23 +164,52 @@ export default {
   },
   props: [],
   methods: {
+    // 获取地图底图服务
+    getBaseMap() {
+      this.mapList = [];
+      let params = new FormData();
+      params = {
+        columnId: 35,
+        states: 3,
+        pageSize: 20,
+        page: 0,
+      };
+      this.$Post(this.urlsCollection.selectContentList, params).then((res) => {
+        if (res.code === 200 && res.content.data.length > 0) {
+          let data = res.content.data;
+          data.forEach((v) => {
+            this.mapList.push({
+              mapName: v.title,
+              mapUrl: v.c_url + localStorage.getItem("TOKEN"),
+              active: false,
+            });
+          });
+          this.mapList[0].active = true
+          console.log(this.mapList);
+        }
+      });
+    },
+
     // 当用户点击svg底座时，切换底部菜单显示隐藏状态。
     changeShowBottomMenusStatus() {
       // 打开弹窗
       this.dialogVisible = true;
       this.$emit("changeShowBottomMenusStatus", false);
       // 打开弹窗前首先同步一下地图定位
-      this.centerZoomInit = { center: map2DViewer.map.getCenter(), zoom: map2DViewer.map.getZoom() };
+      this.centerZoomInit = {
+        center: map2DViewer.map.getCenter(),
+        zoom: map2DViewer.map.getZoom(),
+      };
       this.handleCheckedCitiesChange();
     },
     // 弹窗关闭询问
     handleClose() {
       if (this.dialogVisible) {
         this.$confirm("确认关闭？")
-          .then(_ => {
+          .then((_) => {
             this.clearDialogVisible();
           })
-          .catch(_ => {});
+          .catch((_) => {});
       }
     },
     // 同屏对比取消
@@ -289,11 +243,13 @@ export default {
         _width,
         _height,
         useCORS: true,
-        allowTaint: false
+        allowTaint: false,
       };
       let that = this;
-      html2canvas(this.$refs.doPrint, ops).then(canvas => {
-        document.getElementById("imgOut").setAttribute("src", canvas.toDataURL("image/png"));
+      html2canvas(this.$refs.doPrint, ops).then((canvas) => {
+        document
+          .getElementById("imgOut")
+          .setAttribute("src", canvas.toDataURL("image/png"));
       });
 
       this.interval = setInterval(() => {
@@ -318,7 +274,11 @@ export default {
       document.body.appendChild(new_iframe);
       doc = new_iframe.contentWindow.document;
       var obj = document.getElementById("imgBox");
-      doc.write('<div style="width:100%;height:auto;margin:0px;">' + obj.innerHTML + "</div>");
+      doc.write(
+        '<div style="width:100%;height:auto;margin:0px;">' +
+          obj.innerHTML +
+          "</div>"
+      );
       doc.close();
       new_iframe.contentWindow.focus();
       new_iframe.contentWindow.print();
@@ -363,9 +323,9 @@ export default {
       if (!this.MouseDownStatus) {
         this.mouseIndex = mouseIndex;
       }
-    }
+    },
   },
-  watch: {}
+  watch: {},
 };
 </script>
 <style lang="less" scoped>

src/components/map/Map.vue

@@ -8,13 +8,13 @@ export default {
   data() {
     return {
       map: "",
-      layers: [],
+      layers: "",
       minZoom: 10,
       maxZoom: 16,
       bound: [
         [30.5, 121],
-        [31.5, 122]
-      ]
+        [31.5, 122],
+      ],
     };
   },
   mounted() {
@@ -22,11 +22,15 @@ export default {
     this.$nextTick(() => {
       this.mapInit();
       let that = this;
-      this.map.on("move", e => {
+      this.map.on("move", (e) => {
         if (that.index == that.mouseIndex) {
           let center = that.map.getCenter();
           let zoom = that.map.getZoom();
-          this.$emit("changeCenterZoom", { center: [center.lat, center.lng], zoom: zoom, index: that.index });
+          this.$emit("changeCenterZoom", {
+            center: [center.lat, center.lng],
+            zoom: zoom,
+            index: that.index,
+          });
         }
       });
     });
@@ -39,22 +43,20 @@ export default {
         attributionControl: false,
         zoomControl: false,
         minZoom: this.minZoom,
-        maxZoom: this.maxZoom
+        maxZoom: this.maxZoom,
         // maxBounds: new L.LatLngBounds(this.bound[0], this.bound[1]),
       }).setView(map2DViewer.map.getCenter(), map2DViewer.map.getZoom());
 
       //添加默认图层
-      var guid = publicFun.buildGuid("baseLayer");
       var layer = L.esri
         .tiledMapLayer({
           url:
             // "http://aimap.pudong.sh:5236/maps/rest/services/basemap-shanghai-gem-blue-sh2000/mapserver/"
             // systemConfig.mapService + "?servertype=Street_Purplish_Blue&token=" + systemConfig.token
-            systemConfig.blueBlackMap
+            this.mapUrl,
         })
         .addTo(this.map);
-      layer.guid = guid;
-      this.layers[guid] = layer;
+      this.layers = layer;
     },
     setView: function (coord, zoom) {
       let center = L.latLng(coord[0], coord[1]);
@@ -64,10 +66,21 @@ export default {
     changeMapSize() {
       this.$nextTick(() => {
         if (this.map) {
+          // this.layers.setUrl(this.mapUrl);
+          this.map.removeLayer(this.layers);
+          var layer = L.esri
+            .tiledMapLayer({
+              url:
+                // "http://aimap.pudong.sh:5236/maps/rest/services/basemap-shanghai-gem-blue-sh2000/mapserver/"
+                // systemConfig.mapService + "?servertype=Street_Purplish_Blue&token=" + systemConfig.token
+                this.mapUrl,
+            })
+            .addTo(this.map);
+          this.layers = layer;
           this.map.invalidateSize(true);
         }
       });
-    }
+    },
   },
   watch: {
     centerZoom: {
@@ -76,7 +89,7 @@ export default {
           this.setView(newValue.center, newValue.zoom);
         }
       },
-      deep: true
+      deep: true,
     },
     centerZoomInit: {
       handler(newValue, oldValue) {
@@ -85,9 +98,9 @@ export default {
           this.map.setView(center, newValue.zoom);
         }
       },
-      deep: true
-    }
-  }
+      deep: true,
+    },
+  },
 };
 </script>
 <style scoped>

src/components/map/MapHolder.vue

@@ -30,6 +30,9 @@ export default {
       currentLabelCid: null,
       currentLabelHtml: null,
     };
+  },
+  created(){
+
   },
   mounted() {
     // 监听全局事件总线中的卷帘对比事件（JLControl）

src/components/popup/LawPopup.vue

@@ -146,7 +146,7 @@ export default {
 
       let params = new FormData();
       params = {
-        columnId: 58,
+        columnId: 23,
         states: 3,
         pageSize: this.currentPageSize,
         page: val - 1,

src/views/ComprehensiveAnalysis.vue

@@ -851,7 +851,7 @@ export default {
 
             let params = new FormData();
             params = {
-              columnId: 61,
+              columnId: 48,
               states: "2,3",
               pageSize: 10,
               page: 0,

src/views/LawView.vue

@@ -196,7 +196,7 @@ export default {
       // 类别
       if (this.typeSelectVal) {
         let paramType = {
-          field: "type",
+          field: "sh_law_type",
           // 等值查询
           searchType: "1",
           content: {