From 30dea6cb47cd52c8a9857ed5be71bac1c86e7225 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 18 十一月 2020 17:27:15 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 6c0748d..22a3fac 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -679,7 +679,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: ['1', '2', '3', '4', '5', '6', '7'],
+ data: ['1', '2', '3', '4', '5', '6', '7'],
axisLabel: {
textStyle:{
color:'#aaa', //鍧愭爣鐨勫瓧浣撻鑹�
@@ -713,45 +713,58 @@
}
},
- series: [{
- data: [820, 932, 901, 934, 1290, 1330, 1320],
- type: 'line',
- areaStyle: {
- color: '#7494ae' // 鎶樼嚎鍖哄煙棰滆壊
+ series: [
+ {
+ data: [820, 932, 901, 934, 1290, 1330, 1320],
+ type: 'line',
+ // areaStyle: {
+ // color: '#7494ae' // 鎶樼嚎鍖哄煙棰滆壊
+ // },
+ itemStyle:{
+ normal:{
+ color:'#3590ac', //鎶樼偣棰滆壊
+ lineStyle:{
+ color:'#3590ac' //鎶樼嚎棰滆壊
+ }
+ }
+ }
},
- itemStyle:{
- normal:{
- color:'#3590ac', //鎶樼偣棰滆壊
- lineStyle:{
- color:'#3590ac' //鎶樼嚎棰滆壊
+ {
+ data: [820, 932, 901, 934, 1290, 1330, 1320],
+ type: 'line',
+ // areaStyle: {
+ // color: '#d55b35' // 鎶樼嚎鍖哄煙棰滆壊
+ // },
+ itemStyle:{
+ normal:{
+ color:'#0cbad9', //鎶樼偣棰滆壊
+ lineStyle:{
+ color:'#07a093' //鎶樼嚎棰滆壊
+ }
}
}
}
- }]
+ ]
};
// 璁块棶閲忔姤琛ㄥ姞杞�
function initlinChart() {
var reportView = lineChartOption;
- var xAxisDate = [];
- var seriesDate=[];
$.ajax({
- url: baseUrl+"/monitor/pakin/rep",
+ url: baseUrl+"/monitor/line/charts",
method: 'GET',
success: function (res) {
if (res.code === 200){
- var json = res.data;
- for (var i = 0; i < json.length; i++) {
- xAxisDate[i]=json[i].node;
- seriesDate[i]=json[i].val;
- }
- reportView.xAxis.data=xAxisDate;
- reportView.series[0].data=seriesDate;
+ var json = res.data.rows;
+ reportView.xAxis.data=[getDateFormat(-11), getDateFormat(-10), getDateFormat(-9), getDateFormat(-8), getDateFormat(-7), getDateFormat(-6),
+ getDateFormat(-5), getDateFormat(-4), getDateFormat(-3), getDateFormat(-2), getDateFormat(-1), getDateFormat(-0)];
+ reportView.series[0].data=res.data.rows[0].data;
+ reportView.series[1].data=res.data.rows[1].data;
lineCharts.setOption(reportView)
} else if (res.code === 403){
top.location.href = "/";
} else {
- layer.msg(res.msg);
+ console.log(res.msg);
}
}
});
--
Gitblit v1.9.1