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

hdw

2018-11-20 fd77d548a62649faabcecd1c33352aa28cf8fead

 gx_tieta/WebRoot/index.jsp

@@ -956,6 +956,8 @@
                        Almarr.push(/*{

                        name:"<s:text name='Capacity'/><s:text name='Alarm'/><s:text name='Alarm'/>",val:parseInt(data.BattGroupId)         // 容量告警告警                            

                        } ,*/{

                           name:"<s:text name='On-line_voltage'/>",val:parseInt(data.Record_Id),            // 在线电压 
                        },{

                           name:"<s:text name='Group_voltage'/>",val:parseInt(data.MonNum),               // 组端电压 

                        },{

                           name:"<s:text name='Charging_current'/>",val:parseInt(data.alm_id),               // 充电电流