From 8db683d564865b4bcfb436b35dff1eea5b3816fc Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期四, 08 四月 2021 11:08:47 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/summarySheets.vue | 138 ++++++++++++++++++---------------------------
1 files changed, 56 insertions(+), 82 deletions(-)
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 1bb0dc4..6592090 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,107 +1,81 @@
<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 class="summary-sheets">
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="缁熻琛�" placement="left">
+ <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
+ <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
+ <!--<span class="icon-name">缁熻琛�</span>-->
+ </div>
+ </el-tooltip>
+ <!-- <Dialog ref="summarySheets" title="浼佷笟鎸囨爣鍒嗙被缁熻">-->
+ <!-- <tab-handover></tab-handover>-->
+ <!-- </Dialog >-->
+ <div class="dialog" v-drag v-show="dialogShow">
+ <tab-handover></tab-handover>
</div>
+ </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 '@/components/BaseNav/SolidWaste/directive/dir'
+
export default {
name: 'summary-sheet.vue',
components: {
- Dialog,
- WasteWater,
- WasteGas,
- SolidWaste,
- AirQuality
+ tabHandover
+ // Dialog
},
data () {
return {
- activeName: 'first'
+ summaryVisible: false,
+ dialogShow: false
}
},
methods: {
closeBtn () {
+ this.dialogShow = !this.dialogShow
// const summary = document.getElementById('summary')
// summary.style.display = 'none'
this.$refs.summarySheets.show()
- },
- 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'
- },
- // 琛ㄥご鏍峰紡璁剧疆
- rowClass () {
- return 'text-align: center;background-color: rgba(26, 73, 81, 0.901960784313726);color:#fff;width:64px'
+ this.summaryVisible = true
}
+ },
+ mounted () {
+ const that = this
+ this.$nextTick(() => {
+ this.$refs.summarySheets.$on('closeDialog', () => {
+ that.summaryVisible = 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%;
- }
- }
- /*.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;*/
- /*}*/
+.summary-sheets {
+ position: absolute;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ /*width: 850px;*/
+ /*height: 265px;*/
+ z-index: 500;
+
+ .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