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/LcServiceLayer.vue | 40 +++++++++++++++++++--------------------- 1 files changed, 19 insertions(+), 21 deletions(-) diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue index 24dfc00..5d553c3 100644 --- a/src/components/LayerController/modules/LcServiceLayer.vue +++ b/src/components/LayerController/modules/LcServiceLayer.vue @@ -8,7 +8,8 @@ <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"> <!-- 浜岀骇鍥惧眰閬嶅巻 --> @@ -19,7 +20,7 @@ :value="itm.code" @change="swWmsLayer(itm)"/>{{ itm.name }} <!-- 涓夌骇鍥惧眰閬嶅巻 --> - <div style="width: 100%"> + <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" @@ -33,7 +34,7 @@ </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> @@ -45,11 +46,6 @@ export default { name: 'LcServiceLayer', components: { LcServiceLayerFilter }, - data () { - return { - layerFilterVisible: false - } - }, computed: { serviceLayers () { return this.$store.state.map.serviceLayers.LayerSewersLine @@ -86,9 +82,6 @@ } // this.updateWms() }, - swFilter (item) { - this.layerFilterVisible = !this.layerFilterVisible - }, updateServiceLayerList () { }, @@ -113,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%; @@ -132,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