From 36f77ee0e6835526451616cc8d20b37dbaecfa77 Mon Sep 17 00:00:00 2001 From: 20918 <2091823062@qq.com> Date: Thu, 6 Jun 2024 11:37:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/SysNetworknumController.java | 2 +- .../system/count/SysTrainnumController.java | 18 +- .../filemanager/TdFileExtractController.java | 2 +- .../filemanager/TdFileReceiveController.java | 2 +- .../resources/templates/index-topnav.html | 2 +- .../src/main/resources/templates/index.html | 4 +- .../templates/system/fileprovide/detail.html | 8 +- .../system/network/networknum/networknum.html | 3 +- .../property/propertynum/propertynum.html | 3 +- .../templates/system/trainnum/detail.html | 193 ++++++++++++++++++ .../templates/system/trainnum/trainnum.html | 5 +- 11 files changed, 219 insertions(+), 23 deletions(-) create mode 100644 ruoyi-admin/src/main/resources/templates/system/trainnum/detail.html diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java index ddda3b3..b7cb811 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysNetworknumController.java @@ -50,7 +50,7 @@ public class SysNetworknumController extends BaseController { /** * 打印界面 */ - @RequiresPermissions("system:propertynum:print") + @RequiresPermissions("system:networknum:print") @GetMapping("/print/{netId}") @Log(title = "网络设备统计", businessType = BusinessType.PRINT) public String print(@PathVariable("netId") String netId, ModelMap mmap) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java index c6cac47..abe7cc8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/count/SysTrainnumController.java @@ -63,16 +63,16 @@ public class SysTrainnumController extends BaseController { } /** - * 打印 + * 详细 */ - @RequiresPermissions("system:trainnum:print") - @GetMapping("/print/{traiId}") - @ResponseBody - public String print(@PathVariable("trainId") Long trainId, ModelMap mmap){ - TdTrain tdTrain = tdTrainService.selectTdTrainByID(trainId); - List tdTrains = tdTrainService.selectTdTrainList(tdTrain); - mmap.put("train", tdTrain); - return prefix + "/print"; + @RequiresPermissions("system:trainnum:detail") + @GetMapping("/detail/{ID}") + public String detail(@PathVariable("ID") Long ID, ModelMap mmap) + { + mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID)); + SysUser user = getSysUser(); + mmap.put("user", user); + return prefix + "/detail"; } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java index 819d60a..44f9198 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileExtractController.java @@ -49,7 +49,7 @@ public class TdFileExtractController extends BaseController { List list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); List tdFileReceives = new ArrayList<>(); for (TdFileReceive FileReceivelist : list){ - if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){ + if (FileReceivelist.getReceiveState().equals("1") && FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){ tdFileReceives.add(FileReceivelist); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java index 6c7c996..b7bf773 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/filemanager/TdFileReceiveController.java @@ -59,7 +59,7 @@ public class TdFileReceiveController extends BaseController List list = tdFileReceiveService.selectTdFileReceiveList(tdFileReceive); List tdFileReceives = new ArrayList<>(); for (TdFileReceive FileReceivelist : list){ - if (FileReceivelist.getReceiveDepartid().equals(deptService.selectDeptById(getSysUser().getDeptId()).getDeptName())){ + if (FileReceivelist.getReceiveDepartid().equals(getSysUser().getDept().getDeptName())){ tdFileReceives.add(FileReceivelist); } } diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html index 8ddb7e6..5332931 100644 --- a/ruoyi-admin/src/main/resources/templates/index-topnav.html +++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html @@ -246,7 +246,7 @@
    -
  • 文档
    • +
  • 锁屏
  • 全屏
    • diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html index 08e454b..f6a054a 100644 --- a/ruoyi-admin/src/main/resources/templates/index.html +++ b/ruoyi-admin/src/main/resources/templates/index.html @@ -72,7 +72,7 @@
  • - 实例演示 +
    • 表单
        @@ -193,7 +193,7 @@
          -
        • 文档
          • +
        • 锁屏
        • 全屏
        • diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html index 32a004f..a7331b3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/detail.html @@ -21,9 +21,9 @@
          - +
          -
          - +
          -