From 9097f4962f945ec85f7da1f8477f1e6ff442335f Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Tue, 20 Aug 2024 15:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E5=AF=86=E5=93=81=E9=94=80?= =?UTF-8?q?=E6=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TdPropertyDestoryListController.java | 10 ++ .../property/ementDestory/ementDestory.html | 76 +++++++++++- .../property/ementDestory/ementList.html | 114 +++++++++++++++++- .../propertydestory/list/property.html | 17 ++- 4 files changed, 202 insertions(+), 15 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java index c7e8952..163f46f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyDestoryListController.java @@ -62,4 +62,14 @@ public class TdPropertyDestoryListController extends BaseController { mmap.put("useId",useId); return "system/property/propertydestory/destoryproperty"; } + /** + * 密品条目 + */ + @RequiresPermissions("system:destory:detail") + @GetMapping("/destoryDetail/{useId}") + public String destoryDetail(@PathVariable("useId") String useId, ModelMap mmap) + { + mmap.put("useId",useId); + return "system/property/ementDestory/ementList"; + } } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html index 566549b..a22721c 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementDestory.html @@ -1,10 +1,76 @@ - + - - Title + + - + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html index 566549b..25b8fab 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementDestory/ementList.html @@ -1,10 +1,114 @@ - + - - Title + - + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+ + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html index a149c5f..216ba5a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertydestory/list/property.html @@ -113,7 +113,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('密品销毁 '); + var rowData = encodeURIComponent(JSON.stringify(row)); + actions.push('密品销毁 '); return actions.join(''); } }] @@ -162,10 +163,16 @@ } } }) - /*密品列表-详细*/ - function detail(useId) { - var url = prefix + '/detail/' + useId; - $.modal.openTab("密品列表数据", url); + function detail(element) { + var rowData = $(element).data('row'); + var row = JSON.parse(decodeURIComponent(rowData)); + if (row.secretsType == '1'){ + var url = prefix + '/detail/' + row.useId; + $.modal.openTab("涉密信息设备销毁列表", url); + }else{ + var url = prefix + '/destoryDetail/' + row.useId; + $.modal.openTab("涉密设备销毁列表", url); + } }