From fffe09711cbad822e117038bad61cf4e840448ce Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 09:47:04 +0800
Subject: [PATCH] 添加单位
---
gx_tieta/WebRoot/js/charge.js | 30 +++++++++++++++++++++++++++---
gx_tieta/WebRoot/charge-test.jsp | 12 ++++++------
2 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 91dca38..166b111 100644
--- a/gx_tieta/WebRoot/charge-test.jsp
+++ b/gx_tieta/WebRoot/charge-test.jsp
@@ -1317,7 +1317,7 @@
var min = getMinFromArr(batt_test_voldata);
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_voldata = getArrByStatus(batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,max,min,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋鐢靛帇鎶樼嚎鍥�';
@@ -1332,7 +1332,7 @@
var min = getMinFromArr(batt_test_tmpdata);
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_tmpdata = getArrByStatus(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max,min,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -2298,11 +2298,11 @@
if(line_status == 0) { // 鐢熸垚鍗曚綋鐢靛帇鎶樼嚎鍥�
max = getMaxFromArr(batt_test_voldata);
min = getMinFromArr(batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_voldata,max,min,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_voldata,max,min,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
}else { // 鐢熸垚鍗曚綋
max = getMaxFromArr(batt_test_tmpdata);
min = getMinFromArr(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_tmpdata,max+20,0,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,Monnum_list,TestTime,batt_test_tmpdata,max+20,0,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -3313,7 +3313,7 @@
// 鑾峰彇鍏ㄩ儴鍗曚綋鐢靛帇鏁版嵁鐨勬渶鍊�
var lineMax = getMaxFromArr(new_batt_test_voldata);
var lineMin = getMinFromArr(new_batt_test_voldata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,lineMax,lineMin,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_voldata,lineMax,lineMin,thrname, 'V'); //鐢熸垚鍙充笅鎶樼嚎鍥�
$('#lineStatus').val('0');
//console.info(Monvol_list);
};break;
@@ -3325,7 +3325,7 @@
// 鏇存柊鍙充笅鏂圭殑鎶樼嚎鍥句负鍗曚綋娓╁害鎶樼嚎鍥�
var new_Monnum_list = getArrByStatus(Monnum_list);
var new_batt_test_tmpdata = getArrByStatus(batt_test_tmpdata);
- CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max+10,0,thrname); //鐢熸垚鍙充笅鎶樼嚎鍥�
+ CreateLineEchart('myLineChart',oRBottom,new_Monnum_list,TestTime,new_batt_test_tmpdata,max+10,0,thrname, '鈩�'); //鐢熸垚鍙充笅鎶樼嚎鍥�
var opt = myLineChart.getOption();
//console.info(opt.title);
opt.title[0].text = '鍗曚綋娓╁害鎶樼嚎鍥�';
diff --git a/gx_tieta/WebRoot/js/charge.js b/gx_tieta/WebRoot/js/charge.js
index e16d474..7693bdb 100644
--- a/gx_tieta/WebRoot/js/charge.js
+++ b/gx_tieta/WebRoot/js/charge.js
@@ -193,7 +193,18 @@
myLineChartTop.group = 'group1';
var option={
tooltip:{
- trigger: 'axis'
+ trigger: 'axis',
+ formatter:function(params){
+ var data = "";
+ var str = '';
+ str+=params[0].name+'</br>';
+ for(var i=0;i<params.length;i++){
+ var marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:'+params[i].color+';"></span>';
+ str+=marker+params[i].seriesName+': '+params[i].data+'V</br>';
+ data = params[i].data == undefined?marker+params[i].seriesName+":-":str;
+ }
+ return data;
+ }
},
toolbox: {
show : true
@@ -410,18 +421,31 @@
//鍒涘缓鍙充笅鎶樼嚎鍥�
var myLineChart; //灏忓彸涓嬫姌绾垮浘
var mybigLineChart; //澶у彸涓嬫姌绾垮浘
-function CreateLineEchart(echartObj,ele,lname,xdata,sdata,ymax,ymin,tname){
+function CreateLineEchart(echartObj,ele,lname,xdata,sdata,ymax,ymin,tname,unit){
if(echartObj=='myLineChart'){
myLineChart=echarts.init(ele);
myLineChart.clear();
}else if(echartObj='mybigLineChart'){
mybigLineChart=echarts.init(ele);
}
+ // 鍒ゆ柇鏄惁unit鐨勫��
+ unit = unit?unit:'';
myLineChart.group = 'group1';
//console.info("ymax :"+ymax+"ymin:"+ymin);
var option={
tooltip:{
- trigger:'axis'
+ trigger:'axis',
+ formatter:function(params){
+ var data = "";
+ var str = '';
+ str+=params[0].name+'</br>';
+ for(var i=0;i<params.length;i++){
+ var marker = '<span style="display:inline-block;margin-right:5px;border-radius:10px;width:9px;height:9px;background-color:'+params[i].color+';"></span>';
+ str+=marker+params[i].seriesName+': '+params[i].data+unit+'</br>';
+ data = params[i].data == undefined?marker+params[i].seriesName+":-":str;
+ }
+ return data;
+ }
},
title : {
text: "鍗曚綋鐢靛帇鎶樼嚎鍥�",
--
Gitblit v1.9.1