diff --git a/src/renderer/src/api/file/index.js b/src/renderer/src/api/file/index.js index e655614..64cfdfb 100644 --- a/src/renderer/src/api/file/index.js +++ b/src/renderer/src/api/file/index.js @@ -53,3 +53,14 @@ export const moveSmarttalk = (params) => { params }) } + +export const addFileToPrepareThird = (data) => { + return request({ + url: '/smarttalk/file/addFileToPrepareThird', + method: 'post', + headers: { + 'Content-Type': 'multipart/form-data' + }, + data + }) +} diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 04ff553..f8d13ce 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -499,7 +499,7 @@ function Apis(key) { // 年份 yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'', // 知识点 - thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'', + thirdId: entpCourseWorkQueryParams.point && entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'', // 关键字 keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'', @@ -510,9 +510,7 @@ function Apis(key) { }) } const handleQueryFromEntpCourseWork= async (queryType) => { - pageParams.value.loading = true; - // 初中政治特殊处理( warn: 需确认是否修改 ) // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') { @@ -536,32 +534,28 @@ const handleQueryFromEntpCourseWork= async (queryType) => { // workResource.entpCourseWorkList = entpcourseworkres.data; // workResource.entpCourseWorkTotal = entpcourseworkres.data.length; - data.forEach(item=> { - if (item.worktype == '选择题') { - item.worktype = '单选题' + data.forEach(item=> { + if (item.worktype == '选择题') { + item.worktype = '单选题' + } + }) + + // 格式化试题信息 + processList(data); + //workResource.entpCourseWorkList.push(...data); + workResource.entpCourseWorkList = data; + + // 初次加载时更新当前试题数量 + if (pageParams.value.isFirst) { + pageParams.value.isFirst = false; + pageParams.value.originCount = workResource.entpCourseWorkList.length; + pageParams.value.total = parseInt(res.msg); + paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize); + //console.log('first->', pageParams.value, paginationParams); } - }) - - // 格式化试题信息 - processList(data); - //workResource.entpCourseWorkList.push(...data); - workResource.entpCourseWorkList = data; - - // 初次加载时更新当前试题数量 - if (pageParams.value.isFirst) { - pageParams.value.isFirst = false; - pageParams.value.originCount = workResource.entpCourseWorkList.length; - pageParams.value.total = parseInt(res.msg); - paginationParams.pageNum = Math.ceil(parseInt(res.msg)/paginationParams.pageSize); - console.log('first->', pageParams.value, paginationParams); } - } - pageParams.value.loading = false; -}); - - //const entpcourseworkres = await listEntpcourseworkNew(queryForm); - - // const data = entpcourseworkres.data; + pageParams.value.loading = false; + }); } diff --git a/src/renderer/src/views/prepare/components/chooseTextbook.vue b/src/renderer/src/views/prepare/components/chooseTextbook.vue new file mode 100644 index 0000000..144720f --- /dev/null +++ b/src/renderer/src/views/prepare/components/chooseTextbook.vue @@ -0,0 +1,308 @@ + + + + + {{ curBook.data.itemtitle }} + + + + + + {{ node.label }} + + + + + + + + + + 切换教材 + + + + + + + + + + + + {{ item.itemtitle }} + + + + + + + + + + \ No newline at end of file diff --git a/src/renderer/src/views/prepare/components/treeLog.vue b/src/renderer/src/views/prepare/components/treeLog.vue new file mode 100644 index 0000000..90b2fa7 --- /dev/null +++ b/src/renderer/src/views/prepare/components/treeLog.vue @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 17e5a0d..ebceb1d 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -178,6 +178,7 @@ import ClassReserv from '@/views/classManage/classReserv.vue' import classStart from './container/class-start.vue' // 预备上课 import MsgEnum from '@/plugins/imChat/msgEnum' // im 消息枚举 import Chat from '@/utils/chat' // im 登录初始化 +import TreeLog from './components/treeLog.vue' if (!Chat.imChat) Chat.init() const toolStore = useToolState() @@ -235,7 +236,9 @@ export default { isOpenHomework: false, // 当前上课课程 activeClass: null, - pptDialog: false + pptDialog: false, + // 打开章节的弹窗 + treelogRef:null } }, computed: { @@ -630,6 +633,8 @@ export default { }) }, async nodeClick(data) { + console.log(data,'data'); + if (this.currentNode.id === data.node.id) return this.curBookImg = data.textBook.curBookImg this.curBookPath = data.textBook.curBookPath diff --git a/src/renderer/src/views/resource/container/third-list.vue b/src/renderer/src/views/resource/container/third-list.vue index 0039e24..29ca7a6 100644 --- a/src/renderer/src/views/resource/container/third-list.vue +++ b/src/renderer/src/views/resource/container/third-list.vue @@ -50,6 +50,10 @@ + + + 备课 @@ -66,25 +70,27 @@ /> +