From efdbd8ef245f7c46a5926ea1b803d9cffaf08b3c Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Wed, 01 Sep 2021 17:59:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
public/securityPrint.html | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/public/securityPrint.html b/public/securityPrint.html
index 3da7f79..d920bb3 100644
--- a/public/securityPrint.html
+++ b/public/securityPrint.html
@@ -76,6 +76,11 @@
font-weight: 200;
}
+ .img-title {
+ width: 100%;
+ font-size: 14px;
+ }
+
.table-center-right {
width: 152px;
height: 205px;
@@ -92,7 +97,7 @@
height: 100%;
display: inline-block;
vertical-align: middle;
- border-radius: 50px;
+ border-radius: 10px;
}
.security-info {
@@ -139,6 +144,15 @@
.my-picture {
width: 150px;
/* height: 200px; */
+ }
+
+ .avatar {
+ width: 100%;
+ }
+
+ .qrCode {
+ margin-top: 0px;
+ margin-left: 25px;
}
</style>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
@@ -211,7 +225,11 @@
axios.get('http://223.82.109.183:2080/api/apply/userDetail?id=' + id).then(function(res) {
var data = res.data.data;
- var str = `<div id="table1"></div>
+ var img = data.avatar ? `<div class="avatar"><img src="${data.avatar}"></div>` : `<div class="img-title">暂无照片</div>`
+ axios.get('http://223.82.109.183:2080/api/qrCode/getQrCodeBase64?securityNumber=' + data.securitynumber).then(function(res1) {
+ console.log(res1.data, 333);
+ var qrCode = res1.data ? `<div class="qrCode"><img src="${res1.data}"></div>` : `<div"></div>`
+ var str = `<div id="table1"></div>
<div id="table">
<div class="table-top">
<span>保安员证</span>
@@ -240,15 +258,18 @@
</div>
</div>
<div class="table-center-right">
- <img src="${data.avatar}">
+ ${img}
+ ${qrCode}
</div>
</div>
</div>
</div>`
+ // <img src="${data.avatar}">
+ var dom = $('#print');
+ dom.empty();
+ dom.append(str);
+ })
- var dom = $('#print');
- dom.empty();
- dom.append(str);
})
function preview(oper) {
--
Gitblit v1.9.3