From 1de58322fc6627553baaa5767fc5bb4cdf76913c Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 09 四月 2021 11:12:12 +0800
Subject: [PATCH] 修改为div
---
src/components/LayerController/logic/WasteGas.js | 21 +++++-----
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 30 ---------------
src/components/BaseNav/PublicBounced/PublicBounced.vue | 10 +++-
3 files changed, 17 insertions(+), 44 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 03d5345..46ba2cd 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -15,37 +15,7 @@
</el-row>
</div>
<div class="form-echrts">
- <!-- :title="this.$attrs.getWasteGasDetails[0].OnLineMonEmissPointName" -->
<div class="from-search">
-<!-- <el-form :inline="true" :model="formInline" class="demo-form-inline">-->
-<!-- <el-form-item label="瀹℃壒浜�">-->
-<!-- <el-input v-model="formInline.user" placeholder="瀹℃壒浜�"></el-input>-->
-<!-- </el-form-item>-->
-<!-- <div class="block">-->
-<!-- <el-date-picker-->
-<!-- size="'mini"-->
-<!-- class="date"-->
-<!-- v-model="value"-->
-<!-- type="datetimerange"-->
-<!-- range-separator="鑷�"-->
-<!-- start-placeholder="寮�濮嬫棩鏈�"-->
-<!-- end-placeholder="缁撴潫鏃ユ湡">-->
-<!-- </el-date-picker>-->
-<!-- </div>-->
-<!-- <el-form-item label="閲囨牱鐐规暟" class="text-size">-->
-<!-- <el-select v-model="formInline.region" placeholder="0">-->
-<!-- <el-option label="0" value="shanghai"></el-option>-->
-<!-- <el-option label="25" value="beijing"></el-option>-->
-<!-- <el-option label="50" value="beijing"></el-option>-->
-<!-- <el-option label="75" value="beijing"></el-option>-->
-<!-- <el-option label="100" value="beijing"></el-option>-->
-<!-- </el-select>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item>-->
-<!-- <el-button type="primary" @click="onSubmit">鏌ヨ</el-button>-->
-<!-- </el-form-item>-->
-
-<!-- </el-form>-->
<div class="layoutFrom">
<div class="pickerMon">
<div class="pickerData pickerDataLeft">
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index 5a43649..29f6209 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -15,7 +15,9 @@
<public-chart v-else :getWasteGasDetails="getWasteGasDetails"
:value="value"
:getQueryOnlineMonData="getQueryOnlineMonData"
- :getWasteWaterMonitoringDetails="getWasteWaterMonitoringDetails">
+ :getWasteWaterMonitoringDetails='getWasteWaterMonitoringDetails'
+ :getGasQueryOnlineMonData = 'getGasQueryOnlineMonData'
+>
</public-chart>
</div>
</div>
@@ -56,7 +58,8 @@
value: '',
getWasteGasDetails: [],
getWasteWaterMonitoringDetails: [],
- getQueryOnlineMonData: []
+ getQueryOnlineMonData: [],
+ getGasQueryOnlineMonData: []
}
},
methods: {
@@ -74,9 +77,10 @@
this.flag = true
this.value = value
},
- setGasData (data, dataDetails, value) {
+ setGasData (data, dataDetails, GasHourData, value) {
this.setWasteGasdata = data
this.getWasteGasDetails = dataDetails
+ this.getGasQueryOnlineMonData = GasHourData
// console.log(dataDetails)
this.displayContentTitle = data.Name
this.flag = true
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 7db2156..2b74c7b 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -59,21 +59,20 @@
const dataValue = {
StoragePlaceId: e.layer.options.test.StoragePlaceId
}
- // const GasOnlinedata = {
- // onLineMonEmissPointId: 23,
- // monItemId: 28,
- // emissTypeld: 2,
- // beginTime: 2020/0o4/0o6 15:13:20,
- // endTime=2020/0o4/0o7;15:13:20,
- // dataType:1
- // }
- // const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
- // console.log(Mondata)
+ const GasOnlinedata = {
+ onLineMonEmissPointId: '23',
+ monItemId: '28,31',
+ beginTime: '2020-04-06 15:13:20',
+ endTime: '2020-04-07 15:13:20',
+ dataType: '1'
+ }
+ const Mondata = await mapApi.getWasteGasMonData(GasOnlinedata)
+ console.log(Mondata)
const result = await mapApi.getWasteGasDetails(dataValue)
// console.log(result.Result.DataInfo)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setGasData(e.layer.options.test, result.Result.DataInfo, 'feiqi')
+ instance.setGasData(e.layer.options.test, result.Result.DataInfo, Mondata.Result.DataInfo, 'feiqi')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0