From ec4d5c1827487f4c901b69bd9eae58e111e82b32 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 20 五月 2021 18:05:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/Detail.vue | 141 ++++++++--------------------------------------
1 files changed, 25 insertions(+), 116 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/Detail.vue b/src/components/BaseNav/WasteWater/Detail.vue
index 4cc659f..5dc823d 100644
--- a/src/components/BaseNav/WasteWater/Detail.vue
+++ b/src/components/BaseNav/WasteWater/Detail.vue
@@ -1,61 +1,22 @@
<template>
- <div class="detail" style="width: 5.5rem">
- <div class="tab-scroll">
- <PublicDataStandard :dataStandard="dataStandard"></PublicDataStandard>
- <span class="time-select">{{ timeStart }}鈥斺�攞{ timeEnd }}</span>
- </div>
- <el-table
- :data="tableData"
- style="width: 100%;"
- height="280px"
- >
- <el-table-column
- prop="LabMonTime"
- label="妫�娴嬫椂闂�">
+ <div 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">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="COD">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="StdValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="姘ㄦ爱">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="姘ㄦ爱">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="StdValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="鎬荤７">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
- <el-table-column
- label="鎬荤７">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="StdValue"
- label="鏍囧噯鍊�">
- </el-table-column>
- </el-table-column>
- <el-table-column
- label="鎬绘爱">
- <el-table-column
- prop="LabMonValue"
- label="鐩戞祴鍊�">
- </el-table-column>
- <el-table-column
- prop="StdValue"
- label="鏍囧噯鍊�">
- </el-table-column>
+ <el-table-column label="鎬绘爱">
+ <el-table-column prop="LabMonValue" label="鐩戞祴鍊�" width="80"></el-table-column>
+ <el-table-column prop="LabMonValue" label="鏍囧噯鍊�" width="80"></el-table-column>
</el-table-column>
<!-- <el-table-column-->
<!-- fixed="right"-->
@@ -77,61 +38,20 @@
<script>
-import PublicDataStandard from '../PublicDataStandard'
-import mapApi from '@/api/mapApi'
+// 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
+ // PublicDataStandard
},
data () {
return {
tableData: [],
- // tab鏍忎紶閫掓帴鏀舵暟鎹�
- dataStandard: [
- {
- current: {
- name: '姘哀鍖栫墿',
- val: 29.93
- },
- standard: {
- name: '鏍囧噯',
- val: 100
- }
- },
- {
- current: {
- name: '浜屾哀鍖栫～',
- val: 17.34
- },
- standard: {
- name: '鏍囧噯',
- val: 50
- }
- },
- {
- current: {
- name: '鐑熷皹',
- val: 6.93
- },
- standard: {
- name: '鏍囧噯',
- val: 30
- }
- },
- {
- current: {
- name: '搴熸皵娴侀噺',
- val: 120
- },
- standard: {
- name: '',
- val: null
- }
- }],
timeEnd: dayjs().format('YYYY-MM-DD HH:mm:ss'),
timeStart: dayjs().subtract(3, 'minute').format('YYYY-MM-DD HH:mm:ss')
}
@@ -152,6 +72,12 @@
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 '-'
+ }
+ }
}
}
}
@@ -166,21 +92,4 @@
/*/deep/ .el-table {*/
/* border: none !important;*/
/*}*/
-
-.tab-scroll {
- display: flex;
- align-items: center;
- justify-content: space-between;
-}
-
-.time-select {
- cursor: pointer;
- padding: 5px;
- border: 1px solid #2b87c8;
- border-radius: 4px;
- text-align: center;
- color: #fff;
- font-size: 11px;
- width: 280px;
-}
</style>
--
Gitblit v1.8.0