From c56e506fd34c58209240e97fc29043639fae5d19 Mon Sep 17 00:00:00 2001
From: ChenZeping <chenzeping>
Date: 星期四, 29 四月 2021 15:13:21 +0800
Subject: [PATCH] 统计表,指标,预报警表格弹框公共修改,管线分析功能
---
src/components/BaseNav/PublicBounced/PublicBounced.vue | 127 ++++++++++++++++++------------------------
1 files changed, 55 insertions(+), 72 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index c97375d..2ab8d04 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -1,18 +1,24 @@
<template>
- <div class="public-bounced" v-draw v-if="flag">
- <div class="public-bounced-title">
+ <div class="public-bounced map-background" v-drag v-show="flag">
+ <div class="public-bounced-title panel-title" ref="publicBounced">
<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"
+ <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"
- :getWasteWaterMonitoring="getWasteWaterMonitoring"></public-chart>
+ :value="value"
+ :getQueryOnlineMonData="getQueryOnlineMonData"
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :ManualData="ManualData"
+ ref="PublicChart"
+ >
+ </public-chart>
</div>
</div>
<div class="public-bounced-content-right">
@@ -20,40 +26,15 @@
</div>
</div>
</div>
-<!-- <el-dialog-->
-<!-- :visible.sync="flag"-->
-<!-- width="70%"-->
-<!-- class="public-bounced"-->
-<!-- :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>-->
</template>
<script>
-import '@/components/BaseNav/SolidWaste/directive/dir'
-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 '@/utils/dragBoxes'
+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',
@@ -65,47 +46,50 @@
},
data () {
return {
- setWasteGasdata: '',
- setWasteWaterdata: '',
displayContentTitle: '',
displayContentTab: '',
displayContentTable: '',
flag: false,
value: '',
+ setWasteGasdata: '',
+ setWasteWaterdata: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getWasteWaterMonitoring: []
+ 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, value) {
+ setGasData (data, dataDetails, GasHourData, ManualData, value) {
+ // console.log(data, dataDetails, GasHourData, ManualData, value)
this.setWasteGasdata = data
- this.getWasteGasDetails = dataDetails
- // console.log(dataDetails)
this.displayContentTitle = data.Name
+ this.getWasteGasDetails = dataDetails
+ this.getQueryOnlineMonData = GasHourData
+ this.ManualData = ManualData
+ // console.log(this.getQueryOnlineMonData)
this.flag = true
this.value = value
},
- setWaterData (dataWater, dataDetail, drawData, value) {
+ setWaterData (dataWater, detailData, hourData, dateData, value) {
this.setWasteWaterdata = dataWater
- // console.log(data)
- this.getWasteWaterMonitoring = drawData
- console.log(drawData)
- this.getWasteWaterMonitoringDetails = dataDetail
+ this.getQueryOnlineMonData = hourData
+ this.getWasteWaterMonitoringDetails = detailData
this.displayContentTitle = dataWater.Name
this.flag = true
this.value = value
@@ -116,20 +100,18 @@
<style lang="less" scoped>
.public-bounced {
- //width: 75%;
- //z-index: 999;
- //position: absolute;
- //bottom: 5%;
- //left: 15%;
- //background-color: #002432;
- //border: 1px #9fc5c8 solid;
+ z-index: 2000;
+ position: absolute;
+ top: 35%;
+ left: 20%;
.public-bounced-title {
- border: 1px #a4c0d8 solid;
+ cursor: move;
+ height: 0.1rem;
+ padding: 10px 0;
display: flex;
align-items: center;
justify-content: space-between;
- padding: 5px 0;
span {
color: #f4f7ff;
@@ -138,29 +120,30 @@
}
i {
- color: white;
+ color: #C0C4CC;
margin: 0 15px;
font-size: 22px;
+ cursor: pointer;
+ }
+
+ i:hover {
+ color: #00fff6;
}
}
.public-bounced-content {
- margin: 15px 0;
+ padding: 0.05rem;
display: flex;
//align-items: center;
- justify-content: space-around;
- padding: 10px;
+ //justify-content: space-around;
.public-bounced-content-left {
- flex: 3;
- height: 100%;
- margin-right: 10px;
+ //width: 4.8rem;
}
.public-bounced-content-right {
- flex: 2;
- //width: 48%;
- height: 100%;
+ //width: 3rem;
+ margin-left: 0.1rem;
}
}
}
--
Gitblit v1.8.0