From 5bb2dfa53cc52351096a44b0bc87569421ac033c Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 20 Jun 2024 09:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D=E7=A7=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/system/train/add.html | 36 ++++---------------
 .../templates/system/train/detail.html        |  2 +-
 .../templates/system/train/edit.html          |  6 ++--
 .../templates/system/train/examine.html       |  2 +-
 .../templates/system/train/train.html         |  2 +-
 .../resources/templates/system/user/add.html  |  2 +-
 .../templates/system/user/authRole.html       | 14 ++++----
 .../resources/templates/system/user/edit.html |  2 +-
 .../resources/templates/system/user/user.html | 30 ++++++++--------
 .../user/userexamine/examinedetail.html       |  6 ++--
 10 files changed, 40 insertions(+), 62 deletions(-)

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 6a180a8..beb038d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/add.html
@@ -38,7 +38,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">涉密人员名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员姓名：</label>
                         <div class="col-sm-8">
                             <select id="User" name="USERNAME" required class="form-control m-b">
                                 <option value="">---请选择---</option>
@@ -94,9 +94,9 @@
                 </div>
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">培训地点：</label>
+                        <label class="col-sm-4 control-label">培训人员：</label>
                         <div class="col-sm-8">
-                            <textarea name="trainAddress" placeholder="请输入培训地点" required class="form-control"></textarea>
+                            <input name="trainName" placeholder="请输入培训人员" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
@@ -115,34 +115,12 @@
                     </div>
                 </div>
             </div>
-
-            <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="createStaffid" placeholder="请输入填报人" class="form-control" type="text" >
-                        </div>
-                    </div>
-                </div>
-                <div class="col-sm-6">
-                    <div class="form-group">
-                        <label class="col-sm-4 control-label">填报日期：</label>
-                        <div class="col-sm-8">
-                            <div class="input-group date">
-                                <input name="createDate" class="form-control" placeholder="yyyy-MM-dd" type="text">
-                                <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
             <div class="row">
-                <div class="col-sm-6">
+                <div class="col-sm-12">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label">培训人员：</label>
-                        <div class="col-sm-8">
-                            <input name="trainName" placeholder="请输入培训人员" class="form-control" type="text">
+                        <label class="col-sm-2 control-label is-required">培训地点：</label>
+                        <div class="col-sm-10">
+                            <textarea name="trainAddress" placeholder="请输入培训地点" required class="form-control m-t"></textarea>
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/detail.html b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
index 08b1535..d5dba37 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/detail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/detail.html
@@ -41,7 +41,7 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">涉密人名称：</label>
+                    <label class="col-sm-4 control-label">人员姓名：</label>
                     <div class="col-sm-8">
                         <select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b">
                             <option value="">---请选择---</option>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/edit.html b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
index 7dd0d0f..4aa002a 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/edit.html
@@ -39,7 +39,7 @@
             <div class="row">
                 <div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">涉密人名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员姓名：</label>
                         <div class="col-sm-8">
                             <select id="User" name="USERNAME" required v-model="userName" class="form-control m-b">
                                 <option value="">---请选择---</option>
@@ -88,7 +88,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">培训人员：</label>
                         <div class="col-sm-8">
-                            <input name="trainName" required th:field="*{trainName}" class="form-control" type="text">
+                            <input name="trainName" required th:field="*{trainName}" class="form-control m-b" type="text">
                         </div>
                     </div>
                 </div>
@@ -115,7 +115,7 @@
                     <div class="form-group">
                         <label class="col-sm-2 control-label is-required">培训地点：</label>
                         <div class="col-sm-10">
-                            <textarea name="trainAddress" required class="form-control">[[*{trainAddress}]]</textarea>
+                            <textarea name="trainAddress" required class="form-control m-t">[[*{trainAddress}]]</textarea>
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/examine.html b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
index fb72f01..38c7fa3 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/examine.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/examine.html
@@ -40,7 +40,7 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label">人员名称：</label>
+                    <label class="col-sm-4 control-label">人员姓名：</label>
                     <div class="col-sm-8">
                         <select id="User" name="USERNAME" disabled required v-model="userName" class="form-control m-b">
                             <option value="">---请选择---</option>
diff --git a/ruoyi-admin/src/main/resources/templates/system/train/train.html b/ruoyi-admin/src/main/resources/templates/system/train/train.html
index f678c64..9cacba8 100644
--- a/ruoyi-admin/src/main/resources/templates/system/train/train.html
+++ b/ruoyi-admin/src/main/resources/templates/system/train/train.html
@@ -130,7 +130,7 @@
                 },
                 {
                     field: 'username',
-                    title: '涉密人名称',
+                    title: '人员姓名',
                     formatter:function (value, row, index) {
                         return getUser(userList,value)
                     }
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 86cc5f6..46ecdf9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -13,7 +13,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员姓名：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" required>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/authRole.html b/ruoyi-admin/src/main/resources/templates/system/user/authRole.html
index a2a131d..1cc11fd 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/authRole.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/authRole.html
@@ -11,7 +11,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员名称：</label>
                         <div class="col-sm-8">
                             <input name="userName" class="form-control" type="text" disabled th:value="${user.userName}">
                         </div>
@@ -24,9 +24,9 @@
                             <input name="loginName" class="form-control" type="text" disabled th:value="${user.loginName}">
                         </div>
                     </div>
-                </div> 
+                </div>
             </div>
-           
+
             <h4 class="form-header h4">分配角色</h4>
             <div class="row">
                 <div class="col-sm-12">
@@ -37,7 +37,7 @@
             </div>
         </form>
     </div>
-      
+
     <div class="row">
         <div class="col-sm-offset-5 col-sm-10">
             <button type="button" class="btn btn-sm btn-primary" onclick="submitHandler()"><i class="fa fa-check"></i>保 存</button>&nbsp;
@@ -48,7 +48,7 @@
 	<script th:inline="javascript">
 	    var prefix = ctx + "system/user/authRole";
 	    var roles = [[${roles}]]
-	    
+
 	    $(function() {
 		    var options = {
 		        data: roles,
@@ -97,7 +97,7 @@
 		    };
 		    $.table.init(options);
 		});
-	    
+
 	    /* 添加角色-提交 */
         function submitHandler(index, layero){
             var roleIds = [];
@@ -111,4 +111,4 @@
         }
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>
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 32a3da8..12dbbaf 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -14,7 +14,7 @@
             <div class="row">
             	<div class="col-sm-6">
                     <div class="form-group">
-                        <label class="col-sm-4 control-label is-required">用户名称：</label>
+                        <label class="col-sm-4 control-label is-required">人员姓名：</label>
                         <div class="col-sm-8">
                             <input name="userName" placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
                         </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/user.html b/ruoyi-admin/src/main/resources/templates/system/user/user.html
index 68f70d2..80b0fa0 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/user.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/user.html
@@ -24,7 +24,7 @@
 			</div>
 		</div>
 	</div>
-	
+
 	<div class="ui-layout-center">
 		<div class="container-div">
 			<div class="row">
@@ -60,7 +60,7 @@
 						</div>
 					</form>
 				</div>
-				
+
 		        <div class="btn-group-sm" id="toolbar" role="group">
 		        	<a class="btn btn-success" onclick="$.operate.addTab()" shiro:hasPermission="system:user:add">
 		                <i class="fa fa-plus"></i> 新增
@@ -78,14 +78,14 @@
 			            <i class="fa fa-download"></i> 导出
 			        </a>
 		        </div>
-		        
+
 		        <div class="col-sm-12 select-table table-striped">
 				    <table id="bootstrap-table"></table>
 				</div>
 			</div>
 		</div>
 	</div>
-	
+
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: layout-latest-js" />
 	<th:block th:include="include :: ztree-js" />
@@ -140,7 +140,7 @@
 		        },
 		        {
 		            field: 'userName',
-		            title: '用户名称'
+		            title: '人员姓名'
 		        },
 		        {
 		            field: 'dept.deptName',
@@ -197,7 +197,7 @@
 		    };
 		    $.table.init(options);
 		}
-		
+
 		function queryDeptTree()
 		{
 			var url = ctx + "system/user/deptTreeData";
@@ -207,30 +207,30 @@
 		        onClick : zOnClick
 		    };
 			$.tree.init(options);
-			
+
 			function zOnClick(event, treeId, treeNode) {
 				$("#deptId").val(treeNode.id);
 				$("#parentId").val(treeNode.pId);
 				$.table.search();
 			}
 		}
-		
+
 		$('#btnExpand').click(function() {
 			$._tree.expandAll(true);
 		    $(this).hide();
 		    $('#btnCollapse').show();
 		});
-		
+
 		$('#btnCollapse').click(function() {
 			$._tree.expandAll(false);
 		    $(this).hide();
 		    $('#btnExpand').show();
 		});
-		
+
 		$('#btnRefresh').click(function() {
 			queryDeptTree();
 		});
-		
+
 		/* 自定义重置-表单重置/隐藏框/树节点选择色/搜索 */
 		function resetPre() {
 			resetDate();
@@ -252,13 +252,13 @@
 		    var url = prefix + '/resetPwd/' + userId;
 		    $.modal.open("重置密码", url, '800', '300');
 		}
-		
+
 		/* 用户管理-分配角色 */
 		function authRole(userId) {
 		    var url = prefix + '/authRole/' + userId;
 		    $.modal.openTab("用户分配角色", url);
 		}
-		
+
 		/* 用户状态显示 */
 		function statusTools(row) {
 		    if (row.status == 1) {
@@ -267,7 +267,7 @@
     			return '<i class=\"fa fa-toggle-on text-info fa-2x\" onclick="disable(\'' + row.userId + '\')"></i> ';
     		}
 		}
-		
+
 		/* 用户管理-停用 */
 		function disable(userId) {
 			$.modal.confirm("确认要停用用户吗？", function() {
@@ -298,4 +298,4 @@
 	</div>
 </form>
 </script>
-</html>
\ No newline at end of file
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
index fa909d9..26020fe 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examinedetail.html
@@ -29,9 +29,9 @@
         <div class="row">
             <div class="col-sm-6">
                 <div class="form-group">
-                    <label class="col-sm-4 control-label is-required">用户名称：</label>
+                    <label class="col-sm-4 control-label is-required">人员姓名：</label>
                     <div class="col-sm-8">
-                        <input name="userName" disabled placeholder="请输入用户名称" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
+                        <input name="userName" disabled placeholder="请输入人员姓名" class="form-control" type="text" maxlength="30" th:field="*{userName}" required>
                     </div>
                 </div>
             </div>
@@ -344,4 +344,4 @@
     })
 </script>
 </body>
-</html>
\ No newline at end of file
+</html>