diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamAdd.js index 0e9baa3..12882a6 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamAdd.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamAdd.js @@ -4,6 +4,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay var form = layui.form; var common = layui.common; var table = layui.table; + var admin = layui.admin; //对外暴露的接口 exports('reportparamAdd', function (data) { var id = data.paramId; @@ -28,22 +29,21 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay } } else { var url = domainName + '/inspection-report/dataSource/validateDataSource'; - $.ajax({ + admin.req({ url: url, data: { "pollName": $form.find("select[name='pollName']").val(), "content": value, - 'access_token': accessToken + 'accessToken': accessToken }, - async: false, - success: function (res) { - if (res.success && (res.data[0] != '`key`' || res.data[1] != '`value`')) { - msg = '当前输出内容未检测倒输出关键字 key或value' - } else { - msg = res.msg; - } + async: false + }).done(function (res) { + if (res.success && (res.data[0] != '`key`' || res.data[1] != '`value`')) { + msg = '当前输出内容未检测倒输出关键字 key或value' + } else { + msg = res.msg; } - }) + }); } return msg } @@ -53,8 +53,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay function loadSelect() { var $dom = $("#reportparamAddForm").find("select[name='pollName']"); - var url = domainName + '/inspection-report/dataSource/loadSelect?access_token=' + accessToken; - $.get(url, function (res) { + var url = domainName + '/inspection-report/dataSource/loadSelect'; + admin.req({ + url: url + }).done(function (res) { $dom.empty(); if (res.success) { let html = ''; @@ -64,7 +66,10 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay $dom.append(html) if (id) { var url = common.domainName + '/inspection-report/report/param/findById'; - $.get(url, {'paramId': id, 'access_token': accessToken}, function (res) { + admin.req({ + url: url, + data: {'paramId': id} + }).done(function (res) { if (res.object) { let data = res.object; var $form = $("#reportparamAddForm"); @@ -98,24 +103,22 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'xmSelect', 'lay form.on('submit(reportparam-add-submit)', function (data) { var bean = data.field; var loading = layer.load(2); - $.ajax({ + admin.req({ type: 'post', - url: common.domainName + '/inspection-report/report/param/save?access_token=' + accessToken, + url: common.domainName + '/inspection-report/report/param/save', contentType: "application/json; charset=utf-8", - data: JSON.stringify(bean), - success: function (res) { - layer.close(loading); - layer.msg('保存成功', { - offset: '15px' - , icon: 1 - , time: 2000 - }, function () { - layer.closeAll(); - table.reload('reportparam_table', {}); - }) - } + data: JSON.stringify(bean) + }).done(function (res) { + layer.close(loading); + layer.msg('保存成功', { + offset: '15px' + , icon: 1 + , time: 2000 + }, function () { + layer.closeAll(); + table.reload('reportparam_table', {}); + }) }); - }) }); diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamIndex.js index fcc9659..da7ef77 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamIndex.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportparamIndex.js @@ -52,7 +52,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', elem: '#reportparam_table' , url: domainName + '/inspection-report/report/param/page' , where: { - access_token: accessToken, paramName: $('#reportparamSearchForm').find("input[name='keyword']").val() } , height: 'full-200' @@ -170,7 +169,6 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', curr: 1 } , where: { - access_token: accessToken, paramName: $('#reportparamSearchForm').find("input[name='keyword']").val() } });