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

D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore

2018-12-29 ecbc0263fd9cd6558f9445730325aa3ad2a94047

 gx_tieta/WebRoot/iframe/setcurr.html

@@ -108,8 +108,7 @@
            // 是否确定启动

            layer.confirm('是否确定启动测试', {icon: 3, title: '系统提示'}, function(index) {

               var param = getStartTestParam(data);

               console.log(param);

               return;

					
               // 启动测试

               ajaxStartTest(param);

            });