From c6cd6c7a9db14e889c35916f733fe41cc646ff66 Mon Sep 17 00:00:00 2001 From: wangqi <magical1908@outlook.com> Date: 星期三, 07 四月 2021 14:58:36 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/LayerController/modules/LcServiceLayerFilter.vue | 148 ++++++++++++++++++++++++++++--------------------- 1 files changed, 85 insertions(+), 63 deletions(-) diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue index cd5fb45..a617f78 100644 --- a/src/components/LayerController/modules/LcServiceLayerFilter.vue +++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue @@ -1,16 +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> - <div class="content"> - <div v-for="filter in item.filters" :key="filter.code"> - <input type="checkbox" :value="filter.code" :checked="filter.checked"><label - :title="filter.name">{{filter.sname}}</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> </div> </div> </div> @@ -18,59 +21,77 @@ <script> import { mapMutations } from 'vuex' -import WmsHelper from '../../helpers/WmsHelper' +import { LayerSewersPoint } from '@src/conf/layers/LayerSewers' export default { name: 'LcServiceLayerFilter', - components: {}, + components: { }, data () { return { visible: {}, + layerSewersPoint: LayerSewersPoint, + layers: [], filterConfig: [] // 闄勫睘瑕佺礌 } }, computed: { - mapConfig () { - return this.$store.state.map.mapConfig.mapConfig + serviceLayers () { + return this.$store.state.map.serviceLayers.LayerSewersLine }, - pointLayers () { - // 鏍规嵁绾垮浘灞傞�変腑鎯呭喌锛屾樉绀烘垨闅愯棌鐐瑰浘灞傞潰鏉� - var config = this.mapConfig - var checkedLayers = window.serviceLayerHelper.getCheckedLayers(config) - var pointLayers = config.PointLayers - 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 - } - } - }) + config () { + return this.$store.state.map.config } - }, - mounted () { - // this.filterConfig = window.serviceLayerHelper.getWMSConfig().filtersGroup }, methods: { ...mapMutations([]), swAllSubFilter (item) { item.checked = !item.checked - for (let i = 0, len = item.filters.length; i < len; ++i) { - item.filters[i].checked = item.checked - } - var mapConfig = this.mapConfig - var wmsHelper = new WmsHelper() - wmsHelper.initMapConfig(mapConfig) - var wmsLayersMap = wmsHelper.getWmsLayersMap() - for (var k in wmsLayersMap) { - var layers = wmsLayersMap[k] - var tileLayer = this.serviceLayerHelper.getTileLayer(k) - if (tileLayer) { - tileLayer.setParams({ layers: layers.join(',') }, true) - tileLayer.setUrl(tileLayer.config.url, false) + // 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 + if (item.checked) { + window.layerFactory.show(item) + } else { + window.layerFactory.hide(item) + } + // window.serviceLayerHelper.loadLayers() + } + }, + watch: { + // 姝ゅ闇�瑕佹繁搴︾洃鍚浘灞傞�変腑鐘舵�侊紝浣跨敤computed鏃犳晥 + '$store.state.map.serviceLayers.LayerSewersLine': { + handler: function (val) { + this.toggle(val) + }, + immediate: true, + deep: true } } } @@ -82,10 +103,10 @@ font-size: 13px; position: absolute; - left: 250px; - bottom: 10px; + left: 260px; z-index: 1000; height: 220px; + top: 0; .filter-group { display: flex; @@ -97,7 +118,7 @@ margin-right: 5px; .title { - height: '25px'; + height: 25px; background-color: #091331; border: 1px solid #10488c; } @@ -106,28 +127,29 @@ background-color: rgba(44, 62, 80, 0.6); border: 1px solid #10488c; max-height: 200px; - overflow-y: auto; + //overflow-y: hidden; } - ::-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; - } + // + //::-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; + //} } } } -- Gitblit v1.8.0