Compare commits

..

No commits in common. "34cfcf5a6f185d4201b855ebafa8cd91ccbc78b6" and "80ac4a6e1c938a8593e62d55fbfddb0153cc1def" have entirely different histories.

4 changed files with 9 additions and 18 deletions

View File

@ -163,7 +163,7 @@ import QuestToPPTist from '@/views/classTask/newClassTaskAssign/questToPPTist/in
import MaterialDialog from './MaterialDialog.vue' import MaterialDialog from './MaterialDialog.vue'
import { PPTApi } from '../../../api' import { PPTApi } from '../../../api'
import TextCreateImg from '@/components/ai-kolors/index.vue' 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 mainStore = useMainStore()
const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore) const { creatingElement, creatingCustomShape, showSelectPanel, showSearchPanel, showNotesPanel } = storeToRefs(mainStore)
@ -209,7 +209,8 @@ const insertImageElement = (files: FileList) => {
} }
const onhtml2canvas = async (html: HTMLElement) => { const onhtml2canvas = async (html: HTMLElement) => {
const ele = await toPng(html); //createImageElement(imgbs64);
const ele = await toPng(html)
createImageElement(ele); createImageElement(ele);
} }

View File

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

View File

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

View File

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