From b71cec05fbfdc4f32683f65555cdce0b19251ec9 Mon Sep 17 00:00:00 2001 From: dsh <15569653818@163.com> Date: Mon, 15 Apr 2024 11:00:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E4=BA=BA=E5=91=98=E5=9F=B9?= =?UTF-8?q?=E8=AE=AD=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5=EF=BC=8C=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/TdTrainController.java | 14 +- .../templates/system/train/detail.html | 130 ++++++++++++++++-- .../templates/system/train/examine.html | 73 +++++----- .../templates/system/train/train.html | 6 +- 4 files changed, 164 insertions(+), 59 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java index cc13ad0..2cc85fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TdTrainController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.system; import java.util.List; + +import com.ruoyi.common.core.domain.entity.SysUser; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -129,11 +131,13 @@ public class TdTrainController extends BaseController /** * 培训记录详情 */ - @RequiresPermissions("monitor:train:detail") - @GetMapping("/detail/{operId}") - public String detail(@PathVariable("id") Long operId, ModelMap mmap) + @RequiresPermissions("system:train:detail") + @GetMapping("/detail/{ID}") + public String detail(@PathVariable("ID") Long ID, ModelMap mmap) { - mmap.put("train", tdTrainService.selectTdTrainByID(operId)); + mmap.put("tdTrain", tdTrainService.selectTdTrainByID(ID)); + SysUser user = getSysUser(); + mmap.put("user", user); return prefix + "/detail"; } @@ -145,7 +149,9 @@ public class TdTrainController extends BaseController public String examine(@PathVariable("ID") Long ID, ModelMap mmap) { TdTrain tdTrain = tdTrainService.selectTdTrainByID(ID); + SysUser user = getSysUser(); mmap.put("tdTrain", tdTrain); + mmap.put("user", user); return prefix + "/examine"; } diff --git a/ruoyi-admin/src/main/resources/templates/system/train/detail.html b/ruoyi-admin/src/main/resources/templates/system/train/detail.html index c32885d..8abd419 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/detail.html @@ -7,10 +7,94 @@
-
+ +
- -
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
@@ -19,19 +103,35 @@ diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html index 3c27f0c..8cfe53f 100644 --- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html +++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html @@ -2,63 +2,64 @@ +
-
- + +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -66,69 +67,63 @@
- +
- +
- +
- + +
- -
-
-
- -
-
- - -
-
-
-
- -
- +
- +
- + + \ No newline at end of file