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 | 221 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 140 insertions(+), 81 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 1bb0dc4..e02c120 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,107 +1,166 @@
<template>
- <div class="summary-sheets">
-<!-- <div id="summary">-->
-<!-- <el-row type="flex" class="head-area" align="middle">-->
-<!-- <el-col>-->
-<!-- <span>浼佷笟鎸囨爣鍒嗙被缁熻</span>-->
-<!-- </el-col>-->
-<!-- <el-col class="head-area-button">-->
-<!-- <el-button style="float: right; padding: 3px 0" icon="el-icon-close" type="info" @click="closeBtn"></el-button>-->
-<!-- </el-col>-->
-<!-- </el-row>-->
-<!-- <el-tabs class="tabs-text">-->
- <div>
- <i class="el-icon-c-scale-to-original" @click="closeBtn"></i>
- </div>
- <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">
-<!-- <el-row :gutter="20" >-->
-<!-- <el-col>-->
- <el-tabs v-model="activeName" type="border-card">
- <el-tab-pane label="搴熸按" name="first">
- <waste-water></waste-water>
- </el-tab-pane>
- <el-tab-pane label="搴熸皵" name="second">
- <waste-gas></waste-gas>
- </el-tab-pane>
- <el-tab-pane label="鍥哄簾" name="third">
- <solid-waste></solid-waste>
- </el-tab-pane>
- <el-tab-pane label="绌烘皵璐ㄩ噺" name="fourth">
- <AirQuality></AirQuality>
- </el-tab-pane>
- </el-tabs>
-<!-- </el-col>-->
-<!-- </el-row>-->
- </Dialog >
- </div>
+ <div class="summary-sheets">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎶ヨ〃" placement="left">
+ <div :class='["iconBtn",subtopic ? "active-button" : ""]' @click="subtopicBtn" >
+ <i class="el-icon-tickets icon"></i>
+ </div>
+ </el-tooltip>
+ <transition name="animationChange">
+ <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">
+ <!-- -->
+ <i class="icon iconfont iconbiaoge2"></i>
+ <!--<span class="icon-name">缁熻琛�</span>-->
+ </div>
+ </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="鎸囨爣" placement="bottom">
+ <div :class='["iconBtn",companyVisible ? "active-button" : ""]' @click="showStatisDialog()" >
+ <!-- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon"> -->
+ <i class="el-icon-office-building icon"></i>
+ </div>
+ </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="棰勬姤璀�" placement="bottom">
+ <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()" >
+ <i class="icon iconfont iconbaojing01"></i>
+ <!--<span class="icon-name">棰勬姤璀�</span>-->
+ </div>
+ </el-tooltip>
+ </div>
+ </transition>
+ <Dialog ref="summarySheets" title="鎶ヨ〃" >
+ <tab-handover></tab-handover>
+ </Dialog>
+ <Dialog ref="warnDialog" title="棰勬姤璀�" >
+ <warn></warn>
+ </Dialog>
+ <Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻" >
+ <index-statistics></index-statistics>
+ </Dialog>
+ </div>
</template>
<script>
-import WasteWater from '@/components/table/components/WasteWater.vue'
-import WasteGas from './components/WasteGas'
-import SolidWaste from './components/SolidWaste'
-import AirQuality from './components/AirQuality'
-import Dialog from '@views/popup/Dialog'
+import tabHandover from '@components/table/components/tabHandover'
+// import Dialog from '@views/popup/Dialog'
+import Dialog from '../../views/popup/Dialog'
+import Warn from './components/Warn'
+import IndexStatistics from './components/IndexStatistics'
+
+// import '@/components/BaseNav/SolidWaste/directive/dir'
+// import '@/components/plugin/DialogDrag'
+
+import bus from '@/eventBus'
export default {
name: 'summary-sheet.vue',
components: {
+ tabHandover,
Dialog,
- WasteWater,
- WasteGas,
- SolidWaste,
- AirQuality
+ Warn,
+ IndexStatistics
+ // Dialog
},
data () {
return {
- activeName: 'first'
+ summaryVisible: false,
+ dialogShow: false,
+ comp: Warn,
+ warnVisible: false,
+ companyVisible: false,
+ subtopic: false
}
},
methods: {
+
closeBtn () {
- // const summary = document.getElementById('summary')
- // summary.style.display = 'none'
this.$refs.summarySheets.show()
+ this.summaryVisible = true
},
- tableHeaderColor ({ row, column, owIndex, columnIndex }) {
- return 'background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;font-wight:500;font-size:12px;text-align:center;height:0px'
+ showWarnDialog () {
+ this.$refs.warnDialog.show()
+ this.warnVisible = true
},
- // 琛ㄥご鏍峰紡璁剧疆
- rowClass () {
- return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ showStatisDialog () {
+ this.$refs.indexStatisticsDialog.show()
+ this.companyVisible = true
+ },
+ 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
+ })
+ this.$refs.warnDialog.$on('closeDialog', () => {
+ that.warnVisible = false
+ })
+ this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
+ that.companyVisible = false
+ })
+ })
}
}
</script>
<style scoped lang="less">
- .summary-sheets {
- position: absolute;
- top: 450px;
- left: 200px;
- width: 40px;
- height: 40px;
- /*width: 850px;*/
- /*height: 265px;*/
- border: #90c8e0 1px solid;
- z-index:2000;
- background-color: rgba(26, 73, 81, 0.901960784313726);
- /*color: #fff;*/
- .el-icon-c-scale-to-original {
- width: 100%;
- height: 100%;
- }
+ .animationChange-enter-active, .animationChange-leave-active {
+ transition: all 0.5s;
+ }
+
+ .animationChange-enter, .animationChange-leave-to {
+ opacity: 0;
+ transform: translateX(-100px);
+ }
+
+.summary-sheets {
+ position: absolute;
+ display: inline-flex;
+ overflow: hidden;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ /*width: 850px;*/
+ /*height: 265px;*/
+ z-index: 500;
+ .subtopic{
+ display: inline-flex;
+ .iconBtn{
+ margin-left: 0.03rem;
+ border-color:#DCDFE6;
+ color:#fff;
}
- /*.head-area{*/
- /* color: #fff;*/
- /* width: 100%;*/
- /* height: 40px;*/
- /* background-color: #002433;*/
- /* font-size: 16px;*/
- /* border-bottom: #90c8e0 2px solid;*/
- /* padding-left: 16px;*/
- /* !*line-height: 40px;*!*/
- /*}*/
- /*.head-area-button{*/
- /* margin-right: 5px;*/
- /*}*/
+ .iconBtn.active-button{
+ border-color:#00fff6 !important;
+ color:#00fff6 !important;
+ }
+ }
+
+ .dialog {
+ //width: 800px;
+ //height: 300px;
+ position: absolute;
+ top: 15%;
+ left: 3rem;
+ }
+
+ /*color: #fff;*/
+
+ .el-icon-c-scale-to-original {
+ width: 30px;
+ height: 30px;
+ font-size: 30px;
+ }
+}
</style>
--
Gitblit v1.8.0