yuexiang

src/store/modules/dictionary.ts

@@ -28,12 +28,12 @@ const state = {
 		{dictLabel: '缉私警', dictValue: 'jsj', icon: iconJSJ},
 		{dictLabel: '网格员', dictValue: 'wgy', icon: iconWGY},
 		{dictLabel: '危险车辆', dictValue: 'wxcl', icon: iconWXCL},
-		{dictLabel: '公安类设备', dictValue: 'gal', icon: iconGALSB, dictType: 'sb', geoType: 'mysqlGeo:gis_sb_gal'},
-		{dictLabel: '社会类设备', dictValue: 'shl', icon: iconSHLSB, dictType: 'sb', geoType: 'mysqlGeo:gis_sb_shl'},
-		{dictLabel: '民用类设备', dictValue: 'myl', icon: iconMYLSB, dictType: 'sb', geoType: 'mysqlGeo:gis_sb_myl'},
-		{dictLabel: '零关税自用进口生产设备', dictValue: 'lgszyjkscsb', icon: iconLGSZYJKSCSB, dictType: 'qy', geoType: 'mysqlGeo:gis_qy_lgszyjkscsb'},
-		{dictLabel: '加工增值免关税', dictValue: 'jgzzmgs', icon: iconJGZZMGS, dictType: 'qy', geoType: 'mysqlGeo:gis_qy_jgzzmgs'},
-		{dictLabel: '零关税进口原辅料', dictValue: 'lgsjkyfl', icon: iconLGSJKYFL, dictType: 'qy', geoType: 'mysqlGeo:gis_qy_lgsjkyfl'},
+		{dictLabel: '公安类设备', dictValue: 'gal', icon: iconGALSB, dictType: 'sb', geoType: 'gis_sb_gal'},
+		{dictLabel: '社会类设备', dictValue: 'shl', icon: iconSHLSB, dictType: 'sb', geoType: 'gis_sb_shl'},
+		{dictLabel: '民用类设备', dictValue: 'myl', icon: iconMYLSB, dictType: 'sb', geoType: 'gis_sb_myl'},
+		{dictLabel: '零关税自用进口生产设备', dictValue: 'lgszyjkscsb', icon: iconLGSZYJKSCSB, dictType: 'qy', geoType: 'gis_qy_lgszyjkscsb'},
+		{dictLabel: '加工增值免关税', dictValue: 'jgzzmgs', icon: iconJGZZMGS, dictType: 'qy', geoType: 'gis_qy_jgzzmgs'},
+		{dictLabel: '零关税进口原辅料', dictValue: 'lgsjkyfl', icon: iconLGSJKYFL, dictType: 'qy', geoType: 'gis_qy_lgsjkyfl'},
 		{dictLabel: '景区', dictValue: 'jq', icon: iconJQ},
 		{dictLabel: '旅馆', dictValue: 'lg', icon: iconLG},
 		{dictLabel: '出租屋', dictValue: 'czw', icon: iconCZW},

src/store/modules/gis.ts

@@ -815,8 +815,9 @@ const actions = {
         }
       })
     }
-    const cql: any = ["(geoType = 2)"]
-    cql.push(`(typeValue in (${getters['elementActiveArr'].length > 0 ? getters['elementActiveArr'].map(v => `'${v.value}'`).join(',') : -1}))`)
+    // const cql: any = ["(geoType = 2)"]
+    const cql: any = []
+    cql.push(`(type_value in (${getters['elementActiveArr'].length > 0 ? getters['elementActiveArr'].map(v => `'${v.value}'`).join(',') : -1}))`)
     const notIds: Array<string> = []
     if (state.gisParams.default.feature) {
       notIds.push(`'${state.gisParams.default.feature.getId()}'`)
@@ -852,8 +853,8 @@ 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 cql: any = ["(geoType = 1)", "(typeValue in ('gal', 'shl', 'myl'))"]
+      const cql: any = ["(type_value in ('gal', 'shl', 'myl'))"]
       const notIds: Array<string> = []
       if (state.gisParams.default.feature) {
         notIds.push(`'${state.gisParams.default.feature.getId()}'`)
@@ -881,8 +882,8 @@ 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 cql: any = ["(geoType = 1)", "(typeValue in ('gal', 'shl', 'myl'))"]
+      const cql: any = ["(type_value 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()}'`)