From 062f5d4a5c511f360c2d73a66b24ce84d5cb2d68 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 14 四月 2021 12:43:11 +0800
Subject: [PATCH] 弹框公共问题修改
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index cbf0693..e0f2cfe 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -6,7 +6,7 @@
</div>
<div class="public-bounced-content">
<div class="public-bounced-content-left">
- <public-tabs :displayContentTab="displayContentTab" :value="value"
+ <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'"
@@ -15,6 +15,8 @@
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
:getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
>
</public-chart>
</div>
@@ -29,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',
@@ -44,16 +46,17 @@
},
data () {
return {
- setWasteGasdata: '',
- setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ ManualData: []
// getGasQueryOnlineMonData: []
}
},
@@ -61,22 +64,21 @@
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(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
@@ -99,7 +101,7 @@
.public-bounced {
z-index: 2000;
position: absolute;
- top: 45%;
+ top: 15%;
left: 20%;
.public-bounced-title {
--
Gitblit v1.8.0