Bug修复

BJYSYBZ_C/public/config.js

@@ -1,7 +1,7 @@
 const arcMapToken = "sy-af242c93-2d14-4232-812b-b9f23172dbb2";
 window.ApplicationConfig = {
   // baseUrl: "https://zdzy.zrzyt.zj.gov.cn/app215/ybz-api/",
-  baseUrl: "http://localhost:7089/ysgzybz/",
+  baseUrl: '/ybzBjServer',
   mapLayerConfig: {
     use: "innerNet",
     projection: {
@@ -85,8 +85,8 @@ window.ApplicationConfig = {
                     layers: 'sde:sjxzq',
                   },
                   url:
-                    "http://10.249.168.231:8080/geoserver/sde/wms",
-                  queryUrl: 'http://10.249.168.231:8080/geoserver/sde',
+                    "https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms",
+                  queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
                 },
                 {
                   id: "xzqh-x-search",
@@ -99,8 +99,8 @@ window.ApplicationConfig = {
                     layers: 'sde:xjxzq',
                   },
                   url:
-                    "http://10.249.168.231:8080/geoserver/sde/wms",
-                  queryUrl: 'http://10.249.168.231:8080/geoserver/sde',
+                    "https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms",
+                  queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
                 },
                 {
                   id: "xzqh-x",
@@ -172,8 +172,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:bjwlyd2000',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "未供地块资源",
                 defs: {
@@ -319,14 +319,13 @@ window.ApplicationConfig = {
               name: "滨江区供地地块",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0",
-                layerDefs: {
-                  0: "xzqdm like '330108%'"
-                }
+                version: '1.1.1',
+                layers: 'ysybz:gdxminfo_bj_1',
               },
-              url: "https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJQGD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
             },
             {
               id: "bj-wnz",
@@ -338,8 +337,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:chdywnz',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "未农转用地块资源",
                 defs: {
@@ -360,8 +359,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'sde:ydb_bj_gyyd_1',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "滨江工业用地五色图",
                 defs: {
@@ -568,8 +567,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:ydb_bj_gyyd',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "工业用地",
                 defs: {
@@ -610,8 +609,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'sde:bjsyyd',
               },
-              url: 'http://10.249.168.231:8080/geoserver/sde/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/sde',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "商业用地",
                 defs: {
@@ -2011,8 +2010,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'sde:bjwkfly2000',
               },
-              url: 'http://10.249.168.231:8080/geoserver/sde/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/sde',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "管地单位",
                 defs: {
@@ -2152,8 +2151,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:特色小镇',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江小镇",
                 defs: {
@@ -2174,8 +2173,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:bjstbhhx',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江生态保护红线",
                 defs: {
@@ -2196,8 +2195,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:bjczkfbj_1',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江城镇开发边界",
                 defs: {
@@ -2218,8 +2217,8 @@ window.ApplicationConfig = {
           version: '1.1.1',
           layers: 'ysybz:ydb_bj_gyyd',
         },
-        url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-        queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+        url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+        queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
 			  legend: {
 				title: "滨江工业用地",
 				defs: {
@@ -2240,8 +2239,8 @@ window.ApplicationConfig = {
           version: '1.1.1',
           layers: 'ysybz:zzyd',
         },
-        url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-        queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+        url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+        queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
 			  legend: {
 				  title: "滨江住宅用地",
           defs: {
@@ -2262,8 +2261,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:jyyd',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江教育用地",
                 defs: {
@@ -2308,8 +2307,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:kfbjw',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江城镇开发边界外",
                 defs: {
@@ -2330,8 +2329,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:bjld2000',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江林地",
                 defs: {
@@ -2352,8 +2351,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'ysybz:bjgd',
               },
-              url: 'http://10.249.168.231:8080/geoserver/ysybz/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/ysybz',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江耕地",
                 defs: {
@@ -2374,8 +2373,8 @@ window.ApplicationConfig = {
                 version: '1.1.1',
                 layers: 'sde:bjlsyd',
               },
-              url: 'http://10.249.168.231:8080/geoserver/sde/wms',
-              queryUrl: 'http://10.249.168.231:8080/geoserver/sde',
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "滨江临时用地",
                 defs: {

BJYSYBZ_C/public/config_prod.js

@@ -1,6 +1,7 @@
 const arcMapToken = "sy-af242c93-2d14-4232-812b-b9f23172dbb2";
 window.ApplicationConfig = {
-  baseUrl: "/ybzBjServer",
+  // baseUrl: "https://zdzy.zrzyt.zj.gov.cn/app215/ybz-api/",
+  baseUrl: '/ybzBjServer',
   mapLayerConfig: {
     use: "innerNet",
     projection: {
@@ -78,18 +79,28 @@ window.ApplicationConfig = {
                   name: "市级行政区",
                   enabled: true,
                   visible: false,
-                  serverType: "dynamic",
+                  serverType: "wms",
+                  params: {
+                    version: '1.1.1',
+                    layers: 'sde:sjxzq',
+                  },
                   url:
-                    "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/zp/XZQ_SJ/MapServer"
+                    "https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms",
+                  queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
                 },
                 {
                   id: "xzqh-x-search",
                   name: "县级行政区",
                   enabled: true,
                   visible: false,
-                  serverType: "dynamic",
+                  serverType: "wms",
+                  params: {
+                    version: '1.1.1',
+                    layers: 'sde:xjxzq',
+                  },
                   url:
-                    "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/zp/XZQ_XJ/MapServer"
+                    "https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms",
+                  queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
                 },
                 {
                   id: "xzqh-x",
@@ -156,15 +167,13 @@ window.ApplicationConfig = {
               name: "滨江未供地块",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1",
-                layerDefs: {
-                  "0": "sfygd is null or sfygd = ''",
-                  "1": "sfygd is null or sfygd = ''",
-                }
+                version: '1.1.1',
+                layers: 'ysybz:bjwlyd2000',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJWLYD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "未供地块资源",
                 defs: {
@@ -310,25 +319,26 @@ window.ApplicationConfig = {
               name: "滨江区供地地块",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0",
-                layerDefs: {
-                  0: "xzqdm like '330108%'"
-                }
+                version: '1.1.1',
+                layers: 'ysybz:gdxminfo_bj_1',
               },
-              url: "https://zlzd.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJQGD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
             },
             {
               id: "bj-wnz",
               name: "滨江未农转用地块",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0"
+                version: '1.1.1',
+                layers: 'ysybz:chdywnz',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJWNZ/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "未农转用地块资源",
                 defs: {
@@ -344,15 +354,13 @@ window.ApplicationConfig = {
               name: "滨江工业用地五色图",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1",
-                layerDefs: {
-                  "0": "1=1",
-                  "1": "1=1",
-                }
+                version: '1.1.1',
+                layers: 'sde:ydb_bj_gyyd_1',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJWST/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "滨江工业用地五色图",
                 defs: {
@@ -508,26 +516,6 @@ window.ApplicationConfig = {
                 }
               }
             },
-            {
-              id: "gyyd_all",
-              name: "工业用地",
-              enabled: true,
-              visible: false,
-              serverType: "dynamic",
-              params: {
-                layers: "show:0"
-              },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer3/arcgis/rest/services/GYYDDC/GYYD_ALL/MapServer",
-              legend: {
-                title: "工业用地",
-                defs: {
-                  工业用地: {
-                    color: "#0099FF",
-                    query: {}
-                  }
-                }
-              }
-            },
             {
               id: "pewg",
               name: "批而未供",
@@ -574,11 +562,13 @@ window.ApplicationConfig = {
               name: "工业用地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:ydb_bj_gyyd',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/gyyd/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "工业用地",
                 defs: {
@@ -614,11 +604,13 @@ window.ApplicationConfig = {
               name: "商业用地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'sde:bjsyyd',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/syyd/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "商业用地",
                 defs: {
@@ -1583,30 +1575,6 @@ window.ApplicationConfig = {
                 }
               }
             },
-            {
-              id: "gd-gyyd",
-              name: "工业用地",
-              enabled: true,
-              visible: false,
-              serverType: "dynamic",
-              params: {
-                layers: "show:0,1",
-                layerDefs: {
-                  "0": "tdyt like '06%'",
-                  "1": "tdyt like '06%'"
-                }
-              },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer3/arcgis/rest/services/ZDZY/TDGY2022/MapServer",
-              legend: {
-                title: "工业用地",
-                defs: {
-                  工业用地: {
-                    color: "#03FFC4",
-                    query: {}
-                  }
-                }
-              }
-            },
             {
               id: "tsxz",
               name: "特色小镇",
@@ -2037,11 +2005,13 @@ window.ApplicationConfig = {
               name: "滨江地块管理",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0"
+                version: '1.1.1',
+                layers: 'sde:bjwkfly2000',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_DKGL/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "管地单位",
                 defs: {
@@ -2176,11 +2146,13 @@ window.ApplicationConfig = {
               name: "滨江小镇",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:特色小镇',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJXZ/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江小镇",
                 defs: {
@@ -2196,11 +2168,13 @@ window.ApplicationConfig = {
               name: "滨江生态保护红线",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:bjstbhhx',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJSQSX/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江生态保护红线",
                 defs: {
@@ -2216,11 +2190,13 @@ window.ApplicationConfig = {
               name: "滨江城镇开发边界",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:2,3"
+                version: '1.1.1',
+                layers: 'ysybz:bjczkfbj_1',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJSQSX/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江城镇开发边界",
                 defs: {
@@ -2233,20 +2209,22 @@ window.ApplicationConfig = {
             },
 			{
 			  id: "bj-gyyd-new",
-			  name: "滨江工业用地",
+			  name: "滨江住宅用地",
 			  enabled: true,
 			  visible: false,
-			  serverType: "dynamic",
-			  params: {
-				layers: "show:0,1"
-			  },
-			  url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/gyyd/MapServer",
+        serverType: 'wms',
+        params: {
+          version: '1.1.1',
+          layers: 'ysybz:ydb_bj_gyyd',
+        },
+        url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+        queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
 			  legend: {
 				title: "滨江工业用地",
 				defs: {
-				  滨江工业用地: {
-					color: "#BB9674",
-					query: {}
+          滨江工业用地: {
+            color: "#BB9674",
+            query: {}
 				  }
 				}
 			  }
@@ -2256,21 +2234,21 @@ window.ApplicationConfig = {
 			  name: "滨江住宅用地",
 			  enabled: true,
 			  visible: false,
-			  serverType: "dynamic",
-			  params: {
-				layers: "show:0,1",
-				layerDefs: {
-				}
-			  },
-			  url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/zzyd/MapServer",
+        serverType: 'wms',
+        params: {
+          version: '1.1.1',
+          layers: 'ysybz:zzyd',
+        },
+        url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+        queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
 			  legend: {
-				title: "滨江住宅用地",
-				defs: {
-				  滨江住宅用地: {
-					color: "#FFFF2D",
-					query: {}
-				  }
-				}
+				  title: "滨江住宅用地",
+          defs: {
+            滨江住宅用地: {
+              color: "#FFFF2D",
+              query: {}
+            }
+          }
 			  }
 			},
             {
@@ -2278,13 +2256,13 @@ window.ApplicationConfig = {
               name: "滨江教育用地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1",
-                layerDefs: {
-                }
+                version: '1.1.1',
+                layers: 'ysybz:jyyd',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/bjjyyd/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江教育用地",
                 defs: {
@@ -2324,11 +2302,13 @@ window.ApplicationConfig = {
               name: "滨江城镇开发边界外",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:kfbjw',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJ_KFBJW/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江城镇开发边界外",
                 defs: {
@@ -2344,11 +2324,13 @@ window.ApplicationConfig = {
               name: "滨江林地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:bjld2000',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJLD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江林地",
                 defs: {
@@ -2364,11 +2346,13 @@ window.ApplicationConfig = {
               name: "滨江耕地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'ysybz:bjgd',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJGD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/ysybz',
               legend: {
                 title: "滨江耕地",
                 defs: {
@@ -2384,11 +2368,13 @@ window.ApplicationConfig = {
               name: "滨江临时用地",
               enabled: true,
               visible: false,
-              serverType: "dynamic",
+              serverType: 'wms',
               params: {
-                layers: "show:0,1"
+                version: '1.1.1',
+                layers: 'sde:bjlsyd',
               },
-              url: "https://zdzy.zrzyt.zj.gov.cn/arcMapServer216/arcgis/rest/services/YSYBZ/BJLSYD/MapServer",
+              url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+              queryUrl: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde',
               legend: {
                 title: "滨江临时用地",
                 defs: {

BJYSYBZ_C/src/views/YgxqView/components/Yt.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="TwoContent">
-    <cart-item3 title="空间组成1" clickText="工业详情" @click="toBlank">
+    <cart-item3 title="空间组成" clickText="工业详情" @click="toBlank">
       <div class="main-box">
         <div class="item" @click="showLayer('bj-gyyd-new')">
           <div class="item-top">工业用地</div>

BJYSYBZ_C/src/views/components/BigScreenMap/index.vue

@@ -1771,7 +1771,6 @@ export default {
             }
           })
         }
-        alert(layerConfig.url)
         arcgisQuery(
           `${layerConfig.url}/${this.layerIndex}/query`,
           param,

WEB-VIEW/src/components/ol/VlLegend/index.vue

@@ -1,265 +0,0 @@
-<template>
-  <div v-if="legend.length" class="vl-legend" :class="{'layer-filter':enabledLayerFilter}">
-    <Tooltip v-if="!show" content="图例" theme="light" transfer>
-      <div
-        class="legend-btn flex-align-center"
-        @click.stop="show = !show"
-      >
-        <i class="icon"></i>
-        <span>图例</span>
-      </div>
-    </Tooltip>
-    <div v-if="show" class="legend-panel flex-col" :style="{maxHeight:`${maxHeight}px`}">
-      <div class="legend-title">
-        图例
-        <i class="close-icon" @click.stop="show = !show">
-          <svg
-            t="1638176702281"
-            class="icon"
-            viewBox="0 0 1024 1024"
-            version="1.1"
-            xmlns="http://www.w3.org/2000/svg"
-            p-id="3145"
-          >
-            <path
-              d="M822.00345 776.822434l0.022513-0.022513L246.50423 201.317075c-5.78782-5.791913-13.785981-9.374508-22.621207-9.374508-17.662265 0-31.980365 14.3181-31.980365 31.980365 0 8.834202 3.582595 16.832364 9.373485 22.620184L776.11226 821.339324c5.838985 6.277984 14.166651 10.209526 23.416316 10.209526 17.662265 0 31.980365-14.3181 31.980365-31.980365C831.508941 790.667767 827.871087 782.620487 822.00345 776.822434z"
-              p-id="3146"
-            />
-            <path
-              d="M776.783549 201.448058l-0.022513-0.022513L201.278189 776.947278c-5.791913 5.78782-9.374508 13.785981-9.374508 22.621207 0 17.662265 14.3181 31.980365 31.980365 31.980365 8.834202 0 16.832364-3.582595 22.620184-9.373485l574.797231-574.836117c6.277984-5.838985 10.209526-14.166651 10.209526-23.416316 0-17.662265-14.3181-31.980365-31.980365-31.980365C790.628882 191.942567 782.580578 195.58042 776.783549 201.448058z"
-              p-id="3147"
-            />
-          </svg>
-        </i>
-      </div>
-      <vue-perfect-scrollbar class="flex-1">
-        <ul v-for="(i,idx) in legend" :key="idx" class="layer-legend">
-          <li class="title">{{ i.title }}</li>
-          <li
-            v-for="([k,v]) in Object.entries(i.defs)"
-            :key="k"
-            class="legend-item"
-            :class="{'disabled':!v.enabled,'no-event':i.disabled}"
-            @click.stop="handleLegendClick(v,i, k)"
-            :ref="k"
-          >
-            <svg
-              class="icon"
-              viewBox="0 0 1024 1024"
-              version="1.1"
-              xmlns="http://www.w3.org/2000/svg"
-              width="35"
-              height="35"
-              :fill="v.color"
-            >
-              <path
-                d="M896 896H128c-46.933333 0-85.333333-38.4-85.333333-85.333333V213.333333c0-46.933333 38.4-85.333333 85.333333-85.333333h768c46.933333 0 85.333333 38.4 85.333333 85.333333v597.333334c0 46.933333-38.4 85.333333-85.333333 85.333333zM128 213.333333v597.333334h768V213.333333H128z"
-              />
-              <path
-                v-if="legendFill>0"
-                d="M128 853.333333h768a42.666667 42.666667 0 0 0 42.666667-42.666666V213.333333a42.666667 42.666667 0 0 0-42.666667-42.666666H128a42.666667 42.666667 0 0 0-42.666667 42.666666v597.333334a42.666667 42.666667 0 0 0 42.666667 42.666666z"
-                :opacity="legendFill"
-              />
-            </svg>
-            {{ k }}
-          </li>
-        </ul>
-      </vue-perfect-scrollbar>
-    </div>
-  </div>
-</template>
-
-<script>
-import VuePerfectScrollbar from 'vue-perfect-scrollbar'
-import { layerConfigEach } from '../VlConfigLayers/create-layer'
-
-export default {
-  name: 'VlLegend',
-  components: { VuePerfectScrollbar },
-  props: {
-    enabledLayers: {
-      type: Array,
-      required: true,
-      default: () => ([])
-    },
-    defaultExpand: {
-      type: Boolean,
-      default: false
-    },
-    size: { // 尺寸大小
-      type: Number,
-      default: 40
-    },
-    maxHeight: { // 尺寸大小
-      type: Number,
-      default: 350
-    },
-    legendFill: { // legend 填充色透明度
-      type: Number,
-      default: 0,
-      validator: val => val >= 0 && val <= 1
-    },
-    enabledLayerFilter: {
-      type: Boolean,
-      default: true
-    }
-  },
-  data() {
-    return {
-      show: this.defaultExpand,
-      legend: []
-    }
-  },
-  watch: {
-    enabledLayers: {
-      deep: true,
-      handler(newValue, oldValue) {
-        const visibleLayers = []
-
-        layerConfigEach(newValue, (layerConfig, isGroup) => {
-          if (isGroup || !layerConfig.visible) {
-            return
-          }
-          visibleLayers.push(layerConfig)
-        })
-
-        this.legend = visibleLayers.filter(i => i.legend).sort((a, b) => a.zIndex - b.zIndex).map(i => {
-          Object.values(i.legend.defs).forEach(j => {
-            if (!Object.hasOwnProperty.call(j, 'enabled')) {
-              this.$set(j, 'enabled', true)
-            }
-          })
-          return i.legend
-        })
-      }
-    }
-  },
-  created() {
-  },
-  methods: {
-    handleLegendClick(legendItem, i, key) {
-      const MIN_ENABLED = 1
-      if (i.disabled) {
-        return
-      }
-
-      const { enabled } = legendItem
-      if (Object.values(i.defs).filter(i => i.enabled).length <= MIN_ENABLED && enabled) {
-        return
-      }
-      legendItem.enabled = !enabled
-      const type = enabled ? 'hide' : 'show';
-      this.$vm.$emit('showIconEvent', key, type);
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.vl-legend {
-  position: absolute;
-  right: 20px;
-  bottom: 20px;
-  border-radius: 4px;
-  overflow: hidden;
-
-  &.layer-filter {
-    .layer-legend {
-
-      .legend-item {
-        cursor: pointer;
-
-        &.no-event {
-          cursor: default;
-        }
-
-        &.disabled {
-          svg {
-            opacity: 0.1;
-          }
-        }
-      }
-    }
-  }
-
-  .legend-btn {
-    text-align: center;
-    border-radius: 2px;
-    cursor: pointer;
-    display: flex;
-    align-items: center;
-    color: #fff;
-    padding: 5px 10px;
-    border: 1px solid #468EC0;
-    background: linear-gradient(0deg, #102A54 0%, #3E5C95 100%);
-    >i {
-      width: 16px;
-      height: 16px;
-      display: block;
-      margin-right: 3px;
-      background: url('~@/assets/images/map/tl_icon.png') no-repeat;
-      background-size: 100% 100%;
-    }
-  }
-
-  .legend-panel {
-    width: max-content;
-    background: #fff;
-    box-shadow: 0 0 4px 0 #999;
-    display: flex;
-    flex-direction: column;
-
-    .legend-title {
-      width: 100%;
-      background: #2390ee;
-      border-radius: 2px 0px 0px 2px;
-      height: 35px;
-      font-size: 14px;
-      color: #fff;
-      line-height: 32px;
-      padding-left: 12px;
-
-      .close-icon {
-        float: right;
-        padding-right: 1em;
-        cursor: pointer;
-
-        svg {
-          width: 1.5em;
-          height: 1.5em;
-          vertical-align: middle;
-          fill: #fff;
-        }
-      }
-    }
-
-    .layer-legend {
-      display: grid;
-      grid-template-columns: repeat(1, 1fr);
-      grid-column-gap: 10px;
-      padding: 0.5em 0.6em 0;
-
-      &:last-of-type {
-        margin-bottom: 1em;
-      }
-
-      .title {
-        padding: 4px 0;
-        font-size: 15px;
-        font-weight: bold;
-        color: #fff;
-      }
-
-      .legend-item {
-        margin: 0 1em;
-        font-size: 16px;
-
-        svg {
-          vertical-align: middle;
-          margin-right: 0.5em;
-        }
-      }
-    }
-  }
-}
-</style>

WEB-VIEW/src/views/components/BigScreenMap/index.vue

@@ -41,13 +41,6 @@
       </vl-tool-bar-item>
     </vl-tool-bar>
 
-    <vl-legend
-      :size="40"
-      :legend-fill="0.4"
-      :enabled-layers="enabledLayersConfig"
-      :default-expand="defaultExpand"
-      v-if="legendShow"
-    />
     <VlImglayers
       :imgLayers="imgLayers"
       @change="vlImgLayerChangeHandle"
@@ -79,7 +72,6 @@ import {
   VlFeatureFlicker,
   VlFeatureOverlay,
 } from '@/components/ol/VlFeatureTool';
-import VlLegend from '@/components/ol/VlLegend';
 import VlImglayers from '@/components/ol/VLImgLayers';
 import { arcgisQuery } from '@/utils/arcgis-map-server-query';
 import VlMapDevInfo from '@/components/ol/VlMapDevInfo';
@@ -120,7 +112,6 @@ export default {
     VlFeatureOverlay,
     VlChinaCities,
     VlMapDevInfo,
-    VlLegend,
     VlLayerTree,
     VlFeatureFlicker,
     VlToolBarItem,

WEB-VIEW/src/webview.vue

@@ -309,7 +309,7 @@ export default {
       }
 
       .btn2 {
-        background-color: #e1edfc;
+        background-color: #cee1f9;
       }
     }
   }

YSGZYBZ_WXAPP/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -10680,7 +10680,7 @@ var k = "development" === "development",
   C = S([]),
   A = "h5" === I ? "web" : "app-plus" === I ? "app" : I,
   P = S(undefined),
-  E = S(undefined) || [],
+  E = S([]) || [],
   O = true;
 var x = "";
 try {