From 484bd662e2fd4461ef34dbf9d64106c12b3ef961 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:43:49 +0800
Subject: [PATCH] 冲突
---
src/components/LayerController/modules/LcServiceLayer.vue | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/src/components/LayerController/modules/LcServiceLayer.vue b/src/components/LayerController/modules/LcServiceLayer.vue
index 866eb17..5aef608 100644
--- a/src/components/LayerController/modules/LcServiceLayer.vue
+++ b/src/components/LayerController/modules/LcServiceLayer.vue
@@ -36,7 +36,6 @@
<script>
import LcServiceLayerFilter from '@components/LayerController/modules/LcServiceLayerFilter'
-import bus from '@/eventBus'
export default {
name: 'LcServiceLayer',
components: { LcServiceLayerFilter },
@@ -68,8 +67,53 @@
} else {
this.toggleLayer(item)
}
+ /* <<<<<<< 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)
},
swLayers (configs, checked) {
--
Gitblit v1.8.0