From 258a1467940bef026c72055452f9818bae26d3d0 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 16 八月 2024 11:05:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/kb/stationTerminal/index.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
index a33ec89..96ac33d 100644
--- a/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
+++ b/jcdm-ui/src/views/main/kb/stationTerminal/index.vue
@@ -139,7 +139,7 @@
</div>
</div>
<div style="margin-top: 2px;margin-left: 80px">
- <span style="font-size: 29px;">婀栧窞鏅鸿姱鍔ㄥ姏鍙戝睍鏈夐檺鍏徃</span>
+ <span style="font-size: 26px;">婀栧窞鏅鸿姱鍔ㄥ姏绯荤粺鍙戝睍鏈夐檺鍏徃</span>
</div>
@@ -166,26 +166,30 @@
</div>
</div>
- <div style="margin-top: 61px;display: flex;margin-left: 45px">
- <div ref="canvasWrapper" id="canvasWrapper1" style="width: 30%;flex: 1"></div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
- <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
+ <div style="margin-top: 61px;display: flex;margin-left: 48px">
+ <div style="width: 30%;flex: 1">
+ <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
+ </div>
+ <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
+ <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
P9900166410#T{{headContent.sfcCode}}
</span><br>
- <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
+ <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
#V993983#SSW002.005#HHW001.001#NMCU
</span>
<!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
</div>
</div>
- <div style="margin-top: 48px;display: flex;margin-left: 45px">
- <div ref="canvasWrapper" id="canvasWrapper2" style="width: 30%;flex: 1"></div>
- <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 13px">
- <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
+ <div style="margin-top: 48px;display: flex;margin-left: 48px">
+ <div style="width: 30%;flex: 1">
+ <VueQr :size='80' :margin='0' :text='this.text'></VueQr>
+ </div>
+ <div style="width: 70%;flex: 1;margin-top: 18px;margin-right: 23px">
+ <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
P9900166410#T{{headContent.sfcCode}}
</span><br>
- <span style="margin-left: -80px;font-size: 19px;font-family: FangSong">
+ <span style="margin-left: -80px;font-size: 20px;font-family: FangSong;letter-spacing: -0.8px">
#V993983#SSW002.005#HHW001.001#NMCU
</span>
<!-- <span style="font-size: 10px;word-break: break-all;display: flex;justify-content: center;width: 155px;margin-left: 9px">P9900166410#T{{text1}}#V993983#SSW002.005#HHW001.001#NBMS#</span>-->
@@ -276,11 +280,16 @@
} from "@/api/main/da/paramCollection/paramCollection";
import {addFormula} from "@/api/main/bs/formula/formula";
import QRCode from "qrcodejs2";
+import VueQr from "vue-qr";
export default {
+ components: {
+ VueQr
+ },
name: "stationTerminal",
data() {
return {
+ text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#',
materialCode: '', // 鐗╂枡缂栫爜
carCode: '',
showInput: false,
@@ -553,8 +562,9 @@
this.cakeLamp.scanFinish = 1
this.cakeLamp.startWork = 1
this.cakeLamp.InPlace = 1
- this.test1()
- this.test2()
+ // this.test1()
+ // this.test2()
+ this.text = 'P9900166410#T'+this.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
}
});
},
@@ -701,8 +711,9 @@
//鎵撳嵃
if(self.headContent.processesCode === "OP165"){
- self.test1()
- self.test2()
+ // self.test1()
+ // self.test2()
+ self.text = 'P9900166410#T'+self.headContent.sfcCode+'\n#V993983#SSW002.005#HHW001.001#NMCU#'
}
}else if (event.data.includes("[")) {//鎷х揣
--
Gitblit v1.9.3