From 5eda9ebc27193dfdbe5941499bf213815d1e98f6 Mon Sep 17 00:00:00 2001
From: hdy <1105738590@qq.com>
Date: 星期日, 12 五月 2024 17:00:26 +0800
Subject: [PATCH] 点位订阅
---
jcdm-ui/package.json | 3 +--
package-lock.json | 2 +-
jcdm-ui/src/views/main/bs/workshop/index.vue | 51 +++++++++++++++++++++++++++------------------------
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/jcdm-ui/package.json b/jcdm-ui/package.json
index d1f482d..887cea5 100644
--- a/jcdm-ui/package.json
+++ b/jcdm-ui/package.json
@@ -49,7 +49,7 @@
"js-cookie": "3.0.1",
"jsencrypt": "3.0.0-rc.1",
"nprogress": "0.2.0",
- "qrcode": "^1.5.3",
+ "qrcodejs2": "^0.0.2",
"quill": "1.3.7",
"screenfull": "5.0.2",
"sortablejs": "1.10.2",
@@ -57,7 +57,6 @@
"vue-count-to": "1.0.13",
"vue-cropper": "0.5.5",
"vue-meta": "2.4.0",
- "vue-qr": "^4.0.9",
"vue-router": "3.4.9",
"vuedraggable": "2.24.3",
"vuex": "3.6.0"
diff --git a/jcdm-ui/src/views/main/bs/workshop/index.vue b/jcdm-ui/src/views/main/bs/workshop/index.vue
index 531e5ec..49c4f27 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>
@@ -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(){
diff --git a/package-lock.json b/package-lock.json
index a52acb9..e6b48bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
{
- "name": "Jcdm-Mes",
+ "name": "Jcdm042-Mes",
"lockfileVersion": 2,
"requires": true,
"packages": {}
--
Gitblit v1.9.3