From 4f35a8b56c12315c82fd5bd136f32da2dcadc5e2 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 27 四月 2021 09:27:22 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/Detail.vue | 381 ++++++++++++++----------------------------------------
1 files changed, 100 insertions(+), 281 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/Detail.vue b/src/components/BaseNav/WasteWater/Detail.vue
index 1374053..e156d44 100644
--- a/src/components/BaseNav/WasteWater/Detail.vue
+++ b/src/components/BaseNav/WasteWater/Detail.vue
@@ -1,311 +1,130 @@
<template>
-<!-- <el-table :data="tableData" style="width:730px" height="200px">-->
-<!-- <el-table-column v-for="(item, index) in tableLabel" :key="index" :prop="item.prop"-->
-<!-- :label="item.label">-->
-<!-- <el-table-column v-for="(item1, index1) in item.label" :key="index1" :prop="item1.prop" :label="item1.label">-->
-<!-- </el-table-column>-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
- <div style="width: 5.9rem">
- <el-table
- :data="tableData"
- max-height="255px"
- style="width: 100%;height: 100%">
- <el-table-column
- prop="date"
- width="130"
- label="妫�娴嬫椂闂�">
- </el-table-column>
- <el-table-column
- label="BOD5">
+ <div class="detail" style="width: 5.5rem">
+ <el-table
+ :data="tableData"
+ style="width: 100%;"
+ height="280px"
+ >
<el-table-column
- prop="codWatch"
- label="鐩戞祴鍊�">
+ prop="LabMonTime"
+ 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="phWatch"
- label="鐩戞祴鍊�">
+ label="COD">
+ <el-table-column
+ prop="LabMonValue"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="LabMonValue"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</el-table-column>
<el-table-column
- prop="codTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="PH">
- <el-table-column
- prop="bod5Watch"
- label="鐩戞祴鍊�">
+ label="姘ㄦ爱">
+ <el-table-column
+ prop="LabMonValue"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="LabMonValue"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</el-table-column>
<el-table-column
- prop="bod5Time"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="姘ㄦ爱">
- <el-table-column
- prop="adWatch"
- label="鐩戞祴鍊�">
+ label="鎬荤７">
+ <el-table-column
+ prop="LabMonValue"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="LabMonValue"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</el-table-column>
<el-table-column
- prop="adTime"
- label="鏍囧噯鍊�">
+ label="鎬绘爱">
+ <el-table-column
+ prop="LabMonValue"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="LabMonValue"
+ label="鏍囧噯鍊�">
+ </el-table-column>
</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>
+ <!-- <el-table-column-->
+ <!-- fixed="right"-->
+ <!-- label="鑻�">-->
+ <!-- <el-table-column-->
+ <!-- fixed="right"-->
+ <!-- prop="LabMonValue"-->
+ <!-- label="鐩戞祴鍊�">-->
+ <!-- </el-table-column>-->
+ <!-- <el-table-column-->
+ <!-- fixed="right"-->
+ <!-- prop="StdValue"-->
+ <!-- label="鏍囧噯鍊�">-->
+ <!-- </el-table-column>-->
+ <!-- </el-table-column>-->
+ </el-table>
</div>
</template>
<script>
+
+// import PublicDataStandard from '../PublicDataStandard'
+// import mapApi from '@/api/mapApi'
+import mapApi from '../../../api/mapApi'
+import 'dayjs/locale/es'
+import dayjs from 'dayjs'
+
export default {
name: 'Detail',
+ components: {
+ // PublicDataStandard
+ },
data () {
return {
- tableData: [{
- date: '2016-05-03 12:00:00',
- codWatch: '7.23',
- codTime: '-',
- phWatch: '0.43',
- phTime: '9.21',
- bod5Watch: '7.12',
- bod5Time: '-',
- adWatch: '0.23',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:00:15',
- codWatch: '-',
- codTime: '5.32',
- phWatch: '-',
- phTime: '0.23',
- bod5Watch: '1',
- bod5Time: '9.88',
- adWatch: '1.76',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:00:30',
- codWatch: '-',
- codTime: '0.92',
- phWatch: '-',
- phTime: '8.71',
- bod5Watch: '0.72',
- bod5Time: '-',
- adWatch: '6.23',
- adTime: '0.86'
- },
- {
- date: '2016-05-03 12:01:15',
- codWatch: '10.22',
- codTime: '-',
- phWatch: '-',
- phTime: '0.92',
- bod5Watch: '0.82',
- bod5Time: '-',
- adWatch: '23.82',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:01:30',
- codWatch: '0.31',
- codTime: '-',
- phWatch: '-',
- phTime: '6.12',
- bod5Watch: '0.31',
- bod5Time: '-',
- adWatch: '0.21',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:02:15',
- codWatch: '9.22',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '0.72',
- adWatch: '-',
- adTime: '17.23'
- },
- {
- date: '2016-05-03 12:02:30',
- codWatch: '-',
- codTime: '-',
- phWatch: '0.83',
- phTime: '-',
- bod5Watch: '23.22',
- bod5Time: '-',
- adWatch: '-',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:03:15',
- codWatch: '8.74',
- codTime: '-',
- phWatch: '-',
- phTime: '13.22',
- bod5Watch: '-',
- bod5Time: '0.23',
- adWatch: '-',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:03:30',
- codWatch: '0.82',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '32.42',
- adWatch: '-',
- adTime: '0.88'
- },
- {
- date: '2016-05-03 12:04:15',
- codWatch: '-',
- codTime: '-',
- phWatch: '0.71',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '15.83',
- adWatch: '-',
- adTime: '24.82'
- },
- {
- date: '2016-05-03 12:04:30',
- codWatch: '-',
- codTime: '19.65',
- phWatch: '29.22',
- phTime: '-',
- bod5Watch: '0.98',
- bod5Time: '-',
- adWatch: '-',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:05:15',
- codWatch: '19.32',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '12.21',
- adWatch: '-',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:05:30',
- codWatch: '10.53',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '23.71',
- adWatch: '-',
- adTime: '10.55'
- },
- {
- date: '2016-05-03 12:06:15',
- codWatch: '31.63',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '0.56',
- adWatch: '-',
- adTime: '-'
- },
- {
- date: '2016-05-03 12:06:30',
- codWatch: '19.53',
- codTime: '-',
- phWatch: '-',
- phTime: '-',
- bod5Watch: '-',
- bod5Time: '0.28',
- adWatch: '-',
- adTime: '0.75'
- }]
+ tableData: [],
+ timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss'),
+ timeStart: dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
}
},
- created () {
- // this.$nextTick(() => {
- // this.$attrs.ManualData.forEach(item => {
- // this.tableData = [...item]
- // })
- // this.tableData.LabMonTime = 100
- // console.log(this.tableData)
- // })
+ mounted () {
+ 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')
+ const data = {
+ companyId: 3900100145,
+ labMonPointId: 219,
+ beginTime: timeStart,
+ endTime: timeEnd
+ }
+ const result = (await mapApi.getQueryLabMonData(data)).Result.DataInfo
+ // 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 '-'
+ }
+ }
+ }
}
}
</script>
<style scoped>
-.el-table--border::after, .el-table--group::after, .el-table::before{
+/deep/ .el-table--border::after, .el-table--group::after, .el-table::before {
background: none;
}
+
+/*/deep/ .el-table {*/
+/* border: none !important;*/
+/*}*/
</style>
--
Gitblit v1.8.0