From 43631f60199d96d3c30fd94447d87c346475eca2 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 21 四月 2021 18:05:39 +0800
Subject: [PATCH] 废水弹框相关修改
---
src/components/BaseNav/WasteWater/RealData.vue | 3 +
src/components/BaseNav/WasteWater/Detail.vue | 75 ++++++++++++++++++++++++++++++++++++-
src/components/BaseNav/WasteWater/HourData.vue | 4 +-
src/components/BaseNav/WasteWater/DayData.vue | 4 +-
4 files changed, 78 insertions(+), 8 deletions(-)
diff --git a/src/components/BaseNav/WasteWater/DayData.vue b/src/components/BaseNav/WasteWater/DayData.vue
index 82d3332..c46779f 100644
--- a/src/components/BaseNav/WasteWater/DayData.vue
+++ b/src/components/BaseNav/WasteWater/DayData.vue
@@ -468,8 +468,8 @@
}
},
grid: { // 缃戞牸
- top: '20%',
- left: '5%'
+ top: '20%'
+ // left: '5%'
},
legend: {
data: legend
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>
diff --git a/src/components/BaseNav/WasteWater/HourData.vue b/src/components/BaseNav/WasteWater/HourData.vue
index 24a3175..f78dd9b 100644
--- a/src/components/BaseNav/WasteWater/HourData.vue
+++ b/src/components/BaseNav/WasteWater/HourData.vue
@@ -473,8 +473,8 @@
}
},
grid: { // 缃戞牸
- top: '20%',
- left: '5%'
+ top: '20%'
+ // left: '15%'
},
legend: {
data: legend
diff --git a/src/components/BaseNav/WasteWater/RealData.vue b/src/components/BaseNav/WasteWater/RealData.vue
index 1af842f..7a134ae 100644
--- a/src/components/BaseNav/WasteWater/RealData.vue
+++ b/src/components/BaseNav/WasteWater/RealData.vue
@@ -703,7 +703,8 @@
display: flex;
> span {
- line-height: 22px
+ line-height: 22px;
+ margin-right: 15px;
}
.pickerTable {
--
Gitblit v1.8.0