From 545ba46e971816dc56b4ea80e48ed26a4b152d62 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期一, 19 四月 2021 14:04:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
index c23fb93..927e8a3 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHour.vue
@@ -1,14 +1,7 @@
<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
- <div class="infomation">
- <div>
- <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">120343.18</i></span>
- </div>
- </div>
+ <public-data-standard :dataStandard = "dataStandard"></public-data-standard>
<div class="form-echrts">
<div class="from-search">
<div class="pickerMon">
@@ -48,9 +41,11 @@
// import mapApi from '@/api/mapApi'
import PublicDetailedList from '@components/BaseNav/PublicBounced/common/echarts/PublicDetailedList'
import dayjs from 'dayjs'
+import PublicDataStandard from '@components/BaseNav/PublicBounced/common/PublicDataStandard'
export default {
name: 'ECharts',
components: {
+ PublicDataStandard,
PublicDetailedList
},
data () {
@@ -64,6 +59,23 @@
timeEnd: null
},
myChart: 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 }
+ }
+ ],
JsonCtarts: {
id: 'mychart',
title: '鍔犵儹鐐夌儫姘�',
@@ -926,21 +938,6 @@
</script>
<style scoped lang="less">
- .animation {
- .infomation {
- padding: 0.02rem 0.04rem;
- .grid-content {
- font-size: 0.08rem;
- background-color: #2e4967;
- text-align: center;
- border-radius: 0.01rem;
- height: 0.15rem;
- line-height: 0.15rem;
- margin-right: 0.04rem;
- padding:0 0.04rem
- }
- }
- }
.form-echrts {
width: 100%;
border-top: 1px solid #396d83;
--
Gitblit v1.8.0