上一次核容测试终止原因bug修改

hdw

2018-11-12 3f924e7081cd27ab8989c404602b89ccdf230e6f

 gx_tieta/WebRoot/control.jsp

@@ -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();

         }

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

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

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

         console.log(data);

         //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;   // 结束函数

         }

         

@@ -3518,6 +3528,7 @@
            status.setStatus('msg', isLink);

            // 设置温度信息

            status.setStatus('tmp', alarms[2] == 'true'?0:1);

				
            // 设置核容停止原因

            if(data.dev_workstate == 2) {

               status.setStatus('stop', 99);

@@ -3539,11 +3550,7 @@
            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.setStatus('stop', data.dev_last_captest_stop_type);

            

            // 设置通信计数

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

@@ -4539,7 +4546,7 @@
            searchSysData(temp, true);

         });

         

         // 点击设置系统参数

         // 点击系统参数按钮

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

            var batt = getBatt();

            var temp = {

@@ -4571,7 +4578,7 @@
                  var batt = getBatt();

                  var temp = {

                     dev_id: batt.FBSDeviceId,

                     cmd: sysCMD.restart

                     num: sysCMD.restart

                  };

                  

                  /* console.log(temp);

@@ -4702,8 +4709,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);      // 停电升压榨干电池数量

@@ -4745,8 +4752,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,