From f8865d1c7f36c4ffa66002e0dd3a9d5e99e4fe6b Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期日, 30 五月 2021 13:45:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/MenuTopic.vue | 104 +++++++++-------------------------------------------
1 files changed, 18 insertions(+), 86 deletions(-)
diff --git a/src/components/panel/MenuTopic.vue b/src/components/panel/MenuTopic.vue
index 845ef16..bf13eeb 100644
--- a/src/components/panel/MenuTopic.vue
+++ b/src/components/panel/MenuTopic.vue
@@ -6,19 +6,18 @@
style=""
@click="toggle()">
<div id="menu-special-context" class="menu-special-context">
- <el-checkbox-button v-show="isShow" class="menu-special-item" v-model="specialAll.check" :checked="specialAll.checked" @change="checkedSpecialChangeAll(specialAll)">
- <div style="height: 1rem;width: 1rem;display: inline-flex;"> <img :src="specialAll.icon" ></div>
- {{ specialAll.name }}</el-checkbox-button>
+ <el-checkbox-button v-show="isShow" class="menu-special-item" v-model="topicSelectAll.check" :checked="topicSelectAll.checked" @change="checkedSpecialChangeAll(topicSelectAll)">
+ <div style="height: 16px;width: 17px;display: inline-flex;"><img style="width : 100%" :src="topicSelectAll.icon" ></div>
+ {{ topicSelectAll.name }}</el-checkbox-button>
- <el-checkbox-group :indeterminate="isIndeterminate" v-show="isShow" v-model="checkedList" size="medium" @change="checkedGroupSpecialChange">
- <el-checkbox-button class="menu-special-item" v-for="item in specialList" :label="item.name" :key="item.id" :checked="item.checked" @change="checkedSpecialChange(item)">
- <div style="height: 1rem;width: 1rem;display: inline-flex;"> <img :src="item.icon" ></div>
+ <el-checkbox-group :indeterminate="isIndeterminate" v-show="isShow" v-model="topicCheckedList" size="medium" @change="checkedGroupSpecialChange">
+ <el-checkbox-button class="menu-special-item" v-for="item in topicList" :label="item" :key="item.id" :checked="item.checked" @change="checkedSpecialChange(item)">
+ <div style="height: 16px;width: 17px;display: inline-flex;"><img style="width : 100%" :src="item.icon" ></div>
{{item.name}}</el-checkbox-button>
</el-checkbox-group>
<!-- <ul class="menu-special-item" v-for="item in SpecialList" :key="item.id">-->
<!-- <li style="display: inline-flex;vertical-align: middle">-->
<!-- <div style="height: 1rem;width: 1rem;"> <img :src="item.icon" ></div>-->
-
<!-- <a>{{ item.name }}</a>-->
<!-- </li>-->
<!-- </ul>-->
@@ -28,70 +27,16 @@
</template>
<script>
-
+import { TopicSelectAll, TopicList } from '../../conf/Topic'
export default {
name: 'MenuTopic',
data () {
return {
isShow: false,
isIndeterminate: true,
- checkedList: [],
- specialAll: {
- name: '鍏ㄩ��',
- check: false,
- icon: '/assets/images/menu/special.png'
- },
- specialList: [{
- name: '姹℃煋婧�',
- id: 1,
- check: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '搴熸按鐩戞祴',
- id: 2,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '搴熸皵鐩戞祴',
- id: 3,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '鍥哄簾绠＄悊',
- id: 4,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '鐜椋庨櫓',
- id: 5,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '鍦熷￥鍙婂湴涓嬫按',
- id: 6,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '姹￠洦姘寸缃�',
- id: 7,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '棰勮鎶ヨ',
- id: 8,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '鎸囨爣缁熻',
- id: 9,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }, {
- name: '搴旀�ュ湴鍥�',
- id: 10,
- checked: false,
- icon: '/assets/images/menu/special.png'
- }]
+ topicCheckedList: [],
+ topicSelectAll: TopicSelectAll,
+ topicList: TopicList
}
},
computed: {
@@ -99,33 +44,21 @@
methods: {
toggle () {
this.isShow = !this.isShow
- // console.log('toggle')
- // const el = document.getElementById('menu-special-context')
- // console.log(el.clientWidth + ':' + el.offsetHeight)
- // if (el.clientWidth > 0) {
- // el.style.width = '0'
- // } else {
- // el.style.width = 'auto'
- // }
},
checkedGroupSpecialChange (val) {
const len = val.length
- this.specialAll.check = len === this.specialList.length
- this.isIndeterminate = len > 0 && len < this.specialList.length
+ this.topicSelectAll.check = len === this.topicList.length
+ this.isIndeterminate = len > 0 && len < this.topicList.length
+ this.$store.commit('setTopic', this.topicCheckedList)
},
checkedSpecialChangeAll (val) {
- // this.checkedCities = val ? this.cities.map(item => item.id) : []
- // this.isIndeterminate = false
- // let list = []
- // if (val === true) {
- // list = this.specialList.map(item => item.name)
- // }
-
- this.checkedList = val.check ? this.specialList.map(item => item.name) : []
+ this.topicCheckedList = val.check ? this.topicList.map(item => item) : []
this.isIndeterminate = false
+ this.$store.commit('setTopic', this.topicCheckedList)
},
- checkedSpecialChange (item) {
- console.log(item)
+ checkedSpecialChange () {
+ console.log(this.topicCheckedList)
+ // this.$store.commit('setTopic', this.topicCheckedList)
}
}
@@ -133,7 +66,6 @@
</script>
<style lang="less" >
-@import '@assets/css/map/_map-variable';
.menu-special {
position: absolute;
left: 1rem;
--
Gitblit v1.8.0