From f762c87c25d53a7f7038ebe9a6b313f018ddfc77 Mon Sep 17 00:00:00 2001
From: 20918 <2091823062@qq.com>
Date: Thu, 1 Aug 2024 09:34:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A3=80=E6=9F=A5--=E8=87=AA=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/templates/system/check/check.html        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/check/check.html b/ruoyi-admin/src/main/resources/templates/system/check/check.html
index 302392d..0217773 100644
--- a/ruoyi-admin/src/main/resources/templates/system/check/check.html
+++ b/ruoyi-admin/src/main/resources/templates/system/check/check.html
@@ -148,7 +148,7 @@
                         var actions = [];
                         actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>详情</a> ');
                         actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>检查</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + selfCheckFlag + '" href="javascript:void(0)" onclick="selfcheck(\'' + row.checkId + '\')"><i class="fa fa-edit"></i>自查</a> ');
                         actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.checkId + '\')"><i class="fa fa-remove"></i>删除</a>');
                         return actions.join('');
                     }

From 1b5d51fe3d3cab4ca55b51c1f7009cf3a97b0113 Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Thu, 1 Aug 2024 09:46:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/system/checkresult/checkresultprint.html      | 2 +-
 .../templates/system/fileprovide/filenum/print.html         | 2 +-
 .../main/resources/templates/system/leave/leaveprint.html   | 4 ++--
 .../templates/system/network/networknum/print.html          | 2 +-
 .../templates/system/property/propertynum/print.html        | 2 +-
 .../src/main/resources/templates/system/user/add.html       | 6 +++---
 .../src/main/resources/templates/system/user/edit.html      | 4 ++--
 .../templates/system/user/userexamine/examineprint.html     | 2 +-
 .../src/main/resources/templates/system/usernum/print.html  | 2 +-
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
index cd360e1..f7ade48 100644
--- a/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
+++ b/ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
@@ -1530,7 +1530,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
diff --git a/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html b/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
index 3cf7629..b59a81b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
+++ b/ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
@@ -759,7 +759,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
diff --git a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html
index 40db844..c2804e9 100644
--- a/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html
+++ b/ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html
@@ -605,7 +605,7 @@
 </head>
 <body link=blue vlink=purple >
 
-<table border=0 cellpadding=0 cellspacing=0 width=666 style='border-collapse: 
+<table border=0 cellpadding=0 cellspacing=0 width=666 style='border-collapse:
  collapse;table-layout:fixed;width:499pt;margin: 0 auto;'>
     <col width=111 span=6 style='mso-width-source:userset;width:83.25pt'>
     <tr height=38 style='mso-height-source:userset;height:28.5pt' id='r0'>
@@ -652,7 +652,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
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 54f1404..9200f63 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
@@ -1678,7 +1678,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
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 e5ecc88..fb330b5 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
@@ -775,7 +775,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
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 235440f..c4bbb32 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html
@@ -103,7 +103,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label is-required">籍贯：</label>
                         <div class="col-sm-8">
-                            <input name="userarea" required class="form-control" type="text">
+                            <input name="userarea" required class="form-control" placeholder="请输入籍贯" type="text">
                         </div>
                     </div>
                 </div>
@@ -209,7 +209,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">学历：</label>
                         <div class="col-sm-8">
-                            <input name="graduate" class="form-control" type="text">
+                            <input name="graduate" class="form-control" placeholder="请输入学历" type="text">
                         </div>
                     </div>
                 </div>
@@ -253,7 +253,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">健康状况：</label>
                         <div class="col-sm-8">
-                            <input name="helthy" class="form-control" type="text">
+                            <input name="helthy" class="form-control" placeholder="请输入健康状况" type="text">
                         </div>
                     </div>
                 </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 916d2b6..a59b08b 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html
@@ -90,7 +90,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">健康状况：</label>
                         <div class="col-sm-8">
-                            <input name="helthy" class="form-control"  th:field="*{helthy}" type="text">
+                            <input name="helthy" class="form-control" placeholder="请输入健康状况" th:field="*{helthy}" type="text">
                         </div>
                     </div>
                 </div>
@@ -204,7 +204,7 @@
                     <div class="form-group">
                         <label class="col-sm-4 control-label">学历：</label>
                         <div class="col-sm-8">
-                            <input name="graduate" th:field="*{graduate}" class="form-control" type="text">
+                            <input name="graduate" th:field="*{graduate}" placeholder="请输入学历" class="form-control" type="text">
                         </div>
                     </div>
                 </div>
diff --git a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html
index a240039..96a1cba 100644
--- a/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html
+++ b/ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html
@@ -1105,7 +1105,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>
diff --git a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html
index bf15e29..1d2bb8d 100644
--- a/ruoyi-admin/src/main/resources/templates/system/usernum/print.html
+++ b/ruoyi-admin/src/main/resources/templates/system/usernum/print.html
@@ -1821,7 +1821,7 @@
     </tr>
     <tr>
         <!-- 打印网页时通过hidden-print隐藏元素 -->
-        <div class="text-right hidden-print" style="position: absolute;bottom: 20px;right: 50%;">
+        <div class="text-right hidden-print" style="position: fixed;bottom: 20px;right: 50%;">
             <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
         </div>
     </tr>