diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index e21472d5..fded42aa 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -284,8 +284,7 @@ export default defineComponent({ }); canvas.preserveObjectStacking = true; //鼠标移动 - setCanvasKeyDown()//document上添加按下和抬起事件 - canvas.on("mouse:over", event =>console.log(123123123123)); + canvas.on("mouse:over", event =>setCanvasKeyDown());//document上添加按下和抬起事件 canvas.on("mouse:move", event =>setCanvasMove(event)); canvas.on("mouse:out", event=>setCanvasOut(event)); canvas.on("mouse:down", event=>setCanvasDown(event)); @@ -830,7 +829,6 @@ export default defineComponent({ // 监听键盘的 keydown 和 keyup 事件 let keyDown = [] let canvasKeyDown = (event) => { - console.log(123123123); if(keyDown.indexOf(event.key)>-1){ }else{ keyDown.push(event.code) @@ -1232,7 +1230,7 @@ export default defineComponent({ } } let setHDExport = async ()=>{//获取选中内容的位置信息 - let {url,imageType} = await exportSele(canvas,'jpg') + let {url,imageType} = await exportSele(canvas,'jpeg') if(!imageType){ message.info('Please select the region of SR') return @@ -1270,6 +1268,7 @@ export default defineComponent({ } Https.axiosPost(Https.httpUrls.prepareForSR, data).then((rv) => { console.log(rv); + store.dispatch('getCredits') emit('setTask') }); }, @@ -1546,6 +1545,7 @@ export default defineComponent({ &.active{ opacity: .7; cursor: not-allowed; + pointer-events:none; } } diff --git a/src/component/HomePage/TaskPage.vue b/src/component/HomePage/TaskPage.vue index 660a178c..4ea21c36 100644 --- a/src/component/HomePage/TaskPage.vue +++ b/src/component/HomePage/TaskPage.vue @@ -108,27 +108,27 @@ export default defineComponent({ mounted() { }, directives:{ - observe:{ - mounted (el,binding) { - // console.log(binding.instance); - const ob = new IntersectionObserver(callback,{ - root:null, - threshold:[0.1] - }) - ob.observe(el) - // this.currentPage = 1 - // this.pageSize = 12 - let this_:any = binding.instance - function callback(entries:any, observer:any) { - entries.forEach((entry:any) => { - if (entry.isIntersecting) { - this_.getTaskMoreList() - } else { - } - }); - } - }, - }, + // observe:{ + // mounted (el,binding) { + // // console.log(binding.instance); + // const ob = new IntersectionObserver(callback,{ + // root:null, + // threshold:[0.1] + // }) + // ob.observe(el) + // // this.currentPage = 1 + // // this.pageSize = 12 + // let this_:any = binding.instance + // function callback(entries:any, observer:any) { + // entries.forEach((entry:any) => { + // if (entry.isIntersecting) { + // this_.getTaskMoreList() + // } else { + // } + // }); + // } + // }, + // }, }, watch:{ taskList:{ @@ -197,19 +197,19 @@ export default defineComponent({ } }) }, - getTaskMoreList(){ - let data = { - size:this.pageSize, - page: this.currentPage, - type:this.currentState.value, - endTime: "", - startTime: "", - } - this.currentPage += 1 - Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{ - this.taskListMore = rv - }) - } + // getTaskMoreList(){ + // let data = { + // size:this.pageSize, + // page: this.currentPage, + // type:this.currentState.value, + // endTime: "", + // startTime: "", + // } + // this.currentPage += 1 + // Https.axiosPost(Https.httpUrls.getTasksHistory,data).then((rv)=>{ + // this.taskListMore = rv + // }) + // } }, }); diff --git a/src/tool/canvasDrawing.js b/src/tool/canvasDrawing.js index c5b79fb8..fd662e19 100644 --- a/src/tool/canvasDrawing.js +++ b/src/tool/canvasDrawing.js @@ -138,9 +138,7 @@ async function exportSele(canvas,format){ }) }) exportCanvas.renderAll(); - var imgData = exportCanvas.toDataURL({ - format: format - }); + var imgData = exportCanvas.toDataURL({format: format,quality:1}); data = { url:imgData, imageType:'b',