From c6d73ab9748dcafb3977f3e7acfaf4257b270408 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 14:23:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/modules/LcServiceLayer.vue | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 6f43745..5d553c3 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -6,22 +6,35 @@
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
<div v-for="item in serviceLayers" :key="item.code" class="layerbox">
+ <!-- 涓�绾у浘灞傞亶鍘� -->
<div>
- <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
+ <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
+ @change="swAllLayers(item)"/>{{ item.name }}
</div>
<div class="layerbox-item">
+ <!-- 浜岀骇鍥惧眰閬嶅巻 -->
<div class="basemap-layer-item" v-for="itm in item.layers" :key="itm.code">
<input type="checkbox"
:name="'wmsSublayers_'+item.code+'_'+itm.code"
:checked="itm.checked"
:value="itm.code"
@change="swWmsLayer(itm)"/>{{ itm.name }}
+ <!-- 涓夌骇鍥惧眰閬嶅巻 -->
+ <div class="layerbox-item-3">
+ <div class="basemap-layer-item" v-for="layer in itm.layers" :key="layer.code">
+ <input type="checkbox"
+ :name="'wmsSublayers_'+item.code+'_'+layer.code"
+ :checked="layer.checked"
+ :value="layer.code"
+ @change="swWmsLayer(layer)"/>{{ layer.name }}
+ </div>
+ </div>
</div>
</div>
</div>
</el-scrollbar>
</div>
- <lc-service-layer-filter v-if="layerFilterVisible" ref="serviceLayerFilter"></lc-service-layer-filter>
+ <lc-service-layer-filter ref="serviceLayerFilter"></lc-service-layer-filter>
</div>
</template>
@@ -33,11 +46,6 @@
export default {
name: 'LcServiceLayer',
components: { LcServiceLayerFilter },
- data () {
- return {
- layerFilterVisible: false
- }
- },
computed: {
serviceLayers () {
return this.$store.state.map.serviceLayers.LayerSewersLine
@@ -74,9 +82,6 @@
}
// this.updateWms()
},
- swFilter (item) {
- this.layerFilterVisible = !this.layerFilterVisible
- },
updateServiceLayerList () {
},
@@ -101,18 +106,19 @@
<style scoped lang="less">
.inner-panel {
.title{
- color: #ffffff;
- font-size: 16px;
- font-weight: 600;
+ color: @color-title;
+ font-size: 18px;
margin: 10px;
text-align: center;
}
+
.btn-filter {
cursor: pointer;
color: #ffffff;
}
+
.wms-panel {
- width: 1.79167rem;
+
.wms-panel-scrollbar{
height: 50vh;
width: 100%;
@@ -120,15 +126,19 @@
.layerbox {
width: 100%;
.layerbox-item {
- display: flex;
- flex-flow: row wrap;
- margin-left: 15px;
- margin-top: 5px;
-
+ padding-left: 20px;
+ padding-top: 5px;
.basemap-layer-item {
- width: 50%;
+ margin-bottom: 5px;
}
}
+ .layerbox-item-3{
+ padding-left: 20px;
+ padding-top: 5px;
+ display: flex;
+ flex-wrap: wrap;
+ .basemap-layer-item{width: 50%}
+ }
}
}
}
--
Gitblit v1.8.0