Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetw...

chenzeping

2021-04-07 05f6eb0aaa7914289b60e87ee7fdc2aa357b36cb

 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,22 +101,18 @@

<style scoped lang="less">
    .inner-panel {
        width: 500px;
        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;

@@ -128,6 +126,7 @@
                    background-color: rgba(44, 62, 80, 0.6);
                    border: 1px solid #10488c;
                    max-height: 200px;
                    padding-bottom: 5px;
                    //overflow-y: hidden;
                }