Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git ...

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-28 b3f62ab5fb6adf03a92f62b42e69ad849f903b45

Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

 gx_tieta/WebRoot/charge-test.jsp

@@ -3059,6 +3059,7 @@
                }else{ 

                    if("Voltage"==units){

                        Titleobj.setAvg((sum/array.length).toFixed(3));            

                        Titleobj.setSum(sum);		
                        var low=getLow(1,1);

                        if(low.low_method==0){

                            //根据标称值计算


 gx_tieta/WebRoot/control.jsp

@@ -2289,6 +2289,7 @@
                    table_index = 0;

                    createAllTbl(tbHd, tbBd, thVol, mon_vol_table_list);

                    title.setAvg(parseFloat(sum/array.length).toFixed(3));

                    title.setSum(sum);

                    getBattAlarmTitle(batt,"Voltage",title);

                    //title.alow = temp.alow;                //设置电压告警低值    

                    //title.ahight = temp.ahight;            //设置电压告警高值            


 gx_tieta/WebRoot/js/Title.js

@@ -2,6 +2,7 @@
        this.min=0;                //最小值

        this.max=0;                //最大值

        this.avg=0;                //平均值

        this.sum=0;                //总和

        this.ahight=0;            //高告警阀值

        this.alow=0;            //低告警阀值

        this.clow=0;            //次低更换阀值

@@ -14,6 +15,7 @@
    obj.min=0;

    obj.max=0;

    obj.avg=0;

    obj.sum=0;

    obj.ahight=0;

    obj.alow=0;

    obj.clow=0;    

@@ -55,6 +57,14 @@


Title.prototype.getAvg=function(){

    return this.avg;

};



Title.prototype.setSum=function(sum){

    this.sum=sum;

};



Title.prototype.getSum=function(){

    return this.sum;

};



Title.prototype.setAhight=function(ahight){

@@ -102,7 +112,7 @@
    var title="";

    if("Voltage"==lname){

        //title=maxText+"="+(parseFloat(this.max).toFixed(3))+"V;"+minText+"="+(parseFloat(this.min).toFixed(3))+"V;"+avgText+"="+(parseFloat(this.avg).toFixed(3))+"V;"+lowText+"="+this.alow+"V;"+lcText+"="+this.lc+";"+lpText+"="+this.lp+"%";

        title=maxText+"="+(parseFloat(this.max).toFixed(3))+"V;"+minText+"="+(parseFloat(this.min).toFixed(3))+"V;"+avgText+"="+(parseFloat(this.avg).toFixed(3))+"V";

        title=maxText+"="+(parseFloat(this.max).toFixed(3))+"V;"+minText+"="+(parseFloat(this.min).toFixed(3))+"V;"+avgText+"="+(parseFloat(this.avg).toFixed(3))+"V;累加和="+(parseFloat(this.sum).toFixed(3))+"V";

    }else if("Resistance"==lname){

        //title=maxText+"="+(parseFloat(this.max).toFixed(3))+"mΩ;"+minText+"="+(parseFloat(this.min).toFixed(3))+"mΩ;"+avgText+"="+(parseFloat(this.avg).toFixed(3))+"mΩ;"+lowText+"="+this.alow+"mΩ;"+lcText+"="+this.lc+";"+lpText+"="+this.lp+"%";

        title=maxText+"="+(parseFloat(this.max).toFixed(3))+"mΩ;"+minText+"="+(parseFloat(this.min).toFixed(3))+"mΩ;"+avgText+"="+(parseFloat(this.avg).toFixed(3))+"mΩ";