From cdbf47d7626b457b496b49ab417ec5a56516e871 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 六月 2020 15:23:37 +0800
Subject: [PATCH] #
---
src/main/webapp/views/matCode/matCode.html | 38 +++++++++++++++++++++++++++++++++-----
src/main/java/com/zy/common/utils/QrCode.java | 2 +-
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/QrCode.java b/src/main/java/com/zy/common/utils/QrCode.java
index ccc1196..5f5f63a 100644
--- a/src/main/java/com/zy/common/utils/QrCode.java
+++ b/src/main/java/com/zy/common/utils/QrCode.java
@@ -20,7 +20,7 @@
private static final String CHARSET = "utf-8";
private static final String FORMAT_NAME = "JPG";
// 浜岀淮鐮佸昂瀵�
- private static final int QRCODE_SIZE = 60;
+ private static final int QRCODE_SIZE = 100;
public static BufferedImage createImg(String content) throws WriterException {
ConcurrentHashMap hints = new ConcurrentHashMap();
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 1738de0..c4e986a 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -138,7 +138,7 @@
<tr>
<td colspan="1" align="center" scope="col">鏉＄爜</td>
<td class="barcode" colspan="3" align="center" scope="col">
- <img class="template-code" src="" width="80%">
+ <img class="template-code template-barcode" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -180,7 +180,7 @@
</tr>
<tr>
<td align="center" colspan="6" style="border: none">
- <img class="template-code" src="" width="80%">
+ <img class="template-code template-barcode" src="" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>xxxxxx</span>
</div>
@@ -191,7 +191,34 @@
<!-- 棰勮鍥� 3 -->
<div id="template-preview-3" class="template-preview" style="display: inline-block">
-
+ <table class="contain" height="217" width="317" style="overflow: hidden;font-size: xx-small">
+ <tr>
+ <td align="center" scope="col" width="50%" colspan="3">鐗╂枡缂栫爜</td>
+ <td align="center" scope="col" width="50%" colspan="3">xxxxxx-xx/xx</td>
+ </tr>
+ <tr>
+ <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+ <td align="center" colspan="3">xxxxxxx</td>
+ </tr>
+ <tr>
+ <td align="center" width="50%" rowspan="1" colspan="3">鐗╂枡瑙勬牸</td>
+ <td align="center" width="50%" colspan="3" rowspan="4">
+ <img class="template-code template-qrcode" src="" width="80%">
+ <div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
+ <span>xxxxxx</span>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td align="center" colspan="3" rowspan="1">xxxxxx</td>
+ </tr>
+ <tr>
+ <td align="center" colspan="3" rowspan="1">鐗╂枡鍗曚綅</td>
+ </tr>
+ <tr>
+ <td align="center" colspan="3" rowspan="1">xxxxxxxx</td>
+ </tr>
+ </table>
</div>
</div>
@@ -205,7 +232,8 @@
<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
<script type="text/javascript">
- $('.template-code').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=123");
+ $('.template-barcode').attr("src", baseUrl+"/macCode/code/auth?type=1¶m=123");
+ $('.template-qrcode').attr("src", baseUrl+"/macCode/code/auth?type=2¶m=123");
</script>
<!-- 妯℃澘寮曟搸 -->
@@ -216,7 +244,7 @@
<tr>
<td align="center" colspan="1" scope="col">鏉＄爜</td>
<td align="center" class="barcode" colspan="3" scope="col">
- <img class="qrcode" src="{{this.barcodeUrl}}" width="80%">
+ <img class="template-code" src="{{this.barcodeUrl}}" width="80%">
<div style="letter-spacing: 2px;margin-top: 3px; text-align: center">
<span>{{this.barcode}}</span>
</div>
--
Gitblit v1.9.1