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 | 98 +++++++++++++++++++++++++++---------------------
1 files changed, 55 insertions(+), 43 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index fab563b..37a4fa4 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,15 +1,16 @@
<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">
- <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,13 +22,13 @@
</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="鎶ヨ〃" class="baoBiao" >
<tab-handover></tab-handover>
</Dialog>
<Dialog ref="warnDialog" title="棰勬姤璀�" >
@@ -46,7 +47,9 @@
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',
@@ -64,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
@@ -82,46 +109,18 @@
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>
-<style scoped lang="less">
- .animationChange-enter-active, .animationChange-leave-active {
- transition: all 0.5s;
- }
-
- .animationChange-enter, .animationChange-leave-to {
- opacity: 0;
- transform: translateX(-100px);
- }
-
+<style lang="less">
.summary-sheets {
position: absolute;
display: inline-flex;
@@ -135,12 +134,12 @@
display: inline-flex;
.iconBtn{
margin-left: 0.03rem;
- border-color:#DCDFE6;
- color:#fff;
+ border-color:#00fff6;
+ color:#00fff6;
}
.iconBtn.active-button{
- border-color:#00fff6 !important;
- color:#00fff6 !important;
+ //border-color:#00fff6 !important;
+ //color:#00fff6 !important;
}
}
@@ -151,7 +150,14 @@
top: 15%;
left: 3rem;
}
+ .animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+ }
+ .animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+ }
/*color: #fff;*/
.el-icon-c-scale-to-original {
@@ -159,5 +165,11 @@
height: 30px;
font-size: 30px;
}
+
+ .el-dialog.el-dialog--center{
+ left: 0.5rem;
+ top: 0.73979rem;
+ }
+
}
</style>
--
Gitblit v1.8.0