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

hdw

2018-10-26 e458320cba7664a484d3a763e288047edb74d55f

 gx_tieta/WebRoot/dischargetest.jsp

@@ -1418,9 +1418,9 @@
            if(regEquipType(dev_id, globalPattern.LD9) || regEquipType(dev_id, globalPattern.BTS)) {

               if(confirm("确认停止"+dev_id+"设备的测试吗？")){

                  if(regEquipType(dev_id, globalPattern.LD9)){

                     sendLD9DischargeParam(CMD_Stop);

                     sendLD9DischargeParam(CMD_Stop,true);

                  }else if(regEquipType(dev_id, globalPattern.BTS)){            

                     checkDischargeParam(CMD_Stop);

                     checkDischargeParam(CMD_Stop,true);

                  }            

               }

            }

@@ -1483,7 +1483,8 @@
         loading.showLoading();

         flushDischargeParam({

            num:CMD_GetDischargeParm,

            dev_id:$('#dev_id').val()

            dev_id:$('#dev_id').val(),

            TestCmd:0,

         });

      });

      

@@ -1586,13 +1587,16 @@
      }

      

      //向客户端发送指定的命令

      function checkDischargeParam(cmd){

      function checkDischargeParam(cmd,stop){

         var dev_id = $('#main .tbl-body tbody tr.active').find('td').eq(2).text();

         loading.showLoading($('#main'));

         var distype = stop?0:$('#discharge_type').val();

         var param = {

            num:cmd,

            dev_id:dev_id

            dev_id:dev_id,

            TestCmd:distype

         };   

			
         $.ajax({    

              type: "post",             

              url:"Fbs9100_setparamAction_action_serchbyDev_id",            

@@ -1837,6 +1841,7 @@
                  updateUserDevinfo();         //设置放电参数成功后修改用户添加的放电设备信息

                  flushDischargeParam({

                     num:CMD_GetDischargeParm,

                     TestCmd:$('#discharge_type').val(),

                     dev_id:$('#dev_id').val()

                  });

                  paramsBtn.startTest(true);