From 20d36a12850a594b17ad40baf3718230f4547890 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Fri, 17 May 2024 09:39:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/count/SysNetworknumController.java | 4 +- .../system/network/networknum/networknum.html | 122 +- .../system/network/networknum/print.html | 1705 ++++++++++++++++- .../system/property/propertynum/print.html | 6 +- 4 files changed, 1821 insertions(+), 16 deletions(-) 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 4688c9d..557c48c 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 @@ -49,14 +49,14 @@ public class SysNetworknumController extends BaseController { * 打印界面 */ @RequiresPermissions("system:propertynum:print") - @GetMapping("/print/{useId}") + @GetMapping("/print/{netId}") public String print(@PathVariable("netId") String netId, ModelMap mmap) { List tdPropertyNetinfos = tdPropertyNetinfoService.selectTdPropertyNetinfoByNetId(netId); TdPropertyNet tdPropertyNet = tdPropertyNetService.selectTdPropertyNetByNetId(netId); mmap.put("tdPropertyNetinfos", tdPropertyNetinfos); mmap.put("tdPropertyNet", tdPropertyNet); - mmap.put("sysuser", getSysUser().getDeptId()); + mmap.put("sysuser", getSysUser()); return prefix + "/print"; } diff --git a/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html b/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html index 566549b..aeae0fd 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/networknum/networknum.html @@ -1,10 +1,122 @@ - + - - Title + - + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ +
+
+
+
+
+ + - \ No newline at end of file + diff --git a/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html b/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html index 566549b..1cbbaa9 100644 --- a/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html @@ -1,10 +1,1703 @@ - - + + + + - - Title + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + +
[[${sysuser.dept.deptName}]]涉密网络信息表
单位：[[${sysuser.dept.deptName}]]
所属地市[[${tdPropertyNet.framework}]]所属区县[[${tdPropertyNet.area}]]使用单位[[${tdPropertyNet.netDepart}]]
使用人员[[${tdPropertyNet.netUser}]]使用时间[[${tdPropertyNet.netDate}]]登记编号[[${tdPropertyNet.netId}]]
涉密网络设备数量[[${tdPropertyNet.terminalNum}]]
网络编号涉密网络名称品牌型号Ip地址资产SN码备注信息
[[${propertynum.netId}]][[${propertynum.netsmname}]][[${propertynum.netBrand}]][[${propertynum.netNo}]][[${propertynum.netIp}]][[${propertynum.netSn}]][[${propertynum.remark}]]
+ + - \ No newline at end of file + + diff --git a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html index a18ada5..e7d0387 100644 --- a/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html +++ b/ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html @@ -4,7 +4,7 @@ xmlns="http://www.w3.org/TR/REC-html40"> - + @@ -722,7 +722,7 @@ - 甘肃省国家保密局资产统计信息表 + [[${sysuser.dept.deptName}]]资产统计信息表 单位：[[${sysuser.dept.deptName}]] @@ -752,7 +752,7 @@ 接收时间 [[${tdPropertyManager.useDate}]] 登记编号 - [[${tdPropertyInfos[0].useId}]] + [[${tdPropertyInfos[0].useId}]] 资产总数 [[${tdPropertyManager.propertyNum}]]