~whychwj/haha.git

~whychwj / haha

keke

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace

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

 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;         //设置电压告警高值

			@@ -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; //设置电压告警高值