Merge remote-tracking branch 'origin/master'

# Conflicts:
#	web_ui/src/views/industrial-land/AiIndustriaLandDetail.vue

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

@@ -321,6 +321,7 @@ import industrialTop from '@/components/IndustrialTop'
 import znxzDetail from './ZnxzDetail.vue'
 import znxzCompare from './ZnxzCompare.vue'
 import L from 'leaflet'
+import Proj from 'proj4leaflet'
 import ArrayQueue from '@/struct/ArrayQueue'
 import axios from 'axios'
 import { arcgisToGeoJSON } from '@terraformer/arcgis'
@@ -960,33 +961,33 @@ export default {
       }
     },
     initMap() {
-      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
+        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
@@ -996,14 +997,14 @@ export default {
       })
       let myCenter = new L.LatLng(this.latitude, this.longitude) // 设置地图中心
       this.map = L.map(this.id, {
-        zoom: window.ApplicationConfig.mapOptions['zoom'],
-        center: window.ApplicationConfig.mapOptions['center'],
+        zoom:window.ApplicationConfig.mapOptions["zoom"],
+        center: window.ApplicationConfig.mapOptions["center"],
         zoomControl: false,
         crs: CRS_4490,
-        attributionControl: false //去掉右下角的logo
-      })
-      var tk = window.ApplicationConfig.tk
-      var tk = '6dfd31e3b55a8466f34997aee5551a9c'
+        attributionControl: false, //去掉右下角的logo
+      });
+      var tk = window.ApplicationConfig.tk;
+      var tk = "6dfd31e3b55a8466f34997aee5551a9c";
       // 添加天地图底图
       //底图
       // const image = L.tileLayer(
@@ -1039,38 +1040,43 @@ export default {
       //   }
       // );
       // 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'
-          }
-        ]
-      }
-
-      var zjyx = dtLayers.layers[0]
-      this.switchMapLayer(zjyx)
-      var zjzj = dtLayers.layers[1]
-      this.switchMapLayer(zjzj)
+      // 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",
+      //     },
+      //   ],
+      // };
+
+      // var zjyx = dtLayers.layers[0];
+      // this.switchMapLayer(zjyx);
+      // var zjzj = dtLayers.layers[1];
+      // this.switchMapLayer(zjzj);
 
       //定位浙江省
-      this.location(polygons)
-      //默认加载供地图层
-      var gd = this.layers[0].layers[0]
-      this.switchMapLayer(gd)
+      // this.location(polygons)
+      //默认加载所有选中图层
+      this.layers.forEach(layerGroup=>{
+        layerGroup.layers.forEach(oneLayer=>{
+           this.switchMapLayer(oneLayer)
+        })
+      });
+      // var gd = this.layers[0].layers[0]
+
     },
     //属性识别
     mapClick(e) {
@@ -1830,6 +1836,9 @@ export default {
               T.messages.splice(index, 1)
             }
           })
+
+          T.loading = false
+
           T.addHistory(question, T.messages[T.messages.length - 1].content)
         }
       }

web_ui/static/config.js

@@ -62,6 +62,39 @@
     tk: 'f7c3163e305d6b2a4b6a14938b1932ae',
     routeUrl: 'http://api.tianditu.gov.cn/drive?postStr=',
     layerTreeConfig: [
+      {
+        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",
+          },
+        ],
+      },
+      {
+        name: '行政区', layers: [
+          {
+            name: "市级行政区",
+            id: "sjxzq",
+            checked: true,
+            type: 'geoserver',
+            url: 'https://kjzl.zrzyt.zj.gov.cn/zdzy/geoserver/test/wms',
+            layername: 'sde:sjxzq'
+          }
+        ]
+      },
       {
         name: '现状图层', layers: [
           {