From 3bc191973a0a67cbc8c0d77d92ea1a807555aa6a Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 08 四月 2021 17:52:39 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop

---
 src/components/LayerController/modules/LcServiceLayer.vue |  108 +++++++++++++++++++++++++++++++++---------------------
 1 files changed, 66 insertions(+), 42 deletions(-)

diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 64b2361..b404bc8 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,24 +1,39 @@
 <template>
     <div class="inner-panel">
+        <div class="panel-title"> 鍥惧眰鎺у埗 </div>
         <div class="wms-panel">
-            <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 }} <span @click="swFilter(item)"
-                                                                               class="btn-filter">杩囨护</span><span @click="loadWfs()"
-                                                                                                                 class="btn-filter">娴嬭瘯</span>
-                </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(item.url,itm)"/>{{
-                        itm.name }}
+            <el-scrollbar class="wms-panel-scrollbar">
+                <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
+                    <i class="downUp el-icon-caret-bottom" @click="item.isShow=!item.isShow" :class="item.isShow?'':'active'" ></i><!-- el-icon-arrow-down -->
+                    <!-- 涓�绾у浘灞傞亶鍘� -->
+                    <div style="padding-left:25px;padding-top:10px;color:#fff">
+                        <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
+                    </div>
+                    <div class="layerbox-item" v-show="item.isShow">
+                        <!-- 浜岀骇鍥惧眰閬嶅巻 -->
+                        <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)"/>
+                                    <span :style="'color:'+layer.color">{{ layer.name }}</span>
+                                </div>
+                            </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>
 
@@ -30,11 +45,6 @@
 export default {
   name: 'LcServiceLayer',
   components: { LcServiceLayerFilter },
-  data () {
-    return {
-      layerFilterVisible: false
-    }
-  },
   computed: {
     serviceLayers () {
       return this.$store.state.map.serviceLayers.LayerSewersLine
@@ -56,23 +66,20 @@
     loadWfs () {
       var wfsHelper = new WfsHelper()
       wfsHelper.addTypeName('绠$嚎鐐�')
-      wfsHelper.appendEquals('pipename', '鐮旂┒闄�01璺痀S000001')
+      wfsHelper.addEquals('pipename', '鐮旂┒闄�01璺痀S000001')
 
       AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {
         console.log(res)
       })
     },
-    swWmsLayer (url, itm) {
+    swWmsLayer (itm) {
       itm.checked = !itm.checked
       if (itm.checked) {
-        window.serviceLayerHelper.loadGeojsonLayer(url, itm)
+        window.layerFactory.show(itm)
       } else {
-        window.serviceLayerHelper.removeLayer(itm)
+        window.layerFactory.hide(itm)
       }
       // this.updateWms()
-    },
-    swFilter (item) {
-      this.layerFilterVisible = !this.layerFilterVisible
     },
     updateServiceLayerList () {
 
@@ -97,34 +104,51 @@
 
 <style scoped lang="less">
     .inner-panel {
-        display: flex;
-        justify-content: center;
-        align-items: center;
-
         .btn-filter {
             cursor: pointer;
             color: #ffffff;
         }
 
         .wms-panel {
-            display: flex;
-            flex-flow: column;
 
+            .wms-panel-scrollbar{
+                height: 457px;
+                width: 100%;
+                font-size: 14px;
+            }
             .layerbox {
                 width: 100%;
-                display: flex;
-                flex-flow: column;
-
+                position: relative;
+                .downUp{
+                    position: absolute;
+                    top:3px;
+                    left: -2px;
+                    height: 30px;
+                    width: 30px;
+                    text-align: center;
+                    line-height: 30px;
+                    cursor: pointer;
+                    font-size: 20px;
+                    transition: all 1.5s;
+                }
+                .downUp.active{
+                    transform: rotate(-90deg);
+                }
+                .downUp:hover{font-size: 26px;font-weight: 900}
                 .layerbox-item {
-                    display: flex;
-                    flex-flow: row wrap;
-                    margin-left: 15px;
-                    margin-top: 5px;
-
+                    padding-left: 30px;
+                    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