From cb81eef3d9aabe280e506fc7971c539542cf13f7 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 19 Aug 2021 15:12:01 +0800
Subject: [PATCH] 冲突
---
public/papersApply.html | 142 ++++++++++++++++++++++++++--------------------
1 files changed, 80 insertions(+), 62 deletions(-)
diff --git a/public/papersApply.html b/public/papersApply.html
index 1e7229d..9607aa9 100644
--- a/public/papersApply.html
+++ b/public/papersApply.html
@@ -13,6 +13,25 @@
flex-direction: column;
}
+ .excelPrint {
+ width: 100%;
+ text-align: center;
+ margin-top: 50px;
+ }
+
+ .print {
+ /* position: absolute;
+ left: 47%;
+ top: 58%; */
+ width: 7%;
+ height: 30px;
+ border: 0px;
+ border-radius: 6px;
+ color: #fff;
+ background-color: #1D5CE4;
+ letter-spacing: 4px;
+ }
+
.user-info-table {
margin-top: 30px;
width: 90%;
@@ -54,35 +73,35 @@
<body>
<div>
- <div>
- <button onclick="preview(1)">打印</button>
- </div>
+
<!--startprint-->
<div id="table">
<!-- <span class="title">准考证信息</span>
<table class="user-info-table" border="1px" align="center" cellspacing="0" cellpadding="10">
- </table>
- </div> -->
- <!--endprint-->
-
+ </table> -->
</div>
- <script>
- var getData = function(name) {
- var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
- var r = window.location.search.substr(1).match(reg);
- if (r != null) return unescape(r[2]);
- return null;
- };
- var id = JSON.parse(getData("data")).examId;
- var name = JSON.parse(getData("data")).name;
- // console.log(JSON.parse(getData("data")), 111);
+ <!--endprint-->
+ <div class="excelPrint">
+ <button onclick="preview(1)" class="print">打印</button>
+ </div>
+ </div>
+ <script>
+ var getData = function(name) {
+ var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+ var r = window.location.search.substr(1).match(reg);
+ if (r != null) return unescape(r[2]);
+ return null;
+ };
+ var id = JSON.parse(getData("data")).examId;
+ var name = JSON.parse(getData("data")).name;
+ // console.log(JSON.parse(getData("data")), 111);
- axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
- // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
- var data = res.data;
- var list = data.applyList;
- console.log(data, 123);
- var str = `<span class="title">${data.examName}</span>
+ axios.get('http://223.82.109.183:2080/api/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ // axios.get('http://localhost:81/apply/getApplyDetailList?examId=' + id).then(function(res) {
+ var data = res.data;
+ var list = data.applyList;
+ console.log(data, 123);
+ var str = `<span class="title">${data.examName}</span>
<table class="user-info-table" border="1px" align="center" cellspacing="0" cellpadding="10">
<tr class="user-info-tr">
<td width="80px">姓名</td>
@@ -94,8 +113,8 @@
<td width="200px">报名时间</td>
</tr>`
- for (var k in list) {
- str += `
+ for (var k in list) {
+ str += `
<tr class="user-info-tr">
<td>${list[k].realName}</td>
<td>${list[k].sex==1?"男":(data.sex==2?"女":"")}</td>
@@ -106,52 +125,51 @@
<td>${list[k].applyTime}</td>
</tr>
`
- }
+ }
- // <tr class="user-info-tr">
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // <td></td>
- // </tr>
+ // <tr class="user-info-tr">
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // <td></td>
+ // </tr>
- str += ` <tr class="user-info-tr">
+ str += ` <tr class="user-info-tr">
<td>总人数</td>
<td colspan="6">${data.num}人</td>
</tr>
- </table>
- </div>`
+ </table>`
- var dom = $('#table');
- dom.empty();
- dom.append(str);
- })
+ var dom = $('#table');
+ dom.empty();
+ dom.append(str);
+ })
- function preview(oper) {
- if (oper < 10) {
- bdhtml = window.document.body.innerHTML;
- // 打印开始的标志
- sprnstr = "<!--startprint-->";
- // 打印结束的标志
- eprnstr = "<!--endprint-->";
- // 从打印开始的位置截取到末尾
- prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
- // 从开始截取到打印结束的位置
- prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
- // 替换html
- window.document.body.innerHTML = prnhtml;
- // 打印
- window.print();
- window.document.body.innerHTML = bdhtml;
- } else {
- window.print();
- }
+ function preview(oper) {
+ if (oper < 10) {
+ bdhtml = window.document.body.innerHTML;
+ // 打印开始的标志
+ sprnstr = "<!--startprint-->";
+ // 打印结束的标志
+ eprnstr = "<!--endprint-->";
+ // 从打印开始的位置截取到末尾
+ prnhtml = bdhtml.substr(bdhtml.indexOf(sprnstr));
+ // 从开始截取到打印结束的位置
+ prnhtml = prnhtml.substring(0, prnhtml.indexOf(eprnstr));
+ // 替换html
+ window.document.body.innerHTML = prnhtml;
+ // 打印
+ window.print();
+ window.document.body.innerHTML = bdhtml;
+ } else {
+ window.print();
}
- </script>
+ }
+ </script>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3