luoluo
/
ry_zhky
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/new-exam' into new-exam

Browse Source
pg_adapter
wangxy 8 months ago
parent 64f5c6c27a 1b5d51fe3d
commit 53c730bb16
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
ruoyi-admin/src/main/resources/templates/system/check/check.html
Unescape View File

@ -148,7 +148,7 @@
var actions = []; 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 ' + 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 ' + 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>'); 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(''); return actions.join('');
} }

2
ruoyi-admin/src/main/resources/templates/system/checkresult/checkresultprint.html
Unescape View File

@ -1530,7 +1530,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

2
ruoyi-admin/src/main/resources/templates/system/fileprovide/filenum/print.html
Unescape View File

@ -759,7 +759,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

4
ruoyi-admin/src/main/resources/templates/system/leave/leaveprint.html
Unescape View File

@ -605,7 +605,7 @@
</head> </head>
<body link=blue vlink=purple > <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;'> collapse;table-layout:fixed;width:499pt;margin: 0 auto;'>
<col width=111 span=6 style='mso-width-source:userset;width:83.25pt'> <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'> <tr height=38 style='mso-height-source:userset;height:28.5pt' id='r0'>
@ -652,7 +652,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

2
ruoyi-admin/src/main/resources/templates/system/network/networknum/print.html
Unescape View File

@ -1678,7 +1678,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

2
ruoyi-admin/src/main/resources/templates/system/property/propertynum/print.html
Unescape View File

@ -775,7 +775,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

6
ruoyi-admin/src/main/resources/templates/system/user/add.html
Unescape View File

@ -103,7 +103,7 @@
<div class="form-group"> <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"> <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> </div>
</div> </div>
@ -209,7 +209,7 @@
<div class="form-group"> <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"> <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> </div>
</div> </div>
@ -253,7 +253,7 @@
<div class="form-group"> <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"> <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> </div>
</div> </div>

4
ruoyi-admin/src/main/resources/templates/system/user/edit.html
Unescape View File

@ -90,7 +90,7 @@
<div class="form-group"> <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"> <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> </div>
</div> </div>
@ -204,7 +204,7 @@
<div class="form-group"> <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"> <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> </div>
</div> </div>

2
ruoyi-admin/src/main/resources/templates/system/user/userexamine/examineprint.html
Unescape View File

@ -1105,7 +1105,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

2
ruoyi-admin/src/main/resources/templates/system/usernum/print.html
Unescape View File

@ -1821,7 +1821,7 @@
</tr> </tr>
<tr> <tr>
<!-- 打印网页时通过hidden-print隐藏元素 --> <!-- 打印网页时通过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> <button class="btn btn-primary" onclick="printPage()"><i class="fa fa-print"></i> 打印</button>
</div> </div>
</tr> </tr>

Write Preview
Loading…
Cancel
Save