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

81041

2019-01-18 5fe2efb71f6ad809a1cfc59beab18bbea99fff5e

 gx_tieta/WebRoot/control.jsp

@@ -1933,11 +1933,13 @@
      //查询电池组的实时状态信息

      function showtable(){

         //searbattrealInfomation();

         searchDevStatusByDev_id();

         findrtstate();

         findrtdata();

         //查询设备的dcdc状态

         searchDevDcDcState();

			
         // 更新拓扑图状态

         searchDevStatusByDev_id();

      }

      

      //根据设备id查询设备当前的开关状态

@@ -1980,8 +1982,7 @@
                  //console.info("上一次核容测试停止原因："+lastStopReason);

                  //console.info("通信计数："+_data.dev_commcount);

                  //console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));                  

						
                  var nowTime = new Date().getTime();      //当前时间

                  var nowTime = new Date(model.data[0].note).getTime();      //当前时间

                  var record = new Date(model.data[0].record_datetime).getTime();

                  

                  //console.info(Math.abs(nowTime-record)/1000);

@@ -2289,6 +2290,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;         //设置电压告警高值         

@@ -3733,6 +3735,9 @@
            // 设置通信计数

            status.setText('count', "通信计数："+data.dev_commcount);

            

            // 设置设备版本号

            status.setText('devVersion', '设备版本号：'+data.dev_version);

				
            // 设置丢包率

            var errorCount = data.dev_errcommcount;

            var allCount = data.dev_commcount+errorCount;

@@ -4606,6 +4611,7 @@
         // 电路拓扑图右键菜单

         var menuItems = [

            {txt: '基站机历卡', cla: 'home-info-card'},

            {txt: '机房问题记录', cla: 'target', data:{target: 'batt-fault-manage.jsp'}},

            {txt: '机房实时状态查询', cla: 'target', data:{target: 'batt-state-manage.jsp'}},

            {txt: '设备流量统计查询', cla: 'target', data:{target: 'batt-traffic-statistics1.jsp'}},

            {txt: '机房续航能力查询', cla: 'target', data: {target: 'batt-life-manage.jsp'}},

@@ -5324,7 +5330,7 @@
      //查询设备的SD卡状态

      function searchDevSDState(){

         var obj= getBatt();   

         console.info(obj);	
         var status = GLOBAL.circleStatus.status;	
         $.ajax({

               type: "post",

               url: "Bts_station_stateAction_action_serchSDCard",

@@ -5333,8 +5339,10 @@
               data: "json = " + JSON.stringify(obj),

               success: function(result) {

                   var rs = JSON.parse(result.result);

                   console.info(rs);

	                
                   //console.info(rs);

                   var sdStatus = (rs.data == 0)?'正常': '<span style="color: #FF0000">故障</span>';

                   //console.log(sdStatus);

                   status.setText('sdCard', "SD卡状态："+sdStatus);

                   clearTimeout(searchDevSDState.timeout);

                   searchDevSDState.timeout = setTimeout(function() {
                      searchDevSDState();