添加单位

hdw

2018-11-12 fffe09711cbad822e117038bad61cf4e840448ce

添加单位

 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 = '单体温度折线图';


 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: "单体电压折线图",