From a3a0083ab18c8b4f0dad49ecbc67275df1896f5d Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期一, 19 四月 2021 12:38:03 +0800
Subject: [PATCH] 修改废气页面的标准值，生成独立组件
---
src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index 2be904a..1cad629 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -1,13 +1,6 @@
<template>
<div id="Tab">
- <div class="animation">
- <div class="infomation">
- <span class="grid-content">姘哀鍖栫墿 :<i style="color: #e8ee0b">29.93</i> 鏍囧噯 : 100</span>
- <span class="grid-content">浜屾哀鍖栫～ : <i style="color: #e8ee0b">17.34</i> 鏍囧噯 : 50</span>
- <span class="grid-content">鐑熷皹 : <i style="color: #e8ee0b">6.93</i> 鏍囧噯 : 30</span>
- <span class="grid-content">搴熸皵娴侀噺 : <i style="color: #e8ee0b">5.23</i></span>
- </div>
- </div>
+ <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -26,7 +19,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="50">
+ <el-select v-model="formInline.region" placeholder="50" class="">
<el-option label="0" value="0"></el-option>
<el-option label="25" value="25"></el-option>
<el-option label="50" value="50"></el-option>
@@ -46,9 +39,13 @@
// import mapApi from '@/api/mapApi'
import 'dayjs/locale/es'
import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
+ components: {
+ PublicDataStandard
+ },
data () {
return {
days: dayjs(new Date()).format('YYYYMMDDHHmmss'),
@@ -62,6 +59,23 @@
timeEnd: ''
},
RealTimeChart: null,
+ dataStandard: [{
+ current: { name: '姘哀鍖栫墿1', 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: 120343.18 },
+ standard: { name: '', val: null }
+ }
+ ],
JsonTimeCtarts: {
id: 'mychart_ss ',
title: '鐑熷皹',
@@ -1026,13 +1040,6 @@
color: #ffffff;
}
}
-.animation {
- //width: 600px;
- //height: 0.06rem;
- .infomation {
- padding: 5px 10px;
- }
-}
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
@@ -1060,7 +1067,7 @@
}
/deep/.el-input__inner{
position: relative;
- width:140px;
+ //width:140px;
background-color: #2e4967;
color: #fff;
font-size: 12px;
--
Gitblit v1.8.0