From 23d788fc1e11ee3c012bdad6a5129624566a6a23 Mon Sep 17 00:00:00 2001
From: ChenZeping02609 <chenzeping02609@163.com>
Date: 星期四, 13 五月 2021 14:51:49 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteGas/Detail.vue | 147 +++++++++++++++++++++++++------------------------
1 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/src/components/BaseNav/WasteGas/Detail.vue b/src/components/BaseNav/WasteGas/Detail.vue
index 8bee0af..4ba715c 100644
--- a/src/components/BaseNav/WasteGas/Detail.vue
+++ b/src/components/BaseNav/WasteGas/Detail.vue
@@ -1,85 +1,88 @@
<template>
- <el-table
- :data="tableData"
- style="width: 100%;height: 100%">
- <el-table-column
- prop="LabMonTime"
- label="妫�娴嬫椂闂�">
- </el-table-column>
- <el-table-column
- label="姘哀鍖栫墿">
- <el-table-column
- prop="NOMonTime"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="NOEndTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="浜屾哀鍖栫～">
- <el-table-column
- prop="SOMontime"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="SoEndTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="鐑熷皹">
- <el-table-column
- prop="MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="EndMonTime"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="闈炵敳鐑锋�荤儍">
- <el-table-column
- prop="MonItemId"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="MonItemId"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- </el-table>
+ <div class="wastegas" style="width: 5rem;height: 1.5rem">
+ <el-table
+ :data="tableData"
+ style="width: 100%;height: 100%">
+ <el-table-column
+ prop="LabMonTime"
+ label="妫�娴嬫椂闂�">
+ </el-table-column>
+ <el-table-column
+ label="姘哀鍖栫墿">
+ <el-table-column
+ prop="NOMonTime"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="NOEndTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="浜屾哀鍖栫～">
+ <el-table-column
+ prop="SOMontime"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="SoEndTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="鐑熷皹">
+ <el-table-column
+ prop="MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="EndMonTime"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ <el-table-column
+ label="闈炵敳鐑锋�荤儍">
+ <el-table-column
+ prop="MonItemId"
+ label="鐩戞祴鍊�">
+ </el-table-column>
+ <el-table-column
+ prop="MonItemId"
+ label="鏍囧噯鍊�">
+ </el-table-column>
+ </el-table-column>
+ </el-table>
+ </div>
</template>
<script>
+import dayjs from 'dayjs'
+import mapApi from '@/api/mapApi'
+
export default {
name: 'Detail',
data () {
return {
- tableData: [{
- LabMonTime: '2021-02-05 09:54',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '44',
- NOEndTime: '100',
- SOMontime: '9',
- SoEndTime: '50'
- }, {
- LabMonTime: '2021-01-14 10:15',
- MonItemId: '---',
- EndMonTime: '30',
- NOMonTime: '70',
- NOEndTime: '100',
- SOMontime: '---',
- SoEndTime: '50'
- }]
+ tableData: []
}
},
- created () {
- // this.tableData = [...this.$attrs.ManualData]
- // 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.getWasteGasManualData(data)).Result.DataInfo
+ // console.log(result)
+ this.tableData = result
+ }
}
}
--
Gitblit v1.8.0