From 20bac7bbc63788b14a40757da47a7f200d4155c1 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 22 四月 2021 09:00:28 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/WasteWater/Detail.vue | 75 ++++++++++++++++++++++++++++++++++++-
1 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/Detail.vue b/src/components/BaseNav/WasteWater/Detail.vue
index 29c7a3b..4cc659f 100644
--- a/src/components/BaseNav/WasteWater/Detail.vue
+++ b/src/components/BaseNav/WasteWater/Detail.vue
@@ -1,9 +1,13 @@
<template>
- <div class="detail" style="width: 5rem">
+ <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="200px"
+ height="280px"
>
<el-table-column
prop="LabMonTime"
@@ -73,15 +77,63 @@
<script>
+import PublicDataStandard from '../PublicDataStandard'
import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
export default {
name: 'Detail',
+ components: {
+ PublicDataStandard
+ },
data () {
return {
- tableData: []
+ 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')
}
},
mounted () {
@@ -114,4 +166,21 @@
/*/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