From 79028970d73bb6fcb3fb6522589affda312dcabe Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期三, 31 三月 2021 19:06:21 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 46 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 35 insertions(+), 11 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index 65a7885..8f66ec0 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,7 +1,6 @@
<template>
- <div class="main">
- <div id="echarts" ref="main"></div>
- </div>
+ <div id="echarts" ref="main">
+ </div>
</template>
<script>
@@ -25,7 +24,32 @@
}
},
legend: {
- data: ['姘哀鍖栫墿', '浜屾哀鍖栫～', '鐑熷皹', '搴熸皵娴侀噺']
+ x: '200px',
+ y: '30px',
+ data: [{
+ name: '姘哀鍖栫墿',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '浜屾哀鍖栫～',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '鐑熷皹',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ },
+ {
+ name: '搴熸皵娴侀噺',
+ textStyle: {
+ color: '#00d0f9'
+ }
+ }]
// pageTextStyle: {
// color: '#fff'
// }
@@ -34,7 +58,7 @@
left: '3%',
right: '1%',
bottom: '3%',
- top: '10%',
+ // top: '1%',
containLabel: true
},
toolbox: {
@@ -92,6 +116,7 @@
// Y 杞寸殑璁剧疆
yAxis: [{
type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
// name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
name: '娴撳害(mg/m鲁)',
axisLabel: {
@@ -150,15 +175,14 @@
</script>
<style scoped lang="less">
- .main{
- background: rgba(255, 255, 255, 0.1);
- }
#echarts{
- width: 600px;
- //height: 260px;
- height: 100%;
+ width: 670px;
+ height: 260px;
position: relative;
margin: 0;
padding: 0;
+ /*background-color: rgba(0, 0, 0, 0.6);*/
+ border: 1px solid #396d83;
+ margin: 10px 10px 10px 10px;
}
</style>
--
Gitblit v1.8.0