From fb1bdc2a4046408f931fce85b331f333c6de973e Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123456 <zxx19900626>
Date: 星期三, 13 四月 2022 18:31:52 +0800
Subject: [PATCH] echarts
---
src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue | 54 +++++++++++++++++++-------
src/pages/show/index/index.vue | 33 ++++++++--------
2 files changed, 56 insertions(+), 31 deletions(-)
diff --git a/src/pages/show/index/index.vue b/src/pages/show/index/index.vue
index cb3f447..b196e75 100644
--- a/src/pages/show/index/index.vue
+++ b/src/pages/show/index/index.vue
@@ -762,10 +762,10 @@
},
legend: {
data: ['鎬绘暟', '鍦ㄨ亴鑱屽伐', '绂婚��浼�'],
- itemWidth: nowSize(30),
+ itemWidth: nowSize(24),
itemHeight: nowSize(4),
- itemGap: nowSize(20),
- right:'4%',
+ itemGap: nowSize(10),
+ right:'0%',
top: '0%',
textStyle: {
color: '#FFFFFF',
@@ -773,7 +773,7 @@
}
},
grid: {
- top: '15%',
+ top: '20%',
left: '1%',
right: '5%',
bottom: '3%',
@@ -855,10 +855,10 @@
},
legend: {
data: ['鎬绘暟', '鍦ㄨ亴鑱屽伐', '绂婚��浼�'],
- itemWidth: nowSize(30),
+ itemWidth: nowSize(24),
itemHeight: nowSize(4),
- itemGap: nowSize(20),
- right:'4%',
+ itemGap: nowSize(10),
+ right:'0%',
top: '0%',
textStyle: {
color: '#FFFFFF',
@@ -866,7 +866,7 @@
}
},
grid: {
- top: '15%',
+ top: '20%',
left: '1%',
right: '5%',
bottom: '3%',
@@ -948,10 +948,10 @@
},
legend: {
data: ['鎬绘暟', '鍦ㄨ亴鑱屽伐', '绂婚��浼�'],
- itemWidth: nowSize(30),
+ itemWidth: nowSize(24),
itemHeight: nowSize(4),
- itemGap: nowSize(20),
- right:'4%',
+ itemGap: nowSize(1),
+ right:'0%',
top: '0%',
textStyle: {
color: '#FFFFFF',
@@ -959,7 +959,7 @@
}
},
grid: {
- top: '15%',
+ top: '20%',
left: '1%',
right: '5%',
bottom: '3%',
@@ -1041,10 +1041,10 @@
},
legend: {
data: ['鎬绘暟', '鍦ㄨ亴鑱屽伐', '绂婚��浼�'],
- itemWidth: nowSize(30),
+ itemWidth: nowSize(24),
itemHeight: nowSize(4),
- itemGap: nowSize(20),
- right:'4%',
+ itemGap: nowSize(10),
+ right:'0%',
top: '0%',
textStyle: {
color: '#FFFFFF',
@@ -1052,7 +1052,7 @@
}
},
grid: {
- top: '15%',
+ top: '20%',
left: '1%',
right: '5%',
bottom: '3%',
@@ -1176,6 +1176,7 @@
display: flex;
flex: 1;
justify-content: right;
+ margin-left: 0.15625rem /* 40/256 */;
}
.inside-right{
display: flex;
diff --git a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
index f66d23e..839aaaf 100644
--- a/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
+++ b/src/pages/show/jiuyeAndChuangye/jiuyeChildren/zhiyePeixun.vue
@@ -134,20 +134,34 @@
crossStyle: {
color: '#999'
}
+ },
+ textStyle: {
+ color: '#fff',
+ fontSize: nowSize(28)
}
},
title: {
text:'鍘嗗勾鑱屼笟鍩硅鎯呭喌鍒嗘瀽鍥�',
left: 'center',
- top:'3%',
+ top:'5%',
textStyle: {
color: '#fff',
fontSize: nowSize(30)
}
},
+ grid: {
+ top: '15%',
+ left: '4%',
+ right: '18%',
+ bottom: '3%',
+ containLabel: true
+ },
legend: {
+ data: ['瀹為檯鍩硅浜烘暟','瀹屾垚鐜�'],
right:'3%',
- top:'3%',
+ top:'center',
+ orient:'vertical',
+ itemGap: nowSize(50),
textStyle: {
color:'#fff',
fontSize: nowSize(24)
@@ -178,36 +192,46 @@
yAxis: [
{
type: 'value',
- name: 'Precipitation',
- min: 0,
- max: 250,
- interval: 50,
axisLabel: {
- formatter: '{value} ml',
textStyle: {
color: '#fff',
fontSize: nowSize(24)
}
},
axisLine: {
-
+ lineStyle: {
+ color: "#999999",
+ width: 1,
+ type: "solid"
+ }
+ },
+ splitLine: {
+ show: false
}
},
{
type: 'value',
- name: 'Temperature',
- min: 0,
- max: 25,
- interval: 5,
axisLabel: {
- formatter: '{value} 掳C'
+ show: false,
+ formatter: '{value} %'
+ },
+ axisLine: {
+ show: false,
+ },
+ splitLine: {
+ show: false
+ },
+ axisTick: {
+ show: false
}
}
],
series: [
{
- name: 'Evaporation',
+ name: '瀹為檯鍩硅浜烘暟',
type: 'bar',
+ barWidth: nowSize(48),
+ color:'#51D2FF',
tooltip: {
valueFormatter: function (value) {
return value + ' ml';
@@ -218,7 +242,7 @@
]
},
{
- name: 'Temperature',
+ name: '瀹屾垚鐜�',
type: 'line',
yAxisIndex: 1,
tooltip: {
--
Gitblit v1.9.1