From 0cbf795f21d787db7d6b29a59d81579a7a736ab8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期五, 16 四月 2021 14:40:09 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 101 +++++++++++++++++++++++++++-----------------------
1 files changed, 54 insertions(+), 47 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index cbf0693..0db423e 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -4,89 +4,96 @@
<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"
- :value="value"
- :getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
- >
- </public-chart>
- </div>
- </div>
- <div class="public-bounced-content-right">
- <public-video></public-video>
- </div>
- </div>
+<!-- <div class="public-bounced-content">-->
+<!-- <div class="public-bounced-content-left">-->
+<!-- <public-tabs :setSolidWaste="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"-->
+<!-- :value="value"-->
+<!-- :getQueryOnlineMonData="getQueryOnlineMonData"-->
+<!-- :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'-->
+<!-- :ManualData="ManualData"-->
+<!-- ref="PublicChart"-->
+<!-- >-->
+<!-- </public-chart>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="public-bounced-content-right">-->
+<!-- <public-video></public-video>-->
+<!-- </div>-->
+<!-- </div>-->
+ <PublicSector></PublicSector>
</div>
</template>
<script>
import '@/utils/dragBoxes'
-import PublicTabs from '@components/BaseNav/PublicBounced/GasComponents/PublicTabs'
-import PublicTable from '@components/BaseNav/PublicBounced/GasComponents/PublicTable'
-import PublicVideo from '@components/BaseNav/PublicBounced/GasComponents/PublicVideo'
-import PublicChart from './GasComponents/PublicChart'
+// import PublicTabs from '@components/BaseNav/PublicBounced/common/PublicTabs'
+// import PublicTable from '@components/BaseNav/PublicBounced/common/PublicTable'
+// import PublicVideo from '@components/BaseNav/PublicBounced/common/PublicVideo'
+// import PublicChart from './common/PublicChart'
+
+import PublicSector from '@components/BaseNav/PublicSector'
export default {
name: 'PublicBounced',
components: {
- PublicTabs,
- PublicTable,
- PublicChart,
- PublicVideo
+ PublicSector
+ // PublicTabs,
+ // PublicTable,
+ // PublicChart,
+ // PublicVideo
},
data () {
return {
- setWasteGasdata: '',
- setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
- // getGasQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
}
+ },
+ destoryed () {
+ this.$refs.PublicChart.$refs.Echats.DrawEXHRealTimeDateChart()
+ this.$refs.PublicChart.$refs.Echats.DrawRealTimeDateChart()
},
methods: {
closePopup () {
this.flag = false
},
- setData (dataBasic, dataDetailed, value) {
+ // 鍥哄簾鐩稿叧淇℃伅璁剧疆
+ setData (title, dataBasic, dataDetailed, value) {
this.flag = true
this.value = value
- dataBasic.forEach(item => {
- this.displayContentTitle = item.StoragePlaceName
- })
- this.displayContentTab = dataBasic
- this.displayContentTable = dataDetailed
- this.flag = true
- this.value = value
+ this.displayContentTitle = title
+ this.displayContentTab = dataBasic[0]
+ this.displayContentTable = dataDetailed[0]
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(data, dataDetails, GasHourData, ManualData, value)
this.setWasteGasdata = data
+ this.displayContentTitle = data.Name
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
- console.log(this.getQueryOnlineMonData)
- this.displayContentTitle = data.Name
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, hourData, dateData, value) {
+ setWaterData (dataWater, detailData, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
- // console.log(data)
this.getQueryOnlineMonData = hourData
- // console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getWasteWaterMonitoringDetails = detailData
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -99,7 +106,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 45%;
+ top: 35%;
left: 20%;
.public-bounced-title {
--
Gitblit v1.8.0