From 20b2f0847b17b899515b5aa6c05166080e3d63c1 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Mon, 17 Jun 2024 14:20:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=89=E5=AF=86=E7=BD=91=E7=BB=9C=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E3=80=90=E7=BD=91=E7=BB=9C=E8=AE=BE=E5=A4=87=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E6=B7=BB=E5=8A=A0=E3=80=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=E5=B8=83=E5=B1=80=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/network/netinfo/add.html | 161 ++++++++++-------
 .../system/network/netinfo/detail.html        |  10 -
 .../system/network/netinfo/edit.html          | 171 +++++++++++-------
 3 files changed, 205 insertions(+), 137 deletions(-)
 delete mode 100644 ruoyi-admin/src/main/resources/templates/system/network/netinfo/detail.html

diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html
index be217b7..3c79343 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/add.html
@@ -7,86 +7,123 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-netinfo-add">
             <input name="netId" class="form-control" th:value="${netId}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备种类：</label>
-                <div class="col-sm-8">
-                    <select name="netName" class="form-control m-b" th:with="type=${@dict.getType('sys_net_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">设备种类：</label>
+                        <div class="col-sm-8">
+                            <select name="netName" class="form-control" th:with="type=${@dict.getType('sys_net_type')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">网络设备品牌：</label>
-                <div class="col-sm-8">
-                    <input name="netBrand" required class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">IP地址：</label>
+                        <div class="col-sm-8">
+                            <input name="netIp" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">IP地址：</label>
-                <div class="col-sm-8">
-                    <input name="netIp" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">设备型号：</label>
+                        <div class="col-sm-8">
+                            <input name="netNo" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">设备型号：</label>
-                <div class="col-sm-8">
-                    <input name="netNo" required class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">序列号：</label>
+                        <div class="col-sm-8">
+                            <input name="netSn" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">序列号：</label>
-                <div class="col-sm-8">
-                    <input name="netSn" required class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">登记人员：</label>
+                        <div class="col-sm-8">
+                            <input name="netname" class="form-control" readonly th:value="${sysuser.userName}" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">登记人员：</label>
-                <div class="col-sm-8">
-                    <input name="netname" class="form-control" readonly th:value="${sysuser.userName}" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">责任人：</label>
+                        <div class="col-sm-8">
+                            <input name="netManager" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">责任人：</label>
-                <div class="col-sm-8">
-                    <input name="netManager" required class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">单位名称：</label>
+                        <div class="col-sm-8">
+                            <input name="depart" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="depart" required class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">密级：</label>
+                        <div class="col-sm-8">
+                            <select name="netMiji"  required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">密级：</label>
-                <div class="col-sm-8">
-                    <select name="netMiji"  required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
-                    </select>
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">网络设备品牌：</label>
+                        <div class="col-sm-8">
+                            <input name="netBrand" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">涉密网络名称：</label>
-                <div class="col-sm-8">
-                    <input name="netsmname" required class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">涉密网络名称：</label>
+                        <div class="col-sm-8">
+                            <input name="netsmname" required class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否属于要害部门部位：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
-                        <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label is-required">是否属于要害部门部位：</label>
+                        <div class="col-sm-10">
+                            <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                                <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:checked="${dict.default}">
+                                <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark" class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
+                </div>
             </div>
-        </div>
         </form>
     </div>
     <th:block th:include="include :: footer" />
@@ -103,4 +140,4 @@
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/detail.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/detail.html
deleted file mode 100644
index 566549b..0000000
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/detail.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html
index 6837276..78a8f4a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/netinfo/edit.html
@@ -7,89 +7,130 @@
     <div class="wrapper wrapper-content animated fadeInRight ibox-content">
         <form class="form-horizontal m" id="form-netinfo-edit" th:object="${tdPropertyNetinfo}">
             <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">
-                <label class="col-sm-3 control-label">设备编号：</label>
-                <div class="col-sm-8">
-                    <input name="id" disabled th:field="*{id}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">设备编号：</label>
+                        <div class="col-sm-8">
+                            <input name="id" disabled th:field="*{id}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">网络编号：</label>
-                <div class="col-sm-8">
-                    <input name="netId" disabled th:field="*{netId}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">网络编号：</label>
+                        <div class="col-sm-8">
+                            <input name="netId" disabled th:field="*{netId}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">设备种类：</label>
-                <div class="col-sm-8">
-                    <select name="netName" required class="form-control m-b" th:with="type=${@dict.getType('sys_net_type')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netName}"></option>
-                    </select>
+
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">设备种类：</label>
+                        <div class="col-sm-8">
+                            <select name="netName" required class="form-control" th:with="type=${@dict.getType('sys_net_type')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netName}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">网络设备品牌：</label>
-                <div class="col-sm-8">
-                    <input name="netBrand" required th:field="*{netBrand}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">网络设备品牌：</label>
+                        <div class="col-sm-8">
+                            <input name="netBrand" required th:field="*{netBrand}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">IP地址：</label>
-                <div class="col-sm-8">
-                    <input name="netIp" th:field="*{netIp}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label">IP地址：</label>
+                        <div class="col-sm-8">
+                            <input name="netIp" th:field="*{netIp}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">设备型号：</label>
-                <div class="col-sm-8">
-                    <input name="netNo" required th:field="*{netNo}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">设备型号：</label>
+                        <div class="col-sm-8">
+                            <input name="netNo" required th:field="*{netNo}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">序列号：</label>
-                <div class="col-sm-8">
-                    <input name="netSn" required th:field="*{netSn}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">序列号：</label>
+                        <div class="col-sm-8">
+                            <input name="netSn" required th:field="*{netSn}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">责任人：</label>
-                <div class="col-sm-8">
-                    <input name="netManager" required th:field="*{netManager}" class="form-control" type="text">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">责任人：</label>
+                        <div class="col-sm-8">
+                            <input name="netManager" required th:field="*{netManager}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label is-required">单位名称：</label>
-                <div class="col-sm-8">
-                    <input name="depart" required th:field="*{depart}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">单位名称：</label>
+                        <div class="col-sm-8">
+                            <input name="depart" required th:field="*{depart}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">密级：</label>
-                <div class="col-sm-8">
-                    <select name="netMiji" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
-                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netMiji}"></option>
-                    </select>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">密级：</label>
+                        <div class="col-sm-8">
+                            <select name="netMiji" required class="form-control" th:with="type=${@dict.getType('sys_file_miji')}">
+                                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{netMiji}"></option>
+                            </select>
+                        </div>
+                    </div>
                 </div>
             </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">涉密网络名称：</label>
-                <div class="col-sm-8">
-                    <input name="netsmname" required th:field="*{netsmname}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">涉密网络名称：</label>
+                        <div class="col-sm-8">
+                            <input name="netsmname" required th:field="*{netsmname}" class="form-control" type="text">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">是否属于要害部门部位：</label>
-                <div class="col-sm-8">
-                    <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
-                        <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:field="*{isCurcial}">
-                        <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                <div class="col-sm-6">
+                    <div class="form-group">
+                        <label class="col-sm-4 control-label is-required">是否属于要害部门部位：</label>
+                        <div class="col-sm-8">
+                            <div class="radio-box" th:each="dict : ${@dict.getType('sys_yes_no')}">
+                                <input type="radio" required th:id="${'isCurcial_' + dict.dictCode}" name="isCurcial" th:value="${dict.dictValue}" th:field="*{isCurcial}">
+                                <label th:for="${'isCurcial_' + dict.dictCode}" th:text="${dict.dictLabel}"></label>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>
-            <div class="form-group">
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+            <div class="row">
+                <div class="col-sm-12">
+                    <div class="form-group">
+                        <label class="col-sm-2 control-label">备注：</label>
+                        <div class="col-sm-10">
+                            <textarea name="remark" th:field="*{remark}" class="form-control" type="text"></textarea>
+                        </div>
+                    </div>
                 </div>
             </div>
         </form>
@@ -108,4 +149,4 @@
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>