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

hdw

2018-11-09 b2ef49bf8f4fb47a0bb5e2efd37d44f3f1acad61

 gx_tieta/WebRoot/Top.jsp

@@ -557,7 +557,7 @@
   

   //查询电池告警信息

   function searchBattAlarm(data){

      //console.info(data);

      console.info(data);

      $.ajax({    

           type:"post",             

           url: "Battalarm_dataAction!serchBatt_alarm",            

@@ -574,16 +574,17 @@
            var model = eval('('+data.result+')');

            if(model.code == 1){

               var obj = model.data[0];

               //console.info(obj);

               console.info(obj);

               if(obj.alm_cleared_type == 0){

                  //实时告警

                  window.open("elewarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);

                  window.open("elewarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

               }else{

                  //历史告警

                  window.open("eleHistoryWarn.jsp?stationId="+obj.stationid+"&battgroupId="+obj.BattGroupId);

                  window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

               }

            }else{

               alert("该告警已经被删除");

               alert("该告警已经恢复");

               //window.open("eleHistoryWarn.jsp?home="+obj.stationname+"&battid="+obj.BattGroupId);

            }            

          }             

      });

@@ -609,12 +610,12 @@
               var obj = model.data[0];

               console.info(obj);

               if(obj.alm_cleared_type == 0){

                  window.open("equipWarn1.jsp");

                  window.open("equipWarn1.jsp?home="+obj.stationName);

               }else{

                  window.open("equipHistWarn1.jsp?stationId="+obj.stationId);

                  window.open("equipHistWarn1.jsp?home="+obj.stationName);

               }

            }else{

               alert("该告警已经被删除");

               alert("该告警已经恢复");

            }      

          }             

      });

@@ -651,7 +652,7 @@
   

   // 核容测试模块

   $(function() {

      var arrTh = ['机房名称', '设备ID', '设备名称','设备状态', '在线电压（V）', '组端电压（V）', '组端电流（mA）','设备温度（℃）', '已测容量（AH）', '设备告警', '已测时间'];

      var arrTh = ['机房名称', '设备ID', '设备名称','设备状态', '在线电压（V）', '组端电压（V）', '组端电流（A）','设备温度（℃）', '已测容量（AH）', '设备告警', '已测时间'];

      var arrTd = [];

      var eleTh = $('#navNuclearTest-data .nuclearTest-tbl-header');

      var eleTd = $('#navNuclearTest-data .nuclearTest-tbl-body');

@@ -700,7 +701,7 @@
              data:null,      

              success: function(data){ 

               var model = eval('('+data.result+')');

               console.info(model);

               //console.info(model);

               if(model.code == 1){

                  $('#nuclear_test').text(model.data.length);

                  if(model.data.length != 0) {

@@ -723,7 +724,7 @@
       

       // 根据数据生成表格

       function createTblByModel(model) {

          //console.log(model);

          console.log(model);

          arrTd = [];

         for(var i=0; i<model.data.length; i++) {

            var data = model.data[i];

@@ -737,7 +738,7 @@
            arrTd.push(data.dev_temp);                                 // 设备温度

            arrTd.push(data.dev_captest_cap);                           // 已测容量

            arrTd.push(getStateByArray(data.dev_alarmstate,BTS_alarmstates));   // 设备告警

            arrTd.push(formatSeconds(data.num));                        // 已测时间

            arrTd.push(formatSeconds(data.dev_captest_timelong));            // 已测时间

         }

         createFullTbl(eleTh, eleTd, arrTh, arrTd);