From 91cfc50d5231ffa6e1e9a86e12bd68f3efa57e50 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 22 十月 2025 09:21:09 +0800 Subject: [PATCH] * --- src/main/webapp/views/operateLog/operateLog.html | 19 +++++++++++++++++-- src/main/java/com/zy/asrs/controller/WrkMastLogController.java | 2 +- src/main/java/com/zy/asrs/controller/BasArmController.java | 8 ++++---- 3 files changed, 22 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/BasArmController.java b/src/main/java/com/zy/asrs/controller/BasArmController.java index de9bc78..c663167 100644 --- a/src/main/java/com/zy/asrs/controller/BasArmController.java +++ b/src/main/java/com/zy/asrs/controller/BasArmController.java @@ -61,14 +61,14 @@ } @RequestMapping(value = "/basArm/add/auth") - @ManagerAuth + @ManagerAuth(memo = "鏂板鏈烘鑷傜浉鍏抽厤缃�") public R add(BasArm basArm) { basArmService.insert(basArm); return R.ok(); } @RequestMapping(value = "/basArm/update/auth") - @ManagerAuth + @ManagerAuth(memo = "淇敼鏈烘鑷傜浉鍏抽厤缃�") public R update(BasArm basArm){ if (Cools.isEmpty(basArm) || null==basArm.getId()){ return R.error(); @@ -78,7 +78,7 @@ } @RequestMapping(value = "/basArm/delete/auth") - @ManagerAuth + @ManagerAuth(memo = "鍒犻櫎鏈烘鑷傜浉鍏抽厤缃�") public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ basArmService.deleteById(id); @@ -87,7 +87,7 @@ } @RequestMapping(value = "/basArm/export/auth") - @ManagerAuth + @ManagerAuth(memo = "瀵煎嚭鏈烘鑷傜浉鍏抽厤缃�") public R export(@RequestBody JSONObject param){ EntityWrapper<BasArm> wrapper = new EntityWrapper<>(); List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); diff --git a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java index c16a7c2..a6fae62 100644 --- a/src/main/java/com/zy/asrs/controller/WrkMastLogController.java +++ b/src/main/java/com/zy/asrs/controller/WrkMastLogController.java @@ -57,7 +57,7 @@ } @RequestMapping(value = "/inventoryFlow/list/auth") - @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍") +// @ManagerAuth(memo = "搴撳瓨绉诲姩娴佹按璁板綍") public R inventoryFlowList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html index 827ece5..5bef4f2 100644 --- a/src/main/webapp/views/operateLog/operateLog.html +++ b/src/main/webapp/views/operateLog/operateLog.html @@ -30,6 +30,21 @@ </div> </div> </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="action" placeholder="鎿嶄綔鍐呭" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="request" placeholder="璇锋眰鏁版嵁" autocomplete="off"> + </div> + </div> + <div class="layui-inline"> + <div class="layui-input-inline"> + <input class="layui-input" type="text" name="response" placeholder="杩斿洖鏁版嵁" autocomplete="off"> + </div> + </div> <!-- 鏃ユ湡鑼冨洿 --> <div class="layui-inline" style="width: 300px"> <div class="layui-input-inline"> @@ -47,8 +62,8 @@ <table class="layui-hide" id="operateLog" lay-filter="operateLog"></table> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> -<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>--> -<!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>--> + <!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>--> + <!-- <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>--> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button> </div> </script> -- Gitblit v1.9.1