viewparams替换

src/components/easyMap/func/measure.ts

@@ -12,7 +12,6 @@ import { unByKey } from 'ol/Observable'
 import './dom.scss'
 import {createBox} from "ol/interaction/Draw";
 import {Circle, LineString, Polygon} from "ol/geom";
-import {locationTooltipElement} from "@/components/easyMap/func/location";
 import {v4} from "uuid";
 import store from "@/store";
 

src/store/modules/gis.ts

@@ -827,22 +827,24 @@ const actions = {
     if (notIds.length > 0) {
       cql.push(`(dataId not in (${notIds.join(',')}))`)
     }
-    let vp: null | string = null
+    // let vp: null | string = null
     if (state.gisParams.qy.analysisWKT) {
-      vp = `locationValue:${formatWkt(state.gisParams.qy.analysisWKT)}`
+      // vp = `locationValue:${formatWkt(state.gisParams.qy.analysisWKT)}`
+      cql.push(`DISJOINT(location, ${state.gisParams.qy.analysisWKT})`)
     }
     if (state.analysis.wkt) {
-      vp = `locationValue:${formatWkt(state.analysis.wkt)}`
+      // vp = `locationValue:${formatWkt(state.analysis.wkt)}`
+      cql.push(`DISJOINT(location, ${state.analysis.wkt})`)
     }
     const tileWMS = new source.TileWMS({
-      url: `/${rootState.app.apiProxy.geoserverApi}/geoserver/mysqlGeo/wms`,
+      url: `/${rootState.app.apiProxy.geoserverApi}/queryTile`,
       params: {
         'FORMAT': 'image/png8',
         'VERSION': '1.1.1',
         "exceptions": 'application/vnd.ogc.se_inimage',
         refresh: new Date().getTime(),
-        LAYERS: 'mysqlGeo:socialManagementElement',
-        viewparams: vp,
+        LAYERS: 'socialManagementElement',
+        // viewparams: vp,
         CQL_FILTER: `(${cql.join(' and ')})`
       }
     })
@@ -851,6 +853,7 @@ const actions = {
   LOAD_GIS_QY_ANALYSIS_ELEMENT({state, dispatch, rootState}: any) {
     if (state.gisParams.qy.analysisWKT) {
       const cql: any = ["(geoType = 1)", "(typeValue in ('gal', 'shl', 'myl'))"]
+      // const cql: any = ["(typeValue in ('gal', 'shl', 'myl'))"]
       const notIds: Array<string> = []
       if (state.gisParams.default.feature) {
         notIds.push(`'${state.gisParams.default.feature.getId()}'`)
@@ -858,7 +861,9 @@ const actions = {
       if (notIds.length > 0) {
         cql.push(`(dataId not in (${notIds.join(',')}))`)
       }
-
+      if (state.gisParams.qy.analysisWKT) {
+        cql.push(`INTERSECTS(location, ${state.gisParams.qy.analysisWKT})`)
+      }
       const tileWMS = new source.TileWMS({
         url: `/${rootState.app.apiProxy.geoserverApi}/geoserver/mysqlGeo/wms`,
         params: {
@@ -867,7 +872,7 @@ const actions = {
           "exceptions": 'application/vnd.ogc.se_inimage',
           refresh: new Date().getTime(),
           LAYERS: 'mysqlGeo:socialManagementElement',
-          viewparams: `locationValue:${formatWkt(state.gisParams.qy.analysisWKT)}`,
+          // viewparams: `locationValue:${formatWkt(state.gisParams.qy.analysisWKT)}`,
           CQL_FILTER: `(${cql.join(' and ')})`
         }
       })
@@ -877,6 +882,7 @@ const actions = {
   LOAD_GIS_ANALYSIS_ELEMENT({state, dispatch, rootState}: any) {
     if (state.analysis.wkt) {
       const cql: any = ["(geoType = 1)", "(typeValue in ('gal', 'shl', 'myl'))"]
+      // const cql: any = ["(typeValue in ('gal', 'shl', 'myl'))"]
       const notIds: Array<string> = []
       if (state.gisParams.default.type === 'sb' && state.gisParams.default.feature) {
         notIds.push(`'${state.gisParams.default.feature.getId()}'`)
@@ -884,6 +890,9 @@ const actions = {
       if (notIds.length > 0) {
         cql.push(`(dataId not in (${notIds.join(',')}))`)
       }
+      if (state.analysis.wkt) {
+        cql.push(`INTERSECTS(location, ${state.analysis.wkt})`)
+      }
       const tileWMS = new source.TileWMS({
         url: `/${rootState.app.apiProxy.geoserverApi}/geoserver/mysqlGeo/wms`,
         params: {
@@ -892,7 +901,7 @@ const actions = {
           "exceptions": 'application/vnd.ogc.se_inimage',
           refresh: new Date().getTime(),
           LAYERS: 'mysqlGeo:socialManagementElement',
-          viewparams: `locationValue:${formatWkt(state.analysis.wkt)}`,
+          // viewparams: `locationValue:${formatWkt(state.analysis.wkt)}`,
           CQL_FILTER: `(${cql.join(' and ')})`
         }
       })

vite.config.ts

@@ -77,7 +77,8 @@ export default defineConfig({
         }
       },
       '/geoserver-api/': {
-        target: 'http://8.141.90.117:18092/',
+        // target: 'http://8.141.90.117:18092/',
+        target: 'http://192.168.32.111:7074/',
         changeOrigin: true,
         rewrite: path => {
           return path.replace(/^\/geoserver-api/, '')