diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java index 9c99644..ea5d589 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyManagerController.java @@ -154,4 +154,14 @@ public class TdPropertyManagerController extends BaseController { return "system/property/data/propertyinfo"; } + /** + * 添加密品条目 + */ + @RequiresPermissions("system:property:list") + @GetMapping("/ementDetail/{useId}") + public String ementDetail(@PathVariable("useId") String useId, ModelMap mmap) { + mmap.put("useId", useId); + return "system/property/ementdata/propertyEment"; + } + } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html index 566549b..8654ae1 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/add.html @@ -1,10 +1,47 @@ - + - - Title + + - + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html index 566549b..2446812 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/detail.html @@ -1,10 +1,47 @@ - + - - Title + + - + +
+
+ + +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html index 566549b..7f9bd2d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementdata/propertyEment.html @@ -1,10 +1,123 @@ - + - - Title + - + +
+
+
+
+
+
    +
  • + + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+ + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html index 0220437..46afcde 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/property/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/property/property.html @@ -128,7 +128,8 @@ align: 'center', formatter: function(value, row, index) { var actions = []; - actions.push('密品登记 '); + var rowData = encodeURIComponent(JSON.stringify(row)); + actions.push('密品登记 '); actions.push('编辑 '); actions.push('删除'); return actions.join(''); @@ -180,9 +181,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 + '/ementDetail/' + row.useId; + $.modal.openTab("涉密设备登记列表", url); + } }