webui界面修改

web_ui/config/index.js

@@ -36,7 +36,7 @@ module.exports = {
         }
       },
       '/geoserver-host': {
-        target: 'http://60.191.110.204:8515', //对应服务器地址
+        target: 'https://zdzy.zrzyt.zj.gov.cn', //对应服务器地址
         changeOrigin: true, //允许跨域
         ws: true,
         pathRewrite: {

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

@@ -813,7 +813,8 @@ export default {
       if (this.inputText == "" || this.inputText == null) {
         // this.$Message.info("请输入");
         // return;
-         this.inputText = "帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地";
+        this.inputText =
+          "帮我在杭州市西湖区找几块面积35亩左右，人口相对密集的工业用地";
       }
 
       this.zwinputText = "";
@@ -928,7 +929,7 @@ export default {
       this.map = L.map(this.id, {
         center: myCenter,
         zoom: this.zoomLevel,
-        zoomControl:false
+        zoomControl: false,
       });
       // var tk = window.ApplicationConfig.tk;
       var tk = "6dfd31e3b55a8466f34997aee5551a9c";
@@ -1065,7 +1066,7 @@ export default {
           }
         }
         this.clearMark();
-        this.showDetail = true;
+        // this.showDetail = true;
         this.activeItem = item;
         this.dkIndex = index;
         //高亮marker
@@ -1079,7 +1080,7 @@ export default {
         this.clearMark();
         this.activeItem = null;
       }
-      this.goLocation(item,index);
+      this.goLocation(item, index);
     },
     //地块收藏点击查看详情
     dkInfo(item) {
@@ -1181,14 +1182,21 @@ export default {
         this.geojsonLayer = this.dkGeo.addTo(this.map);
         this.map.fitBounds(this.dkGeo.getBounds());
       } else {
+        // let query =
+        //   window.ApplicationConfig.landUrl +
+        //   "/0/query?where=id=" +
+        //   item.id +
+        //   "&" +
+        //   "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
+        //   "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
+        //   "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
         let query =
-          window.ApplicationConfig.landUrl +
-          "/0/query?where=id=" +
-          item.id +
-          "&" +
-          "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
-          "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
-          "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
+          window.ApplicationConfig.geoserverUrl +
+          "?service=WFS&version=1.0.0&request=GetFeature&typeName=" +
+          window.ApplicationConfig.gdLayerName +
+          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=name='" +
+          item.name +
+          "'";
         axios.get(query).then((data) => {
           console.log(data);
           if (data.data.features.length < 1) {
@@ -1196,7 +1204,7 @@ export default {
             return;
           }
           this.land = data.data.features[0].attributes;
-          var geojson = arcgisToGeoJSON(data.data.features[0].geometry);
+          var geojson = data.data.features[0].geometry;
           var geos = L.geoJSON(geojson, {
             style: function (feature) {
               return { color: "#3BA5FF" };
@@ -1212,14 +1220,21 @@ export default {
     //获取地块信息
     async getActiveItemGeometry(item) {
       return new Promise((resolve, reject) => {
+        // let query =
+        //   window.ApplicationConfig.landUrl +
+        //   "/0/query?where=id=" +
+        //   item.id +
+        //   "&" +
+        //   "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
+        //   "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
+        //   "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
         let query =
-          window.ApplicationConfig.landUrl +
-          "/0/query?where=id=" +
-          item.id +
-          "&" +
-          "geometryType=esriGeometryPoint&inSR=4490&spatialRel=esriSpatialRelIntersects&relationParam=&outFields=*&returnGeometry=true&" +
-          "maxAllowableOffset=&geometryPrecision=&outSR=&returnIdsOnly=false&returnCountOnly=false&orderByFields=&groupByFieldsForStatistics=&" +
-          "outStatistics=&returnZ=false&returnM=false&gdbVersion=&returnDistinctValues=false&f=json";
+          window.ApplicationConfig.geoserverUrl +
+          "?service=WFS&version=1.0.0&request=GetFeature&typeName=" +
+          window.ApplicationConfig.gdLayerName +
+          "&maxFeatures=50&outputFormat=application%2Fjson&cql_filter=name='" +
+          item.name +
+          "'";
         axios.get(query).then((data) => {
           console.log(data);
           if (data.data.features.length < 1) {
@@ -1227,7 +1242,7 @@ export default {
             this.dkGeojson = null;
             return;
           }
-          var geojson = arcgisToGeoJSON(data.data.features[0].geometry);
+          var geojson = data.data.features[0].geometry;
           var geos = L.geoJSON(geojson, {
             style: function (feature) {
               return { color: "#3BA5FF" };
@@ -2331,7 +2346,7 @@ export default {
           position: absolute;
           bottom: 26px;
           padding: 18px 0px 0px 19px;
-          border:1px solid #adadad;
+          border: 1px solid #adadad;
           textarea {
             border: none;
             resize: none;

web_ui/static/config.js

@@ -13,9 +13,11 @@
     zizsUrl: 'http://ai.zjugis.com:8510/#/ai-assistant',
     // aiUrl: 'http://localhost:8080/#/ai',
     // landuseAiUrl:'http://localhost:8080/#/assistant',
-    gdUrl: '/arcserver-host/arcgis/rest/services/NRLLM/ZPGGD/MapServer',
-    landUrl: '/arcserver-host/arcgis/rest/services/NRLLM/LAND_PUBLIC_SALE/MapServer',
-    xzqUrl: '/arcserver-host/arcgis/rest/services/NRLLM/ZJXZQ/MapServer',
+    gdUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/ZPGGD/MapServer',
+    landUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/LAND_PUBLIC_SALE/MapServer',
+    xzqUrl: 'http://60.191.110.204:6080/arcgis/rest/services/NRLLM/ZJXZQ/MapServer',
+    geoserverUrl:'/geoserver-host/geoserver/sde/ows',
+    gdLayerName:'sde%3Aland_public_sale',
     aiAgent: [
       'plan_dispatcher',
       'summary',
@@ -61,9 +63,9 @@
             checked: true,
             // type: 'dynamic',
             // url: '/arcserver-host/arcgis/rest/services/NRLLM/LAND_PUBLIC_SALE/MapServer'
-            type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
-            layername: 'nrllm:land_public_sale'
+            type: 'geoserver',
+            url: 'https://zdzy.zrzyt.zj.gov.cn/geoserver/sde/wms',
+            layername: 'sde:land_public_sale'
           }
         ]
       },
@@ -74,7 +76,7 @@
             id: "DLFB",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_land_type'
           },
         ]
@@ -86,7 +88,7 @@
             id: "KZXXXGH",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_control_planning'
           },
           {
@@ -94,14 +96,14 @@
             id: "CZKFBJX",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_development_bound'
           },{
             name: "永久基本农田控制线",
             id: "YJJBNT",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_capital_farmland'
           }
           ,{
@@ -109,7 +111,7 @@
             id: "STBHHX",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ecological_protection'
           }
         ]
@@ -121,7 +123,7 @@
             id: "CYYQ",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_park'
           },
         ]
@@ -133,7 +135,7 @@
             id: "JT_GK",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_port'
           },
           {
@@ -141,7 +143,7 @@
             id: "JT_JC",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_traffic_airport'
           },
           {
@@ -149,7 +151,7 @@
             id: "JT_HCZ",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_traffic_train_station'
           },
           {
@@ -157,7 +159,7 @@
             id: "JT_GJZ",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_traffic_bus_station'
           },
           {
@@ -165,7 +167,7 @@
             id: "JT_GJZ",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_traffic_metro_station'
           },
           {
@@ -173,7 +175,7 @@
             id: "JT_GS",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_highway_expressway'
           },
           {
@@ -181,7 +183,7 @@
             id: "JT_GD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_way_g'
           },
           {
@@ -189,7 +191,7 @@
             id: "JT_GD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_way_s'
           },
           {
@@ -197,7 +199,7 @@
             id: "JT_GD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_way_x'
           },
           {
@@ -205,7 +207,7 @@
             id: "JT_GD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_way_y'
           },
         ]
@@ -217,7 +219,7 @@
             id: "ENV_ZDXM",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_env_major_project'
           },
           {
@@ -225,7 +227,7 @@
             id: "ENV_DZZHD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_env_geologic_hazard'
           },
           {
@@ -233,7 +235,7 @@
             id: "ENV_HGC",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_env_chemical_plant'
           },
           {
@@ -241,7 +243,7 @@
             id: "ENV_WXPCK",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_env_gas_station'
           },
           {
@@ -249,7 +251,7 @@
             id: "ENV_RQZ",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_env_gas_station'
           },
         ]
@@ -261,7 +263,7 @@
             id: "GAXF",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_xfd'
           },
           {
@@ -269,14 +271,14 @@
             id: "YLWS",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_ylss'
           }, {
             name: "教育学校",
             id: "JYXX",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_jyss'
           },
           {
@@ -284,7 +286,7 @@
             id: "WHSS",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_whss'
           },
           {
@@ -292,7 +294,7 @@
             id: "TYSS",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_tyss'
           },
           {
@@ -300,7 +302,7 @@
             id: "GYLD",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_gyld'
           },
           {
@@ -308,7 +310,7 @@
             id: "ZFJG",
             checked: false,
             type: 'wmts',
-            url: '/geoserver-host/geoserver/nrllm/gwc/service/wmts',
+            url: 'http://60.191.110.204:8515/geoserver/nrllm/gwc/service/wmts',
             layername: 'nrllm:layer_poi_ggfw_zfjg'
           },
         ]