From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/summarySheets.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 41239cf..e02c120 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -9,7 +9,8 @@
<div class="subtopic" v-if="subtopic">
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="bottom">
<div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
- <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
+ <!-- -->
+ <i class="icon iconfont iconbiaoge2"></i>
<!--<span class="icon-name">缁熻琛�</span>-->
</div>
</el-tooltip>
@@ -21,19 +22,19 @@
</el-tooltip>
<el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom">
<div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()" >
- <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
+ <i class="icon iconfont iconbaojing01"></i>
<!--<span class="icon-name">棰勬姤璀�</span>-->
</div>
</el-tooltip>
</div>
</transition>
- <Dialog ref="summarySheets" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
+ <Dialog ref="summarySheets" title="鎶ヨ〃" >
<tab-handover></tab-handover>
</Dialog>
- <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
+ <Dialog ref="warnDialog" title="棰勬姤璀�" >
<warn></warn>
</Dialog>
- <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻">
+ <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻" >
<index-statistics></index-statistics>
</Dialog>
</div>
@@ -46,8 +47,10 @@
import Warn from './components/Warn'
import IndexStatistics from './components/IndexStatistics'
-import '@/components/BaseNav/SolidWaste/directive/dir'
+// import '@/components/BaseNav/SolidWaste/directive/dir'
+// import '@/components/plugin/DialogDrag'
+import bus from '@/eventBus'
export default {
name: 'summary-sheet.vue',
components: {
@@ -68,6 +71,7 @@
}
},
methods: {
+
closeBtn () {
this.$refs.summarySheets.show()
this.summaryVisible = true
@@ -82,10 +86,20 @@
},
subtopicBtn () {
this.subtopic = !this.subtopic
+ const state = {
+ type: this.subtopic,
+ 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
--
Gitblit v1.8.0