From 484bd662e2fd4461ef34dbf9d64106c12b3ef961 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:43:49 +0800
Subject: [PATCH] 冲突
---
src/components/LayerController/modules/LcServiceLayerFilter.vue | 101 ++++++++++++++++++++++++++++++--------------------
1 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 92ec212..22c701b 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -2,35 +2,29 @@
<div class="inner-panel">
<div class="filter-group">
<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 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"
- @change="swSubFilter(item.url,filter)"><label
- :title="filter.name">{{filter.name}}</label>
+ <input type="checkbox" :value="filter.code" :checked="filter.checked" @change="swAllSubFilter(filter)"><label :title="filter.name">{{filter.name}}</label>
</div>
</div>
- </el-scrollbar>
+ <!-- </el-scrollbar> -->
</div>
</div>
</div>
</template>
<script>
-import { mapMutations } from 'vuex'
-import { LayerSewersPoint } from '@src/conf/layers/LayerSewers'
-
export default {
name: 'LcServiceLayerFilter',
components: { },
data () {
return {
visible: {},
- layerSewersPoint: LayerSewersPoint,
layers: [],
+ changeList: [],
filterConfig: [] // 闄勫睘瑕佺礌
}
},
@@ -43,25 +37,52 @@
}
},
methods: {
- ...mapMutations([]),
swAllSubFilter (item) {
+ // eslint-disable-next-line no-debugger
item.checked = !item.checked
- // window.serviceLayerHelper.loadLayers()
+ this.toggleLayer(item)
+ if (item.layers && item.layers.length > 0) {
+ this.swLayers(item.layers, item.checked)
+ if (item.checked) {
+ window.layerFactory.showAll(this.changeList)
+ } else {
+ window.layerFactory.hideAll(this.changeList)
+ }
+ this.changeList = []
+ } else {
+ this.toggleLayer(item)
+ }
+ },
+ swLayers (configs, checked) {
+ if (configs) {
+ for (let i = 0, len = configs.length; i < len; ++i) {
+ const config = configs[i]
+ const layers = config.layers
+ this.changeList.push(config)
+ if (layers) {
+ this.swLayers(config, checked)
+ }
+ config.checked = checked
+ }
+ }
},
// 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)
}
}
},
@@ -74,8 +95,7 @@
}
}
},
- swSubFilter (url, item) {
- item.checked = !item.checked
+ toggleLayer (item) {
if (item.checked) {
window.layerFactory.show(item)
} else {
@@ -99,38 +119,37 @@
<style scoped lang="less">
.inner-panel {
- color: #90c8e0;
font-size: 13px;
-
position: absolute;
- left: 270px;
+ // left: 1.82167rem;
+ left: 2.13167rem;
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;
-
+ 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;
}
-
- //
+ input[type="checkbox"]{width:10px;height:10px;display: inline-block;text-align: center;vertical-align: middle; line-height: 10px;position: relative;}
+ input[type="checkbox"]::before{content: "";position: absolute;top: 0;left: 0;background: #fff;width: 100%;height: 100%;border: 1px solid #d9d9d9}
+ input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;color:@background-color;font-size: 10px;font-weight: bold;}
+ //
//::-webkit-scrollbar {
// width: 7px;
// height: 5px !important;
--
Gitblit v1.8.0