From 8ce78efe9885bc2ad7351e3dec8805a8b6dadf42 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Wed, 19 Jun 2024 09:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=E7=9A=84=E9=BB=98=E8=AE=A4=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/dept/add.html |  4 ++--
 .../resources/templates/system/filedestory/edit.html  |  1 +
 .../resources/templates/system/fileprovide/add.html   |  2 ++
 .../resources/templates/system/indenture/add.html     |  1 +
 .../templates/system/leave/leaveexamine.html          |  8 ++++----
 .../templates/system/network/netinfo/add.html         |  4 +++-
 .../templates/system/network/network/add.html         |  1 +
 .../resources/templates/system/property/data/add.html |  1 +
 .../main/resources/templates/system/question/add.html | 11 ++++++-----
 .../main/resources/templates/system/train/add.html    |  2 ++
 .../src/main/resources/templates/system/user/add.html |  6 +++++-
 .../main/resources/templates/system/user/edit.html    | 10 +++++-----
 12 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/dept/add.html b/ruoyi-admin/src/main/resources/templates/system/dept/add.html
index be1933c..a03753a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/dept/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/dept/add.html
@@ -69,10 +69,10 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="col-sm-3 control-label">部门状态：</label>
+				<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_normal_disable')}">
-						<input type="radio" th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}" th:checked="${dict.default}">
+						<input type="radio" required th:id="${dict.dictCode}" name="status" th:value="${dict.dictValue}">
 						<label th:for="${dict.dictCode}" th:text="${dict.dictLabel}"></label>
 					</div>
 				</div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
index fa40fd0..598acb7 100644
--- a/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/filedestory/edit.html
@@ -55,6 +55,7 @@
             <label class="col-sm-3 control-label is-required">销毁方式：</label>
             <div class="col-sm-8">
                 <select name="destoryStyle" required class="form-control m-b" th:with="type=${@dict.getType('sys_destory_style')}">
+                    <option value="">请选择</option>
                     <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{destoryStyle}"></option>
                 </select>
             </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
index e2b515e..3c2616c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/add.html
@@ -86,6 +86,7 @@
                         <label class="col-sm-4 control-label is-required">紧急程度：</label>
                         <div class="col-sm-8">
                             <select name="instancyExtent" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_jinjichengdu')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -116,6 +117,7 @@
                         <label class="col-sm-4 control-label is-required">文件密级：</label>
                         <div class="col-sm-8">
                             <select name="fileSecret" required class="form-control m-b" th:with="type=${@dict.getType('sys_file_miji')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
index 9ebefb9..0383f98 100644
--- a/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/indenture/add.html
@@ -75,6 +75,7 @@
                         <label class="col-sm-4 control-label">维修商状态：</label>
                         <div class="col-sm-8">
                             <select name="indentureState" class="form-control" th:with="type=${@dict.getType('sys_normal_disable')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
index 907a469..f81baa4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveexamine.html
@@ -26,7 +26,7 @@
                     <div class="col-sm-8">
                         <select name="leavestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_leave')}">
                             <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{leavestate}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -47,7 +47,7 @@
                     <div class="col-sm-8">
                         <select name="workstate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_user_work')}">
                             <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{workstate}"></option>
+                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -60,7 +60,7 @@
                     <div class="col-sm-8">
                         <select name="examinestate" required class="form-control m-b"  th:with="type=${@dict.getType('sys_examine_state')}">
                             <option value="">所有</option>
-                            <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}" th:field="*{examinestate}"></option>
+                            <option th:each="dict : ${type}" th:if="${dict.dictValue != '2'}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
                 </div>
@@ -129,4 +129,4 @@
     });
 </script>
 </body>
-</html>
\ No newline at end of file
+</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 3c79343..f3038bf 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
@@ -12,7 +12,8 @@
                     <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')}">
+                            <select name="netName" required class="form-control" th:with="type=${@dict.getType('sys_net_type')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -77,6 +78,7 @@
                         <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 value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
index 4c1d082..6aa4956 100644
--- a/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/network/network/add.html
@@ -60,6 +60,7 @@
                 <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 value="">请选择</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/property/data/add.html b/ruoyi-admin/src/main/resources/templates/system/property/data/add.html
index 32a21cf..fdd9d7a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/property/data/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/property/data/add.html
@@ -80,6 +80,7 @@
                     <label class="col-sm-3 control-label is-required ">是否安装防护软件：</label>
                     <div class="col-sm-8">
                         <select name="isSoftware" required class="form-control m-b" th:with="type=${@dict.getType('sys_yes_no')}">
+                            <option value="">请选择</option>
                             <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                         </select>
                     </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/question/add.html b/ruoyi-admin/src/main/resources/templates/system/question/add.html
index 7f0b0cb..2d3075d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/question/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/question/add.html
@@ -10,12 +10,13 @@
             <div class="form-group">
                 <label class="col-sm-3 control-label is-required">题库类型：</label>
                 <div class="col-sm-8">
-                    <select name="TYPEID" class="form-control m-b" th:with="type=${@dict.getType('td_question_type')}">
+                    <select name="TYPEID" class="form-control m-b" required th:with="type=${@dict.getType('td_question_type')}">
+                        <option value="">请选择</option>
                         <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                     </select>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label is-required">问题描述：</label>
                 <div class="col-sm-8">
                     <input name="qSubject" required class="form-control" type="text">
@@ -51,13 +52,13 @@
                     <input name="NOTE" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">创建人：</label>
                 <div class="col-sm-8">
                     <input name="CREATEPERSON" class="form-control"  readonly th:value="${sysuser.userName}" type="text">
                 </div>
             </div>
-            <div class="form-group">    
+            <div class="form-group">
                 <label class="col-sm-3 control-label">创建时间：</label>
                 <div class="col-sm-8">
                     <div class="input-group date">
@@ -89,4 +90,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/add.html b/ruoyi-admin/src/main/resources/templates/system/train/add.html
index 8d93843..7a0ecf8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -67,6 +67,7 @@
                         <label class="col-sm-4 control-label is-required">培训类型：</label>
                         <div class="col-sm-8">
                             <select name="trainType" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_typer')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -80,6 +81,7 @@
                         <label class="col-sm-4 control-label is-required">培训对象：</label>
                         <div class="col-sm-8">
                             <select name="trainSubject" required class="form-control m-b" th:with="type=${@dict.getType('sys_usertrain_obj')}">
+                                <option value="">请选择</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html
index 1a372c9..aa14f8c 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -84,6 +84,7 @@
                         <label class="col-sm-4 control-label is-required">用户性别：</label>
                         <div class="col-sm-8">
                             <select name="sex" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_sex')}">
+                                <option value="">请选择用户性别</option>
 				                <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
 				            </select>
                         </div>
@@ -115,7 +116,7 @@
                         <label class="col-sm-4 control-label is-required">角色：</label>
                         <div class="col-sm-8">
                             <label th:each="role:${roles}"  class="check-box">
-                                <input name="role"  type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}" >
+                                <input name="role" type="checkbox" th:value="${role.roleId}" th:text="${role.roleName}" th:disabled="${role.status == '1'}" >
                             </label>
                         </div>
                     </div>
@@ -135,6 +136,7 @@
                         <label class="col-sm-4 control-label is-required">民族：</label>
                         <div class="col-sm-8">
                             <select name="nation" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_nation')}">
+                                <option value="">请选择民族</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -158,6 +160,7 @@
                         <label class="col-sm-4 control-label">政治面貌：</label>
                         <div class="col-sm-8">
                             <select name="politics" class="form-control m-b" th:with="type=${@dict.getType('sys_user_politics')}">
+                                <option value="">请选择政治面貌</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
@@ -170,6 +173,7 @@
                         <label class="col-sm-4 control-label is-required">涉密程度：</label>
                         <div class="col-sm-8">
                             <select name="shemichengdu" required class="form-control m-b" th:with="type=${@dict.getType('sys_user_shemi')}">
+                                <option value="">请选择涉密程度</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                             </select>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
index 69eea32..7764bb4 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -104,7 +104,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">健康状况：</label>
                         <div class="col-sm-8">
-                            <input name="helthy" required class="form-control"  th:field="*{helthy}" type="text">
+                            <input name="helthy" class="form-control"  th:field="*{helthy}" type="text">
                         </div>
                     </div>
                 </div>
@@ -196,7 +196,7 @@
     <th:block th:include="include :: datetimepicker-js" />
 	<script type="text/javascript">
         var prefix = ctx + "system/user";
-        
+
         $("#form-user-edit").validate({
         	onkeyup: false,
         	rules:{
@@ -243,7 +243,7 @@
             },
             focusCleanup: true
         });
-        
+
         function submitHandler() {
 	        if ($.validate.form()) {
 	        	var data = $("#form-user-edit").serializeArray();
@@ -269,7 +269,7 @@
 			};
 			$.modal.openOptions(options);
 		}
-		
+
 		function doSubmit(index, layero){
 			var body = $.modal.getChildFrame(index);
    			$("#treeId").val(body.find('#treeId').val());
@@ -290,4 +290,4 @@
         })
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>