From 399aa27e68dae5c26ba739cf7d72dadeb3f5a6fa Mon Sep 17 00:00:00 2001
From: zhangshuaibao <15731629597@163.com>
Date: 星期三, 14 四月 2021 18:24:24 +0800
Subject: [PATCH] 修改人工数据
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue | 12 +
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 10
src/components/LayerController/logic/WasteWater.js | 10
src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue | 4
src/components/BaseNav/PublicBounced/PublicBounced.vue | 6
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 328 +++++++++++++++++++++++++++++++++++-----------
6 files changed, 268 insertions(+), 102 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/PublicBounced.vue b/src/components/BaseNav/PublicBounced/PublicBounced.vue
index db3efff..b8a66bf 100644
--- a/src/components/BaseNav/PublicBounced/PublicBounced.vue
+++ b/src/components/BaseNav/PublicBounced/PublicBounced.vue
@@ -83,12 +83,10 @@
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
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
index bebdeb0..1ba24a5 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsDateWasteWater.vue
@@ -77,8 +77,8 @@
formInline: {
user: '',
region: '',
- timeStart: '2021-03-14 00:00:00',
- timeEnd: '2021-04-12 00:00:00'
+ timeStart: '2021-03-15 00:00:00',
+ timeEnd: '2021-04-13 00:00:00'
},
JsonDateWater: {
datatype: 1,
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index a5de8ba..6e35fdc 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -62,7 +62,7 @@
<script>
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
-import dayjs from 'dayjs'
+// import dayjs from 'dayjs'
export default {
name: 'ECharts',
@@ -79,8 +79,8 @@
value: '',
formInline: {
region: '',
- timeStart: '2021-04-12 17:00:00',
- timeEnd: '2021-04-13 16:00:00'
+ timeStart: '2021-04-12 10:00:00',
+ timeEnd: '2021-04-13 09:00:00'
},
myChart: null,
JsonHourWater: {
@@ -138,8 +138,8 @@
}
},
mounted () {
- this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
+ // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ // this.formInline.timeStart = dayjs().subtract(12, 'hour').format('YYYY-MM-DD HH:mm:ss')
this.onSubmit()
},
updated () {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
index b59c45b..16b0a78 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsRealWasteWater.vue
@@ -249,16 +249,18 @@
}
},
mounted () {
- // this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- // this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
- // this.DrawEXHRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
+ this.formInline.timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
+ this.formInline.timeStart = dayjs().subtract(1, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ // console.log(this.formInline.timeStart)
+ console.log(this.JsonRealWasteWater.ydatas[0].data[0].value[0])
+ this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
methods: {
onSubmit () {
this.DrawRealTimeDateChart(this.JsonRealWasteWater.id, this.JsonRealWasteWater.title, this.JsonRealWasteWater.legend, this.JsonRealWasteWater.ydatas, this.JsonRealWasteWater.yname)
},
DrawRealTimeDateChart (id, title, legend, ydatas, yname) {
- this.RealTimeChart = this.$echarts.init(this.$refs.echarts)
+ this.RealTimeChart = this.$echarts.init(this.$refs.main)
var serLists = []
for (var i = 0; i < ydatas.length; i++) {
// var zdcbcolor = ydatas[i].zdcbcolor
@@ -489,7 +491,7 @@
}
}, {
type: 'value',
- name: '娴侀噺(m鲁/h)',
+ name: '娴侀噺(m鲁/d)',
axisLabel: {
formatter: '{value}',
textStyle: {
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index 3fa7022..9fe3512 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -6,58 +6,116 @@
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
+ <div style="width: 766px">
<el-table
:data="tableData"
+ max-height="260px"
style="width: 100%;height: 100%">
<el-table-column
- prop="tableData.LabMonTime"
+ prop="date"
label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column
+ label="BOD5">
+ <el-table-column
+ prop="codWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="codTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</el-table-column>
<el-table-column
label="COD">
<el-table-column
- prop="tableData.MonItemId"
+ prop="phWatch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="codTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="PH">
<el-table-column
- prop="tableData.MonItemId"
+ prop="bod5Watch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="BOD5">
- <el-table-column
- prop="tableData.MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="tableData.LabMonTime"
+ prop="bod5Time"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
<el-table-column
label="姘ㄦ爱">
<el-table-column
- prop="tableData.MonItemId"
+ prop="adWatch"
label="鐩戞祴鍊�">
</el-table-column>
<el-table-column
- prop="tableData.LabMonTime"
+ prop="adTime"
label="鏍囧噯鍊�">
</el-table-column>
</el-table-column>
+ <el-table-column
+ label="鎸ュ彂閰�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="姘熺瀛�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="纭寲鐗�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鐭虫补绫�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鎮诞鐗�">
+ <el-table-column
+ prop="adWatch"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="adTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
</el-table>
+ </div>
</template>
<script>
@@ -65,71 +123,181 @@
name: 'EChartsTable',
data () {
return {
- // tableLabel: [
- // {
- // label: '妫�娴嬫椂闂�',
- // prop: 'StoragePlaceId'
- // },
- // {
- // label: '浜屾哀鍖栫～',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '姘哀鍖栫墿',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '鐑熷皹',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // },
- // {
- // label: '榛戝害',
- // prop: [
- // {
- // label: '鐩戞祴鍊�',
- // NOMonitor: ''
- // },
- // {
- // label: '鏍囧噯鍊�',
- // NOtandard: ''
- // }]
- // }
- // ],
- tableData: []
+ tableData: [{
+ date: '2016-05-03 12:00:00',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '1',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:00:15',
+ codWatch: '-',
+ codTime: '2',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '2',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:00:30',
+ codWatch: '1',
+ codTime: '2',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:01:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:01:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '2',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '1',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:02:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:02:30',
+ codWatch: '-',
+ codTime: '-',
+ phWatch: '2',
+ phTime: '-',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:03:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:03:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ },
+ {
+ date: '2016-05-03 12:04:15',
+ codWatch: '-',
+ codTime: '-',
+ phWatch: '1',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '2'
+ },
+ {
+ date: '2016-05-03 12:04:30',
+ codWatch: '-',
+ codTime: '1',
+ phWatch: '2',
+ phTime: '-',
+ bod5Watch: '1',
+ bod5Time: '-',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:05:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:05:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ },
+ {
+ date: '2016-05-03 12:06:15',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '-'
+ },
+ {
+ date: '2016-05-03 12:06:30',
+ codWatch: '1',
+ codTime: '-',
+ phWatch: '-',
+ phTime: '-',
+ bod5Watch: '-',
+ bod5Time: '1',
+ adWatch: '-',
+ adTime: '1'
+ }]
}
},
created () {
- this.$nextTick(() => {
- this.$attrs.ManualData.forEach(item => {
- this.tableData = [...item]
- })
- this.tableData.LabMonTime = 100
- console.log(this.tableData)
- })
+ // this.$nextTick(() => {
+ // this.$attrs.ManualData.forEach(item => {
+ // this.tableData = [...item]
+ // })
+ // this.tableData.LabMonTime = 100
+ // console.log(this.tableData)
+ // })
}
}
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 5b510ae..2ed9ee0 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -71,15 +71,13 @@
endTime: '2020-04-07',
dataType: '1'
}
- const hourData = await mapApi.getQueryOnlineMonData(hourValue)
- const dateData = await mapApi.getQueryOnlineMonData(dateValue)
- // console.log(dateData)
+ const detailData = await mapApi.getWasteWaterMonitoringDetails(dataValue) // 鏄庣粏琛ㄨ繑鍥炴暟鎹�
+ const hourData = await mapApi.getQueryOnlineMonData(hourValue) // 灏忔椂鏁版嵁
+ const dateData = await mapApi.getQueryOnlineMonData(dateValue) // 鏃ユ暟鎹�
// const drawback = await mapApi.getWasteWaterMonitoring()
- // console.log(drawback)
- const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
const PublicBounced = window.Vue.extend(publicBounced)
const instance = new PublicBounced()
- instance.setWaterData(e.layer.options.test, result.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
+ instance.setWaterData(e.layer.options.test, detailData.Result.DataInfo, hourData.Result.DataInfo, dateData.Result.DataInfo, 'feishui')
// console.log(e.layer.options.test)
instance.$mount()
document.body.appendChild(instance.$el)
--
Gitblit v1.8.0