From cd80929f0ae8882a98cfe3936b2a96bded1c12d8 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期三, 07 四月 2021 18:59:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/modules/LcServiceLayerFilter.vue | 55 ++++++++++++++++++++++++++-----------------------------
1 files changed, 26 insertions(+), 29 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayerFilter.vue b/src/components/LayerController/modules/LcServiceLayerFilter.vue
index a8aa08a..2e4d80d 100644
--- a/src/components/LayerController/modules/LcServiceLayerFilter.vue
+++ b/src/components/LayerController/modules/LcServiceLayerFilter.vue
@@ -5,7 +5,7 @@
<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"
@@ -13,7 +13,7 @@
:title="filter.name">{{filter.name}}</label>
</div>
</div>
- </el-scrollbar>
+ <!-- </el-scrollbar> -->
</div>
</div>
</div>
@@ -50,18 +50,20 @@
},
// 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)
}
}
},
@@ -77,9 +79,9 @@
swSubFilter (url, item) {
item.checked = !item.checked
if (item.checked) {
- window.serviceLayerHelper.loadGeojsonLayer(url, item)
+ window.layerFactory.show(item)
} else {
- window.serviceLayerHelper.removeLayer(item)
+ window.layerFactory.hide(item)
}
// window.serviceLayerHelper.loadLayers()
}
@@ -99,35 +101,30 @@
<style scoped lang="less">
.inner-panel {
-
- color: #90c8e0;
font-size: 13px;
-
position: absolute;
- left: 260px;
+ left: 1.82167rem;
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;
}
--
Gitblit v1.8.0