From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/LayerController/modules/LcServiceLayer.vue | 225 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 162 insertions(+), 63 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 5d553c3..eb0472f 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -1,32 +1,28 @@
<template>
<div class="inner-panel">
- <div class="title">
- 鍥惧眰鎺у埗
- </div>
+ <div class="panel-title"> 鍥惧眰鎺у埗 </div>
<div class="wms-panel">
<el-scrollbar class="wms-panel-scrollbar">
- <div v-for="item in serviceLayers" :key="item.code" class="layerbox">
+ <div v-for="(item,index1) in serviceLayers" :key="index1" class="layerbox">
+ <i class="downUp el-icon-caret-bottom" @click="item.isShow=!item.isShow" :class="item.isShow?'':'active'" ></i><!-- el-icon-arrow-down -->
<!-- 涓�绾у浘灞傞亶鍘� -->
- <div>
- <input type="checkbox" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code"
- @change="swAllLayers(item)"/>{{ item.name }}
+ <div style="padding-left:25px;padding-top:10px;color:#fff;font-size: 16px;">
+ <input type="checkbox" :class="{ 'active': item.type === 1 }" :name="'wmsLayer_'+item.code" :checked="item.checked" :value="item.code" @change="swAllLayers(item)"/>{{ item.name }}
</div>
- <div class="layerbox-item">
+ <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="basemap-layer-item" v-for="(itm,index2) in item.layers" :key="index2" :class="!itm.layers?'felxs':''" >
+ <input type="checkbox" :class="{ 'active': itm.type === 1 }" :name="'wmsSublayers_'+item.code+'_'+itm.code" :checked="itm.checked" :value="itm.code" @change="swAllLayers(itm)"/>{{ itm.name }}
<!-- 涓夌骇鍥惧眰閬嶅巻 -->
- <div class="layerbox-item-3">
- <div class="basemap-layer-item" v-for="layer in itm.layers" :key="layer.code">
+ <div class="layerbox-item-3" v-show="itm.layers">
+ <div class="basemap-layer-item" v-for="(layer,index3) in itm.layers" :key="index3">
<input type="checkbox"
+ :class="{ 'active': layer.type === 1 }"
:name="'wmsSublayers_'+item.code+'_'+layer.code"
:checked="layer.checked"
:value="layer.code"
- @change="swWmsLayer(layer)"/>{{ layer.name }}
+ @change="swAllLayers(layer)"/>
+ <span :style="'color:'+layer.color">{{ layer.name }}</span>
</div>
</div>
</div>
@@ -39,65 +35,140 @@
</template>
<script>
-import WfsHelper from '../../helpers/WfsHelper'
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
-import AjaxUtils from '../../../utils/AjaxUtils'
export default {
name: 'LcServiceLayer',
components: { LcServiceLayerFilter },
+ data () {
+ return {
+ changeList: []
+ }
+ },
computed: {
serviceLayers () {
return this.$store.state.map.serviceLayers.LayerSewersLine
}
},
mounted () {
- // console.log('03姝ラ锛�', this.helper)
- this.updateServiceLayerList()
},
methods: {
swAllLayers (item) {
// eslint-disable-next-line no-debugger
item.checked = !item.checked
- for (let i = 0, len = item.layers.length; i < len; ++i) {
- item.layers[i].checked = item.checked
+ // this.toggleLayer(item)
+ if (item.layers && item.layers.length > 0) {
+ this.swLayers(item.layers, item.checked)
+ if (item.checked) {
+ window.layerFactory.showAll(this.changeList)
+ } else {
+ window.layerFactory.hideAll(this.changeList)
+ }
+ this.changeList = []
+ } else {
+ this.toggleLayer(item)
}
- this.updateWms()
- },
- loadWfs () {
- var wfsHelper = new WfsHelper()
- wfsHelper.addTypeName('绠＄嚎鐐�')
- wfsHelper.addEquals('pipename', '鐮旂┒闄�01璺痀S000001')
-
- AjaxUtils.GetDataAsynByUrl(wfsHelper.getUrl(), {}, (res) => {
- console.log(res)
+ /* <<<<<<< HEAD
+ bus.$emit('changeSearchBar', item)
+ this.serviceLayers.forEach(function (item1, index1) {
+ if (item1.layers) {
+ item1.istrue = 0
+ item1.isfalse = 0
+ item1.layers.forEach(function (item2, index2) {
+ if (item2.layers) {
+ item2.istrue = 0
+ item2.isfalse = 0
+ item2.layers.forEach(function (item3, index3) {
+ if (item3.checked) { item2.istrue += 1 } else { item2.isfalse += 1 }
+ })
+ // console.log(item2.layers.length, item2.istrue, item2.isfalse, item2.type)
+ if (item2.istrue === item2.layers.length) {
+ item2.type = 2
+ item2.checked = true
+ } else if (item2.isfalse === item2.layers.length) {
+ item2.type = 0
+ item2.checked = false
+ } else {
+ item2.type = 1
+ }
+ if (item1.name === '涓撻鍥惧眰') {
+ bus.$emit('changeSearchBar', item2)
+ // console.log(item2, 'item2')
+ }
+ if (item2.checked) { item1.istrue += 1 } else { item1.isfalse += 1 }
+ }
+ })
+ if (item1.istrue === item1.layers.length) {
+ item1.type = 2 // 鍏ㄩ��
+ item1.checked = true
+ } else if (item1.isfalse === item1.layers.length) {
+ item1.type = 0 // 涓嶉��
+ item1.checked = false
+ } else {
+ item1.type = 1 // 鍗婇��
+ }
+ if (item1.name === '浼佷笟搴旀��') {
+ // console.log(item1)
+ bus.$emit('changeSearchBar', item1)
+ }
+ // console.log(item1.layers.length, item1.istrue, item1.isfalse, item1.type)
+ }
})
+>>>>>>> de7390c66ef3e3fe316e804495a78d05a01f0160 */
+ // console.log(this.serviceLayers)
},
- swWmsLayer (itm) {
- itm.checked = !itm.checked
+ swLayers (configs, checked) {
+ if (configs) {
+ for (let i = 0, len = configs.length; i < len; ++i) {
+ var config = configs[i]
+ config.checked = checked
+ this.changeList.push(config)
+ if (config.layers) {
+ this.swLayers(config.layers, checked)
+ }
+ }
+ }
+ },
+ setLayerType (configs, checkedSum) {
+ if (configs) {
+ for (let i = 0, len = configs.length; i < len; ++i) {
+ const config = configs[i]
+ const checked = config.checked
+ if (config.layers) {
+ checkedSum = this.setLayerType(config.layers, checkedSum || 0)
+ if (checkedSum === config.layers.length) {
+ config.type = 2
+ config.checked = true
+ } else if (checkedSum === 0) {
+ config.type = 0
+ config.checked = false
+ } else {
+ config.type = 1
+ }
+ checkedSum = 0
+ continue
+ }
+ checkedSum = checkedSum + (checked ? 1 : 0)
+ }
+ return checkedSum
+ }
+ },
+ toggleLayer (itm) {
if (itm.checked) {
window.layerFactory.show(itm)
} else {
window.layerFactory.hide(itm)
}
// this.updateWms()
- },
- updateServiceLayerList () {
-
- },
- updateWms () {
- var mapConfig = this.mapConfig
- var wmsHelper = new WfsHelper()
- wmsHelper.initMapConfig(mapConfig)
- var wmsLayersMap = wmsHelper.getWmsLayersMap()
- for (var k in wmsLayersMap) {
- var layers = wmsLayersMap[k]
- var tileLayer = window.serviceLayerHelper.getTileLayer(k)
- if (tileLayer) {
- tileLayer.setParams({ layers: layers.join(',') }, false)
- tileLayer.setUrl(tileLayer.config.url, false)
- }
- }
+ }
+ },
+ watch: {
+ serviceLayers: {
+ handler: function (val) {
+ this.setLayerType(val, 0)
+ },
+ immediate: true,
+ deep: true
}
}
}
@@ -105,31 +176,59 @@
<style scoped lang="less">
.inner-panel {
- .title{
- color: @color-title;
- font-size: 18px;
- margin: 10px;
- text-align: center;
- }
-
.btn-filter {
cursor: pointer;
color: #ffffff;
+ }
+ .felxs{
+ display: flex;
+ flex-wrap:wrap;
+ width: 50% !important;
}
.wms-panel {
.wms-panel-scrollbar{
- height: 50vh;
- width: 100%;
+ // height: 600px;
+ //width: 285px;
+ // width: 1.79rem;
+ height: 70vh;
+ width:2.1rem;
+ font-size: 14px;
}
.layerbox {
width: 100%;
+ 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 {
- padding-left: 20px;
+ padding-left: 25px;
padding-top: 5px;
- .basemap-layer-item {
- margin-bottom: 5px;
+ display: flex;
+ flex-wrap:wrap;
+ .basemap-layer-item {margin-bottom: 5px;
+ width: 100%;
+ input[type="checkbox"]{width:10px;height:10px;display: inline-block;text-align: center;vertical-align: middle; line-height: 10px;position: relative;}
+ input[type="checkbox"]::before{content: "";position: absolute;top: 0;left: 0;background: #fff;width: 100%;height: 100%;border: 1px solid #d9d9d9}
+ input[type="checkbox"]:checked::before{content: "\2713";background-color: @color-highlight;position: absolute;top: 0;left: 0;width:100%;border: 1px solid #fff700;
+ color:@background-color;font-size: 10px;font-weight: bold;}
+ input.active[type="checkbox"]::before,
+ input.active[type="checkbox"]:checked::before{content: "\2713";background: @background-color;position: absolute;top: 0;left: 0;width:100%;border: 1px solid @background-color;
+ color:@color-highlight;font-size: 10px;font-weight: bold;}
}
}
.layerbox-item-3{
--
Gitblit v1.8.0