diff --git a/src/pages/index/index.js b/src/pages/index/index.js index 08e8b499..b760e6c0 100644 --- a/src/pages/index/index.js +++ b/src/pages/index/index.js @@ -67,8 +67,8 @@ Vue.use(VueQuillEditor) // 注册富文本编辑器 Vue.use(SlideVerify) Vue.use(VueAwesomeSwiper) -import VueKonva from 'vue-konva'; -Vue.use(VueKonva); +// import VueKonva from 'vue-konva'; +// Vue.use(VueKonva); // 全局组件挂载 Vue.component('Pagination', Pagination) diff --git a/src/views/companyAdmin/qualityAndSafety/components/myPictode.vue b/src/views/companyAdmin/qualityAndSafety/components/myPictode.vue index 2b952ac1..72efc092 100644 --- a/src/views/companyAdmin/qualityAndSafety/components/myPictode.vue +++ b/src/views/companyAdmin/qualityAndSafety/components/myPictode.vue @@ -241,6 +241,7 @@ export default { showTools: { type: Boolean, default: true }, placement: { type: String, default: "left" }, configJson: { type: String, default: () => "" }, + zonePlaceInfoId: { type: String, default: () => "" }, }, data() { return { @@ -973,6 +974,12 @@ export default { strokeWidth(newVal) { if (this.boardObj) this.boardObj.freeDrawingBrush.width = newVal; }, + zonePlaceInfoId(newVal) { + if (newVal) { + this.initCanvas(); + this.initEvent(); + } + }, }, }; diff --git a/src/views/companyAdmin/qualityAndSafety/ocrRecognitionArea.vue b/src/views/companyAdmin/qualityAndSafety/ocrRecognitionArea.vue index 72800abe..a43a4df0 100644 --- a/src/views/companyAdmin/qualityAndSafety/ocrRecognitionArea.vue +++ b/src/views/companyAdmin/qualityAndSafety/ocrRecognitionArea.vue @@ -127,6 +127,7 @@ ref="canvasfabric" :canvasWidth="width" :canvasHeight="height" + :zonePlaceInfoId="zonePlaceInfo.id" :configJson="zonePlaceInfo.configJson" >