From c22971419e96c3a5acde4526741b0233291f84ab Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期一, 12 十一月 2018 16:03:44 +0800
Subject: [PATCH] 跳转
---
gx_tieta/WebRoot/charge-test.jsp | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/charge-test.jsp b/gx_tieta/WebRoot/charge-test.jsp
index 91dca38..c3d6430 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 = '鍗曚綋娓╁害鎶樼嚎鍥�';
@@ -3410,8 +3410,8 @@
var city = batt.StationName2;
var county = batt.StationName5;
var home = batt.StationName;
- var homeid = batt.BattGroupId;
- $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&homeid='+homeid);
+ var battid = batt.BattGroupId;
+ $(this).attr('href', 'control.jsp?province='+province+'&city='+city+'&county='+county+'&home='+home+'&battid='+battid);
});
});
--
Gitblit v1.9.1