diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java index 028e671a..5b11019e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/property/TdPropertyChangeListController.java @@ -62,4 +62,14 @@ public class TdPropertyChangeListController extends BaseController { mmap.put("useId",useId); return "system/property/propertychange/changeproperty"; } + /** + * 添加密品条目 + */ + @RequiresPermissions("system:change:detail") + @GetMapping("/ementChDetail/{useId}") + public String ementChDetail(@PathVariable("useId") String useId, ModelMap mmap) + { + mmap.put("useId",useId); + return "system/property/ementChange/ementChange"; + } } diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html new file mode 100644 index 00000000..a3272acc --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/destory.html @@ -0,0 +1,49 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html new file mode 100644 index 00000000..6082d8f2 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementChange.html @@ -0,0 +1,135 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html new file mode 100644 index 00000000..9988afe7 --- /dev/null +++ b/ruoyi-admin/src/main/resources/templates/system/property/ementChange/ementEdit.html @@ -0,0 +1,79 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ + +
+
+
+
+ +
+ +
+
+
+
+ + + + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html index 9b0d47d3..f8a47069 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertychange/list/property.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertychange/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 + '/ementChDetail/' + row.useId; + $.modal.openTab("涉密设备登记列表", url); + } }