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/BaseNav/PublicBounced/PublicBounced.vue | 40 ++++++++--------------------------------
1 files changed, 8 insertions(+), 32 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 051b3c4..5a47938 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>
@@ -107,7 +81,7 @@
this.setWasteWaterdata = dataWater
// console.log(data)
this.getWasteWaterMonitoring = drawData
- console.log(drawData)
+ // console.log(drawData)
this.getWasteWaterMonitoringDetails = dataDetail
this.displayContentTitle = dataWater.Name
this.flag = true
@@ -119,14 +93,16 @@
<style lang="less" scoped>
.public-bounced {
- width: 10rem;
+ width: 8rem;
//height: 2.6rem;
//width: 70vw;
//height: 30vh;
z-index: 999;
position: absolute;
- top: 5%;
- left: 5%;
+ //bottom: 2rem;
+ //left: 5rem;
+ top: 15%;
+ left: 15%;
background-color: #002432;
border: 1px #9fc5c8 solid;
@@ -159,7 +135,7 @@
justify-content: space-around;
.public-bounced-content-left {
- width: 6.8rem;
+ width: 4.8rem;
}
.public-bounced-content-right {
--
Gitblit v1.8.0