Authored by zhichao

fix:迁移采集协议管理页面

@@ -19,18 +19,17 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay @@ -19,18 +19,17 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
19 var msg = ''; 19 var msg = '';
20 var url = common.domainName + '/api-web/manage/protocol/checkUniqueCode'; 20 var url = common.domainName + '/api-web/manage/protocol/checkUniqueCode';
21 //var protocolId = $("#protocolAddForm").find("input[name='protocolId']"); 21 //var protocolId = $("#protocolAddForm").find("input[name='protocolId']");
22 - var data = {protocolCode: value, access_token: accessToken}; 22 + var data = {protocolCode: value, accessToken: accessToken};
23 if (id) { 23 if (id) {
24 data['notProtocolId'] = id; 24 data['notProtocolId'] = id;
25 } 25 }
26 - $.ajax({ 26 + admin.req({
27 url: url, 27 url: url,
28 data: data, 28 data: data,
29 - async: false,  
30 - success: function (res) {  
31 - if (res.object != null) {  
32 - msg = '当前名称已存在'  
33 - } 29 + async: false
  30 + }).done(function (res) {
  31 + if (res.object != null) {
  32 + msg = '当前名称已存在'
34 } 33 }
35 }) 34 })
36 return msg 35 return msg
@@ -39,7 +38,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay @@ -39,7 +38,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay
39 form.verify(verify); 38 form.verify(verify);
40 if (code) { 39 if (code) {
41 var url = common.domainName + '/api-web/manage/protocol/getById'; 40 var url = common.domainName + '/api-web/manage/protocol/getById';
42 - $.get(url, {'protocolCode': code, 'access_token': accessToken}, function (res) { 41 + admin.req({url: url, data: {protocolCode: code}}).done(function (res) {
43 if (res.object) { 42 if (res.object) {
44 var bean = res.object 43 var bean = res.object
45 var param = res.data; 44 var param = res.data;
@@ -256,22 +256,20 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -256,22 +256,20 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
256 var submitData = layui.form.val('protocol-add-form'); 256 var submitData = layui.form.val('protocol-add-form');
257 submitData.protocolParamList = paramList; 257 submitData.protocolParamList = paramList;
258 var loading = layer.load(2) 258 var loading = layer.load(2)
259 - $.ajax({  
260 - url: common.domainName + '/api-web/manage/protocol/save?access_token=' + accessToken, 259 + admin.req({
  260 + url: common.domainName + '/api-web/manage/protocol/save',
261 type: 'post', 261 type: 'post',
262 data: JSON.stringify(submitData), 262 data: JSON.stringify(submitData),
263 contentType: "application/json;charset=utf-8", 263 contentType: "application/json;charset=utf-8",
264 - async: false,  
265 - success: function (res) {  
266 - // layer.closeAll();  
267 - layer.close(indexm); //joke modify 20210303  
268 - layer.closeAll('loading');  
269 - reloadTable();  
270 - },  
271 - error: function () {  
272 - layer.closeAll('loading');  
273 - }  
274 - }) 264 + async: false
  265 + }).done(function (res) {
  266 + // layer.closeAll();
  267 + layer.close(indexm); //joke modify 20210303
  268 + layer.closeAll('loading');
  269 + reloadTable();
  270 + }.catch(function () {
  271 + layer.closeAll('loading');
  272 + }))
275 }); 273 });
276 274
277 }, 275 },