From e9e2c4dba5e42c8b07ee7d4f1cf8fdbd8f0b4bc7 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 02 八月 2024 15:41:52 +0800
Subject: [PATCH] -bug修改
---
jcdm-ui/src/views/main/bs/workshop/index.vue | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/jcdm-ui/src/views/main/bs/workshop/index.vue b/jcdm-ui/src/views/main/bs/workshop/index.vue
index 531e5ec..2cc0976 100644
--- a/jcdm-ui/src/views/main/bs/workshop/index.vue
+++ b/jcdm-ui/src/views/main/bs/workshop/index.vue
@@ -28,11 +28,11 @@
<!-- </el-form>-->
<div>
<div id="printMe">
- <div ref="canvasWrapper"></div>
+ <div ref="canvasWrapper" id="canvasWrapper"></div>
<p>1111</p>
</div>
- <button @click="print">鎵撳嵃</button>
- <button @click="test1">鐢熸垚浜岀淮鐮�</button>
+ <el-button @click="print">鎵撳嵃</el-button>
+ <el-button @click="test1">鐢熸垚浜岀淮鐮�</el-button>
</div>
</el-card>
@@ -102,9 +102,9 @@
</el-table-column>
<el-table-column label="鏇存柊浜�" align="center" prop="updateUser" width="150">
</el-table-column>
- <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime" width="180">
+ <el-table-column label="鏇存柊鏃堕棿" align="center" prop="updateTime">
</el-table-column>
- <el-table-column fixed="right" label="鎿嶄綔" width="200" align="center" class-name="small-padding fixed-width">
+ <el-table-column fixed="right" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
@@ -176,7 +176,7 @@
</template>
<script>
-import QRCode from 'qrcode'
+import QRCode from 'qrcodejs2'
import { listWorkshop, getWorkshop, delWorkshop, addWorkshop, updateWorkshop } from "@/api/main/bs/workshop/workshop";
export default {
@@ -234,32 +234,35 @@
},
created() {
this.getList();
- this.test1();
+ // this.test1();
},
methods: {
print() {
+ // 鏈〉闈㈢洿鎺ユ墦鍗帮紙鏈塨ug鍗曞瞾鍏堜笉瑕佸垹锛�
+ // let oldStr = window.document.body.innerHTML;
+ // let newStr = document.getElementById('printMe').innerHTML;
+ // document.body.innerHTML = newStr;
+ // window.print();
+ // document.body.innerHTML = oldStr;
+ // return false;
- let printMe = document.querySelector('#printMe');
- let printWindow = window.open('', '_blank');
- printWindow.document.write(printMe.innerHTML);
- printWindow.document.close();
- printWindow.focus();
- printWindow.print();
- printWindow.close();
+ // 鏂板紑椤甸潰鎵撳嵃
+ let newStr = document.getElementById('printMe').innerHTML;
+ let newWin = window.open('', '_blank');
+ newWin.document.body.innerHTML = newStr;
+ newWin.print();
+ return false;
},
test1(){
- QRCode.toCanvas(this.text, {
- width: 40,
- // height: 40,
- margin: 1,
-
- }, (error, canvas) => {
- if (error) {
- console.error(error)
- return
- }
- // 鍦╟anvas鐨勭埗鍏冪礌涓彃鍏anvas鍏冪礌
- this.$refs.canvasWrapper.appendChild(canvas)
+ document.getElementById('canvasWrapper').innerHTML = '';
+ this.$nextTick(() => {
+ let qrCode = new QRCode('canvasWrapper',{
+ width: 50,
+ height: 50,
+ text: this.text,
+ colorDark: '#000',
+ colorLight: '#fff'
+ })
})
},
advancedQuery(){
--
Gitblit v1.9.3