diff --git a/src/main/webapp/assets/modular/system/log/log.js b/src/main/webapp/assets/modular/system/log/log.js index 70c9db17..0e7a5970 100644 --- a/src/main/webapp/assets/modular/system/log/log.js +++ b/src/main/webapp/assets/modular/system/log/log.js @@ -36,8 +36,8 @@ layui.use(['HttpRequest', 'treeTable', 'laydate', 'func', 'form'], function () { */ Log.search = function () { var queryData = {}; - queryData['beginDateTime'] = $("#beginDateTime").val(); - queryData['endDateTime'] = $("#endDateTime").val(); + queryData['beginDate'] = $("#beginDate").val(); + queryData['endDate'] = $("#endDate").val(); queryData['logName'] = $("#logName").val(); queryData['appName'] = $("#appName").val(); // queryData['logType'] = $("#logType").val(); @@ -72,10 +72,10 @@ layui.use(['HttpRequest', 'treeTable', 'laydate', 'func', 'form'], function () { */ Log.cleanLog = function () { var queryData = {}; - queryData['beginDateTime'] = $("#beginDateTime").val(); - queryData['endDateTime'] = $("#endDateTime").val(); + queryData['beginDate'] = $("#beginDate").val(); + queryData['endDate'] = $("#endDate").val(); queryData['appName'] = $("#appName").val(); - if (queryData.beginDateTime == "" || queryData.endDateTime == "" || queryData.appName == "") { + if (queryData.beginDate == "" || queryData.endDate == "" || queryData.appName == "") { Feng.error("请选择开始时间、结束时间和服务名称"); return false; } @@ -92,12 +92,12 @@ layui.use(['HttpRequest', 'treeTable', 'laydate', 'func', 'form'], function () { // 渲染时间选择框 laydate.render({ - elem: '#beginDateTime' + elem: '#beginDate' }); //渲染时间选择框 laydate.render({ - elem: '#endDateTime' + elem: '#endDate' }); // 渲染表格 diff --git a/src/main/webapp/assets/modular/system/notice/notice.js b/src/main/webapp/assets/modular/system/notice/notice.js index 031ac081..10deeefe 100644 --- a/src/main/webapp/assets/modular/system/notice/notice.js +++ b/src/main/webapp/assets/modular/system/notice/notice.js @@ -75,12 +75,12 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func'], function ( Feng.success("删除成功!"); table.reload(Notice.tableId); }, function (data) { - Feng.error("删除失败!" + data.responseJSON.message + "!"); + Feng.error("删除失败!" + data.message + "!"); }); ajax.set("noticeId", data.noticeId); - ajax.start(); + ajax.start(true); }; - Feng.confirm("是否删除通知 " + data.title + "?", operation); + Feng.confirm("是否删除通知 " + data.noticeTitle + "?", operation); }; // 渲染表格 diff --git a/src/main/webapp/pages/modular/system/log/log.html b/src/main/webapp/pages/modular/system/log/log.html index 40b626b6..27e9a751 100644 --- a/src/main/webapp/pages/modular/system/log/log.html +++ b/src/main/webapp/pages/modular/system/log/log.html @@ -12,10 +12,10 @@