From c3f7ab6bbaf26298d2d53f5422b8281a335752b7 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 11:38:41 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue | 4 +-
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 6 ++-
src/components/LayerController/modules/LcServiceLayerFilter.vue | 81 ++++++++++++++++++++++++++--------------
src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue | 2
src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue | 2
5 files changed, 61 insertions(+), 34 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index c3338d4..5ab9de8 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -11,10 +11,12 @@
<el-button size="mini" round @click="dialogVisible = true">鏄庣粏琛�</el-button>
<el-dialog :visible.sync="dialogVisible"
:append-to-body="true"
- width="66%"
+ :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName"
+ width="68%"
center
+ v-dialogDrag
>
- <div class="el-dialog-div" style="height: 600px">
+ <div class="el-dialog-div" style="height: 500px">
<public-detailed-list v-bind="$attrs"></public-detailed-list>
</div>
</el-dialog>
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
index efdfd77..4510bc3 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicDetailedList.vue
@@ -1,6 +1,6 @@
<template>
<div class="PublicDetailedList">
- <el-table :data="tableData" max-height="600px">
+ <el-table :data="tableData" max-height="500px">
<el-table-column prop="OnLineMonEmissPointName" label="鎺掓斁鐐�"></el-table-column>
<el-table-column prop="MonTimeStr" label="鐩戞祴鏃堕棿"></el-table-column>
<el-table-column label="姘哀鍖栫墿">
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
index eb2bcda..262f1c9 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicTable.vue
@@ -84,7 +84,7 @@
.win {
position: relative;
background-color: rgba(33, 41, 69, 0.9);
- min-height: 300px;
+ min-height: 354px;
}
.main {
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
index 9c29b81..ab9246b 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicVideo.vue
@@ -31,10 +31,10 @@
border: 1px solid #396d83;
padding: 6px;
//.main-video {
- height: 378px;
+ height: 432px;
video {
width: 100%;
- height: 378px;
+ height: 432px;
outline: none;
}
//}
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 4b68c97..ffc77a5 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -1,18 +1,19 @@
<template>
<div class="inner-panel">
<div class="filter-group">
- <div v-for="item in pointLayers" :key="item.code" class="filter-item">
+ <div v-for="item in layers" :key="item.code" class="filter-item">
<div class="title"><input type="checkbox" :value="item.code" :checked="item.checked"
@change="swAllSubFilter(item)">{{item.name}}
</div>
- <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" @change="swSubFilter(item.url,filter)"><label
- :title="filter.name">{{filter.name}}</label>
+ <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"
+ @change="swSubFilter(item.url,filter)"><label
+ :title="filter.name">{{filter.name}}</label>
+ </div>
</div>
- </div>
- </el-scrollbar>
+ </el-scrollbar>
</div>
</div>
</div>
@@ -20,45 +21,58 @@
<script>
import { mapMutations } from 'vuex'
+import { LayerSewersPoint } from '@src/conf/layers/LayerSewers'
export default {
name: 'LcServiceLayerFilter',
- components: {},
+ components: { },
data () {
return {
visible: {},
+ layerSewersPoint: LayerSewersPoint,
+ layers: [],
filterConfig: [] // 闄勫睘瑕佺礌
}
},
computed: {
+ serviceLayers () {
+ return this.$store.state.map.serviceLayers.LayerSewersLine
+ },
config () {
return this.$store.state.map.config
- },
- pointLayers () {
- // 鏍规嵁绾垮浘灞傞�変腑鎯呭喌锛屾樉绀烘垨闅愯棌鐐瑰浘灞傞潰鏉�
- var serviceLayers = this.config.mapConfig.Layers.LayerSewersLine // 涓�绾у浘灞�
- var checkedLayers = window.serviceLayerHelper.getCheckedLayers(serviceLayers)
- var pointLayers = this.config.mapConfig.Layers.layerSewersPoint // 浜岀骇鍥惧眰
- return pointLayers.filter(function (layer) {
- var code = layer.code
- for (var i = 0; i < checkedLayers.length; i++) {
- var checkedLayer = checkedLayers[i]
- if (checkedLayer.childLayer.indexOf(code) >= 0) {
- return checkedLayer
- }
- }
- })
}
- },
- mounted () {
- // this.filterConfig = window.serviceLayerHelper.getWMSConfig().filtersGroup
},
methods: {
...mapMutations([]),
swAllSubFilter (item) {
item.checked = !item.checked
- console.log(item)
// window.serviceLayerHelper.loadLayers()
+ },
+ // 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
+ } else {
+ this.layers = []
+ }
+ break
+ } else {
+ this.toggle(serviceLayer.layers)
+ }
+ }
+ },
+ checkChecked (serviceLayers) {
+ for (var i = 0; i < serviceLayers.length; i++) {
+ var serviceLayer = serviceLayers[i]
+ var checked = serviceLayer.checked
+ if (checked) {
+ return true
+ }
+ }
},
swSubFilter (url, item) {
item.checked = !item.checked
@@ -68,6 +82,16 @@
window.serviceLayerHelper.removeLayer(item)
}
// window.serviceLayerHelper.loadLayers()
+ }
+ },
+ watch: {
+ // 姝ゅ闇�瑕佹繁搴︾洃鍚浘灞傞�変腑鐘舵�侊紝浣跨敤computed鏃犳晥
+ '$store.state.map.serviceLayers.LayerSewersLine': {
+ handler: function (val) {
+ this.toggle(val)
+ },
+ immediate: true,
+ deep: true
}
}
}
@@ -106,6 +130,7 @@
max-height: 200px;
//overflow-y: hidden;
}
+
//
//::-webkit-scrollbar {
// width: 7px;
--
Gitblit v1.8.0