合并代码

web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

@@ -8,7 +8,7 @@
             v-show="radarShow"
             :style="`width: ${radarScanStyle.width}; heigth: ${radarScanStyle.height}; top: ${radarScanStyle.top};left: ${radarScanStyle.left};`"
           >
-            <radar-scan-animation />
+            <!-- <radar-scan-animation /> -->
           </div>
         </div>
         <div class="right-tool">
@@ -337,12 +337,10 @@ import { getWmtsLayer } from '@/util/leaflet'
 import wkt from 'wellknown'
 import VueMarkdownIt from 'vue-markdown-it'
 import landMethods from '@/api/land'
-import RadarScanAnimation from '@/components/animation/RadarScanAnimation.vue'
 import AIBtn from '@/components/AIBtn.vue'
 
 export default {
   components: {
-    RadarScanAnimation,
     industrialTop,
     znxzDetail,
     znxzCompare,
@@ -962,7 +960,33 @@ export default {
       }
     },
     initMap() {
-      this.layers = window.ApplicationConfig.layerTreeConfig
+        let CRS_4490 = new Proj.CRS("EPSG:4490", "+proj=longlat +ellps=GRS80 +no_defs", {
+          resolutions: [
+              1.4062500262315807,
+              0.7031249999891485,
+              0.35156249999999994,
+              0.17578124999999997,
+              0.08789062500000012,
+              0.04394531250000006,
+              0.021972656250000007,
+              0.01098632812500002,
+              0.00549316406250001,
+              0.0027465820312500017,
+              0.0013732910156250009,
+              6.866455078124991E-4,
+              3.4332275390624957E-4,
+              1.7166137695312503E-4,
+              8.583068847656251E-5,
+              4.291534423828141E-5,
+              2.1457672119140645E-5,
+              1.0728836059570307E-5,
+              5.364418029785169E-6,
+              2.6822090642902305E-6,
+              1.3411045333348457E-6
+          ],
+          origin: [-180, 90]
+        });
+      this.layers = window.ApplicationConfig.layerTreeConfig;
       this.layers.forEach((item, index) => {
         if (index == 0) {
           item.checked = true
@@ -972,74 +996,75 @@ export default {
       })
       let myCenter = new L.LatLng(this.latitude, this.longitude) // 设置地图中心
       this.map = L.map(this.id, {
-        center: myCenter,
-        zoom: this.zoomLevel,
+        zoom:window.ApplicationConfig.mapOptions["zoom"],
+        center: window.ApplicationConfig.mapOptions["center"],
         zoomControl: false,
-        attributionControl: false //去掉右下角的logo
-      })
-      var tk = window.ApplicationConfig.tk
-      var tk = '6dfd31e3b55a8466f34997aee5551a9c'
+        crs: CRS_4490,
+        attributionControl: false, //去掉右下角的logo
+      });
+      var tk = window.ApplicationConfig.tk;
+      var tk = "6dfd31e3b55a8466f34997aee5551a9c";
       // 添加天地图底图
       //底图
-      const image = L.tileLayer(
-        'http://t{s}.tianditu.gov.cn/img_w/wmts?tk=' +
-        tk +
-        '&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-        {
-          subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
-          zIndex: 1
-        }
-      )
-      this.map.addLayer(image)
-      const dx = L.tileLayer(
-        'https://t{s}.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=' +
-        tk,
-        {
-          subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
-          transparent: true,
-          zIndex: 2
-        }
-      )
-      this.map.addLayer(dx)
+      // const image = L.tileLayer(
+      //   "http://t{s}.tianditu.gov.cn/img_w/wmts?tk=" +
+      //     tk +
+      //     "&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}",
+      //   {
+      //     subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
+      //     zIndex: 1,
+      //   }
+      // );
+      // this.map.addLayer(image);
+      // const dx = L.tileLayer(
+      //   "https://t{s}.tianditu.gov.cn/vec_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=vec&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILECOL={x}&TILEROW={y}&TILEMATRIX={z}&tk=" +
+      //     tk,
+      //   {
+      //     subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
+      //     transparent: true,
+      //     zIndex: 2,
+      //   }
+      // );
+      // this.map.addLayer(dx);
+
+      // //注记
+      // const cia = L.tileLayer(
+      //   "http://t{s}.tianditu.gov.cn/cia_w/wmts?tk=" +
+      //     tk +
+      //     "&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}",
+      //   {
+      //     subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
+      //     transparent: true,
+      //     zIndex: 3,
+      //   }
+      // );
+      // this.map.addLayer(cia);
+      let dtLayers = {
+        name: "底图",
+        layers: [
+          {
+            name: "浙江影像",
+            id: "zjyx",
+            checked: true,
+            type: "wmts",
+            url: "https://kjzl.zrzyt.zj.gov.cn/zdzy/gtkj/zjgt48/34048bffdd0d4d148ca4a40da7eade21/services/wmts/imgmap/default/oss",
+            layername: "imgmap",
+          },
+          {
+            name: "浙江注记",
+            id: "zjzj",
+            checked: true,
+            type: "wmts",
+            url: "https://zdzy.zrzyt.zj.gov.cn/gtkj/zjgt49/2003392c13044d3ab3097b0a4328ecf2/services/wmts/imgmap_lab/default/oss",
+            layername: "imgmap_lab",
+          },
+        ],
+      };
 
-      //注记
-      const cia = L.tileLayer(
-        'http://t{s}.tianditu.gov.cn/cia_w/wmts?tk=' +
-        tk +
-        '&SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TileMatrix={z}&TileCol={x}&TileRow={y}',
-        {
-          subdomains: [0, 1, 2, 3, 4, 5, 6, 7],
-          transparent: true,
-          zIndex: 3
-        }
-      )
-      this.map.addLayer(cia)
-      // let dtLayers = {
-      //   name: "底图",
-      //   layers: [
-      //     {
-      //       name: "浙江影像",
-      //       id: "zjyx",
-      //       checked: true,
-      //       type: "wmts",
-      //       url: "https://kjzl.zrzyt.zj.gov.cn/zdzy/gtkj/zjgt48/34048bffdd0d4d148ca4a40da7eade21/services/wmts/imgmap/default/oss",
-      //       layername: "imgmap",
-      //     },
-      //     {
-      //       name: "浙江注记",
-      //       id: "zjzj",
-      //       checked: true,
-      //       type: "wmts",
-      //       url: "https://kjzl.zrzyt.zj.gov.cn/zdzy/gtkj/zjgt48/34048bffdd0d4d148ca4a40da7eade21/services/wmts/imgmap_lab/default/oss",
-      //       layername: "imgmap_lab",
-      //     },
-      //   ],
-      // };
-
-      // var zjyx = dtLayers.layers[0];
-      // this.switchMapLayer(zjyx);
-      // var zjzj = dtLayers.layers[1];
-      // this.switchMapLayer(zjzj);
+      var zjyx = dtLayers.layers[0];
+      this.switchMapLayer(zjyx);
+      var zjzj = dtLayers.layers[1];
+      this.switchMapLayer(zjzj);
 
       //定位浙江省
       this.location(polygons)

web_ui/src/views/industrial-land/ZnxzDetail.vue

@@ -478,10 +478,9 @@
 import landMethods from '@/api/land'
 import { getMilliSeconds } from '@/util/date'
 import axios from 'axios'
-import test from '../test.vue'
 
 export default {
-  components: { test },
+  components: { },
   props: {
     item: Object
   },