From 6f256a8be5c330cbf4d852f7dc4a1a6614f0419d Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 10:11:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerPipeLines.js | 4 +-
src/components/panel/topicSearch/pipeInformationSearch.vue | 3 -
src/components/panel/topicSearch/GasWasteSearch.vue | 8 ++++
src/conf/layers/LayerFsss.js | 4 +-
src/conf/layers/LayerAirQuality.js | 4 +-
src/components/LayerController/modules/LcServiceLayerFilter.vue | 3 -
src/conf/layers/LayerArea.js | 4 +-
src/conf/layers/LayerPk.js | 4 +-
src/components/panel/topicSearch/DischargeSearch.vue | 3 -
src/conf/layers/LayerBasin.js | 4 +-
src/components/panel/topicSearch/EnvRiskSearch.vue | 3 -
src/components/panel/topicSearch/pipeChangesSearch.vue | 3 -
src/conf/layers/LayerHbss.js | 4 +-
src/conf/Constants.js | 2 +
src/conf/MapConfig.js | 4 -
src/conf/layers/LayerEnvRisk.js | 4 +-
src/conf/layers/LayerSoilGroundWater.js | 4 +-
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 3 -
18 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 9f36a5e..6903552 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -20,15 +20,12 @@
</template>
<script>
-import { LayerSewersPoint } from '@src/conf/layers/LayerSewers'
-
export default {
name: 'LcServiceLayerFilter',
components: { },
data () {
return {
visible: {},
- layerSewersPoint: LayerSewersPoint,
layers: [],
filterConfig: [] // 闄勫睘瑕佺礌
}
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 294a471..e71a71c 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -117,8 +117,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -127,7 +125,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 8c214dc..5a3aaac 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -77,8 +77,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -87,7 +85,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 102b5e5..c852889 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -97,16 +97,24 @@
</template>
<script>
+<<<<<<< HEAD
+import WfsHelper from '@components/helpers/WfsHelper'
+import AjaxUtils from '@utils/AjaxUtils'
+=======
import mapApi from '@/api/mapApi'
// import WfsHelper from '@components/helpers/WfsHelper'
+>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
export default {
name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
list: [],
+<<<<<<< HEAD
+=======
// labelList: PipelineTypeOptions[0].labelList,
+>>>>>>> d838248f54e3bcacf9c2a54f7dc692525af3c051
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index 7b74153..6060961 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -127,8 +127,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -137,7 +135,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
inareaTypeOptions: [],
enterpriseTypeOptions: [],
diff --git a/src/components/panel/topicSearch/pipeChangesSearch.vue b/src/components/panel/topicSearch/pipeChangesSearch.vue
index dbd4bee..e433b29 100644
--- a/src/components/panel/topicSearch/pipeChangesSearch.vue
+++ b/src/components/panel/topicSearch/pipeChangesSearch.vue
@@ -68,8 +68,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -78,7 +76,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
form: {
areaVal: '',
diff --git a/src/components/panel/topicSearch/pipeInformationSearch.vue b/src/components/panel/topicSearch/pipeInformationSearch.vue
index 916f4d2..19b638f 100644
--- a/src/components/panel/topicSearch/pipeInformationSearch.vue
+++ b/src/components/panel/topicSearch/pipeInformationSearch.vue
@@ -62,8 +62,6 @@
</template>
<script>
-import { PipelineTypeOptions } from '@/conf/layers/LayerSewers'
-
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
@@ -72,7 +70,6 @@
return {
gdVisible: true,
list: [],
- labelList: PipelineTypeOptions[0].labelList,
total: 0,
form: {
areaVal: '',
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 848d666..f78ac95 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -4,6 +4,8 @@
POLYGON: 'polygon'
}
+export const PIPELINE_WFS = 'http://xearth.cn:8088/server/ogcserver/PipeLine2/wfs'
+
export const logicMapper = {
wasteGasPfk: 'WasteGas.js',
wasteWaterPfk: 'WasteWater.js',
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 59e35d6..168b466 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -11,7 +11,6 @@
// service涓绘満閰嶇疆
// const APP_GIS_HOST = 'http://xearth.cn:6299'
const APP_GIS_HOST = 'http://xearth.cn:8088'
-const PIPELINE_WFS = APP_GIS_HOST + '/server/ogcserver/PipeLine2/wfs'
// 鑷畾涔変富鏈洪厤缃�
const BLUEMAP_HOST = APP_GIS_HOST // 鍏徃鍙戝竷鐨勫湴鍥炬湇鍔★紝鐢ㄤ簬娴嬭瘯鐨勫湴鍧�
@@ -80,8 +79,7 @@
mapOptions,
mapConfig,
TokenConfig,
- BLUEMAP_HOST,
- PIPELINE_WFS
+ BLUEMAP_HOST
// mapTokenArray
// MagicMaker
}
diff --git a/src/conf/layers/LayerAirQuality.js b/src/conf/layers/LayerAirQuality.js
index f2436ba..5c0de19 100644
--- a/src/conf/layers/LayerAirQuality.js
+++ b/src/conf/layers/LayerAirQuality.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerAirQuality = {
code: 'sewersAirQuality',
name: '绌烘皵璐ㄩ噺',
diff --git a/src/conf/layers/LayerArea.js b/src/conf/layers/LayerArea.js
index 43af0c1..ffdbf98 100644
--- a/src/conf/layers/LayerArea.js
+++ b/src/conf/layers/LayerArea.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerArea = {
code: 'sewersArea',
name: '鍖哄煙淇℃伅',
diff --git a/src/conf/layers/LayerBasin.js b/src/conf/layers/LayerBasin.js
index 6d66dbc..7e8b80e 100644
--- a/src/conf/layers/LayerBasin.js
+++ b/src/conf/layers/LayerBasin.js
@@ -1,8 +1,8 @@
/**
* 娴佸煙
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerBasin = {
code: 'sewersBasin',
name: '鍖哄煙鍥惧眰',
diff --git a/src/conf/layers/LayerEnvRisk.js b/src/conf/layers/LayerEnvRisk.js
index b893dd5..b1dfafe 100644
--- a/src/conf/layers/LayerEnvRisk.js
+++ b/src/conf/layers/LayerEnvRisk.js
@@ -1,8 +1,8 @@
/**
* 鐜椋庨櫓
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerEnvRisk = {
code: 'sewersEnvRisk',
name: '鐜椋庨櫓',
diff --git a/src/conf/layers/LayerFsss.js b/src/conf/layers/LayerFsss.js
index 3d82df3..01a5615 100644
--- a/src/conf/layers/LayerFsss.js
+++ b/src/conf/layers/LayerFsss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerFsss = {
code: 'sewersFsss',
name: '闄勫睘璁炬柦',
diff --git a/src/conf/layers/LayerHbss.js b/src/conf/layers/LayerHbss.js
index 4a6bca0..fe105f7 100644
--- a/src/conf/layers/LayerHbss.js
+++ b/src/conf/layers/LayerHbss.js
@@ -1,8 +1,8 @@
/**
* 鍖哄煙
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerHbss = {
code: 'sewersHbss',
name: '鐜繚璁炬柦',
diff --git a/src/conf/layers/LayerPipeLines.js b/src/conf/layers/LayerPipeLines.js
index 8287599..6e3f5b1 100644
--- a/src/conf/layers/LayerPipeLines.js
+++ b/src/conf/layers/LayerPipeLines.js
@@ -4,8 +4,8 @@
import { LayerHbss } from './LayerHbss'
import { LayerFsss } from './LayerFsss'
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerPipeLines = {
code: 'sewersPipeLines',
diff --git a/src/conf/layers/LayerPk.js b/src/conf/layers/LayerPk.js
index 1975cf8..5547507 100644
--- a/src/conf/layers/LayerPk.js
+++ b/src/conf/layers/LayerPk.js
@@ -1,8 +1,8 @@
/**
* 鎺掑彛
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerPk = {
code: 'sewersPk',
name: '鎺掑彛',
diff --git a/src/conf/layers/LayerSoilGroundWater.js b/src/conf/layers/LayerSoilGroundWater.js
index d8cf89f..471d241 100644
--- a/src/conf/layers/LayerSoilGroundWater.js
+++ b/src/conf/layers/LayerSoilGroundWater.js
@@ -1,8 +1,8 @@
/**
* 鍦熷￥鍙婂湴涓嬫按
*/
-import MapConfig from '../../conf/MapConfig'
-const WFS_URL = MapConfig.PIPELINE_WFS
+import { PIPELINE_WFS } from '../Constants'
+const WFS_URL = PIPELINE_WFS
export const LayerSoilGroundWater = {
code: 'sewersSoilGroundWater',
name: '鍦熷￥鍙婂湴涓嬫按',
--
Gitblit v1.8.0