From 451228f9adb23cca3fed4ec19fd45ebaa2aedd0f Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 08 四月 2021 09:42:54 +0800
Subject: [PATCH] 统计表弹框
---
src/components/table/summarySheets.vue | 69 +++++++++++++++++++++-------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 30 +-------------
2 files changed, 45 insertions(+), 54 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index b8ab6bf..f760f7e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -14,39 +14,13 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getWasteWaterMonitoring="getWasteWaterMonitoring"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails
-"></public-chart>
+ :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails"></public-chart>
</div>
</div>
<div class="public-bounced-content-right">
<public-video></public-video>
</div>
</div>
- <!-- <el-dialog-->
- <!-- :visible.sync="flag"-->
- <!-- width="70%"-->
- <!-- v-drag-->
- <!-- :modal="false">-->
- <!-- <div class="public-bounced-title">-->
- <!-- <span>{{ displayContentTitle }}</span>-->
- <!-- <i class="el-icon-circle-close" @click="closePopup"></i>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content">-->
- <!-- <div class="public-bounced-content-left">-->
- <!-- <public-tabs :displayContentTab="displayContentTab" :value="value"-->
- <!-- :setWasteGasdata="setWasteGasdata" :setWasteWaterdata="setWasteWaterdata"></public-tabs>-->
- <!-- <div class="public-bounced-content-left-bottom">-->
- <!-- <public-table v-if="value === 'gufei'"-->
- <!-- :displayContentTable="displayContentTable"></public-table>-->
- <!-- <public-chart v-else :getWasteGasDetails="getWasteGasDetails"-->
- <!-- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- <div class="public-bounced-content-right">-->
- <!-- <public-video></public-video>-->
- <!-- </div>-->
- <!-- </div>-->
- <!-- </el-dialog>-->
</div>
</template>
@@ -125,6 +99,8 @@
//height: 30vh;
z-index: 999;
position: absolute;
+ //bottom: 2rem;
+ //left: 5rem;
top: 5%;
left: 5%;
background-color: #002432;
diff --git a/src/components/table/summarySheets.vue b/src/components/table/summarySheets.vue
index 4ab8d7a..9411a28 100644
--- a/src/components/table/summarySheets.vue
+++ b/src/components/table/summarySheets.vue
@@ -1,25 +1,31 @@
<template>
- <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="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>
+ <tab-handover></tab-handover>
</div>
+ </div>
</template>
<script>
import tabHandover from '@components/table/components/tabHandover'
-import Dialog from '@views/popup/Dialog'
+// import Dialog from '@views/popup/Dialog'
+
+import '@/components/BaseNav/SolidWaste/directive/dir'
+
export default {
name: 'summary-sheet.vue',
components: {
- tabHandover,
- Dialog
+ tabHandover
+ // Dialog
},
data () {
return {
@@ -46,19 +52,28 @@
</script>
<style scoped lang="less">
- .summary-sheets {
- position: absolute;
- top: 0.42979rem;
- left: 0.14583rem;
- /*width: 850px;*/
- /*height: 265px;*/
- z-index:500;
+.summary-sheets {
+ position: absolute;
+ top: 0.42979rem;
+ left: 0.14583rem;
+ /*width: 850px;*/
+ /*height: 265px;*/
+ z-index: 500;
- /*color: #fff;*/
- .el-icon-c-scale-to-original {
- width: 30px;
- height: 30px;
- font-size: 30px;
- }
- }
+ .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