From 404b9d331ba10fd1683e77c916c01aaa4cba4f0b Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期四, 01 四月 2021 14:12:55 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue | 106 +++++++++++++++++------------------------------------
1 files changed, 34 insertions(+), 72 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
index a499fb1..c2366b0 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/GasECharts.vue
@@ -1,21 +1,5 @@
<template>
- <!-- 妗� -->
- <div class="win">
- <!-- 鍥涗釜瑙掔殑杈规鏁堟灉 -->
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- <div class="main">
- <div class="ShowEcharts">
- <div id="echarts" ref="main"></div>
- <div class="border_corner border_corner_left_top"></div>
- <div class="border_corner border_corner_right_top"></div>
- <div class="border_corner border_corner_left_bottom"></div>
- <div class="border_corner border_corner_right_bottom"></div>
- </div>
- </div>
- </div>
+ <div style="width:750px;height:260px;" id="echarts" ref="main"></div>
</template>
<script>
@@ -39,15 +23,41 @@
}
},
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'
// }
},
grid: {
left: '3%',
- right: '3%',
+ right: '1%',
bottom: '3%',
+ // top: '1%',
containLabel: true
},
toolbox: {
@@ -105,6 +115,7 @@
// Y 杞寸殑璁剧疆
yAxis: [{
type: 'value',
+ // position: 'left', // 澶� Y 杞翠娇鐢�
// name: yname, // 鍚庢湡鍥炬爣Y杞存樉绀哄崟浣�
name: '娴撳害(mg/m鲁)',
axisLabel: {
@@ -163,59 +174,10 @@
</script>
<style scoped lang="less">
- .win {
- width: 100%;
- height: 100%;
- position: relative;
- //display: inline-block;
- background-color: rgba(33, 41, 69,0.9);
- }
- .ShowEcharts{
- position: relative;
- display: inline-block;
- border: 1px solid #0B89B5;
- background: #243a55;
- margin: 10px;
- }
- .border_corner{
- z-index: 2500;
- position: absolute;
- width: 14px;
- height: 14px;
- background: rgba(0,0,0,0);
- border: 2px solid #47d5ea;
- }
- .border_corner_left_top{
- top: 0;
- left: 0;
- border-right: none;
- border-bottom: none;
- }
- .border_corner_right_top{
- top: 0;
- right: 0;
- border-left: none;
- border-bottom: none;
- }
- .border_corner_left_bottom{
- bottom: 0;
- left: 0;
- border-right: none;
- border-top: none;
- border-bottom-left-radius: 4px;
- }
- .border_corner_right_bottom{
- bottom: 0;
- right: 0;
- border-left: none;
- border-top: none;
- }
#echarts{
- width: 600px;
- height: 260px;
+ margin: 0;
+ padding: 0;
+ border: 1px solid #396d83;
+ /*margin: 10px 10px 10px 10px;*/
}
-.main {
- width: 100%;
- height: 100%;
-}
</style>
--
Gitblit v1.8.0