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 } from 'html-to-image' // 引入html-to-image库
+import { toPng, toJpeg } from 'html-to-image' // 引入html-to-image库
 
 const mainStore = useMainStore()
 const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@@ -209,7 +209,8 @@ const insertImageElement = (files: FileList) => {
 }
 
 const onhtml2canvas = async (html: HTMLElement) => {
-  const ele = await toPng(html);
+  //createImageElement(imgbs64);
+  const ele = await toPng(html)
   createImageElement(ele);
 }
 

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -949,11 +949,11 @@ const showExamAnalyseDrawer = (row) => {
 }
 
 const tableRef = ref();
-const getPaginationList = async ( page, limit ) => {
+const getPaginationList = ( page, limit ) => {
   paginationParams.pageNum = page;
   paginationParams.pageSize = limit;
   //console.log(page, limit)
-  await handleQueryFromEntpCourseWork(0);
+  handleQueryFromEntpCourseWork(0);
   // 重置滚动条至顶部
   tableRef.value.setScrollTop(0);
 }

src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue

@@ -49,7 +49,6 @@
         :data="workResource.entpCourseWorkList" 
         style="width: 100%; height: calc(100% - 55px);"
         v-loading="pageParams.loading"
-        ref="tableRef"
       >
         <el-table-column type="index" width="60" />
         <el-table-column align="left" >
@@ -365,15 +364,11 @@ const showExamAnalyseDrawer = (row) => {
     proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
   })
 }
-
-const tableRef = ref();
-const getPaginationList = async ( page, limit ) => {
+const getPaginationList = ( page, limit ) => {
   paginationParams.pageNum = page;
   paginationParams.pageSize = limit;
   console.log(page, limit)
-  await handleQueryFromEntpCourseWork(0);
-  // 重置滚动条至顶部
-  tableRef.value.setScrollTop(0);
+  handleQueryFromEntpCourseWork(0);
 }
 
 /** 单题上传弹出框----纠错修改框 */

src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue

@@ -62,7 +62,6 @@
         :data="workResource.entpCourseWorkList" 
         style="width: 100%; height: calc(100% - 50px);"
         v-loading="pageParams.loading"
-        ref="tableRef"
       >
         <el-table-column type="index" width="60" />
         <el-table-column align="left" >
@@ -397,15 +396,11 @@ const showExamAnalyseDrawer = (row) => {
     proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
   })
 }
-
-const tableRef = ref();
-const getPaginationList = async ( page, limit ) => {
+const getPaginationList = ( page, limit ) => {
   paginationParams.pageNum = page;
   paginationParams.pageSize = limit;
   console.log(page, limit)
-  await handleQueryFromEntpCourseWork(0);
-  // 重置滚动条至顶部
-  tableRef.value.setScrollTop(0);
+  handleQueryFromEntpCourseWork(0);
 }