From 59dad8a26cc00bc4b12c48df1d17da9c8da84215 Mon Sep 17 00:00:00 2001
From: qiezi <15576055375@163.com>
Date: Wed, 23 Oct 2024 14:09:21 +0800
Subject: [PATCH] 20241023

---
 src/printFormat/RF_RFID.js                 | 6 +++---
 src/printFormat/alphaHardTagPrintFormat.js | 7 +++----
 src/printFormat/antenna.js                 | 5 ++---
 src/printFormat/logisticLabel.js           | 6 +++---
 src/printFormat/roll_label.js              | 4 ++--
 src/views/modules/label/QrCode.vue         | 1 -
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/src/printFormat/RF_RFID.js b/src/printFormat/RF_RFID.js
index 2ba4d50..ed4d66e 100644
--- a/src/printFormat/RF_RFID.js
+++ b/src/printFormat/RF_RFID.js
@@ -25,8 +25,8 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       LODOP.SET_PRINT_PAGESIZE(0,1100,512,"");
       // LODOP.ADD_PRINT_BARCODE(12,33,115,80,"QRCode",row.qrCode);
       // LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",`<img src="${row.qrCode}" style="width: 26mm;height: 26mm;object-fit: contain"/>`);      LODOP.SET_PRINT_STYLEA(0,"HtmWaitMilSecs",100);
-      LODOP.SET_PRINT_STYLEA(0,"HtmWaitMilSecs",100);
+      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
+      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
       LODOP.ADD_PRINT_IMAGE(4,255,90,16,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
@@ -61,7 +61,7 @@ export const printRF_RFIDLabel = (printList, icons, printerName) => {
       LODOP.ADD_PRINT_TEXT(42,271,60,20,"UoM");
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",10);
-      LODOP.ADD_PRINT_TEXT(32,281,70,20,row.uom);
+      LODOP.ADD_PRINT_TEXT(42,281,70,20,row.uom);
       LODOP.SET_PRINT_STYLEA(0,"FontName","Arial");
       LODOP.SET_PRINT_STYLEA(0,"FontSize",14);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
diff --git a/src/printFormat/alphaHardTagPrintFormat.js b/src/printFormat/alphaHardTagPrintFormat.js
index 597c67f..d60ed03 100644
--- a/src/printFormat/alphaHardTagPrintFormat.js
+++ b/src/printFormat/alphaHardTagPrintFormat.js
@@ -24,9 +24,8 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.NewPageA();
       LODOP.SET_PRINTER_INDEXA(printerName)
       LODOP.SET_PRINT_PAGESIZE(0,1100,512,"");
-      // LODOP.ADD_PRINT_BARCODE(12,33,100,80,"QRCode",row.qrCode);
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",`<img src="${row.qrCode}" style="width: 26mm;height: 26mm;object-fit: contain"/>`);      LODOP.SET_PRINT_STYLEA(0,"HtmWaitMilSecs",100);
+      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
+      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
       LODOP.ADD_PRINT_IMAGE(4,255,90,16,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
@@ -69,7 +68,7 @@ export function printAlphaHardTagLabel (printList, icons, printerName) {
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.SET_PRINT_STYLEA(0,"Bold",1);
 
-      LODOP.ADD_PRINT_LINE(86,-2,85,406,0,1);
+      LODOP.ADD_PRINT_LINE(87,-2,85,406,0,1);
       LODOP.ADD_PRINT_LINE(146,-2,145,406,0,1);
 
       LODOP.ADD_PRINT_TEXT(116,25,150,20,"S/N");
diff --git a/src/printFormat/antenna.js b/src/printFormat/antenna.js
index e63d14b..1df2b98 100644
--- a/src/printFormat/antenna.js
+++ b/src/printFormat/antenna.js
@@ -23,9 +23,8 @@ export const printAntennaLabel = (printList, icons, printerName) => {
       LODOP.NewPageA();
       LODOP.SET_PRINTER_INDEXA(printerName)
       LODOP.SET_PRINT_PAGESIZE(0, 1100, 512, '')
-      // LODOP.ADD_PRINT_BARCODE(12, 33, 115,80, 'QRCode', row.qrCode)
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",`<img src="${row.qrCode}" style="width: 26mm;height: 26mm;object-fit: contain"/>`);      LODOP.SET_PRINT_STYLEA(0,"HtmWaitMilSecs",100);
+      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
+      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
       LODOP.ADD_PRINT_IMAGE(4,255,90,16, '<img src="data:image/png;base64,' + ckpLogo + '"/>')
       LODOP.SET_PRINT_STYLEA(0, 'Stretch', 2)
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
diff --git a/src/printFormat/logisticLabel.js b/src/printFormat/logisticLabel.js
index 3a969b6..f9042fd 100644
--- a/src/printFormat/logisticLabel.js
+++ b/src/printFormat/logisticLabel.js
@@ -21,9 +21,9 @@ export const printLogisticLabel = (printList, printerName) => {
       LODOP.NewPage();
       LODOP.SET_PRINTER_INDEXA(printerName)
       LODOP.SET_PRINT_PAGESIZE(0,1100,512,"");
-      // LODOP.ADD_PRINT_BARCODE(12,33,115,80,"QRCode",row.qrCode);
-      // LODOP.SET_PRINT_STYLEA(0,"FontSize",7);
-      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",`<img src="${row.qrCode}" style="width: 26mm;height: 26mm;object-fit: contain"/>`);      LODOP.SET_PRINT_STYLEA(0,"HtmWaitMilSecs",100);
+      LODOP.ADD_PRINT_IMAGE(-5,20,"26mm","26mm",row.qrCode);
+      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
+      LODOP.ADD_PRINT_IMAGE(4,255,90,16,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
       LODOP.SET_PRINT_STYLEA(0,"Alignment",3);
       LODOP.ADD_PRINT_TEXT(20,126,40,20,"REF");
diff --git a/src/printFormat/roll_label.js b/src/printFormat/roll_label.js
index fd9cc72..239be68 100644
--- a/src/printFormat/roll_label.js
+++ b/src/printFormat/roll_label.js
@@ -17,8 +17,8 @@ export const print_roll_label = (printList,printerName)=>{
       LODOP.NewPage();
       LODOP.SET_PRINTER_INDEXA(printerName)
       LODOP.SET_PRINT_PAGESIZE(0,450,250,"");
-      LODOP.ADD_PRINT_IMAGE(3,4,"18mm","18mm",`<img src="${row.qrCode}"/>`);
-      LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
+      LODOP.ADD_PRINT_IMAGE(3,4,"18mm","18mm",row.qrCode);
+      LODOP.SET_PRINT_STYLEA(0,"Stretch",1);
       LODOP.ADD_PRINT_IMAGE(7,120,30,8,"<img src=\"data:image/png;base64," + ckpLogo + "\"/>");
       LODOP.SET_PRINT_STYLEA(0,"Stretch",2);
 
diff --git a/src/views/modules/label/QrCode.vue b/src/views/modules/label/QrCode.vue
index d0ebf1e..1969ab8 100644
--- a/src/views/modules/label/QrCode.vue
+++ b/src/views/modules/label/QrCode.vue
@@ -33,7 +33,6 @@ export default {
           return
         }
         base64 = url
-        console.log(base64)
       })
       return base64
     },