From fb463c015f75915ce2bf7dbcff1495e23ccb9451 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 08 四月 2021 09:43:46 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 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;
--
Gitblit v1.8.0