From a8ab74fdbc4e590a4c9778d447538c3bc30925e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 24 八月 2020 08:54:44 +0800
Subject: [PATCH] Merge branches 'gdasrs' and 'jsasrs' of http://192.168.2.250:9527/r/zy-asrs into gdasrs

---
 src/main/webapp/static/js/trayCode/trayCode.js |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/js/trayCode/trayCode.js b/src/main/webapp/static/js/trayCode/trayCode.js
index e9aa0d6..bc70c7a 100644
--- a/src/main/webapp/static/js/trayCode/trayCode.js
+++ b/src/main/webapp/static/js/trayCode/trayCode.js
@@ -309,10 +309,10 @@
                     for (let i=0;i<res.data.length;i++){
                         if (data.field.type === '1') {
                             res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
-                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+200+"&height="+100;
+                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+200+"&height="+90;
                         } else {
                             res.data[i]["barcodeUrl"]=baseUrl+"/file/barcode/qrcode/auth?" +
-                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+400+"&height="+200;
+                                "type="+data.field.type+"&param="+res.data[i].item+"&width="+400+"&height="+180;
                         }
                     }
                     var tpl = $('#trayCodeTemplate').html();

--
Gitblit v1.9.1