提交内容

hdw

2018-11-12 e41ab8b70d97c1f32d2bf61156a37c4b17746a66

 gx_tieta/WebRoot/control.jsp

@@ -235,7 +235,7 @@
                       <div class="tools-btn">

                          <a href="javascript:void(0);" id="setParamBtn" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

                           <span class="whyc-btn-icon fa fa-play-circle"></span>

                           <span class="whyc-btn-txt">启动核容测试</span>

                           <span class="whyc-btn-txt">核容测试</span>

                        </a>

                        <br>

                        <a href="javascript:void(0);" id="stopTest" class="whyc-btn whyc-btn-disabled" id="specialGraphExport">

@@ -1216,7 +1216,7 @@
      // 设置页面权限模块

      $(function() {

         var testOp = checkUserPermit(permits, 'batt_test_op_permit');

         console.log(testOp);

         //console.log(testOp);

         if(!testOp) {

            $(".ele-circle .tools-btn").remove();

         }

@@ -1799,9 +1799,9 @@
                  

                  var alarmstates = GLOBAL.BTS9100.alarmstates;

                  var lastStopReason = getStateFromIndex(_data.dev_last_captest_stop_type,alarmstates);

                  console.info("上一次核容测试停止原因："+lastStopReason);

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

                  console.info("通信丢包率："+(_data.dev_commcount==0?0:(_data.dev_errcommcount*100/_data.dev_commcount)));						
                  //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 record = new Date(model.data[0].record_datetime).getTime();

@@ -3457,9 +3457,11 @@
      });

   }

      // 根据设备信息显示对应电路拓扑图

		
      function updateEleCircle(batt, data, mygraph) {

         var status = GLOBAL.circleStatus.status;

         //console.info(status);

         var e61850Opts = GLOBAL.circleStatus.e61850Opts;

         var btsOpts = GLOBAL.circleStatus.btsOpts;

         // 初始化二级管

         changeEleCircleOpt(eleCircle, 'diode', {

            isShowValue: false,

@@ -3477,10 +3479,20 @@
         // 拓扑图图标

         changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:-1});   // 放电单元

         changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:-1});   // 充电单元

			
         //console.log(data);

         // 没有形参就不做任何操作

         if(data == undefined) {

            status.hide();

            var opts = [{

               name: 'none',

               type: 'text',

               status: 0,

               notShow: false,

               content: {

                  text:'设备状态：<span class="red">未连接</span>'

               }

            }];

            status.setOpts(opts);

            //status.hide();

            return false;   // 结束函数

         }

         

@@ -3488,6 +3500,7 @@
         if(regEquipType(data.dev_id, globalPattern.equip61850)) {

            //console.info(data);

            var alarms = data.dev_61850alarms.split(',');

            status.setOpts(e61850Opts);

            status.show();

            //alarms = ['true', 'false', 'true', 'true'];

            // 设置二级管的导通压降

@@ -3528,7 +3541,31 @@
            // 拓扑图图标

            changeEleCircleOpt(eleCircle, 'DCDC1', {statusImg:mygraph.graphtype});   // 放电单元

            changeEleCircleOpt(eleCircle, 'DCDC2', {statusImg:mygraph.graphtype});   // 充电单元

         }else {

         }else if(regEquipType(data.dev_id, globalPattern.BTS)){      // 判断如果是BTS9100的设备

            // 设置状态的配置项

            status.setOpts(btsOpts);

				
            // 工作状态

            status.setStatus('workstatus', data.dev_workstate);

				
            // 设置核容停止原因

            if(data.dev_workstate == 2) {

               status.setStatus('stop', 99);

            }else {

               status.setStatus('stop', data.dev_last_captest_stop_type);	
            }

				
            // 设置通信计数

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

				
            // 设置丢包率

            var errorCount = data.dev_errcommcount;

            var allCount = data.dev_commcount+errorCount;

            var percent= (allCount==0?0:errorCount/allCount*100).toFixed(3);

            status.setText('percent', "通信丢包率："+percent+'%');

				
            status.show();

         }else{

            status.hide();

         }

      }

@@ -4506,16 +4543,18 @@
         $('#sysSet_read').click(function() {

            var batt = getBatt();

            var temp = {

               dev_id:batt.FBSDeviceId

               dev_id:batt.FBSDeviceId,

               num: sysCMD.get

            };

            searchSysData(temp, true);

         });

         

         // 点击设置系统参数

         // 点击系统参数按钮

         $('#sysSet').click(function() {

            var batt = getBatt();

            var temp = {

               dev_id:batt.FBSDeviceId

               dev_id:batt.FBSDeviceId,

               num: sysCMD.get

            };

            searchSysData(temp);

         });

@@ -4542,7 +4581,7 @@
                  var batt = getBatt();

                  var temp = {

                     dev_id: batt.FBSDeviceId,

                     cmd: sysCMD.restart

                     num: sysCMD.restart

                  };

                  

                  /* console.log(temp);

@@ -4673,8 +4712,8 @@
            $('#sysSet_endur').val(data.GroupVolRange);         // 总续航时间

            $('#sysSet_firTime').val(data.GroupVolSorce);         // 保一次下电续航时间

            $('#sysSet_range').val(data.CurrentRange);         // 电流钳量程

            $('#sysSet_firVol').val(data.CurrentTyte);         // 一次下电电压

            $('#sysSet_secVol').val(data.MonomerOrder);         // 二次下电电压

            $('#sysSet_firVol').val(data.CurrentTyte/10);         // 一次下电电压

            $('#sysSet_secVol').val(data.MonomerOrder/10);         // 二次下电电压

            $('#sysSet_dcdc').val(data.LoaderCount);         // DCDC模块数量

            $('#sysSet_sourceStyle').val(data.DtCardCount);      // 单体数据来源类型

            $('#sysSet_bleedNum').val(data.POF_BG_Boost_Cnt);      // 停电升压榨干电池数量

@@ -4716,8 +4755,8 @@
               GroupVolRange: endur,

               GroupVolSorce: firTime,

               CurrentRange: range,

               CurrentTyte: firVol,

               MonomerOrder: secVol,

               CurrentTyte: firVol*10,

               MonomerOrder: secVol*10,

               LoaderCount: dcdc,

               DtCardCount: sourceStyle,

               POF_BG_Boost_Cnt:bleedNum,