소스 검색

信创服务集成

songxy 1 년 전
부모
커밋
e5b48d7579

+ 1 - 1
BJYSYBZ_C/public/config.js

@@ -1,6 +1,6 @@
 const arcMapToken = "sy-af242c93-2d14-4232-812b-b9f23172dbb2";
 window.ApplicationConfig = {
-  baseUrl: "/ybzBjServer",
+  baseUrl: "https://zdzy.zrzyt.zj.gov.cn/app215/ybz-api/",
   mapLayerConfig: {
     use: "innerNet",
     projection: {

+ 1 - 1
BJYSYBZ_C/src/views/WlydxqView/components/YqxqMap.vue

@@ -22,7 +22,7 @@ export default {
     this.$vm.$on("changeLayer", payload => {
       const {id,param,layerIdx1,layerIdx2} = payload
       let params={
-          layers: `show:${layerIdx1},${layerIdx2}`,
+          // layers: `show:${layerIdx1},${layerIdx2}`,
           layerDefs: {
             [layerIdx1]: param,
             [layerIdx2]: param

+ 26 - 17
BJYSYBZ_C/src/views/components/BigScreenMap/index.vue

@@ -1115,23 +1115,32 @@ export default {
     async locationFeatureWhere(layerId, where, setting) {
       this.spinShow = true;
       const layerById = this.$refs.configLayer.getLayerConfigById(layerId);
-      await arcgisQuery(
-        `${layerById.url}/${this.layerIndex}/query`,
-        {
-          outSR: getSrid(this.map),
-          where,
-          ...setting,
-        },
-        true
-      ).then(({ features }) => {
-        let feature = features[0];
-        const geometry = feature.getGeometry();
-        const wkt = WkxGeometry.parseGeoJSON(
-          new GeoJSON().writeGeometryObject(geometry)
-        ).toWkt();
-        feature.set("wkt", wkt);
-        this.feature = feature;
-      });
+      if (layerById.serverType === 'wms') {
+        await GeoServerQuery(`${layerById.queryUrl}`, {
+          typeName: layerById.params.layers,
+          cql_filter: where
+        }, true).then(({ features }) => {
+          this.feature = features[0]
+        })
+      } else {
+        await arcgisQuery(
+          `${layerById.url}/${this.layerIndex}/query`,
+          {
+            outSR: getSrid(this.map),
+            where,
+            ...setting,
+          },
+          true
+        ).then(({ features }) => {
+          let feature = features[0];
+          const geometry = feature.getGeometry();
+          const wkt = WkxGeometry.parseGeoJSON(
+            new GeoJSON().writeGeometryObject(geometry)
+          ).toWkt();
+          feature.set("wkt", wkt);
+          this.feature = feature;
+        });
+      }
       this.spinShow = false;
     },
     async locationMaskFeatureHttp(

+ 4 - 4
BJYSYBZ_S/src/main/resources/application-tinker.yml

@@ -3,9 +3,9 @@ spring:
     postgre:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://10.10.9.243:5432/test
+      url: jdbc:postgresql://10.249.3.61:5432/sde
       username: sde
-      password: zdww1402!
+      password: zjugis1402!
       initialSize: 1
       minIdle: 3
       maxActive: 216
@@ -31,9 +31,9 @@ spring:
     oracle51:
       type: com.alibaba.druid.pool.DruidDataSource
       driver-class-name: org.postgresql.Driver
-      url: jdbc:postgresql://10.10.9.243:5432/test
+      url: jdbc:postgresql://10.249.3.61:5432/sde
       username: sde
-      password: zdww1402!
+      password: zjugis1402!
       initialSize: 1
       minIdle: 3
       maxActive: 216