From cd80929f0ae8882a98cfe3936b2a96bded1c12d8 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/logic/WasteGas.js | 16
src/conf/layers/LayerWasteWater.js | 20
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 162 ++++++-----
src/conf/LayerTopic.js | 5
src/conf/layers/LayerPollutionSources.js | 26 ++
src/conf/layers/LayerWasteGas.js | 30 -
src/assets/css/map/map-panel-style.less | 1
src/components/LayerController/modules/LcServiceLayerFilter.vue | 22
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 19 -
src/components/LayerController/logic/Company.js | 6
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 10
src/components/BaseNav/PublicBounced/PublicBounced.vue | 80 +++---
src/conf/layers/LayerSewers.js | 102 -------
src/conf/layers/LayerWasteSolid.js | 16
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 52 ++-
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 139 ++++++----
src/conf/Constants.js | 6
src/conf/MapConfig.js | 3
src/components/LayerController/logic/WasteWater.js | 8
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 44 --
src/components/LayerController/logic/SolidWaste.js | 6
21 files changed, 344 insertions(+), 429 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index 9303d46..144e283 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -294,6 +294,7 @@
}
.el-table td, .el-table th.is-leaf {
border: none;
+ font-size: 0.08rem;
}
.el-table .warning-row {
background: #28304d;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 5ef6f57..d9f23bd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,33 +1,35 @@
<template>
- <div id="Tab">
- <div class="Infomation">
- <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>
- <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>
- <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
- <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
- </div>
- <div class="form-echrts">
- <div>
- <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
- <el-dialog :visible.sync="dialogVisible"
- :append-to-body="true"
- width="68%"
- center
- v-dialogDrag
- >
- <div class="el-dialog-div" style="height: 500px">
- <public-detailed-list v-bind="$attrs"></public-detailed-list>
- </div>
- </el-dialog>
- </div>
- <div style="width:750px;height:260px;" id="echarts" ref="main">
- </div>
+ <div id="Tab">
+ <div class="Infomation">
+ <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>
+ <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>
+ <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
+ <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
+ </div>
+ <div class="form-echrts">
+ <div>
+ <el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
+ <el-dialog :visible.sync="dialogVisible"
+ :append-to-body="true"
+ :title="this.$attrs.value==='feiqi'?this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName:this.$attrs.getWasteWaterMonitoringDetails[0].OnLineMonEmissPointName"
+ width="68%"
+ center
+ v-dialogDrag
+ >
+ <div class="el-dialog-div" style="height: 500px">
+ <public-detailed-list v-bind="$attrs"></public-detailed-list>
+ </div>
+ </el-dialog>
+ </div>
+ <div style="width:100%;height:1.2rem;margin-top:-0.3rem;position:absolute;" id="echarts" ref="main">
</div>
</div>
+ </div>
</template>
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+
export default {
name: 'ECharts',
components: {
@@ -200,50 +202,69 @@
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
myChart.setOption(this.options)
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ }
+ myChart.resize()
+ }
}
},
mounted () {
- this.drawChart()
- const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
- console.log(dataWatch)
- for (var i = 0; i < dataWatch.length; i++) {
- this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
- }
- console.log(this.dataDate)
+ this.$nextTick(() => {
+ this.drawChart()
+ const dataWatch = JSON.parse(JSON.stringify(this.$attrs.getWasteWaterMonitoring))
+ console.log(dataWatch)
+ for (var i = 0; i < dataWatch.length; i++) {
+ this.dataDate.push(dataWatch[i].MonTimeStr.substring(10, 17))
+ }
+ console.log(this.dataDate)
+ })
}
}
</script>
<style scoped lang="less">
- .Infomation {
- margin-left: 10px;
- }
+#Tab {
+ height: 3rem;
+}
+.Infomation {
+ margin-left: 10px;
+}
- .el-tag {
- height: 25px;
- line-height: 25px;
- margin-right: 10px;
- font-size: 10px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- padding: 0 15px;
- }
- .form-echrts{
- width: 100%;
- height: 100%;
- border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- .el-dialog-div{
- //height: 50vh!important;
- overflow: auto;
- //overflow: hidden;
- }
- #echarts {
- margin: 0;
- padding: 0;
- //border: 1px solid #396d83;
- //margin: 10px 10px 10px 10px;
- }
+.el-tag {
+ height: 25px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ padding: 0 15px;
+}
+
+.form-echrts {
+ width: 100%;
+ height: 100%;
+ border-top: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ .el-dialog-div {
+ //height: 50vh!important;
+ overflow: auto;
+ //overflow: hidden;
}
+
+ #echarts {
+ margin: 0;
+ padding: 0;
+ height: 3rem;
+ //border: 1px solid #396d83;
+ //margin: 10px 10px 10px 10px;
+ }
+}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 3f68e5d..a17a64a 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -1,17 +1,17 @@
<template>
- <div class="win">
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <ul class="tab">
- <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
- <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
- <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
- </ul>
- <component :is="currentTab" v-bind="$attrs"></component>
- </div>
+ <div class="win">
+ <div class="border_corner border_corner_left_top"></div>
+ <div class="border_corner border_corner_right_top"></div>
+ <div class="border_corner border_corner_left_bottom"></div>
+ <div class="border_corner border_corner_right_bottom"></div>
+ <ul class="tab">
+ <li @click='tabTaggle("ECharts")'>瀹炴椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>灏忔椂鏁版嵁</li>
+ <li @click='tabTaggle("ECharts")'>鏃ユ暟鎹�</li>
+ <li @click='tabTaggle("ECharts")'>浜哄伐鏁版嵁</li>
+ </ul>
+ <component :is="currentTab" v-bind="$attrs"></component>
+ </div>
</template>
<script>
@@ -38,67 +38,77 @@
</script>
<style scoped>
- *{
- margin: 0;
- padding: 0;
- list-style: none;
- }
- .win {
- position: relative;
- margin-bottom: 13px;
- background-color: rgba(33, 41, 69,0.9);
- border: 0.8px solid #396d83;
- }
- .border_corner{
- z-index: 999;
- position: absolute;
- width: 10px;
- height: 10px;
- background: rgba(0,0,0,0);
- border: 1.5px solid #47d5ea;
- }
- .border_corner_left_top{
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
- }
- .border_corner_right_top{
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
- }
- .border_corner_left_bottom{
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
- }
- .border_corner_right_bottom{
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
- }
- .tab{
- display: flex;
- border-bottom: 1px solid #396d83;
- margin-bottom: 10px;
- }
- li{
- background-color: #243a55;
- margin: 10px 10px 2px 10px;
- /*padding: 5px 10px;*/
- width: 90px;
- height: 25px;
- line-height: 25px;
- text-align: center;
- border-radius: 5px;
- }
- ul li:hover{
- background-color: #0e639e;
- color: #682000;
- cursor: pointer;
- }
+* {
+ margin: 0;
+ padding: 0;
+ list-style: none;
+}
+
+.win {
+ position: relative;
+ margin-bottom: 13px;
+ background-color: rgba(33, 41, 69, 0.9);
+ border: 0.8px solid #396d83;
+ height: 1.5rem;
+}
+
+.border_corner {
+ z-index: 999;
+ position: absolute;
+ width: 10px;
+ height: 10px;
+ background: rgba(0, 0, 0, 0);
+ border: 1.5px solid #47d5ea;
+}
+
+.border_corner_left_top {
+ top: 0;
+ left: 0;
+ border-right: none;
+ border-bottom: none;
+}
+
+.border_corner_right_top {
+ top: 0;
+ right: 0;
+ border-left: none;
+ border-bottom: none;
+}
+
+.border_corner_left_bottom {
+ bottom: 0;
+ left: 0;
+ border-right: none;
+ border-top: none;
+}
+
+.border_corner_right_bottom {
+ bottom: 0;
+ right: 0;
+ border-left: none;
+ border-top: none;
+}
+
+.tab {
+ display: flex;
+ border-bottom: 1px solid #396d83;
+ margin-bottom: 10px;
+}
+
+li {
+ background-color: #243a55;
+ margin: 10px 10px 2px 10px;
+ /*padding: 5px 10px;*/
+ width: 90px;
+ height: 25px;
+ line-height: 25px;
+ text-align: center;
+ border-radius: 5px;
+}
+
+ul li:hover {
+ background-color: #0e639e;
+ color: #682000;
+ cursor: pointer;
+}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index d3c4ce7..5da2a6f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,13 +37,13 @@
}
},
mounted () {
- console.log('value')
- if (this.$attrs.getWasteGasDetails) {
+ console.log(this.$attrs.value)
+ if (this.$attrs.value === 'feiqi') {
this.tableData = this.$attrs.getWasteGasDetails
- console.log(this.$attrs.getWasteGasDetails)
- } else if (this.$attrs.getWasteWaterMonitoringDetails) {
+ // console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.value === 'feishui') {
this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ // console.log(this.$attrs.getWasteWaterMonitoringDetails)
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index 9d971cd..fed1e41 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -8,9 +8,9 @@
<div class="main">
<div class="main-table">
<el-table :data="listData" style="width: 100%" stripe='stripe'
- :height="300"
tooltip-effect="dark" :row-class-name="tableRowClassName">
- <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop" :label="item.label"></el-table-column>
+ <el-table-column v-for="(item, index) in listLabel" :key="index" :prop="item.prop"
+ :label="item.label"></el-table-column>
</el-table>
</div>
</div>
@@ -84,24 +84,13 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- //min-height: 354px;
- height: 208px;
+ //width: 6rem;
+ height: 1.5rem;
}
.main {
- width: 100%;
- height: 100%;
-
.main-table {
width: 100%;
- //min-height: 195px;
- //border: 1px @color solid;
-
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 3b33e08..3aa7f07 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -53,37 +53,7 @@
props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- tabData: [],
- listLabel: [
- {
- label: '搴忓彿',
- prop: 'StoragePlaceId'
- },
- {
- label: '绫诲埆',
- prop: 'StoragePlaceTypeName'
- },
- {
- label: '鍥哄簾鍚嶇О',
- prop: 'StoragePlaceName'
- },
- {
- label: '浠ｇ爜',
- prop: 'StorageZDMJ'
- },
- {
- label: '浜х敓閲�(t)',
- prop: 'StorageZCL'
- },
- {
- label: '璐瓨閲�(t)',
- prop: 'StorageZCNL'
- },
- {
- label: '浜х敓瑁呯疆',
- prop: 'StorageType'
- }
- ]
+ tabData: []
}
},
mounted () {
@@ -106,17 +76,18 @@
position: relative;
margin-bottom: 10px;
background-color: rgba(33, 41, 69, 0.9);
+ //width: 6rem;
+ height: 0.5rem;
}
.main {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
.main-matter {
font-size: 13px;
font-weight: normal;
//padding: 10px 6px;
- min-height: 70px;
border: 1px solid #396d83;
.row-item-one {
@@ -145,8 +116,8 @@
}
ul {
- width: 100%;
- height: 100%;
+ //width: 100%;
+ //height: 100%;
display: flex;
align-items: center;
justify-content: space-around;
@@ -161,6 +132,7 @@
background-color: #243a55;
color: #00d0f9;
border-radius: 4px;
+ font-size: 0.08rem;
}
li:last-child {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index fa9642f..426879e 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -1,17 +1,17 @@
<template>
- <div class="win" >
+ <div class="win">
<!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
<div class="border_corner border_corner_left_top"></div>
<div class="border_corner border_corner_right_top"></div>
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
-<!-- <div class="main-video">-->
- <video controls>
- <source src="movie.mp4" type="video/mp4">
- <source src="movie.ogg" type="video/ogg">
- </video>
-<!-- </div>-->
+ <!-- <div class="main-video">-->
+ <video controls>
+ <source src="movie.mp4" type="video/mp4">
+ <source src="movie.ogg" type="video/ogg">
+ </video>
+ <!-- </div>-->
</div>
</div>
</template>
@@ -25,47 +25,53 @@
<style scoped lang="less">
.win {
position: relative;
- background-color: rgba(33, 41, 69,0.9);
- height: 300px;
+ background-color: rgba(33, 41, 69, 0.9);
+ height: 2.1rem;
}
+
.main {
border: 1px solid #396d83;
- padding: 6px;
- //.main-video {
- video {
- width: 100%;
- height: 100%;
- outline: none;
- }
- //}
+ padding: 5px;
+ height: 2rem;
+
+ video {
+ width: 100%;
+ height: 100%;
+ outline: none;
+ }
}
-.border_corner{
+
+.border_corner {
z-index: 999;
position: absolute;
width: 14px;
height: 14px;
- background: rgba(0,0,0,0);
+ background: rgba(0, 0, 0, 0);
border: 1px solid #47d5ea;
}
-.border_corner_left_top{
+
+.border_corner_left_top {
top: 0;
left: 0;
border-right: none;
border-bottom: none;
}
-.border_corner_right_top{
+
+.border_corner_right_top {
top: 0;
right: 0;
border-left: none;
border-bottom: none;
}
-.border_corner_left_bottom{
+
+.border_corner_left_bottom {
bottom: 0;
left: 0;
border-right: none;
border-top: none;
}
-.border_corner_right_bottom{
+
+.border_corner_right_bottom {
bottom: 0;
right: 0;
border-left: none;
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index d39f737..051b3c4 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -12,38 +12,41 @@
<public-table v-if="value === 'gufei'"
:displayContentTable="displayContentTable"></public-table>
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ :value="value"
+ :getWasteWaterMonitoring="getWasteWaterMonitoring"
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
+"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
-<!-- <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>-->
-<!-- </el-dialog>-->
+ <!-- <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>-->
+ <!-- </el-dialog>-->
</div>
</template>
@@ -116,22 +119,24 @@
<style lang="less" scoped>
.public-bounced {
- width: 75%;
- //height: 520px;
- height: 40%;
+ width: 10rem;
+ //height: 2.6rem;
+ //width: 70vw;
+ //height: 30vh;
z-index: 999;
position: absolute;
- bottom: 5%;
- left: 15%;
+ top: 5%;
+ left: 5%;
background-color: #002432;
border: 1px #9fc5c8 solid;
.public-bounced-title {
+ height: 0.1rem;
border: 1px #a4c0d8 solid;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -148,22 +153,17 @@
}
.public-bounced-content {
- margin: 15px 0;
+ margin: 0.2rem auto !important;
display: flex;
//align-items: center;
justify-content: space-around;
- padding: 10px;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ width: 6.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ width: 3rem;
}
}
}
diff --git a/src/components/LayerController/logic/Company.js b/src/components/LayerController/logic/Company.js
index 8fda8d0..ae08aa5 100644
--- a/src/components/LayerController/logic/Company.js
+++ b/src/components/LayerController/logic/Company.js
@@ -28,11 +28,11 @@
const positionY = data[i].Longitude
var iconUrl = companyImg
- const marker = L.marker.magic([positionX, positionY], {
+ const marker = L.marker([positionX, positionY], {
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [30, 30],
+ iconAnchor: [13, 5]
}),
test: data[i]
})
diff --git a/src/components/LayerController/logic/SolidWaste.js b/src/components/LayerController/logic/SolidWaste.js
index ffbedfa..ea995ac 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -39,8 +39,8 @@
totransferData: getSolidWasteData[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [20, 20],
+ iconAnchor: [10, 10]
})
})
layer.addLayer(marker)
@@ -88,7 +88,7 @@
// 閫氳繃鏂规硶 鍚戠粦瀹氬脊妗嗕紶閫掓暟鎹�
instance.setData(resultBasic.Result.DataInfo, resultDetailed.Result.DataInfo, 'gufei')
/* flyTo()寮瑰嚭妗嗗钩绉讳簨浠� */
- this.setPanTo(e.latlng, 200)
+ this.setPanTo(e.latlng, 80)
}
// flayTo() 寮规鐨勫彲婊戝姩浜嬩欢
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index a83e948..2ac1651 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -20,6 +20,7 @@
this.init = async (layer, L) => {
this.animalService = new AnimalService({ L: L, layer: layer })
const res = await mapApi.getWasteGas()
+ // console.log(res)
const data = res.Result.DataInfo || {}
// console.log(data)
for (let i = 0; i < data.length; i++) {
@@ -29,13 +30,18 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
const ContrLevel = data[i].ContrLevel
var iconUrl = this.differentTypes(ContrLevel)
-
- const marker = L.marker.magic([positionX, positionY], {
+ // const marker = L.canvasMarker([positionX, positionY], {
+ // img: {
+ // // url: 'assets/images/map/marker-icon.png',
+ // url: iconUrl,
+ // size: STYLES.ICON_SIZE
+ // }
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [20, 20],
+ iconAnchor: [10, 10]
})
})
layer.addLayer(marker)
@@ -61,7 +67,7 @@
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 240)
+ this.setPanTo(e.latlng, 80)
}
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index b6bbf06..c3bccaf 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -33,12 +33,12 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
const testValue = data[i].ContrLevel
const iconUrl = this.differentTypes(testValue)
- const marker = L.marker.magic([positionX, positionY], {
+ const marker = L.marker([positionX, positionY], {
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [20, 20],
+ iconAnchor: [10, 10]
})
})
layer.addLayer(marker)
@@ -64,7 +64,7 @@
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
- this.setPanTo(e.latlng, 240)
+ this.setPanTo(e.latlng, 80)
}
// 鏍规嵁杩斿洖鍊肩殑涓嶅悓鏍囪涓嶅悓鍥剧墖
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 99f87b1..2e4d80d 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -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)
}
}
},
diff --git a/src/conf/Constants.js b/src/conf/Constants.js
index 98f7fa1..6784be5 100644
--- a/src/conf/Constants.js
+++ b/src/conf/Constants.js
@@ -5,9 +5,9 @@
}
export const logicMapper = {
- wasteGasJcd: 'WasteGas.js',
- wasteWaterJcd: 'WasteWater.js',
- solidWasteJcd: 'SolidWaste.js',
+ wasteGasPfk: 'WasteGas.js',
+ wasteWaterPfk: 'WasteWater.js',
+ wasteSolidCcd: 'SolidWaste.js',
sewersAreaGs: 'Company.js'
}
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..a516977 100644
--- a/src/conf/layers/LayerWasteGas.js
+++ b/src/conf/layers/LayerWasteGas.js
@@ -8,28 +8,12 @@
checked: true,
layers: [
{
- code: 'wasteGasQy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
+ code: 'wasteGasPfk',
+ 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/LayerWasteSolid.js b/src/conf/layers/LayerWasteSolid.js
index 1610672..f75e58e 100644
--- a/src/conf/layers/LayerWasteSolid.js
+++ b/src/conf/layers/LayerWasteSolid.js
@@ -4,22 +4,14 @@
*/
export const LayerWasteSolid = {
- code: 'solidWaste',
+ code: 'wasteSolid',
name: '鍥哄簾',
checked: true,
layers: [
{
- code: 'solidWasteQy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
- checked: true, // 榛樿閫変腑鐘舵��
- url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
- minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
- },
- {
- code: 'solidWasteJcd',
- name: '鐩戞祴鐐�',
- sname: '鐩戞祴鐐�',
+ code: 'wasteSolidCcd',
+ name: '璐瓨鐐�',
+ sname: '璐瓨鐐�',
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu2.com',
minZoom: 10
diff --git a/src/conf/layers/LayerWasteWater.js b/src/conf/layers/LayerWasteWater.js
index c7d6a65..13ffea0 100644
--- a/src/conf/layers/LayerWasteWater.js
+++ b/src/conf/layers/LayerWasteWater.js
@@ -8,30 +8,28 @@
checked: true,
layers: [
{
- code: 'wasteWaterqy',
- name: '浼佷笟',
- sname: '浼佷笟', // 琛ㄥ悕
+ code: 'wasteWaterPfk',
+ name: '鎺掓斁鍙�',
+ sname: '鎺掓斁鍙�', // 琛ㄥ悕
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu.com', // 璇锋眰涓氬姟鏁版嵁鎺ュ彛
minZoom: 10 // 鍦ㄦ寚瀹氱骇鍒樉绀�
},
{
code: 'wasteWaterJcd',
- name: '鐩戞祴鐐�',
- sname: '鐩戞祴鐐�',
+ name: '娴侀噺',
+ sname: '娴侀噺',
checked: true, // 榛樿閫変腑鐘舵��
url: 'http://www.baidu2.com',
- minZoom: 10,
- childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+ minZoom: 10
},
{
code: 'wasteWaterfk',
- name: '鎺掓斁鍙�',
- sname: '鎺掓斁鍙�',
+ name: '娑蹭綅',
+ sname: '娑蹭綅',
checked: true, // 榛樿閫変腑鐘舵��
url: '',
- minZoom: 10,
- childLayer: 'fsss,hbss' // 鍏宠仈PointLayers
+ minZoom: 10
}
]
}
--
Gitblit v1.8.0