From 4e53f9f57bac8b8a35c8099f3e31d9ff7724398c Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 01 四月 2021 16:30:57 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
/dev/null | 221 ------------------------
src/components/LayerController/logic/WasteGas.js | 2
src/components/LayerController/service/AnimalService.js | 3
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 21 +-
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 28 ++
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 2
src/components/LayerController/logic/WasteWater.js | 3
src/components/panel/LegendPanel.vue | 121 +------------
src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue | 59 ++++--
src/components/BaseNav/PublicBounced/PublicBounced.vue | 31 ++-
src/Sgis.js | 1
11 files changed, 108 insertions(+), 384 deletions(-)
diff --git a/src/Sgis.js b/src/Sgis.js
index 6e794e0..6626200 100644
--- a/src/Sgis.js
+++ b/src/Sgis.js
@@ -49,6 +49,7 @@
*/
const initBasemapsHelper = (map) => {
// todo 杩欓噷杩涜搴曞浘鍦板浘鐨勫垵濮嬪寲
+ console.log(map)
return new BasemapHelper({ map })
}
/**
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
similarity index 84%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index c2366b0..614e424 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,10 +1,18 @@
<template>
- <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 style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ </div>
</template>
<script>
export default {
- name: 'GasECharts',
+ name: 'ECharts',
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
@@ -88,7 +96,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['12:00:01', '12:00:02', '12:00:03', '12:00:04', '12:00:05', '12:00:06', '12:00:07'],
+ data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -174,10 +182,22 @@
</script>
<style scoped lang="less">
+ .Infomation{
+ margin-left: 10px;
+ }
+ .el-tag{
+ height: 25px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ }
#echarts{
margin: 0;
padding: 0;
border: 1px solid #396d83;
- /*margin: 10px 10px 10px 10px;*/
+ margin: 10px 10px 10px 10px;
}
</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue b/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
deleted file mode 100644
index 1ab150f..0000000
--- a/src/components/BaseNav/PublicBounced/GasComponents/EchartsTab.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-<template>
- <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>
-</template>
-
-<script>
-export default {
- name: 'EchartsTab',
- props: ['displayContent'],
- data () {
- return {}
- }
-}
-</script>
-
-<style scoped lang="less">
- .Infomation{
- margin-left: 10px;
- }
- .el-tag{
- height: 25px;
- line-height: 25px;
- margin-right: 10px;
- font-size: 10px;
- background-color: rgba(0, 255, 246, 0.14);
- color: #00d0f9;
- border: none;
- }
-</style>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
similarity index 68%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index 23814fc..002bd92 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,30 +5,27 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<el-tabs type="card" v-model="activeName">
- <el-tab-pane label="瀹炶瘯鏁版嵁" name="first">
- <EchartsTab></EchartsTab>
- <GasECharts></GasECharts>
+ <el-tab-pane label="瀹炶瘯鏁版嵁" name="first"></el-tab-pane>
+ <el-tab-pane label="鏃ユ暟鎹�" name="second">
+ <ECharts></ECharts>
</el-tab-pane>
- <el-tab-pane label="鏃ユ暟鎹�" name="second"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
- <el-tab-pane label="鏈堟暟鎹�" name="third"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
- <el-tab-pane label="浜哄伐鏁版嵁" name="fourth"><EchartsTab></EchartsTab><GasECharts></GasECharts></el-tab-pane>
+ <el-tab-pane label="鏈堟暟鎹�" name="third"></el-tab-pane>
+ <el-tab-pane label="浜哄伐鏁版嵁" name="fourth"></el-tab-pane>
</el-tabs>
</div>
</template>
<script>
-import GasECharts from './GasECharts'
-import EchartsTab from './EchartsTab'
+import ECharts from './ECharts'
export default {
- name: 'GasTabs',
+ name: 'PublicChart',
components: {
- GasECharts,
- EchartsTab
+ ECharts
},
data () {
return {
- activeName: 'first'
+ activeName: 'second'
}
},
methods: {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index a99b76f..a35207d 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -60,7 +60,7 @@
.main-video {
width: 100%;
- min-height: 195px;
+ min-height: 164px;
video {
width: 100%;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
index 4f6f431..dcc006d 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTabs.vue
@@ -8,26 +8,42 @@
<div class="border_corner border_corner_right_bottom"></div>
<div class="main">
<div class="main-matter">
- <el-row type="flex" class="row-bg row-item-one" justify="space-around">
- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
- </el-row>
- <el-row type="flex" class="row-bg" justify="space-around">
- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
- </el-row>
-<!-- <el-row type="flex" class="row-bg row-item-one" justify="space-around">-->
-<!-- <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContent.Name }}</el-col>-->
-<!-- <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContent.porltName }}</el-col>-->
-<!-- <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContent.MonTypeName }}</el-col>-->
-<!-- </el-row>-->
-<!-- <el-row type="flex" class="row-bg" justify="space-around">-->
-<!-- <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContent.EmissDirecti }}</el-col>-->
-<!-- <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContent.ContrLevelShowName }}</el-col>-->
-<!-- <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContent.OrOutPortName }}</el-col>-->
-<!-- </el-row>-->
+ <div v-if="value === 'feiqi'">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.DeptSname }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍚嶇О:{{ setWasteGasdata.MonTypeName }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
+ </el-row>
+ </div>
+ <div v-else-if="value === 'gufei'">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ displayContentTab2.StoragePlaceName }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ displayContentTab2.DesignFloorArea }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ displayContentTab2.StorageQty }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ displayContentTab2.SurplusFloorArea }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ displayContentTab2.StorageDate }}</el-col>
+ </el-row>
+ </div>
+ <div v-else-if="value == 'feishui'">
+ <el-row type="flex" class="row-bg row-item-one" justify="space-around">
+ <el-col :span="8">鐩戞祴鐐瑰悕绉�:{{ setWasteGasdata.Name }}</el-col>
+ <el-col :span="8">鐢熶骇鍗曚綅:{{ setWasteGasdata.DeptSname }}</el-col>
+ <el-col :span="8">鎺掓斁绫诲瀷鍔犺浇:{{ setWasteGasdata.MonTypeName }}</el-col>
+ </el-row>
+ <el-row type="flex" class="row-bg" justify="space-around">
+ <el-col :span="8">鎺掓斁鍘诲悜:{{ setWasteGasdata.EmissDirecti }}</el-col>
+ <el-col :span="8">鎺у埗绾у埆鍚嶇О:{{ setWasteGasdata.ContrLevelShowName }}</el-col>
+ <el-col :span="8">鍐�/澶栨帓鍙�:{{ setWasteGasdata.OrOutPortName }}</el-col>
+ </el-row>
+ </div>
</div>
</div>
</div>
@@ -36,7 +52,7 @@
<script>
export default {
name: 'GasTable',
- props: ['displayContentTab'],
+ props: ['displayContentTab', 'value', 'setWasteGasdata'],
data () {
return {
displayContentTab2: []
@@ -46,6 +62,7 @@
this.$nextTick(() => {
this.displayContentTab.forEach(item => {
this.displayContentTab2 = item
+ console.log(item)
})
})
}
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 140187c..7ef971b 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,14 +6,14 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <GasTab :displayContentTab="displayContentTab"></GasTab>
+ <PublicTabs :displayContentTab="displayContentTab" :value="value" :setWasteGasdata="setWasteGasdata"></PublicTabs>
<div class="public-bounced-content-left-bottom">
- <PublicTable v-if="value === 'gufei'" :displayContentTable="displayContentTable"></PublicTable>
- <GasECharts v-else></GasECharts>
+ <PublicTable v-if="value === 'gufei'"></PublicTable>
+ <PublicChart v-else></PublicChart>
</div>
</div>
<div class="public-bounced-content-right">
- <GasVideo></GasVideo>
+ <PublicVideo></PublicVideo>
</div>
</div>
</div>
@@ -22,26 +22,27 @@
<script>
import '@/components/BaseNav/SolidWaste/directive/dir'
-import GasTab from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
+import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import GasECharts from '@components/BaseNav/PublicBounced/GasComponents/GasECharts'
-import GasVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-// import GasTabs from './GasComponents/GasTabs'
+import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
+import PublicChart from './GasComponents/PublicChart'
export default {
name: 'PublicBounced',
components: {
- GasTab,
+ PublicTabs,
PublicTable,
- GasECharts,
- GasVideo
+ PublicChart,
+ PublicVideo
},
data () {
return {
+ setWasteGasdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
- flag: false
+ flag: false,
+ value: ''
}
},
methods: {
@@ -54,6 +55,12 @@
this.flag = true
this.value = value
},
+ setGasData (data, value) {
+ this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
+ this.flag = true
+ this.value = value
+ },
closePopup () {
this.flag = false
}
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 574ed9f..a992284 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -56,7 +56,7 @@
// const result = await mapApi.getWasteGas(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(e.layer.options.test)
+ instance.setGasData(e.layer.options.test, 'feiqi')
instance.$mount()
document.body.appendChild(instance.$el)
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 5a568e9..0be9e1a 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -56,9 +56,10 @@
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
const result = await mapApi.getWasteWater(dataValue)
+ // console.log(result)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setData(result)
+ instance.setGasData(result, 'feishui')
instance.$mount()
document.body.appendChild(instance.$el)
}
diff --git a/src/components/LayerController/service/AnimalService.js b/src/components/LayerController/service/AnimalService.js
index 9a80b7f..687b6e7 100644
--- a/src/components/LayerController/service/AnimalService.js
+++ b/src/components/LayerController/service/AnimalService.js
@@ -4,8 +4,9 @@
class AnimalService {
constructor (config) {
this.intervals = [] // 瀹氭椂鍣ㄥ垪琛�
+ // todo 杩欑鎯呭喌涓�鑸敤 window绾х殑L銆乵ap杩樻槸浼犻�掑憿
this.L = config.L
- this.layer = config.layer
+ this.layer = window.map
this.times = config.times || 5
this.colors = ['#98FB98', '#ff0000']
}
diff --git a/src/components/icon-btn/IconBtn.vue b/src/components/icon-btn/IconBtn.vue
deleted file mode 100644
index 4c618b8..0000000
--- a/src/components/icon-btn/IconBtn.vue
+++ /dev/null
@@ -1,221 +0,0 @@
-<template>
- <div class="float-panel">
- <div :class='["btn",active ? "active" : ""]' @click="onClick">
- <span>
- <img :src="src" alt="" width="26px" style="display: block;margin: auto">
- <span class="icon-name">{{label}}</span>
- </span>
- </div>
- </div>
-</template>
-
-<script>
-import '@assets/css/map/magic.min.css'
-
-import iconSetting from '@/assets/images/map-pages/icon/setting.png'
-
-export default {
- name: 'LayerController',
- props: {
- src: String,
- label: String,
- active: Object,
- onClick: Function
- },
- computed: {
- map () {
- return this.$store.state.map.map
- },
- L () {
- return this.$store.state.map.L
- },
- layerHelper () {
- return this.$store.state.map.layerHelper
- }
- },
- data () {
- return {
- width: '250px',
- isShow: true,
- icons: {
- setting: iconSetting
- },
- layerControllerVisible: false,
- panelSwitch: {
- main: true // 涓荤獥鍙�
- }
- }
- },
- mounted () {
- this.$nextTick(function () {
- this.init()
- })
- },
- methods: {
- }
-}
-</script>
-
-<style lang="less">
- .float-panel {
- position: absolute;
- left: 2px;
- top: 120px;
- height: auto;
- font-size: 11px;
- z-index: 1000;
-
- div {
- color: #00fff6;
- }
- .btn {
- width:45px;
- text-align: center;
- background: rgba(0, 16, 30, 0.5);
- cursor: pointer;
- color: #00fff6;
- border: 0.00521rem solid #00fff6;
- box-shadow: 0 0 0.03rem #00fff6;
- }
- .active {
- border: 0.00521rem solid #fff700;
- box-shadow: 0 0 0.03rem #fff700;
- }
- .title-border {
- width: 100%;
- height: 28px;
- background: #10488c;
- -webkit-clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
- clip-path: polygon(0px 0px, 0px 28px, 230px 28px, 230px 9px, 95px 9px, 86px 0px);
- position: relative;
- }
-
- .title-border:before {
- content: "";
- display: block;
- position: absolute;
- width: 6px;
- height: 6px;
- top: 0;
- left: 0;
- background-color: #38c8ef;
- }
-
- .title-border:after {
- content: "";
- display: block;
- position: absolute;
- width: 6px;
- height: 6px;
- top: 9px;
- right: 0;
- background-color: #38c8ef;
- -webkit-clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
- clip-path: polygon(0px 0px, 0px 1px, 5px 1px, 5px 6px, 6px 6px, 6px 0px);
- }
-
- .title-text-border {
- width: 30px;
- height: 120px;
- float: left;
- background: #091331;
- // -webkit-clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
- // clip-path: polygon(1px 1px, 1px 27px, 229px 27px, 229px 10px, 94px 10px, 85px 1px);
- }
-
- .title-icon {
- float: left;
- width: 22px;
- height: 22px;
- margin-top: 4px;
- margin-left: 2px;
- background-image: url(../../assets/images/map-pages/icon/setting.png);
- }
-
- .title-text {
- width: 25px;
- color: #00d0f9;
- font-weight: bold;
- margin-top: 6px;
- text-align: center;
- font-size: 14px;
- filter: brightness(100%);
- text-shadow: 0 0 5px #00d0f9, 0 0 0 #00d0f9, 0 0 0 #00d0f9, 0 0 0 #0258c5, 0 0 0 #0258c5, 0 0 2px #0258c5, 0 0 5px #0258c5, 0 0 15px #0258c5;
- }
-
- .title-line {
- display: inline-block;
- width: 120px;
- height: 1px;
- // margin-top: 14px;
- margin-left: 4px;
- background-color: #04527f;
- line-height: 5px;
- vertical-align: middle;
- }
-
- .title-point {
- display: inline-block;
- width: 5px;
- height: 5px;
- // margin-top: 12px;
- background-color: #04527f;
- line-height: 5px;
- vertical-align: middle;
- }
-
- .title-button {
- float: right;
- width: 28px;
- height: 28px;
- cursor: pointer;
-
- :hover {
- font-weight: bold;
- color: white;
- }
- }
-
- .body-box {
- background-color: rgba(44, 62, 80, 0.6);
- border: 1px solid #10488c;
- margin-top: -1px;
- margin-left: 30px;
- height: auto;
- }
- .switch-head-down {
- transform: rotateX(180deg);
- transform-origin: 50% 50%;
- transition: transform 0.5s linear 0s;
- }
-
- select {
- background: transparent;
- margin: 6px;
- border: .5px solid #569EB7;
- width: 150px;
- color: #569EB7;
- padding: 0 16px;
- }
- ::-webkit-scrollbar {
- width: 7px;
- height: 5px !important;
- }
-
- ::-webkit-scrollbar-thumb {
- /*婊氬姩鏉￠噷闈㈠皬鏂瑰潡*/
- border-radius: 10px;
- box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
- background: #0661AE;
- border: 1px solid transparent;
- }
-
- ::-webkit-scrollbar-track {
- /*婊氬姩鏉￠噷闈㈣建閬�*/
- // box-shadow : inset 0 0 5px rgba(0, 0, 0, 0.2);
- border-radius: 0px;
- background: #0E3565;
- }
- }
-
-</style>
diff --git a/src/components/panel/LegendPanel.vue b/src/components/panel/LegendPanel.vue
index 383aea2..b3c4784 100644
--- a/src/components/panel/LegendPanel.vue
+++ b/src/components/panel/LegendPanel.vue
@@ -2,13 +2,13 @@
<div class="legend-panel">
<transition name="fade">
<div :class="'legend-content map-background'" v-show="legendControl">
- <div class="legend-content-box" v-for="(item,index) in legendContents" :key="index">
- <p><span>{{ item.title }}</span></p>
- <div :class="index === 5 ? '':'map-under-line'"></div>
+ <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.items" :key="inde">
+ <li v-for="(ite,inde) in item.layers" :key="inde">
<img :src='ite.legendImage' alt=''>
- <span>{{ ite.legendContent }}</span>
+ <span>{{ ite.name }}</span>
</li>
</ul>
</div>
@@ -28,111 +28,12 @@
data () {
return {
// 鎺у埗鍥句緥 鍐呭鐨� 鏄剧ず/闅愯棌
- legendControl: false,
- // 鍥鹃噷瀛樺偍鏁版嵁
- legendContents: [
- {
- title: '浼佷笟',
- items: [
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '涓浗鐭冲寲'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '娌圭敯浼佷笟 '
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鐐煎寲浼佷笟'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '閿�鍞紒涓�'
- }
- ]
- },
- {
- title: '姘存儏',
- items: [
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '姘存枃绔�'
- }
- ]
- },
- {
- title: '绠＄嚎',
- items: [
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '澶╃劧姘旂绾�'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '澶╃劧姘斿満绔�'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鎴愬搧娌圭绾�'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鎴愬搧娌瑰満绔�'
- }
- ]
- },
- {
- title: '鍙伴',
- items: [
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鍙伴瀹炴祴涓績'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鍙伴瀹炴祴璺緞'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鍙伴棰勬祴涓績'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鍙伴棰勬祴璺緞'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鍙伴褰撳墠涓績'
- }
- ]
- },
- {
- title: '闄嶆按绛夌骇(鍗曚綅锛歮m)',
- items: [
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '灏忛洦0-5'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '涓洦5-10'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '澶ч洦10-20'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '鏆撮洦20-50'
- },
- {
- legendImage: '../.././assets/images/map-pages/setting.png',
- legendContent: '澶ф毚闆�50-100'
- }
- ]
- }
- ]
+ legendControl: false
+ }
+ },
+ computed: {
+ serviceLayers () {
+ return this.$store.state.map.serviceLayers.LayerSewersLine
}
},
methods: {
--
Gitblit v1.8.0