From bbeeffa8d3524be7e19929ecead7fe054059a373 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期四, 01 四月 2021 15:59:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
similarity index 84%
rename from src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
rename to src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
index c2366b0..614e424 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/ECharts.vue
@@ -1,10 +1,18 @@
<template>
- <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ <div id="Tab">
+ <div class="Infomation">
+ <el-tag>姘哀鍖栫墿 : 29.93 鏍囧噯 : 100</el-tag>
+ <el-tag>浜屾哀鍖栫～ : 17.34 鏍囧噯 : 50</el-tag>
+ <el-tag>鐑熷皹 : 6.93 鏍囧噯 : 30</el-tag>
+ <el-tag>搴熸皵娴侀噺 : 120343.18</el-tag>
+ </div>
+ <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
+ </div>
</template>
<script>
export default {
- name: 'GasECharts',
+ name: 'ECharts',
methods: {
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
@@ -88,7 +96,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['12:00:01', '12:00:02', '12:00:03', '12:00:04', '12:00:05', '12:00:06', '12:00:07'],
+ data: ['2021.01.01', '2021.01.02', '2021.01.03', '2021.01.04', '2021.01.05', '2021.01.06', '2021.01.07'],
axisLabel: { // x杞村叏閮ㄦ樉绀�
rotate: 20,
interval: 0,
@@ -174,10 +182,22 @@
</script>
<style scoped lang="less">
+ .Infomation{
+ margin-left: 10px;
+ }
+ .el-tag{
+ height: 25px;
+ line-height: 25px;
+ margin-right: 10px;
+ font-size: 10px;
+ background-color: rgba(0, 255, 246, 0.14);
+ color: #00d0f9;
+ border: none;
+ }
#echarts{
margin: 0;
padding: 0;
border: 1px solid #396d83;
- /*margin: 10px 10px 10px 10px;*/
+ margin: 10px 10px 10px 10px;
}
</style>
--
Gitblit v1.8.0