From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/modules/LcServiceLayerFilter.vue | 46 +++++++++++++++++++++++++++++-----------------
1 files changed, 29 insertions(+), 17 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index 6903552..22c701b 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -2,15 +2,12 @@
<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%"> -->
<div class="content">
<div v-for="filter in item.layers" :key="filter.code">
- <input type="checkbox" :value="filter.code" :checked="filter.checked"
- @change="swAllSubFilter(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> -->
@@ -27,6 +24,7 @@
return {
visible: {},
layers: [],
+ changeList: [],
filterConfig: [] // 闄勫睘瑕佺礌
}
},
@@ -43,17 +41,28 @@
// eslint-disable-next-line no-debugger
item.checked = !item.checked
this.toggleLayer(item)
- this.swLayers(item.layers, item.checked)
+ 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 (layers, checked) {
- if (layers) {
- for (let i = 0, len = layers.length; i < len; ++i) {
- var layer = layers[i]
- layer.checked = checked
- this.toggleLayer(layer)
- if (layer.layers) {
- this.swLayers(layer.layers, checked)
+ 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
}
}
},
@@ -112,7 +121,8 @@
.inner-panel {
font-size: 13px;
position: absolute;
- left: 1.82167rem;
+ // left: 1.82167rem;
+ left: 2.13167rem;
z-index: 1000;
top: 50px;
.filter-group {
@@ -136,8 +146,10 @@
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