From e8692ebf024715c922ca0e10f90dc3a1219862b0 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 22:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/topicSearch/GasWasteSearch.vue | 55 --
src/assets/css/map/map-panel-style.less | 9
src/components/LayerController/modules/LcServiceLayerFilter.vue | 45 +-
src/components/LayerController/logic/Company.js | 6
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 10
src/components/panel/topicSearch/DischargeSearch.vue | 9
src/conf/layers/LayerWasteSolid.js | 16
src/components/panel/topicSearch/EnvRiskSearch.vue | 15
src/components/panel/topicSearch/WaterWasteSearch.vue | 4
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 126 +++---
src/conf/Constants.js | 6
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 44 --
src/components/panel/RightSearchPanel.vue | 40 -
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-popup.less | 4
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 19
src/components/LayerController/LayerController.vue | 12
src/components/BaseNav/PublicBounced/PublicBounced.vue | 82 ++--
src/components/LayerController/modules/LcServiceLayer.vue | 16
src/components/panel/topicSearch/SolidWasteSearch.vue | 4
src/conf/layers/LayerSewers.js | 102 ------
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 52 +-
src/styles/theme-dark/el-ui/tabs.less | 6
src/conf/MapConfig.js | 3
src/components/LayerController/logic/WasteWater.js | 8
src/components/panel/topicSearch/SewersSearch.vue | 49 --
src/components/panel/topicSearch/SoilGroundWaterSearch.vue | 7
src/components/LayerController/logic/SolidWaste.js | 6
33 files changed, 418 insertions(+), 596 deletions(-)
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index fad0be8..3545ff7 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -53,6 +53,7 @@
.select-down {
border: none !important;
background-color: @background-color;
+ margin: 0;
//.el-scrollbar{
//
@@ -298,6 +299,7 @@
}
.el-table td, .el-table th.is-leaf {
border: none;
+ font-size: 0.08rem;
}
.el-table .warning-row {
background: #28304d;
@@ -346,3 +348,10 @@
}
}
+.panel-title{
+ color: @color-title;
+ font-size: 18px;
+ padding: 10px;
+ text-align: center;
+ border-bottom: 1px solid @background-color-split;
+}
\ No newline at end of file
diff --git a/src/assets/css/map/map-popup.less b/src/assets/css/map/map-popup.less
index d451294..4ab0b2e 100644
--- a/src/assets/css/map/map-popup.less
+++ b/src/assets/css/map/map-popup.less
@@ -6,13 +6,15 @@
background-color: @background-color;
/*background-color: transparent;*/
border: .00521rem solid @color;
- padding: .05rem;
//-webkit-box-shadow: 0 0 0.03125rem 0 @color;
//box-shadow: 0 0 0.03125rem 0 @color;
-webkit-box-shadow: 0 0 10px 0 @color;
box-shadow: 0 0 .03rem @color;
//border-radius: .03rem;
+ padding:6px;
border-radius: 10px;
+ .leaflet-popup-content{margin: 0}
+
}
.leaflet-popup-tip-container {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 5ef6f57..ce510b7 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:1rem;margin-top:-0.1rem;position:absolute;" id="echarts" ref="main">
</div>
</div>
+ </div>
</template>
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+
export default {
name: 'ECharts',
components: {
@@ -203,47 +205,53 @@
}
},
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;
- }
+.Infomation {
+ margin-left: 10px;
+ height: 0.2rem;
+}
- .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: 1rem;
+ 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..b8ab6bf 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>
@@ -104,7 +107,7 @@
this.setWasteWaterdata = dataWater
// console.log(data)
this.getWasteWaterMonitoring = drawData
- console.log(drawData)
+ // console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
@@ -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/LayerController.vue b/src/components/LayerController/LayerController.vue
index dcb6ed3..ce4d496 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,7 +1,7 @@
<template>
<div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥惧眰" placement="left">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥惧眰鎺у埗" placement="left">
<div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style=" position: absolute;top:0;left: 0;">
<img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
<!-- <span class="icon-name">鍥惧眰</span>-->
@@ -96,10 +96,6 @@
min-height: 0.28rem;
min-width: 0.28rem;
overflow: hidden;
- div {
- color: #00fff6;
- }
-
.iconBtn.active{
display: none;
}
@@ -238,20 +234,20 @@
background: #0E3565;
}
.el-button--default{
- margin-left: 10px;
padding: 15px 3px;
background:@background-color;
color:@color-tool;
position: absolute;
top:0;
- right: -26px;
+ left: 100%;
+ margin-left: .02rem;
border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
}
.legend-content{
- width: 250px;
+ width: 1.79167rem;
}
}
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/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 68c74b6..3308d0e 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,11 +1,11 @@
<template>
<div class="inner-panel">
- <div class="title"> 鍥惧眰鎺у埗 </div>
+ <div class="panel-title"> 鍥惧眰鎺у埗 </div>
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
<!-- 涓�绾у浘灞傞亶鍘� -->
- <div>
+ <div style="padding-left:10px;padding-top:10px">
<input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
@change="swAllLayers(item)"/>{{ item.name }}
</div>
@@ -103,13 +103,6 @@
<style scoped lang="less">
.inner-panel {
- .title{
- color: @color-title;
- font-size: 18px;
- margin: 10px;
- text-align: center;
- }
-
.btn-filter {
cursor: pointer;
color: #ffffff;
@@ -118,13 +111,14 @@
.wms-panel {
.wms-panel-scrollbar{
- height: 50vh;
+ height: 457px;
width: 100%;
+ font-size: 14px;
}
.layerbox {
width: 100%;
.layerbox-item {
- padding-left: 20px;
+ padding-left: 30px;
padding-top: 5px;
.basemap-layer-item {
margin-bottom: 5px;
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 60e229f..2e4d80d 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)
}
}
},
@@ -99,31 +101,30 @@
<style scoped lang="less">
.inner-panel {
- color: #90c8e0;
font-size: 13px;
position: absolute;
- left: 256px;
+ left: 1.82167rem;
z-index: 1000;
top: 50px;
.filter-group {
display: flex;
flex-flow: row;
-
.filter-item {
- width: 120px;
+ width: 0.6rem;
height: 100%;
margin-right: 5px;
-
+ background-color: @background-color;
+ box-shadow: 0 0 0.03rem #00fff6;
+ border-radius: 0.03rem;
.title {
- height: 25px;
- background-color: #091331;
- border: 1px solid #10488c;
+ border-bottom:1px solid @background-color-split;
+ padding: 5px 0;
+ background-color: @background-color;
}
.content {
- 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/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 875399d..30af0e3 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -10,15 +10,13 @@
<button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
</li>
</ul>
+
<ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
- <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
- <li>
-<!-- <span>{{item.name}}</span>-->
-<!-- <div >-->
- <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
-<!-- </div>-->
- </li>
- </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
+ <li>
+ <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
+ </li>
+ </el-tooltip>
</ul>
</div>
</div>
@@ -41,7 +39,7 @@
</div>
<div :class="'search-container map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
+ <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
<component :title="title" :is="gcComp"></component>
</div>
</div>
@@ -182,11 +180,7 @@
</script>
<style lang="less">
-.search-title{
- color:@color-title;
- font-size: 18px;
- margin: 5px;
-}
+
.search-container {
position: relative;
width: 1.79167rem;
@@ -469,13 +463,14 @@
.el-icon-search{
width: 40px;
border:1px solid @color;
- height: 26px;
- line-height: 26px;
+ height: 28px;
+ line-height: 28px;
text-align: center;
color:#fff;
border-radius: 2px;
cursor:pointer;
background: rgba(0,16,30,.5);
+ padding:0;
}
}
/*鍗曢�夋寜閽牱寮�*/
@@ -524,16 +519,6 @@
color:@color-over;
background: @background-color;
}
- //.search-panel {
- // border: #07325B;
- // background-color: #07325B !important;
- // margin-top: 0px;
- //
- // .el-input__inner {
- // border-radius: 0px !important;
- // background-color: #061e51 !important;
- // }
- //}
input::-webkit-input-placeholder {
color: #569ee1;
@@ -701,10 +686,11 @@
.sewers-search{
position: relative;
overflow: hidden;
+ .panel-title{}
.search-panel{
background-color: transparent;
- border: 1px solid @background-color-split;
padding: 10px 0;
+ border-bottom: 1px solid @background-color-split;
// .el-input{width:calc(100% - 40px);position: relative}
/deep/ input {
border-radius: 0;
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 981d8e8..294a471 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -40,7 +40,7 @@
<!-- <el-form-item >-->
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
@@ -122,7 +122,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'DischargeSearch',
data () {
return {
gdVisible: true,
@@ -147,7 +147,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 1df0f11..8c214dc 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseTypeOptions"
@@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <el-form-item label="浜岀骇鍗曚綅锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
@@ -33,14 +33,14 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="椋庨櫓绾у埆" size="mini"></el-form-item>
+ <el-form-item label="椋庨櫓绾у埆锛�" size="mini"></el-form-item>
<el-radio-group v-model="form.type" class="levelOfRisk">
<el-radio v-for="(item,index) in levelOfRisk" :label="item.value" :key="index"><span class="levelOfRisk-type">{{item.name}}<i :style="'background:'+item.color"></i></span></el-radio>
</el-radio-group>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�">
</el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
@@ -82,7 +82,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'EnvRiskSearch',
data () {
return {
gdVisible: true,
@@ -107,7 +107,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index b46642e..80c2f12 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -13,7 +13,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浼佷笟鍚嶇О" size="mini">
+ <el-form-item label="浼佷笟鍚嶇О锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseVal" @change="enterpriseType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseTypeOptions"
@@ -23,7 +23,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="浜岀骇鍗曚綅" size="mini">
+ <el-form-item label="浜岀骇鍗曚綅锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
@@ -33,7 +33,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="涓夌骇鍗曚綅" size="mini">
+ <el-form-item label="涓夌骇鍗曚綅锛�" size="mini">
<el-select style="width: 100%" v-model="form.enterpriseSubunitsVal" @change="enterpriseSubunitsType" :popper-class="'select-down'">
<el-option
v-for="item in enterpriseSubunitsTypeOptions"
@@ -54,7 +54,7 @@
<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
<!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
</el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
<!-- <el-form-item>-->
@@ -63,7 +63,7 @@
<!-- </el-form-item>-->
</el-form>
</div>
- <el-scrollbar style="height:300px">
+ <el-scrollbar style="height:264px">
<div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
<i class="state"></i>
<div>
@@ -72,46 +72,7 @@
<p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
</div>
</div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
- <div class="environmental-risk-list" ><!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
- <div>
- <h3>###鐐煎寲閮�</h3>
- <p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
- <p>椋庨櫓绾у埆锛�<span>涓夌骇</span></p>
- </div>
- </div>
+
</el-scrollbar>
<!-- <span class="location-btn" @click="handleLocation(item)">588</span> -->
<el-card class="footer-page" v-if="total > 10">
@@ -141,7 +102,7 @@
import WfsHelper from '@components/helpers/WfsHelper'
import AjaxUtils from '@utils/AjaxUtils'
export default {
- name: 'SewersSearch',
+ name: 'GasWasteSearch',
data () {
return {
gdVisible: true,
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 79f5f03..faf0832 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="璁炬柦绫诲瀷锛�" size="mini" class="search-panel-item">
@@ -30,7 +30,7 @@
<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
<!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
</el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
<!-- <el-form-item>-->
@@ -40,46 +40,15 @@
</el-form>
</div>
<el-scrollbar style="height:380.44px;" >
- <div class="B-TMD-table-list" v-for="(item,index) in list" :key="index">
- <div class="B-TMD-table-list-title">
- <div class="B-TMD-table-list-head">
- <div class="B-TMD-table-list-title-y"
- :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]">
- <!-- <span>杩愬崟鍙凤細</span>-->
- <span id="waybillNumber" class=""
- :title="item.properties.pipename">
- <span class="location-btn" @click="handleLocation(item)">{{ item.properties.pipename }}</span>
- </span>
- </div>
- <!-- <div class="B-TMD-table-list-title-c">-->
- <!-- {{ labelList[0] }}锛�-->
- <!-- <span id="plateNumber_p">-->
- <!-- <span id="plateNumber_n"><a href="#">{{ item.properties.item.p1 }}</a></span>-->
- <!-- </span>-->
- <!-- </div>-->
- </div>
- <!-- <div class="B-TMD-table-icons" style="float:right">-->
- <!-- <ul>-->
- <!-- <li class="B-TMD-table-list-title-y-adress"-->
- <!-- @click="handleLocation(item)"></li>-->
- <!-- <li :class="[{'B-TMD-table-list-title-y-car': item.vehicleStatus ==='910002', 'B-TMD-table-list-title-y-car-offline': item.vehicleStatus ==='910001','B-TMD-table-list-title-y-car-warning': item.vehicleStatus==='910003' }]"></li>-->
- <!-- </ul>-->
- <!-- </div>-->
- </div>
- <div class="B-TMD-table-list-content">
-
- <div v-for="itm in labelList" :key="itm.label">
+ <div class="environmental-risk-list" v-for="(item,index) in list" :key="index" >
+ <!-- <i class="state"></i> -->
+ <div @click="handleLocation(item)">
+ <h3 class="B-TMD-table-list-title-y" :class="['B-TMD-table-list-title-y-nam', { 'warning': item.vehicleStatus==='910003' }, { 'offline': item.vehicleStatus==='910001' }]" >{{ item.properties.pipename }}</h3>
+ <p v-for="itm in labelList" :key="itm.label">
<span>{{ itm.label }}锛�</span>
- <span id="b_twe_loan" :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
- </div>
- <!-- <div><span>鏀惰揣浼佷笟锛�</span> <span-->
- <!-- id="b_twe_loan1" :title="item.recvWarehouseName">{{ item.recvWarehouseName }}</span>-->
- <!-- </div>-->
+ <span :title="item.properties[itm.key] ">{{ item.properties[itm.key] }}</span>
+ </p>
</div>
- <!-- <div class="B-TMD-table-list-bottom">-->
- <!-- <div class="B-TMD-table-list-bottom-name">-->
- <!-- 璐х墿鍚嶇О锛�<span :title="item.materialName">{{ item.materialName }}</span></div>-->
- <!-- </div>-->
</div>
</el-scrollbar>
<el-card class="footer-page" v-if="total > 10">
diff --git a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
index e508dfe..7b74153 100644
--- a/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
+++ b/src/components/panel/topicSearch/SoilGroundWaterSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="gdVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item label="鍖哄煙锛�" size="mini" class="search-panel-item">
@@ -44,7 +44,7 @@
<!-- <i slot="prefix" class="el-input__icon el-icon-search"></i>-->
<!-- <i slot="suffix" class="search-btn el-input__icon el-icon-search" @click="handleSearch"></i> -->
</el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
<!-- </el-form-item>-->
@@ -157,7 +157,8 @@
{ name: '涓�绾ч闄�', value: '2', color: 'sandybrown' },
{ name: '浜岀骇椋庨櫓', value: '3', color: 'yellow' },
{ name: '涓夌骇椋庨櫓', value: '4', color: 'green' }
- ]
+ ],
+ areaTypeOptions: []
}
},
props: ['title'],
diff --git a/src/components/panel/topicSearch/SolidWasteSearch.vue b/src/components/panel/topicSearch/SolidWasteSearch.vue
index eb42e35..ea1c17d 100644
--- a/src/components/panel/topicSearch/SolidWasteSearch.vue
+++ b/src/components/panel/topicSearch/SolidWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="judgeVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
@@ -26,7 +26,7 @@
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index 5aa4d31..11992d8 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -1,6 +1,6 @@
<template>
<div class="sewers-search" v-if="judgeVisible">
- <div class="search-title">{{title}}</div>
+ <div class="panel-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
<el-form-item v-for="(item,index) in solidWasteTypeOptions" :key="index" :label="item.label+'锛�'" size="mini"
@@ -20,7 +20,7 @@
</el-radio-group>
<div class="rightButtonSearch">
<el-input v-model="form.keyword" size="mini" placeholder="鍦ㄦ杈撳叆鍏抽敭瀛楁悳绱�"></el-input>
- <el-buttom class="el-icon-search" @click="handleSearch"></el-buttom>
+ <el-button class="el-icon-search" @click="handleSearch"></el-button>
</div>
</el-form>
</div>
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
}
]
}
diff --git a/src/styles/theme-dark/el-ui/tabs.less b/src/styles/theme-dark/el-ui/tabs.less
index 3ca346b..17808d8 100644
--- a/src/styles/theme-dark/el-ui/tabs.less
+++ b/src/styles/theme-dark/el-ui/tabs.less
@@ -1,7 +1,7 @@
.el-tabs{}
.el-tabs__header{
- border-bottom: 1px solid #26defd;
+ border-bottom: 1px solid @background-color-split !important;
padding: 0;
position: relative;
margin: 0 0 15px;
@@ -125,7 +125,9 @@
overflow: hidden;
position: relative;
}
-
+.el-tabs--card > .el-tabs__header{
+ border-bottom: 1px solid @background-color-split;
+}
.el-tabs--card > .el-tabs__header .el-tabs__active-bar {
display: none;
}
--
Gitblit v1.8.0