diff --git a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
index fb3fc70..879865f 100644
--- a/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
+++ b/src/renderer/src/AixPPTist/src/views/Editor/CanvasTool/index.vue
@@ -163,7 +163,7 @@ import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/in
import MaterialDialog from './MaterialDialog.vue'
import { PPTApi } from '../../../api'
import TextCreateImg from '@/components/ai-kolors/index.vue'
-import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
+import { toPng } from 'html-to-image' // 引入html-to-image库
const mainStore = useMainStore()
const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@@ -209,8 +209,7 @@ const insertImageElement = (files: FileList) => {
}
const onhtml2canvas = async (html: HTMLElement) => {
- //createImageElement(imgbs64);
- const ele = await toPng(html)
+ const ele = await toPng(html);
createImageElement(ele);
}
diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 0496bee..218f71c 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -949,11 +949,11 @@ const showExamAnalyseDrawer = (row) => {
}
const tableRef = ref();
-const getPaginationList = ( page, limit ) => {
+const getPaginationList = async ( page, limit ) => {
paginationParams.pageNum = page;
paginationParams.pageSize = limit;
//console.log(page, limit)
- handleQueryFromEntpCourseWork(0);
+ await handleQueryFromEntpCourseWork(0);
// 重置滚动条至顶部
tableRef.value.setScrollTop(0);
}
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index b6a233a..54118ca 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -49,6 +49,7 @@
:data="workResource.entpCourseWorkList"
style="width: 100%; height: calc(100% - 55px);"
v-loading="pageParams.loading"
+ ref="tableRef"
>
@@ -364,11 +365,15 @@ const showExamAnalyseDrawer = (row) => {
proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
})
}
-const getPaginationList = ( page, limit ) => {
+
+const tableRef = ref();
+const getPaginationList = async ( page, limit ) => {
paginationParams.pageNum = page;
paginationParams.pageSize = limit;
console.log(page, limit)
- handleQueryFromEntpCourseWork(0);
+ await handleQueryFromEntpCourseWork(0);
+ // 重置滚动条至顶部
+ tableRef.value.setScrollTop(0);
}
/** 单题上传弹出框----纠错修改框 */
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
index 6c418e8..9cf6b7e 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@@ -62,6 +62,7 @@
:data="workResource.entpCourseWorkList"
style="width: 100%; height: calc(100% - 50px);"
v-loading="pageParams.loading"
+ ref="tableRef"
>
@@ -396,11 +397,15 @@ const showExamAnalyseDrawer = (row) => {
proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
})
}
-const getPaginationList = ( page, limit ) => {
+
+const tableRef = ref();
+const getPaginationList = async ( page, limit ) => {
paginationParams.pageNum = page;
paginationParams.pageSize = limit;
console.log(page, limit)
- handleQueryFromEntpCourseWork(0);
+ await handleQueryFromEntpCourseWork(0);
+ // 重置滚动条至顶部
+ tableRef.value.setScrollTop(0);
}