From 69818a26487f546e62eee96d2d6c4733b01c54a2 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 09:57:18 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 4be0cc0..10b6c9b 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,6 +15,7 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
ref="PublicChart"
>
</public-chart>
@@ -30,10 +31,10 @@
<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'
export default {
name: 'PublicBounced',
@@ -54,15 +55,10 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
- },
- mounted () {
- // this.$nextTick(() => {
- // console.log(this.$refs.publicBounced)
- // console.log(this.$refs.PublicChart)
- // })
},
methods: {
closePopup () {
@@ -79,11 +75,13 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, GasHourData, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(this.$refs)
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
this.getQueryOnlineMonData = GasHourData
- console.log(this.getQueryOnlineMonData)
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.displayContentTitle = data.Name
this.flag = true
this.value = value
--
Gitblit v1.8.0