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/bs/workshop/index.vue | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/jcdm-ui/src/views/main/bs/workshop/index.vue b/jcdm-ui/src/views/main/bs/workshop/index.vue index 2cc0976..aea0178 100644 --- a/jcdm-ui/src/views/main/bs/workshop/index.vue +++ b/jcdm-ui/src/views/main/bs/workshop/index.vue @@ -29,8 +29,9 @@ <div> <div id="printMe"> <div ref="canvasWrapper" id="canvasWrapper"></div> - <p>1111</p> + <p>P9900166410#T2342325325235235#V993983#SSW002.005#HHW001.001#NMCU#</p> </div> + <VueQr :size='80' :margin='0' :text='this.text'></VueQr> <el-button @click="print">鎵撳嵃</el-button> <el-button @click="test1">鐢熸垚浜岀淮鐮�</el-button> </div> @@ -176,15 +177,19 @@ </template> <script> +import VueQr from "vue-qr"; import QRCode from 'qrcodejs2' import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/main/bs/workshop/workshop"; export default { + components: { + VueQr + }, name: "Workshop", dicts: ['sys_normal_disable'], data() { return { - text: '1234', + text: 'P9900166410#T2342325325235235\n#V993983#SSW002.005#HHW001.001#NMCU#', select: '', // 閬僵灞� loading: true, @@ -257,8 +262,8 @@ document.getElementById('canvasWrapper').innerHTML = ''; this.$nextTick(() => { let qrCode = new QRCode('canvasWrapper',{ - width: 50, - height: 50, + width: 83, + height: 83, text: this.text, colorDark: '#000', colorLight: '#fff' -- Gitblit v1.9.3