From 3cc3e812218257698771b5e33df8beeb19cdda8d Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 07 四月 2021 17:15:33 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/conf/layers/LayerWasteWater.js | 6
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 4
src/conf/LayerTopic.js | 5
src/conf/layers/LayerPollutionSources.js | 26 +++++
src/conf/layers/LayerWasteGas.js | 28 ++---
src/components/LayerController/modules/LcServiceLayerFilter.vue | 31 +++--
src/conf/MapConfig.js | 3
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 5
src/components/BaseNav/PublicBounced/PublicBounced.vue | 52 +++++-----
src/conf/layers/LayerSewers.js | 102 --------------------
10 files changed, 91 insertions(+), 171 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 262f1c9..9d971cd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -84,7 +84,8 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- min-height: 354px;
+ //min-height: 354px;
+ height: 208px;
}
.main {
@@ -93,7 +94,7 @@
.main-table {
width: 100%;
- min-height: 195px;
+ //min-height: 195px;
//border: 1px @color solid;
video {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index ab9246b..fa9642f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -26,15 +26,15 @@
.win {
position: relative;
background-color: rgba(33, 41, 69,0.9);
+ height: 300px;
}
.main {
border: 1px solid #396d83;
padding: 6px;
//.main-video {
- height: 432px;
video {
width: 100%;
- height: 432px;
+ height: 100%;
outline: none;
}
//}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 2cccd58..af891c5 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -22,32 +22,32 @@
<public-video></public-video>
</div>
</div>
- </div>
-<!-- <el-dialog-->
-<!-- :visible.sync="flag"-->
-<!-- width="70%"-->
-<!-- class="public-bounced"-->
-<!-- :modal="false">-->
-<!-- <div class="public-bounced-title">-->
-<!-- <span>{{ displayContentTitle }}</span>-->
-<!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
-<!-- </div>-->
-<!-- <div class="public-bounced-content">-->
-<!-- <div class="public-bounced-content-left">-->
-<!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
-<!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
-<!-- <div class="public-bounced-content-left-bottom">-->
-<!-- <public-table v-if="value === 'gufei'"-->
-<!-- :displayContentTable="displayContentTable"></public-table>-->
-<!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
-<!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
+<!-- <el-dialog-->
+<!-- :visible.sync="flag"-->
+<!-- width="70%"-->
+<!-- v-drag-->
+<!-- :modal="false">-->
+<!-- <div class="public-bounced-title">-->
+<!-- <span>{{ displayContentTitle }}</span>-->
+<!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
+<!-- </div>-->
+<!-- <div class="public-bounced-content">-->
+<!-- <div class="public-bounced-content-left">-->
+<!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
+<!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
+<!-- <div class="public-bounced-content-left-bottom">-->
+<!-- <public-table v-if="value === 'gufei'"-->
+<!-- :displayContentTable="displayContentTable"></public-table>-->
+<!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
+<!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="public-bounced-content-right">-->
+<!-- <public-video></public-video>-->
<!-- </div>-->
<!-- </div>-->
-<!-- <div class="public-bounced-content-right">-->
-<!-- <public-video></public-video>-->
-<!-- </div>-->
-<!-- </div>-->
-<!-- </el-dialog>-->
+<!-- </el-dialog>-->
+ </div>
</template>
<script>
@@ -120,8 +120,8 @@
<style lang="less" scoped>
.public-bounced {
width: 75%;
- //height: 540px;
- height: 65%;
+ //height: 520px;
+ height: 40%;
z-index: 999;
position: absolute;
bottom: 5%;
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 60e229f..f390c9f 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -5,7 +5,7 @@
<div class="title"><input type="checkbox" :value="item.code" :checked="item.checked"
@change="swAllSubFilter(item)">{{item.name}}
</div>
- <el-scrollbar style="height:100%">
+ <!-- <el-scrollbar style="height:100%"> -->
<div class="content">
<div v-for="filter in item.layers" :key="filter.code">
<input type="checkbox" :value="filter.code" :checked="filter.checked"
@@ -13,7 +13,7 @@
:title="filter.name">{{filter.name}}</label>
</div>
</div>
- </el-scrollbar>
+ <!-- </el-scrollbar> -->
</div>
</div>
</div>
@@ -50,18 +50,20 @@
},
// todo 杩橀渶瑕佷紭鍖栵紝鍦ㄦ湁澶氫釜闇�瑕佸瓙鍥惧眰鐙珛寮圭獥鎯呭喌涓嬫棤鏁�
toggle (serviceLayers) {
- for (var i = 0; i < serviceLayers.length; i++) {
- var serviceLayer = serviceLayers[i]
- var childLayer = serviceLayer.childLayer
- if (childLayer) {
- if (this.checkChecked(serviceLayer.layers)) {
- this.layers = childLayer
+ if (serviceLayers) {
+ for (var i = 0; i < serviceLayers.length; i++) {
+ var serviceLayer = serviceLayers[i]
+ var childLayer = serviceLayer.childLayer
+ if (childLayer) {
+ if (this.checkChecked(serviceLayer.layers)) {
+ this.layers = childLayer
+ } else {
+ this.layers = []
+ }
+ break
} else {
- this.layers = []
+ this.toggle(serviceLayer.layers)
}
- break
- } else {
- this.toggle(serviceLayer.layers)
}
}
},
@@ -102,7 +104,7 @@
color: #90c8e0;
font-size: 13px;
position: absolute;
- left: 256px;
+ left: 1.82167rem;
z-index: 1000;
top: 50px;
.filter-group {
@@ -110,7 +112,7 @@
flex-flow: row;
.filter-item {
- width: 120px;
+ width: 0.6rem;
height: 100%;
margin-right: 5px;
@@ -124,6 +126,7 @@
background-color: rgba(44, 62, 80, 0.6);
border: 1px solid #10488c;
max-height: 200px;
+ padding-bottom: 5px;
//overflow-y: hidden;
}
diff --git a/src/conf/LayerTopic.js b/src/conf/LayerTopic.js
index 66197d9..1e1fe7d 100644
--- a/src/conf/LayerTopic.js
+++ b/src/conf/LayerTopic.js
@@ -1,5 +1,5 @@
/**
- * 鍖哄煙
+ * 涓撻
*/
import { LayerWasteWater } from './layers/LayerWasteWater'
import { LayerWasteGas } from './layers/LayerWasteGas'
@@ -7,10 +7,11 @@
import { LayerAirQuality } from './layers/LayerAirQuality'
import { LayerEnvRisk } from './layers/LayerEnvRisk'
import { LayerSoilGroundWater } from './layers/LayerSoilGroundWater'
+import { LayerPollutionSources } from './layers/LayerPollutionSources'
export const LayerTopic = {
code: 'sewersTopic',
name: '涓撻鍥惧眰',
checked: true,
- layers: [LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater]
+ layers: [LayerPollutionSources, LayerWasteWater, LayerWasteGas, LayerWasteSolid, LayerAirQuality, LayerEnvRisk, LayerSoilGroundWater]
}
diff --git a/src/conf/MapConfig.js b/src/conf/MapConfig.js
index 8f95cd8..4dff288 100644
--- a/src/conf/MapConfig.js
+++ b/src/conf/MapConfig.js
@@ -3,6 +3,7 @@
import { LayerSewersPoint } from './layers/LayerSewers'
import { LayerTopic } from './LayerTopic'
import { LayerPipeLine } from './LayerPipeLine'
+import { LayerBasin } from './layers/LayerBasin'
const curWwwPath = window.document.location.href
const pathname = window.document.location.pathname
@@ -42,7 +43,7 @@
IntranetBaseMaps: TDT.intranet,
InternetBaseMaps: TDT.internet,
Layers: {
- LayerSewersLine: [LayerPipeLine, LayerTopic],
+ LayerSewersLine: [LayerBasin, LayerTopic, LayerPipeLine],
layerSewersPoint: LayerSewersPoint
} // 姹￠洦姘村浘灞傞厤缃�
}
diff --git a/src/conf/layers/LayerPollutionSources.js b/src/conf/layers/LayerPollutionSources.js
new file mode 100644
index 0000000..324b69e
--- /dev/null
+++ b/src/conf/layers/LayerPollutionSources.js
@@ -0,0 +1,26 @@
+/**
+ * 姹℃煋婧�
+ * @type {string}
+ */
+export const LayerPollutionSources = {
+ code: 'pollutionSources',
+ name: '姹℃煋婧�',
+ checked: true,
+ layers: [
+ {
+ code: 'pollutionSourcesSczz',
+ name: '鐢熶骇瑁呯疆',
+ sname: '鐢熶骇瑁呯疆', // 琛ㄥ悕
+ checked: true, // 榛樿閫変腑鐘舵��
+ url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ },
+ {
+ code: 'pollutionSourcesZlss',
+ name: '娌荤悊璁炬柦',
+ sname: '娌荤悊璁炬柦', // 琛ㄥ悕
+ checked: true, // 榛樿閫変腑鐘舵��
+ url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
+ minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
+ }]
+}
diff --git a/src/conf/layers/LayerSewers.js b/src/conf/layers/LayerSewers.js
index 433b67d..39e71a5 100644
--- a/src/conf/layers/LayerSewers.js
+++ b/src/conf/layers/LayerSewers.js
@@ -1,106 +1,4 @@
const APP_GIS_HOST_2 = 'http://xearth.cn:8088'
-const WFS_URL = APP_GIS_HOST_2 + '/server/ogcserver/PipeLine/wfs'
-// const APP_GIS_HOST_2 = 'http://localhost:3000'
-// const APP_GIS_HOST_2 = 'http://192.168.31.226:8088'
-export const LayerSewersLine = {
- code: 'pipeline',
- name: '绠＄綉鏁版嵁',
- type: 'geojson',
- checked: true,
- layers: [
- {
- code: 'rainline',
- name: '闆ㄦ按绾�',
- sname: '绠＄綉', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=绠＄綉',
- minZoom: 10, // 鍦ㄦ寚瀹氱骇鍒樉绀�
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'oilline',
- name: '鍚补姹℃按绾�',
- sname: '鍚补姹℃按',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鍚补姹℃按',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'saltline',
- name: '鍚洂姹℃按绾�',
- sname: '鍚洂姹℃按',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鍚洂姹℃按',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'alkaliline',
- name: '鍚⒈姹℃按绾�',
- sname: '鍚⒈姹℃按',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鍚⒈姹℃按',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'outlet',
- name: '鎺掑彛',
- sname: '鎺掑彛',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鎺掑彛',
- minZoom: 10,
- childLayer: 'pk' // 鍏宠仈PointLayers
- },
- {
- code: 'accidentline',
- name: '浜嬫晠姘寸嚎',
- sname: '浜嬫晠姘�',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=浜嬫晠姘�',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'loopline',
- name: '寰幆姘寸嚎',
- sname: '寰幆姘�',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=寰幆姘�',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'purifyline',
- name: '鍑�鍖栨按绾�',
- sname: '鍑�鍖栨按',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鍑�鍖栨按',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'lifeline',
- name: '鐢熸椿姹℃按',
- sname: '鐢熸椿姹℃按',
- checked: true, // 榛樿閫変腑鐘舵��
- wfs: WFS_URL + '?TYPENAME=鐢熸椿姹℃按',
- minZoom: 10,
- childLayer: 'sewersFsss,sewersHbss' // 鍏宠仈PointLayers
- },
- {
- code: 'areainfo',
- name: '鍖哄煙淇℃伅',
- sname: '鍖哄煙淇℃伅',
- checked: true, // 榛樿閫変腑鐘舵��
- filter: {},
- minZoom: 10,
- childLayer: 'qyxx' // 鍏宠仈PointLayers
- }
- ]
-}
-
export const LayerSewersPoint = [
{
code: 'sewersFsss',
diff --git a/src/conf/layers/LayerWasteGas.js b/src/conf/layers/LayerWasteGas.js
index 3860e94..c87de74 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -9,27 +9,11 @@
layers: [
{
code: 'wasteGasQy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
+ name: '鎺掓斁鍙�',
+ sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
- },
- {
- code: 'wasteGasJcd',
- name: '鐩戞祴鐐�',
- sname: '鐩戞祴鐐�',
- checked: true, // 榛樿閫変腑鐘舵��
- url: 'http://www.baidu2.com',
- minZoom: 10
- },
- {
- code: 'wasteGasVocs',
- name: 'VOCs',
- sname: 'VOCs',
- checked: true, // 榛樿閫変腑鐘舵��
- url: '',
- minZoom: 10
},
{
code: 'wasteGasKrq',
@@ -46,6 +30,14 @@
checked: true, // 榛樿閫変腑鐘舵��
url: '',
minZoom: 10
+ },
+ {
+ code: 'wasteGasVocs',
+ name: 'VOCs',
+ sname: 'VOCs',
+ checked: true, // 榛樿閫変腑鐘舵��
+ url: '',
+ minZoom: 10
}
]
}
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index c7d6a65..013da1a 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -21,8 +21,7 @@
sname: '鐩戞祴鐐�',
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu2.com',
- minZoom: 10,
- childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+ minZoom: 10
},
{
code: 'wasteWaterfk',
@@ -30,8 +29,7 @@
sname: '鎺掓斁鍙�',
checked: true, // 榛樿閫変腑鐘舵��
url: '',
- minZoom: 10,
- childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+ minZoom: 10
}
]
}
--
Gitblit v1.8.0