From aae66dc025761b18306b9271625748c26524e6a2 Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 07 四月 2021 18:02:34 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/enterprise.vue | 31 +-
src/components/panel/topicSearch/GasWasteSearch.vue | 2
src/assets/css/map/map-panel-style.less | 5
src/components/panel/ToolBoxPanel.vue | 12
src/components/plugin/PathDashFlow.js | 1
src/components/LayerController/modules/LcServiceLayerFilter.vue | 36 +-
src/components/LayerController/logic/Company.js | 6
src/components/panel/LegendPanel.vue | 12
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 12
src/components/panel/topicSearch/DischargeSearch.vue | 2
src/conf/layers/LayerWasteSolid.js | 16
src/components/panel/topicSearch/EnvRiskSearch.vue | 2
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 4
src/conf/Constants.js | 6
src/components/BaseNav/SolidWaste/directive/dir.js | 104 +++----
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 34 ++
src/components/panel/RightSearchPanel.vue | 6
src/components/LayerController/logic/WasteGas.js | 41 +-
src/conf/layers/LayerWasteWater.js | 20
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 1
src/conf/LayerTopic.js | 5
src/conf/layers/LayerPollutionSources.js | 26 ++
src/conf/layers/LayerWasteGas.js | 30 -
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 8
src/components/LayerController/LayerController.vue | 12
src/components/BaseNav/PublicBounced/PublicBounced.vue | 171 +++++++-----
src/components/LayerController/modules/LcServiceLayer.vue | 4
src/conf/layers/LayerSewers.js | 102 -------
src/components/table/summarySheets.vue | 10
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 4
public/assets/images/map/exhaust/fq_green_new.png | 0
src/conf/MapConfig.js | 3
src/components/LayerController/logic/WasteWater.js | 5
src/components/panel/topicSearch/SewersSearch.vue | 4
src/styles/theme-dark/el-ui/button.less | 4
src/components/LayerController/logic/SolidWaste.js | 3
36 files changed, 363 insertions(+), 381 deletions(-)
diff --git a/public/assets/images/map/exhaust/fq_green_new.png b/public/assets/images/map/exhaust/fq_green_new.png
new file mode 100644
index 0000000..10ecab2
--- /dev/null
+++ b/public/assets/images/map/exhaust/fq_green_new.png
Binary files differ
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index a23fdc6..3a72b11 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -301,6 +301,9 @@
.el-table .success-row {
background: #30455f;
}
+.el-table tbody tr:hover>td {
+ background-color:#28304d !important;
+}
/***********************************************鍔ㄧ敾鏁堟灉************/
.transition{
transition: all .5s;
@@ -337,4 +340,4 @@
margin: 0 auto;
}
-}
\ No newline at end of file
+}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index 1cc8a00..3173f9c 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -39,6 +39,7 @@
<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
@@ -56,7 +57,6 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
-
export default {
name: 'ECharts',
components: {
@@ -115,7 +115,7 @@
},
grid: {
left: '3%',
- right: '3%',
+ right: '1%',
bottom: '3%',
// top: '1%',
containLabel: true
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 9d83a99..3a372ae 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -32,6 +32,7 @@
methods: {
tabTaggle (taggleMenu) {
this.currentTab = taggleMenu
+ debugger
}
}
}
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index 0422b5f..5da2a6f 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -37,10 +37,14 @@
}
},
mounted () {
- this.tableData = this.$attrs.getWasteGasDetails
- // console.log(this.$attrs.getWasteGasDetails)
- this.tableData = this.$attrs.getWasteWaterMonitoringDetails
- console.log(this.$attrs.getWasteWaterMonitoringDetails)
+ console.log(this.$attrs.value)
+ if (this.$attrs.value === 'feiqi') {
+ this.tableData = this.$attrs.getWasteGasDetails
+ // console.log(this.$attrs.getWasteGasDetails)
+ } else if (this.$attrs.value === 'feishui') {
+ this.tableData = 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 a1e01bd..9d971cd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -10,8 +10,7 @@
<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>
@@ -85,7 +84,8 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- min-height: 354px;
+ //min-height: 354px;
+ height: 208px;
}
.main {
@@ -94,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/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 8e5f267..3b33e08 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -53,7 +53,37 @@
props: ['displayContentTab', 'value', 'setWasteGasdata', 'setWasteWaterdata'],
data () {
return {
- tabData: []
+ 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'
+ }
+ ]
}
},
mounted () {
@@ -144,7 +174,7 @@
z-index: 999;
position: absolute;
width: 10px;
- //height: 10px;
+ height: 10px;
background: rgba(0, 0, 0, 0);
border: 1px solid #47d5ea;
}
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 b2caeb2..af891c5 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,27 +1,53 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
- <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"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"
- :getWasteWaterMonitoring="getWasteWaterMonitoring">
- </public-chart>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <public-video></public-video>
- </div>
- </div>
+ <div class="public-bounced" v-drag v-if="flag">
+ <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"
+ :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>-->
+ </div>
</template>
<script>
@@ -55,6 +81,9 @@
}
},
methods: {
+ closePopup () {
+ this.flag = false
+ },
setData (dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
@@ -83,62 +112,62 @@
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
- },
- closePopup () {
- this.flag = false
}
}
}
</script>
<style lang="less" scoped>
- .public-bounced {
- width: 75%;
- z-index: 999;
- position: absolute;
- bottom: 5%;
- left: 15%;
- background-color: #002432;
- border: 1px #9fc5c8 solid;
+.public-bounced {
+ width: 75%;
+ //height: 520px;
+ height: 40%;
+ z-index: 999;
+ position: absolute;
+ bottom: 5%;
+ left: 15%;
+ background-color: #002432;
+ border: 1px #9fc5c8 solid;
- .public-bounced-title {
- border: 1px #a4c0d8 solid;
- display: flex;
- align-items: center;
- justify-content: space-between;
- padding: 5px 0;
+ .public-bounced-title {
+ border: 1px #a4c0d8 solid;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ padding: 5px 0;
- span {
- color: #f4f7ff;
- margin: 0 15px;
- font-size: 14px;
- }
-
- i {
- color: white;
- margin: 0 15px;
- font-size: 22px;
- }
- }
-
- .public-bounced-content {
- margin: 15px auto;
- display: flex;
- //align-items: center;
- justify-content: space-around;
- padding: 10px;
-
- .public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
- }
-
- .public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
- }
- }
+ span {
+ color: #f4f7ff;
+ margin: 0 15px;
+ font-size: 14px;
}
+
+ i {
+ color: white;
+ margin: 0 15px;
+ font-size: 22px;
+ cursor: pointer;
+ }
+ }
+
+ .public-bounced-content {
+ margin: 15px 0;
+ display: flex;
+ //align-items: center;
+ justify-content: space-around;
+ padding: 10px;
+
+ .public-bounced-content-left {
+ flex: 3;
+ height: 100%;
+ margin-right: 10px;
+ }
+
+ .public-bounced-content-right {
+ flex: 2;
+ //width: 48%;
+ height: 100%;
+ }
+ }
+}
</style>
diff --git a/src/components/BaseNav/SolidWaste/directive/dir.js b/src/components/BaseNav/SolidWaste/directive/dir.js
index d51b377..ef3a982 100644
--- a/src/components/BaseNav/SolidWaste/directive/dir.js
+++ b/src/components/BaseNav/SolidWaste/directive/dir.js
@@ -1,59 +1,55 @@
import Vue from 'vue'
-
-// 鑷畾涔夊厓绱犲疄鐜板脊妗嗘嫋鎷絒閲嶇偣]
-Vue.directive('draw', {
- // inserted: function (el, binding, vNode) {
- // el.setAttribute('style', 'position: fixed; z-index: 9999')
- // },
- bind: function (el, bindding, vNode) {
- el.setAttribute('draggable', true)
- let left, top, width, height
- el._dragstart = function (event) {
- event.stopPropagation()
- left = event.clientX - el.offsetLeft
- top = event.clientY - el.offsetTop
- width = el.offsetWidth
- height = el.offsetHeight
- }
- el._checkPosition = function () { // 闃叉琚嫋鍑鸿竟鐣�
- const width = el.offsetWidth
- const height = el.offsetHeight
- let left = Math.min(el.offsetLeft, document.body.clientWidth - width)
- left = Math.max(0, left)
- let top = Math.min(el.offsetTop, document.body.clientHeight - height)
- top = Math.max(0, top)
- el.style.left = left + 'px'
- el.style.top = top + 'px'
- el.style.width = width + 'px'
- el.style.height = height + 'px'
- }
- el._dragEnd = function (event) {
- event.stopPropagation()
- left = event.clientX - left
- top = event.clientY - top
- el.style.left = left + 'px'
- el.style.top = top + 'px'
- el.style.width = width + 'px'
- el.style.height = height + 'px'
- el._checkPosition()
- }
- el._documentAllowDraop = function (event) {
- event.preventDefault()
- }
- document.body.addEventListener('dragover', el._documentAllowDraop)
- el.addEventListener('dragstart', el._dragstart)
- el.addEventListener('dragend', el._dragEnd)
- window.addEventListener('resize', el._checkPosition)
+// 浣跨敤Vue.directive()瀹氫箟涓�涓叏灞�鎸囦护
+// 1.鍙傛暟涓�锛氭寚浠ょ殑鍚嶇О锛屽畾涔夋椂鎸囦护鍓嶉潰涓嶉渶瑕佸啓v-
+// 2.鍙傛暟浜岋細鏄竴涓璞★紝璇ュ璞′腑鏈夌浉鍏崇殑鎿嶄綔鍑芥暟
+// 3.鍦ㄨ皟鐢ㄧ殑鏃跺�欏繀椤诲啓v-
+const drag = Vue.directive('drag', {
+ // 1.鎸囦护缁戝畾鍒板厓绱犱笂鍥炵珛鍒绘墽琛宐ind鍑芥暟锛屽彧鎵ц涓�娆�
+ // 2.姣忎釜鍑芥暟涓涓�涓弬鏁版案杩滄槸el锛岃〃绀虹粦瀹氭寚浠ょ殑鍏冪礌锛宔l鍙傛暟鏄師鐢焜s瀵硅薄
+ // 3.閫氳繃el.focus()鏄棤娉曡幏鍙栫劍鐐圭殑锛屽洜涓哄彧鏈夋彃鍏OM鍚庢墠鐢熸晥
+ bind: function (el) {
+ el.style.cursor = 'move' // 榧犳爣鏍峰紡鍙榤ove鏍峰紡
},
+ // inserted琛ㄧず涓�涓厓绱狅紝鎻掑叆鍒癉OM涓細鎵цinserted鍑芥暟锛屽彧瑙﹀彂涓�娆�
+ inserted: function (el) {
+ el.onmousedown = function (e) {
+ var distX = e.pageX - el.offsetLeft
+ var distY = e.pageY - el.offsetTop
+ // console.log('鍏冪礌鏈韩鐨勯珮锛�' + el.clientHeight + ',鍏冪礌鏈韩鐨勫锛�' + el.clientWidth)
- unbind: function (el, bindding, vNode) {
- document.body.removeEventListener('dragover', el._documentAllowDraop)
- el.removeEventListener('dragstart', el._dragstart)
- el.removeEventListener('dragend', el._dragEnd)
- window.removeEventListener('resize', el._checkPosition)
- delete el._documentAllowDraop
- delete el._dragstart
- delete el._dragEnd
- delete el._checkPosition
+ if (e.preventDefault) {
+ e.preventDefault()
+ } else {
+ e.returnValue = false
+ }
+ // 瑙ｅ喅蹇�熸嫋鍔ㄦ粸鍚庨棶棰�
+
+ document.onmousemove = function (e) {
+ // 鐢ㄩ紶鏍囩殑浣嶇疆鍑忓幓榧犳爣鐩稿鍏冪礌鐨勪綅缃紝寰楀埌鍏冪礌鐨勪綅缃�
+ let left = e.clientX - distX
+ let top = e.clientY - distY
+
+ if (left <= 0) {
+ left = 5 // 璁剧疆鎴�5鏄负浜嗕笉绂昏竟缂樺お杩�
+ } else if (left > document.documentElement.clientWidth - el.clientWidth) {
+ // document.documentElement.clientWidth 灞忓箷鐨勫彲瑙嗗搴�
+ left = document.documentElement.clientWidth - el.clientWidth - 5
+ }
+ if (top <= 0) {
+ top = 5
+ } else if (top > document.documentElement.clientHeight - el.clientHeight) {
+ top = document.documentElement.clientHeight - el.clientHeight - 5
+ }
+ el.style.left = left + 'px'
+ el.style.top = top + 'px'
+ }
+ document.onmouseup = function () {
+ document.onmousemove = document.onmouseup = null
+ }
+ }
+ },
+ // 褰揤Node鏇存柊鐨勬椂鍊欎細鎵цupdated锛屽彲浠ヨЕ鍙戝娆�
+ updated: function (el) {
}
})
+export default drag
diff --git a/src/components/LayerController/LayerController.vue b/src/components/LayerController/LayerController.vue
index 7476f09..dcb6ed3 100644
--- a/src/components/LayerController/LayerController.vue
+++ b/src/components/LayerController/LayerController.vue
@@ -1,9 +1,12 @@
<template>
<div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
- <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style=" position: absolute;top:0;left: 0;">
+
+ <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>-->
- </div>
+ <!-- <span class="icon-name">鍥惧眰</span>-->
+ </div>
+ </el-tooltip>
<transition name="animationChange">
<div :class="'legend-content map-background'" v-show="layerControllerVisible">
<lc-service-layer></lc-service-layer>
@@ -242,12 +245,13 @@
position: absolute;
top:0;
right: -26px;
+ border-radius: 0.03rem 50% 50% 0.03rem;
}
.el-button--default:hover{
background:@background-color;
}
.legend-content{
- width: 2.2rem;
+ width: 250px;
}
}
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..7d61927 100644
--- a/src/components/LayerController/logic/SolidWaste.js
+++ b/src/components/LayerController/logic/SolidWaste.js
@@ -39,8 +39,7 @@
totransferData: getSolidWasteData[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [50, 50],
- iconAnchor: [25, 25]
+ iconSize: [20, 20]
})
})
layer.addLayer(marker)
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 9e7b219..eebddfc 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -5,10 +5,10 @@
// const AjaxUtils = require('../../../utils/AjaxUtils').default
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
-const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
-const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
-const ImagGreen = '/assets/images/map/exhaust/fq_green.png'
-const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
+// const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
+// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green_new.png'
+// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
@@ -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,17 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁
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]
})
})
layer.addLayer(marker)
@@ -66,15 +71,17 @@
// 涓嶅悓绫诲瀷鍥剧墖鍔犺浇
this.differentTypes = (ContrLevel) => {
var effectOfChange
- if (ContrLevel === 1) {
- effectOfChange = ImgBlue
- } else if (ContrLevel === 2) {
- effectOfChange = ImagGreen
- } else if (ContrLevel === 3) {
- effectOfChange = ImagBright
- } else {
- effectOfChange = ImgGray
- }
+ /*
+ if (ContrLevel === 1) {
+ effectOfChange = ImgBlue
+ } else if (ContrLevel === 2) {
+ */
+ effectOfChange = ImagGreen
+ // } else if (ContrLevel === 3) {
+ // effectOfChange = ImagBright
+ // } else {
+ // effectOfChange = ImgGray
+ // }
return effectOfChange
}
this.setPanTo = (pos, value) => {
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index b6bbf06..2ff1db4 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -33,12 +33,11 @@
// 瀹氫箟绫诲瀷 鐢ㄦ潵鍖哄垎鏁版嵁鐨勪笉鍚�
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]
})
})
layer.addLayer(marker)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 5d553c3..68c74b6 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,8 +1,6 @@
<template>
<div class="inner-panel">
- <div class="title">
- 鍥惧眰鎺у埗
- </div>
+ <div class="title"> 鍥惧眰鎺у埗 </div>
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index a617f78..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)
}
}
},
@@ -101,19 +103,16 @@
.inner-panel {
color: #90c8e0;
font-size: 13px;
-
position: absolute;
- left: 260px;
+ left: 1.82167rem;
z-index: 1000;
- height: 220px;
- top: 0;
-
+ top: 50px;
.filter-group {
display: flex;
flex-flow: row;
.filter-item {
- width: 120px;
+ width: 0.6rem;
height: 100%;
margin-right: 5px;
@@ -127,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/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index fe6d347..d14a1b3 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -1,13 +1,13 @@
<template>
<div class="legend-panel">
<transition name="fade">
- <div :class="'legend-content map-background'" v-show="legendControl">
+ <div :class="'legend-content map-background'" v-show="isShow">
<div class="legend-content-box" v-for="(item,index) in serviceLayers" :key="index">
<p><span>{{ item.name }}</span></p>
<div class="map-under-line"></div>
<ul>
- <li v-for="(ite,inde) in item.layers" :key="inde">
- <img :src='ite.legendImage' alt=''>
+ <li v-for="(ite,idx) in item.layers" :key="idx">
+ <img :src="ite.legendImage===undefined?'../.././assets/images/map-pages/setting.png':ite.legendImage" alt=''>
<span>{{ ite.name }}</span>
</li>
</ul>
@@ -15,7 +15,7 @@
</div>
</transition>
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鍥句緥" placement="left">
- <div :class="this.legendControl?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
+ <div :class="this.isShow?'legend-btn map-btn-active':'legend-btn map-btn-unactive'"
@click="legendChange()">
<i class="el-icon-more-outline"></i>
</div>
@@ -38,14 +38,14 @@
data () {
return {
// 鎺у埗鍥句緥 鍐呭鐨� 鏄剧ず/闅愯棌
- legendControl: false,
+ isShow: false,
serviceLayers: [LayerSoilGroundWater, LayerEnvRisk, LayerAirQuality, LayerWasteSolid, LayerWasteGas, LayerWasteWater, LayerArea, LayerPk, LayerPipeLines]
}
},
methods: {
// 鍥炬爣 鎺у埗鍐呭鐨勫睍绀轰笌闅愯棌
legendChange () {
- this.legendControl = !this.legendControl
+ this.isShow = !this.isShow
}
}
}
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index a2cdb5f..875399d 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -102,7 +102,7 @@
},
selected (val) {
// console.log(val)
- this.title = val.name + '锛堟绱級'
+ this.title = val.name
this.topicList.forEach((itm) => {
itm.checked = val.name === itm.name
})
@@ -257,10 +257,10 @@
padding: 15px 3px;
background: rgba(0, 16, 30, 0.7);
color: #C0C4CC;
+ border-radius:50% 0.03rem 0.03rem 50% ;
}
.el-button--default:hover{
- background: transparent;
- border-color: #0f93a9;
+ background:@background-color;
}
.el-form-item__label {
diff --git a/src/components/panel/ToolBoxPanel.vue b/src/components/panel/ToolBoxPanel.vue
index f42d6d9..850d54c 100644
--- a/src/components/panel/ToolBoxPanel.vue
+++ b/src/components/panel/ToolBoxPanel.vue
@@ -1,10 +1,12 @@
<template>
<div class="left-top-toolbox-panel">
<div class="specific-tools">
- <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="宸ュ叿" placement="left">
+ <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice" @click.enter.native="changeSelectMouse">
<img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
<!--<span class="span-default">宸ュ叿</span>-->
- </el-button>
+ </el-button>
+ </el-tooltip>
<transition name="animationChange">
<el-row v-show="selectGroup" class="specific-tools-group">
<el-popover
@@ -487,7 +489,11 @@
.special-button {
width: 0.1362rem;
height: 0.2725rem;
- color: @color-over;
+ color: #C0C4CC;
+ border-radius: 0.03rem 50% 50% 0.03rem;
+ }
+ .special-button:hover{
+ color: #00fff6;
}
}
}
diff --git a/src/components/panel/topicSearch/DischargeSearch.vue b/src/components/panel/topicSearch/DischargeSearch.vue
index 2696499..981d8e8 100644
--- a/src/components/panel/topicSearch/DischargeSearch.vue
+++ b/src/components/panel/topicSearch/DischargeSearch.vue
@@ -1,5 +1,5 @@
<template>
- <div class="query-search" v-if="gdVisible">
+ <div class="sewers-search" v-if="gdVisible">
<div class="search-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
diff --git a/src/components/panel/topicSearch/EnvRiskSearch.vue b/src/components/panel/topicSearch/EnvRiskSearch.vue
index 448978e..1df0f11 100644
--- a/src/components/panel/topicSearch/EnvRiskSearch.vue
+++ b/src/components/panel/topicSearch/EnvRiskSearch.vue
@@ -1,5 +1,5 @@
<template>
- <div class="query-search" v-if="gdVisible">
+ <div class="sewers-search" v-if="gdVisible">
<div class="search-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
diff --git a/src/components/panel/topicSearch/GasWasteSearch.vue b/src/components/panel/topicSearch/GasWasteSearch.vue
index 90166ea..b46642e 100644
--- a/src/components/panel/topicSearch/GasWasteSearch.vue
+++ b/src/components/panel/topicSearch/GasWasteSearch.vue
@@ -1,5 +1,5 @@
<template>
- <div class="query-search" v-if="gdVisible">
+ <div class="sewers-search" v-if="gdVisible">
<div class="search-title">{{title}}</div>
<div class="search-panel ">
<el-form ref="form" :model="form" label-width="90px" class="search-form">
diff --git a/src/components/panel/topicSearch/SewersSearch.vue b/src/components/panel/topicSearch/SewersSearch.vue
index 46e94a3..79f5f03 100644
--- a/src/components/panel/topicSearch/SewersSearch.vue
+++ b/src/components/panel/topicSearch/SewersSearch.vue
@@ -164,8 +164,8 @@
wfsHelper.addLike(this.form.query.key, this.form.keyword)
// const _this = this
const res = await AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {})
- if (res.data instanceof Object && Object.prototype.hasOwnProperty.call(res.data, 'features')) {
- this.list = res.data.features
+ if (res instanceof Object && Object.prototype.hasOwnProperty.call(res, 'features')) {
+ this.list = res.features
}
},
handleLocation (val) {
diff --git a/src/components/plugin/PathDashFlow.js b/src/components/plugin/PathDashFlow.js
index a868066..bd1d263 100644
--- a/src/components/plugin/PathDashFlow.js
+++ b/src/components/plugin/PathDashFlow.js
@@ -71,6 +71,7 @@
}
},
_fillStroke: function (ctx, layer) {
+ // debugger
var options = layer.options
if (options.fill) {
diff --git a/src/components/table/enterprise.vue b/src/components/table/enterprise.vue
index 261ca06..da345c3 100644
--- a/src/components/table/enterprise.vue
+++ b/src/components/table/enterprise.vue
@@ -1,20 +1,20 @@
<template>
<div class="enterprise-panel">
<div class="enterprise-function" @click="showWarnDialog()">
- <div :class='["iconBtn",warnVisible ? "active-button" : ""]'>
- <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
- <!--<span class="icon-name">棰勬姤璀�</span>-->
- <!-- <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="left">
- <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="26px" style="display: block;margin: auto">
-
- </el-tooltip> -->
- </div>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="left">
+ <div :class='["iconBtn",warnVisible ? "active-button" : ""]'>
+ <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
+ <!--<span class="icon-name">棰勬姤璀�</span>-->
+ </div>
+ </el-tooltip>
</div>
<div class="enterprise-function" @click="showStatisDialog()">
- <div :class='["iconBtn",companyVisible ? "active-button" : ""]'>
- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon">
-<!-- <span class="icon-name">鎸囨爣</span>-->
- </div>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom">
+ <div :class='["iconBtn",companyVisible ? "active-button" : ""]'>
+ <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon">
+ <!-- <span class="icon-name">鎸囨爣</span>-->
+ </div>
+ </el-tooltip>
</div>
<Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
<warn></warn>
@@ -76,11 +76,8 @@
position: absolute;
right: 0.14583rem;
top:0.11979rem;
- z-index: 9999;
- .enterprise-function{
- float: left;
- cursor: pointer;
- }
+ z-index: 1000;
+ display: flex;
.enterprise-function:not(:first-child){
margin-left: 0.05rem;
}
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 1d1d523..4ab8d7a 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,9 +1,11 @@
<template>
<div class="summary-sheets">
- <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
- <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
- <!--<span class="icon-name">缁熻琛�</span>-->
- </div>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="left">
+ <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
+ <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
+ <!--<span class="icon-name">缁熻琛�</span>-->
+ </div>
+ </el-tooltip>
<Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">
<tab-handover></tab-handover>
</Dialog >
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/button.less b/src/styles/theme-dark/el-ui/button.less
index 9c3cc50..8122b60 100644
--- a/src/styles/theme-dark/el-ui/button.less
+++ b/src/styles/theme-dark/el-ui/button.less
@@ -47,9 +47,7 @@
border: 1px solid @dark--primary-color;
}
.el-button--default:hover{
- background: transparent;
- border-color: #0f93a9;
- color: @dark--title-color;
+ background:@background-color;
}
.el-button--default:active{
border-color: #0f93a9;
--
Gitblit v1.8.0