From 82732610befafe88ae9512c9ac37e6a4bcf291c7 Mon Sep 17 00:00:00 2001
From: XingChuan <m17600301067@163.com>
Date: 星期日, 30 五月 2021 22:59:44 +0800
Subject: [PATCH] 废气小时数据、日数据、人工数据接口替换；增加点位id、检测项id查询；无数据提示；UI优化。
---
src/components/base-page/WasteWater/Detail.vue | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/components/base-page/WasteWater/Detail.vue b/src/components/base-page/WasteWater/Detail.vue
index 5dc823d..37e8999 100644
--- a/src/components/base-page/WasteWater/Detail.vue
+++ b/src/components/base-page/WasteWater/Detail.vue
@@ -1,5 +1,5 @@
<template>
- <div class="detail" style="width: 5rem">
+ <div id="wasteWaterDetailBox" class="detail" style="width: 5rem">
<el-table :data="tableData" style="width: 100%;" height="2.07rem">
<el-table-column prop="LabMonTime" label="妫�娴嬫椂闂�"></el-table-column>
<el-table-column label="COD">
@@ -56,16 +56,35 @@
timeStart: dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
}
},
+ props: {
+ LabMonPointId: {
+ type: Number
+ }
+ },
mounted () {
- this.initdetail()
+ this.$nextTick(() => {
+ this.initdetail()
+ })
},
methods: {
async initdetail () {
const timeEnd = dayjs().format('YYYY-MM-DD HH:mm:ss')
- const timeStart = dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
+ var timeStart = null
+ var oDate = new Date()
+ var year = oDate.getFullYear()
+ if ((year % 4 === 0 && year % 100 !== 0) || year % 400 === 0) { // 鍒ゆ柇鏄钩骞磋繕鏄棸骞�
+ timeStart = dayjs().subtract(366, 'day').format('YYYY-MM-DD HH:mm:ss')
+ } else {
+ timeStart = dayjs().subtract(365, 'day').format('YYYY-MM-DD HH:mm:ss')
+ }
const data = {
companyId: 3900100145,
- labMonPointId: 219,
+ companyCode: '',
+ poltSourceId: '',
+ labMonPointId: this.LabMonPointId ? this.LabMonPointId : '',
+ poltMtrlId: '',
+ monItemId: '28,31,35',
+ emissTypeId: '',
beginTime: timeStart,
endTime: timeEnd
}
@@ -73,7 +92,6 @@
// console.log(result)
this.tableData = result
for (let i = 0; i < result.length; i++) {
- console.log(result[i].LabMonValue)
if (result[i].LabMonValue === '0') {
return '-'
}
--
Gitblit v1.8.0