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

hdw

2018-10-25 eb2d3e13885dfc2206f0a9c69a3e52aeab646917

 gx_tieta/WebRoot/dischargetest.jsp

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

         flushDischargeParam({

            num:CMD_GetDischargeParm,

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

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

            TestCmd:0,

         });

      });

      

@@ -1591,7 +1592,8 @@
         loading.showLoading($('#main'));

         var param = {

            num:cmd,

            dev_id:dev_id

            dev_id:dev_id,

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

         };   

         $.ajax({    

              type: "post",             

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

                  flushDischargeParam({

                     num:CMD_GetDischargeParm,

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

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

                  });

                  paramsBtn.startTest(true);