From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/summarySheets.vue | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 6bc279f..37a4fa4 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,12 +1,12 @@
<template>
<div class="summary-sheets">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
- <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
+ <div :class='["iconBtn",selectGroup ? "active-button" : ""]' @click="subtopicBtn" >
<i class="el-icon-tickets icon"></i>
</div>
</el-tooltip>
<transition name="animationChange">
- <div class="subtopic" v-if="subtopic">
+ <div class="subtopic" v-show="selectGroup">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
<div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
<!-- -->
@@ -67,11 +67,35 @@
comp: Warn,
warnVisible: false,
companyVisible: false,
- subtopic: false
+ selectGroup: false
}
},
+ mounted () {
+ const that = this
+ // 鐩戝惉鏄惁鐐瑰嚮浜嗗綋鍓嶅浘鏍囨寜閽�
+ bus.$on('changeState', function (state) {
+ if (state.num !== 2 && state.type) {
+ that.selectGroup = false
+ }
+ })
+ // 澶栭儴璋冪敤 涓庢姤璀﹀脊妗�
+ bus.$on('forecastWarningDetails', function (state) {
+ that.showWarnDialog()
+ })
+ // 瀛愮粍浠朵簨浠舵帶鍒跺綋鍓嶅彉閲�
+ this.$nextTick(() => {
+ this.$refs.summarySheets.$on('closeDialog', () => {
+ that.summaryVisible = false
+ })
+ this.$refs.warnDialog.$on('closeDialog', () => {
+ that.warnVisible = false
+ })
+ this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
+ that.companyVisible = false
+ })
+ })
+ },
methods: {
-
closeBtn () {
this.$refs.summarySheets.show()
this.summaryVisible = true
@@ -85,32 +109,13 @@
this.companyVisible = true
},
subtopicBtn () {
- this.subtopic = !this.subtopic
+ this.selectGroup = !this.selectGroup
const state = {
- type: this.subtopic,
+ type: this.selectGroup,
num: 2
}
bus.$emit('changeState', state)
}
- },
- mounted () {
- const that = this
- bus.$on('changeState', function (state) {
- if (state.num !== 2 && state.type) {
- that.subtopic = false
- }
- })
- this.$nextTick(() => {
- this.$refs.summarySheets.$on('closeDialog', () => {
- that.summaryVisible = false
- })
- this.$refs.warnDialog.$on('closeDialog', () => {
- that.warnVisible = false
- })
- this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
- that.companyVisible = false
- })
- })
}
}
</script>
--
Gitblit v1.8.0