diff --git a/src/main/java/cn/stylefeng/guns/modular/system/dataCenter/dataCenterViewController.java b/src/main/java/cn/stylefeng/guns/modular/system/dataCenter/dataCenterViewController.java new file mode 100644 index 00000000..be4eac0d --- /dev/null +++ b/src/main/java/cn/stylefeng/guns/modular/system/dataCenter/dataCenterViewController.java @@ -0,0 +1,39 @@ +package cn.stylefeng.guns.modular.system.dataCenter; + +import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource; +import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource; +import org.springframework.stereotype.Controller; + +/** + * 数据中心视图控制器 + * + * @author linjinfeng + * @date 2021/3/29 10:00 + */ +@Controller +@ApiResource(name = "数据中心导入导出相关的界面渲染") +public class dataCenterViewController { + + /** + * 基础数据-导出中心-视图 + * + * @author linjinfeng + * @date 2021/3/29 10:00 + */ + @GetResource(name = "基础数据-导出中心-视图", path = "/view/export") + public String exportView() { + return "/modular/system/dataCenter/exportCenter.html"; + } + + /** + * 基础数据-导入中心-视图 + * + * @author linjinfeng + * @date 2021/3/29 10:00 + */ + @GetResource(name = "基础数据-导出中心-视图", path = "/view/import") + public String importView() { + return "/modular/system/dataCenter/importCenter.html"; + } + +} diff --git a/src/main/webapp/assets/modular/system/log/log.js b/src/main/webapp/assets/modular/system/log/log.js index 139498e3..0cc68093 100644 --- a/src/main/webapp/assets/modular/system/log/log.js +++ b/src/main/webapp/assets/modular/system/log/log.js @@ -22,7 +22,7 @@ layui.use(['HttpRequest', 'treeTable', 'laydate', 'func', 'form'], function () { {field: 'logId', hide: true, sort: true, title: 'id'}, /*{field: 'logType', align: "center", sort: true, title: '日志类型'},*/ {field: 'logName', align: "center", sort: true, title: '日志名称'}, - {field: 'userId', align: "center", sort: true, title: '用户名称'}, + {field: 'realName', align: "center", sort: true, title: '用户名称'}, {field: 'appName', align: "center", sort: true, title: '服务名称'}, {field: 'requestUrl', align: "center", sort: true, title: '方法名'}, {field: 'createTime', align: "center", sort: true, title: '时间'}, diff --git a/src/main/webapp/assets/modular/system/log/login_log.js b/src/main/webapp/assets/modular/system/log/login_log.js index c650baa0..66b6cab1 100644 --- a/src/main/webapp/assets/modular/system/log/login_log.js +++ b/src/main/webapp/assets/modular/system/log/login_log.js @@ -18,7 +18,7 @@ layui.use(['layer', 'table', 'HttpRequest', 'laydate'], function () { return [[ {type: 'checkbox'}, {field: 'menuId', hide: true, sort: true, title: 'id'}, - {field: 'userId', align: "center", sort: true, title: '用户名'}, + {field: 'userName', align: "center", sort: true, title: '用户名'}, {field: 'llgName', align: "center", sort: true, title: '日志名称'}, {field: 'llgSucceed', align: "center", sort: true, title: '执行结果'}, {field: 'createTime', align: "center", sort: true, title: '时间'}, diff --git a/src/main/webapp/pages/modular/system/dataCenter/exportCenter.html b/src/main/webapp/pages/modular/system/dataCenter/exportCenter.html new file mode 100644 index 00000000..6c928a7e --- /dev/null +++ b/src/main/webapp/pages/modular/system/dataCenter/exportCenter.html @@ -0,0 +1,33 @@ +@layout("/layout/_container.html",{js:["/assets/modular/system/datasource/datasource.js"]}){ + +