From 6163fb06f92c0888bb2839036e9ef0fe9778e768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Wed, 16 Oct 2024 14:16:48 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=E5=B8=83=E7=BD=AE=E6=8E=A8=E9=80=81=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=EF=BC=8Crow=E6=94=B9=E4=B8=BA=E6=89=B9=E9=87=8Frows=E9=80=BB?= =?UTF-8?q?=E8=BE=91=EF=BC=9B=E6=88=AA=E6=AD=A2=E6=97=A5=E6=9C=9F=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E5=BD=93=E5=89=8D=E6=97=B6=E9=97=B43?= =?UTF-8?q?=E5=B0=8F=E6=97=B6=E4=B9=8B=E5=90=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/set-homework/index.vue | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue index 380e381..fa41011 100644 --- a/src/renderer/src/components/set-homework/index.vue +++ b/src/renderer/src/components/set-homework/index.vue @@ -61,8 +61,8 @@ const props = defineProps({ entpcourseid: { default: '' }, - row: { - default: '' + rows: { + default: [] }, title: { type: String, @@ -222,31 +222,33 @@ const onSubmit = (formEl) => { let ary = [] for (const value in gradeObj) { //这些参数 参照AIx web端 作业推送 - let obj = { - id: 0, - parentid: props.row.id, - classid: value, - classcourseid: 0, - entpcourseid: props.entpcourseid, - studentlist: JSON.stringify(gradeObj[value]), - feedback: form.feedback, - workkey: '', - timelength: form.timelength, - weights: 1, - deaddate: form.deaddate, - workdate: getCurrentTime('YYYY-MM-DD'), - uniquekey: props.row.uniquekey, - entpcourseworklist: '[' + props.row.entpcourseworklist + ']', - needMsgNotifine: 'false', - msgkey: 'newclasswork', - title: '作业任务', - msgcontent: '', - teachername: userInfo.nickName, - unixstamp: new Date().getTime(), - worktype: props.row.worktype, - status: '1' + for (var i = 0; i < props.rows.length; i++) { + let obj = { + id: 0, + parentid: props.rows[i].id, + classid: value, + classcourseid: 0, + entpcourseid: props.entpcourseid, + studentlist: JSON.stringify(gradeObj[value]), + feedback: form.feedback, + workkey: '', + timelength: form.timelength, + weights: 1, + deaddate: form.deaddate, + workdate: getCurrentTime('YYYY-MM-DD'), + uniquekey: props.rows[i].uniquekey, + entpcourseworklist: '[' + props.rows[i].entpcourseworklist + ']', + needMsgNotifine: 'false', + msgkey: 'newclasswork', + title: '作业任务', + msgcontent: '', + teachername: userInfo.nickName, + unixstamp: new Date().getTime(), + worktype: props.rows[i].worktype, + status: '1' + } + ary.push(obj) } - ary.push(obj) } setLoading.value = true saveByClassWorkArray({ @@ -280,8 +282,9 @@ const cloneDialog = (formEl) => { } onMounted(() => { - // 默认当前 - form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm') + // 默认当前 改为 延后3小时后截止 + // form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm') + form.deaddate = `${getCurrentTime('YYYY-MM-DD')} ${getCurrentTime('HH+3')}:${getCurrentTime('mm')}`; }) -- 2.44.0.windows.1 From f3d59ca8ee07b12875f6893491da531e71d2f305 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Wed, 16 Oct 2024 14:19:30 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A-=E6=8E=A8=E9=80=81=E5=B8=83?= =?UTF-8?q?=E7=BD=AE=E4=BF=AE=E6=94=B9=EF=BC=9B=E4=BD=9C=E4=B8=9A=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=A4=96=E9=93=BE=E6=94=B9=E4=B8=BApc=E7=AB=AF?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E8=AE=BE=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/index.vue | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index 06e709f..dfbc308 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -95,7 +95,8 @@
  - 作业设计 + + 作业设计
@@ -126,7 +127,7 @@
- + Date: Wed, 16 Oct 2024 14:20:46 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8E=A8=E9=80=81?= =?UTF-8?q?=EF=BC=9Arow=E6=94=B9=E4=B8=BArows=E7=BB=84=E4=BB=B6=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/tool/components/homework.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue index f4a053f..b5af42b 100644 --- a/src/renderer/src/views/tool/components/homework.vue +++ b/src/renderer/src/views/tool/components/homework.vue @@ -47,7 +47,7 @@ - 推送 + 推送
@@ -56,7 +56,7 @@
-
@@ -110,8 +110,11 @@ const curNode = reactive({ data: {} }) -const sendHomework = (row) => { - curRow.value = row +const sendHomework = (row,type) => { + if(type == 'item'){ + // 布置推送单个作业 + curRow.value = [row] + } setTimeout(() => { ipcMsgSend('tool-sphere:set:ignore', false) }, 200) -- 2.44.0.windows.1 From 7c539614fdab9842d5159d7693d68c35b1cb0040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Wed, 16 Oct 2024 16:11:07 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=BC=96=E8=BE=91=E5=A4=96=E9=93=BE?= =?UTF-8?q?=E6=94=B9=E4=B8=BApc=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/hooks/useClassTask.js | 117 ++++++++++++++++++ .../container/newTask/prevReadMsg-Dialog.vue | 2 +- src/renderer/src/views/prepare/index.vue | 112 ++++++++++------- 3 files changed, 185 insertions(+), 46 deletions(-) create mode 100644 src/renderer/src/hooks/useClassTask.js diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js new file mode 100644 index 0000000..45760ad --- /dev/null +++ b/src/renderer/src/hooks/useClassTask.js @@ -0,0 +1,117 @@ +import { listEntpcoursework,getEvaluationclue } from '@/api/classTask'; +import { processList } from '@/hooks/useProcessList'; + +const isJson = (str) => { + if (typeof str == 'string') { + try { + let obj = JSON.parse(str) + if (typeof obj == 'object' && obj) { + return true + } else { + return false + } + } catch (e) { + return false + } + } +} + + +/** + * @description 编辑作业配置 + * @param {*} row + */ +export const editListItem = (row, courseObj) => { + return new Promise((resolve, reject) => { + // 作业内容编辑-跳转到设计界面-传参 + let classtaskObj = { + id: '', // + bookName: '', // 课程名称 + uniquekey: '', // 设计中的标题 + title: '', // 设计中的说明 + worktype: '', // 设计中的作业类型 + quizlist: [], // 设计中的试题列表 + chooseWorkLists: [],// 设计中的框架梳理list + fileHomeworkList: [],// 设计中的常规作业list + whiteboardObj: '',// 设计中的课堂展示对象 + }; + + + //重新更新[新任务]中右侧列表数据 + var listCourseWork = []; + for (var i=0; i < row.entpcourseworklistarray.length; i++) { + listCourseWork.push(row.entpcourseworklistarray[i]); + } + + if (listCourseWork.length > 0) { + classtaskObj.id= row.id; // + classtaskObj.bookObj = courseObj; // 教材对象 + classtaskObj.bookName = row.evaltitle? row.evalparenttitle? row.evalparenttitle+'/'+row.evaltitle : row.evaltitle: row.evalparenttitle// 课程名称:单元/章节： 单元 + classtaskObj.uniquekey= row.uniquekey; // 设计中的标题 + classtaskObj.title= row.title; // 设计中的说明 + classtaskObj.worktype= row.worktype; // 设计中的作业类型 + classtaskObj.quizlist= []; // 设计中的试题列表 + classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list + classtaskObj.fileHomeworkList = []; //设计中的 常规作业list + classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象 + + + if (row.worktype == '框架梳理') { + // 框架梳理对应只有一个内容 + getEvaluationclue(listCourseWork[0].id).then(res => { + if ( res.data==null || res.data==undefined ) { + return ; + } + res.data.worktype = '框架梳理'; + res.data.score = listCourseWork[0].score; + classtaskObj.chooseWorkLists.push(res.data); + // + // console.log('框架梳理', classtaskObj); + return resolve(classtaskObj); + }); + } + else if (row.worktype == '习题训练') { + const ids = listCourseWork.map(item => item.id).join(","); + listEntpcoursework({ids: ids, pageSize: 50}).then(idres => { + // for (var i=0; i]+>/g, ''); + // } + // 格式化试题 + if(idres.rows&&idres.rows.length > 0){ + processList(idres.rows); + //重新将task中的分值更新 + row.entpcourseworklistarray.forEach(item => { + const quizItem = idres.rows.find(quiz => quiz.id === item.id); + if (quizItem) { + quizItem.score = item.score; + quizItem.scoreOrigin = item.score; + } + }); + + classtaskObj.quizlist = idres.rows; + // + // console.log('习题训练', classtaskObj); + return resolve(classtaskObj); + } + }) + } + else if (row.worktype == '课堂展示') { + console.log('row.课堂展示', row.workcodes); + const workcodes = JSON.parse(row.workcodes); + classtaskObj.whiteboardObj = JSON.stringify(workcodes.json); + // + // console.log('课堂展示', classtaskObj); + return resolve(classtaskObj); + } + else if (row.worktype == '常规作业') { + if(isJson(row.workcodes)){ + classtaskObj.fileHomeworkList = JSON.parse(row.workcodes); + // + // console.log('常规作业', classtaskObj); + return resolve(classtaskObj); + } + } + } + }); +} + diff --git a/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue index a96cd04..953e677 100644 --- a/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue +++ b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue @@ -125,7 +125,7 @@ onMounted(() => { watch(() => props.bookobj.levelSecondId, (newVal) => { - console.log(props.bookobj,'课程选择') + // console.log(props.bookobj,'课程选择') }) diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue index dfbc308..a3d38c6 100644 --- a/src/renderer/src/views/prepare/index.vue +++ b/src/renderer/src/views/prepare/index.vue @@ -106,7 +106,7 @@ :item="item" :index="index" @on-set="openSet" - @on-reSet="openReSet" + @on-reSet="openReSet" @on-delhomework="delhomework" > @@ -170,6 +170,7 @@ import { delClasswork, listEntpcourse } from '@/api/teaching/classwork' import { updateClasscourse } from '@/api/teaching/classcourse' import { getClassInfo, getSelfReserv, endClass } from '@/api/classManage' import { useGetHomework } from '@/hooks/useGetHomework' +import { editListItem } from '@/hooks/useClassTask' import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile' import ClassReserv from '@/views/classManage/classReserv.vue' import classStart from './container/class-start.vue' // 预备上课 @@ -647,35 +648,35 @@ export default { this.$refs['reservDialog'].openDialog() }, - // 打开外部链接 - handleOutLink(key) { - if (key == 'homeWork') { - this.isOpenHomework = true - } - // key 对应的 linkConfig.js 外部链接配置 - let configObj = outLink()[key] - let fullPath = configObj.fullPath - //打开作业 高考 url增加unitId 章节ID - if (key != 'standard' && key != 'aiModel') { - let unitId = this.uploadData.levelSecondId - ? this.uploadData.levelSecondId - : this.uploadData.levelFirstId - let bookId = this.uploadData.textbookId; - if(fullPath.indexOf('?') == -1){ - fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` - } - else{ - fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` - } - } + // 打开外部链接 + // handleOutLink(key) { + // if (key == 'homeWork') { + // this.isOpenHomework = true + // } + // // key 对应的 linkConfig.js 外部链接配置 + // let configObj = outLink()[key] + // let fullPath = configObj.fullPath + // //打开作业 高考 url增加unitId 章节ID + // if (key != 'standard' && key != 'aiModel') { + // let unitId = this.uploadData.levelSecondId + // ? this.uploadData.levelSecondId + // : this.uploadData.levelFirstId + // let bookId = this.uploadData.textbookId; + // if(fullPath.indexOf('?') == -1){ + // fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` + // } + // else{ + // fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` + // } + // } - // 通知主进程 - ipcRenderer.send('openWindow', { - key, - fullPath: fullPath, - cookieData: { ...configObj.data } - }) - }, + // // 通知主进程 + // ipcRenderer.send('openWindow', { + // key, + // fullPath: fullPath, + // cookieData: { ...configObj.data } + // }) + // }, // 前往作业设计页面 goNewClassTask(){ // router.push({ path: '/newClassTask' }); @@ -694,24 +695,45 @@ export default { }, // 打开作业编辑窗口 openReSet(row) { - // 新窗口打开标识 - this.isOpenHomework = true; - // key 对应的 linkConfig.js 外部链接配置 - let configObj = outLink()['homeWork'] - let fullPath = configObj.fullPath + //跳转 作业设计 编辑页面 + const courseObj = { + textbookId: this.uploadData.textbookId, + levelFirstId: this.uploadData.levelFirstId, + levelSecondId: this.uploadData.levelSecondId, + coursetitle: this.currentNode.itemtitle, // (单元/章节) 名称, + node: this.currentNode, // 选择的课程节点 + } + console.log('courseObj', courseObj) + editListItem(row, courseObj).then((obj) => { + if(obj){ + //前往作业设计 + this.$router.push({ + path: '/newClassTask', + query: { + classtaskObj: JSON.stringify(obj), + } + }) + } + }); + //--------------------- + // 暂时弃用 外链 新窗口打开标识 + // this.isOpenHomework = true; + // // key 对应的 linkConfig.js 外部链接配置 + // let configObj = outLink()['homeWork'] + // let fullPath = configObj.fullPath - let unitId = this.uploadData.levelSecondId - ? this.uploadData.levelSecondId - : this.uploadData.levelFirstId - let bookId = this.uploadData.textbookId; - fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}` + // let unitId = this.uploadData.levelSecondId + // ? this.uploadData.levelSecondId + // : this.uploadData.levelFirstId + // let bookId = this.uploadData.textbookId; + // fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}` - // 通知主进程 - ipcRenderer.send('openWindow', { - key: 'homeWork', - fullPath: fullPath, - cookieData: { ...configObj.data } - }) + // // 通知主进程 + // ipcRenderer.send('openWindow', { + // key: 'homeWork', + // fullPath: fullPath, + // cookieData: { ...configObj.data } + // }) }, // 删除作业 delhomework(item) { -- 2.44.0.windows.1 From a1002a1f400802e009bce6737f037e939a53a24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Thu, 17 Oct 2024 10:19:22 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=B8=83=E7=BD=AE?= =?UTF-8?q?=EF=BC=9A=E5=88=97=E8=A1=A8=E9=80=BB=E8=BE=91=E6=94=B9=E4=B8=BA?= =?UTF-8?q?usegetHomework=E9=87=8C=E9=9D=A2=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E7=9A=84?= =?UTF-8?q?=E6=89=B9=E9=98=85=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/hooks/useClassTask.js | 2 +- src/renderer/src/hooks/useGetHomework.js | 21 +- .../src/views/classTask/classTaskAssign.vue | 813 +++++------------- 3 files changed, 257 insertions(+), 579 deletions(-) diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js index 45760ad..85966bb 100644 --- a/src/renderer/src/hooks/useClassTask.js +++ b/src/renderer/src/hooks/useClassTask.js @@ -35,7 +35,7 @@ export const editListItem = (row, courseObj) => { fileHomeworkList: [],// 设计中的常规作业list whiteboardObj: '',// 设计中的课堂展示对象 }; - + console.log('编辑的行', row); //重新更新[新任务]中右侧列表数据 var listCourseWork = []; diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js index c122d9f..e07a2de 100644 --- a/src/renderer/src/hooks/useGetHomework.js +++ b/src/renderer/src/hooks/useGetHomework.js @@ -71,6 +71,7 @@ const getHomeWorkList = async () => { return await homeworklist({ entpcourseid: chapterId, edituserid: userStore.user.userId, + orderby: "timestamp DESC", pageSize: 100, status: '10' }).then((res) => { @@ -79,7 +80,25 @@ const getHomeWorkList = async () => { for (var i = 0; i < res.rows.length; i++) { res.rows[i].taskconfig = [] - // 找child + // 处理任务类型的UI + // if (res.rows[i].worktype == '学习目标定位') { + // res.rows[i].workclass = 'success'; + // res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes); + // } else + // 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加 + if (res.rows[i].worktype == '课堂展示') { + res.rows[i].workclass = 'primary'; + } else if (res.rows[i].worktype == '框架梳理') { + res.rows[i].workclass = 'warning'; + } else if (res.rows[i].worktype == '常规作业') { + res.rows[i].workclass = 'info'; + } else if (res.rows[i].worktype == '习题训练') { + res.rows[i].workclass = 'danger'; + } else { + res.rows[i].workclass = 'primary'; + } + + // 找child for (var j = 0; j < res.rows.length; j++) { if (res.rows[j].parentid == res.rows[i].id) { var ss = [] diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue index 4816e4f..184eb2a 100644 --- a/src/renderer/src/views/classTask/classTaskAssign.vue +++ b/src/renderer/src/views/classTask/classTaskAssign.vue @@ -36,6 +36,7 @@
- 编辑 + 编辑
查看详情 @@ -75,10 +76,10 @@
- 编辑 + 编辑
- 查看详情 + 查看详情
@@ -92,10 +93,15 @@ + + +
@@ -197,8 +203,6 @@
- 确 定
@@ -206,94 +210,79 @@ - - + +
确 定
- - - - - - - - - - - - - - - - - - - -
- -
- - - - - - - - - 必做 - 选做 - - - - - - - - - - - - - 点 - 分 - - - - - - - 分钟 - - - - - - - - - - - - - - - - -
- 取消 - - {{'推送'}} + + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ 确 定
+ + @@ -310,16 +299,20 @@ import { useRouter } from 'vue-router' import ChooseTextbook from '@/components/choose-textbook/index.vue' import { homeworklist, delClasswork } from '@/api/teaching/classwork' import { listEntpcoursework, listClassworkeval,updateClasswork,getEvaluationclue } from '@/api/classTask' -import { listClassmain, listClassgroup } from '@/api/classManage/index' -import { saveByClassWorkArray } from '@/api/teaching/classwork' import { useGetHomework } from '@/hooks/useGetHomework' +import { editListItem } from '@/hooks/useClassTask' import { processList } from '@/hooks/useProcessList' -import { uniqBy, groupBy } from 'lodash' -import { getCurrentTime } from '@/utils/date' import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue' import prevReadImgFileDialog from '@/views/classTask/container/classTask/prevReadImgFileDialog.vue' +import SetHomework from '@/components/set-homework/index.vue' +import {sessionStore} from '@/utils/store' +import {createWindow} from '@/utils/tool' +import { useToolState } from '@/store/modules/tool' +import {throttle,debounce } from '@/utils/comm' + +const toolState = useToolState(); import useUserStore from '@/store/modules/user' const userStore = useUserStore().user const { proxy } = getCurrentInstance() @@ -349,13 +342,17 @@ const courseObj = reactive({ // }) -const taskList = ref([]); -const loading = ref(false); +const taskList = ref([]); // 作业列表 +const loading = ref(false); +const pushRecordsList = ref([]); // 作业推送历史 +const pushRecordsOpen = ref(false); // 推送历史记录弹窗 +const pushRecordsLoading = ref(false); // 推送历史记录loading // 作业编辑 const workEdit = ref(false); const currentWorkEdit = reactive({ workTitleEdit: false, + currentType:'query', currentTask: {}, currentTitle: '', currentIndex: 0, @@ -371,21 +368,9 @@ const workConfObj = reactive({ }); // 推送相关 -const defaultProps = ref({ - children: 'children', - label: 'label', - isLeaf: 'leaf' -}); -const gradeList = ref([]);// 学生节点 -const workConfDialogOpen = ref(false);// 推送配置弹窗 -const classWorkConfigForm = reactive({ - formRowsType: '',// - formRowsList: null, - // - feedtype: '必做', - studentlist: [], //需要推送的学生list -}); // 推送作业配置 - +const setDialog = ref(false); // 推送配置 弹窗 +const rowsList = ref([]) // 当前需要推送行的数据 +const entpcourseid = ref('') // 当前课程id // --------------------------------------------------- @@ -411,6 +396,88 @@ const getData = (data) => { // 头部 教材分析打开外部链接需要当前章节ID localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId})) + + // + initHomeWork(); +} + +/** + * 获取 entpcourseid + */ +const initHomeWork = async()=> { + const { res, chapterId } = await useGetHomework(courseObj.node); + console.log('entpcourseid', chapterId); + console.log('res', res); + entpcourseid.value = chapterId; + taskList.value = res; + +} +/** + * 查看推送历史 + * + */ +const queryPushRecords = (row) => { + // 获取已推送历史 + console.log(row,'查看该行推送历史') + pushRecordsOpen.value = true; + pushRecordsLoading.value = true; + homeworklist({ + entpcourseid: entpcourseid.value, + edituserid: userStore.userId, + parentid: row.id, + orderby: "timestamp DESC", + pageSize: 100, + status: '1' // 推送状态： 1 已推送； 10 推送模版 + }).then((res) => { + if(res.rows&& res.rows.length>0){ + for (var i = 0; i < res.rows.length; i++) { + res.rows[i].taskconfig = [] + + // 处理任务类型的UI + // if (res.rows[i].worktype == '学习目标定位') { + // res.rows[i].workclass = 'success'; + // res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes); + // } else + // 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加 + if (res.rows[i].worktype == '课堂展示') { + res.rows[i].workclass = 'primary'; + } else if (res.rows[i].worktype == '框架梳理') { + res.rows[i].workclass = 'warning'; + } else if (res.rows[i].worktype == '常规作业') { + res.rows[i].workclass = 'info'; + } else if (res.rows[i].worktype == '习题训练') { + res.rows[i].workclass = 'danger'; + } else { + res.rows[i].workclass = 'primary'; + } + + // 如果是习题训练任务，则检查一共有多少道 + if (res.rows[i].entpcourseworklist != '') { + res.rows[i].entpcourseworklistarray = JSON.parse('[' + res.rows[i].entpcourseworklist + ']') + } else { + res.rows[i].entpcourseworklistarray = [] + } + + res.rows[i].fileShowName = res.rows[i].uniquekey + } + pushRecordsList.value = res.rows; + pushRecordsLoading.value = false; + } + }).catch((err) => { + pushRecordsLoading.value = false; + }) +} + +const debounceOpenWin = debounce(() => { + toolState.isTaskWin=true; // 设置打开批改窗口 + createWindow('open-taskwin',{url:'/teachClassTask'}); // 调用新窗口批改页面 +}, 1000); + +// 批改作业 +const onClickItem = (item) => { + console.log('防抖开启弹窗') + sessionStore.set('teachClassWorkItem', item); // 缓存点击的item + debounceOpenWin(); } /** @@ -441,10 +508,10 @@ const handleDelete =() => { * 1.获取作业列表 */ const getTaskList = async () => { - const { chapterId } = await useGetHomework(courseObj.node) - // this.entpcourseid = chapterId // 新版查询方式 - homeworklist({entpcourseid: chapterId, orderby: "deaddate DESC" , edituserid: userStore.userId, pageSize: 500}).then(res => { + taskList.value = []; + loading.value = true; + homeworklist({entpcourseid: entpcourseid.value, orderby: "deaddate DESC" , edituserid: userStore.userId, pageSize: 500}).then(res => { let model = []; let mission = []; @@ -542,26 +609,14 @@ const getTaskList = async () => { // 【编辑/查看】作业说明 -const handleWorkTitleEdit = (row, index) => { +const handleWorkTitleEdit = (row, index, type) => { + currentWorkEdit.currentType = type; currentWorkEdit.workTitleEdit = true; currentWorkEdit.currentTask = row; currentWorkEdit.currentTitle = row.title; currentWorkEdit.currentIndex = index; }; - -// 作业内容编辑-跳转到设计界面-传参 -let classtaskObj = reactive({ - id: '', // - bookName: '', // 课程名称 - uniquekey: '', // 设计中的标题 - title: '', // 设计中的说明 - worktype: '', // 设计中的作业类型 - quizlist: [], // 设计中的试题列表 - chooseWorkLists: [],// 设计中的框架梳理list - fileHomeworkList: [],// 设计中的常规作业list - whiteboardObj: '',// 设计中的课堂展示对象 -}) /** * 作业内容-查看详情 * */ @@ -569,10 +624,7 @@ let classtaskObj = reactive({ console.log(row, index) workEdit.value = true currentWorkEdit.currentTask = row; - // currentWorkEdit.currentIndex = index; currentTag.value = row.worktype; - // this.attainmentList = row.workcodesList?.attlist; - // this.courseQualityList = row.workcodesList?.qualist; if (row.worktype == '框架梳理') { //包含 entpcourseworklistarray 内容 var listCourseWork = []; @@ -652,457 +704,58 @@ let classtaskObj = reactive({ } } }; -// 作业内容编辑-跳转到设计界面 -const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{ - //重新更新[新任务]中右侧列表数据 - var listCourseWork = []; - for (var i=0; i < row.entpcourseworklistarray.length; i++) { - listCourseWork.push(row.entpcourseworklistarray[i]); - } - - if (listCourseWork.length > 0) { - classtaskObj.id= row.id; // - classtaskObj.bookObj = courseObj; // 教材对象 - classtaskObj.bookName = row.evaltitle? row.evalparenttitle? row.evalparenttitle+'/'+row.evaltitle : row.evaltitle: row.evalparenttitle// 课程名称:单元/章节： 单元 - classtaskObj.uniquekey= row.uniquekey; // 设计中的标题 - classtaskObj.title= row.title; // 设计中的说明 - classtaskObj.worktype= row.worktype; // 设计中的作业类型 - classtaskObj.quizlist= []; // 设计中的试题列表 - classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list - classtaskObj.fileHomeworkList = []; //设计中的 常规作业list - classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象 - - - if (row.worktype == '框架梳理') { - // 框架梳理对应只有一个内容 - const res = await getEvaluationclue(listCourseWork[0].id); - if ( res.data==null || res.data==undefined ) { - return; - } - console.log('res.data', res.data); - // this.chooseWorkLists = []; - res.data.worktype = '框架梳理'; - res.data.score = listCourseWork[0].score; - classtaskObj.chooseWorkLists.push(res.data); - // - ToNewClassTask(classtaskObj); - } - else if (row.worktype == '习题训练') { - const ids = listCourseWork.map(item => item.id).join(","); - listEntpcoursework({ids: ids, pageSize: 50}).then(idres => { - // for (var i=0; i]+>/g, ''); - // } - // 格式化试题 - if(idres.rows&&idres.rows.length > 0){ - processList(idres.rows); - //重新将task中的分值更新 - row.entpcourseworklistarray.forEach(item => { - const quizItem = idres.rows.find(quiz => quiz.id === item.id); - if (quizItem) { - quizItem.score = item.score; - quizItem.scoreOrigin = item.score; - } - }); - - classtaskObj.quizlist = idres.rows; - // - ToNewClassTask(classtaskObj); +/** + * 作业内容-前往作业设计 编辑页面 + * @param row + */ +const handleWorkEditItem = (row) => { + editListItem(row, courseObj).then((obj) => { + if(obj){ + //前往作业设计 + router.push({ + path: '/newClassTask', + query: { + classtaskObj: JSON.stringify(obj), } }) - } - else if (row.worktype == '课堂展示') { - console.log('row.课堂展示', row.workcodes); - const workcodes = JSON.parse(row.workcodes); - classtaskObj.whiteboardObj = JSON.stringify(workcodes.json); - // - ToNewClassTask(classtaskObj); } - else if (row.worktype == '常规作业') { - if(isJson(row.workcodes)){ - classtaskObj.fileHomeworkList = JSON.parse(row.workcodes); - // - ToNewClassTask(classtaskObj); - } - } - } -}; -/** - * 跳转 作业设计 进行编辑页面 - * @param classtaskObj - */ -const ToNewClassTask = (classtaskObj) => { - router.push({ - path: '/newClassTask', - query: { - classtaskObj: JSON.stringify(classtaskObj), - } - }) -} - -const isJson = (str) => { - if (typeof str == 'string') { - try { - let obj = JSON.parse(str) - if (typeof obj == 'object' && obj) { - return true - } else { - return false - } - } catch (e) { - return false - } - } -} - -// 获取班级 -const getGradeList = async() => { - let { rows } = await listClassmain({ - classuserid: userStore.userId, - pageSize: 100, - status: 'open' - }) - rows.forEach((item) => { - item.label = item.caption - item.level = 0 - item.leaf = false - item.children = [] - item.classstudentlist = JSON.parse('[' + item.classstudentlist + ']') - item.classstudentlist.forEach((el) => { - el.classid = item.id - }) - }) - return rows -}; -// 获取节点下一级 -const getLoad = async (node, resolve) =>{ - // 获取一级节点 班级 - if (node.level == 0) { - gradeList.value = await getGradeList() - resolve(gradeList.value) - } - // 获取二级节点 小组 - if (node.level == 1) { - listClassgroup({ classid: node.key, orderby: 'orderidx', pageSize: 100 }).then((res) => { - if (res.rows.length > 0) { - let ary = [] - res.rows.forEach((item) => { - if (item.parentid === 0) { - //studentGroup 小组学生 为三级节点 - let studentGroup = JSON.parse('[' + item.studentlist + ']') - studentGroup.forEach((el) => { - el.label = el.name - el.leaf = true - el.level = 2 - el.id = el.studentid - el.classid = item.classid - }) - ary.push({ - label: item.groupname, - leaf: false, - ...item, - level: 1, - // children 小组学生 三级节点 这样就不用再从接口拿 - children: studentGroup - }) - } - }) - resolve(ary) - } else { - // 班级下面没有小组 直接取学生 - let students = node.data.classstudentlist - students.forEach((item) => { - item.label = item.name - item.level = 2 - item.leaf = true - }) - resolve(students) - } - }) - } - // 三级节点 小组学生 - if (node.level == 2) { - resolve(node.data.children) - } -} - -//节点勾选后触发 拿学生 -const handleCheckChange = (data, checked) => { - classWorkConfigForm.studentlist = []; - // 选中节点集合 - let checkNodes = checked.checkedNodes - let ary = [] - checkNodes.forEach((item) => { - // 一级节点 班级 - if (item.level == 0) { - ary = [...ary, ...item.classstudentlist] - } - // 二级节点 班级下面的小组 - if (item.level == 1) { - ary = [...ary, ...item.children] - } - // 三级节点 小组下面的学生 - if (item.level == 2) { - ary = [...ary, item] - } - }) - classWorkConfigForm.studentlist = uniqBy(ary, 'studentid') -}; -// 从已经选中的学生中删除 -const handleClassDialogClassStudentRemove = (item,index) => { - classWorkConfigForm.studentlist.splice(index, 1); - // 同步删除 [班级、班级]小组]中对应的该学生 - proxy.$refs.treeRef.setChecked(item.id, false, true); - //TODO 后续再看 ，待完善 - // const ids = this.$refs.treeRef.getCheckedKeys(); - // console.log(ids) - // console.log(ids.filter((_item)=>_item == item.id),'???????') - // if(ids&&ids.filter((_item)=>_item == item.id).length>0){ - // console.log(ids,'?====?') - // console.log(item.id,'?=item.id===?') - // // 个人多组的情况，再次删除该个人?为啥没删除掉呢 - // this.$refs.treeRef.setChecked(item.id, false, true); - // // setCheckedKeys - // } -}; - -/** - * 处理在作业推送前的任务配置 - */ -const openClassWorkConfigDialog = (row, configindex, type) => { - // 初始 - workConfDialogOpen.value = true; - classWorkConfigForm.formRowsType = '';// - classWorkConfigForm.formRowsList = null; - if(type == 'list'){ - classWorkConfigForm.formRowsType = 'list'; - classWorkConfigForm.formRowsList = row; - }else{ - classWorkConfigForm.formRowsType = 'item'; - classWorkConfigForm.formRowsList = [row]; - } - // TODO 重复推送？待完善 - // if (configindex > -1) { - // this.handleClassDialogConfigShow(configindex, 0) - // } - - classWorkConfigForm.deaddate = getCurrentTime('YYYY-MM-DD'); - classWorkConfigForm.deadhour = getCurrentTime('HH+3');//当前时间 往后延时3个小时； - classWorkConfigForm.deadmin = getCurrentTime('mm'); - classWorkConfigForm.timelength = 1; -}; - - - -/** - * 推送配置：保存配置 - * @param key 'cancel' or 'submit' - */ -const handleWorkConfigUpdate = (key,row) => { - if (key == 'cancel') { - workConfDialogOpen.value = false; - } else if (key == 'submit') { - - // 2024-04-08, by jackyshen - // 注意，这里的逻辑较复杂。不能以this.classWorkConfigForm.classlist为准，需要从选中的学生要找出班级列表 - var clist = []; - var cidlist = []; - for (var i=0; i< classWorkConfigForm.studentlist.length; i++) { - if (cidlist.indexOf(classWorkConfigForm.studentlist[i].classid) == -1) { - // 再找班级名称，为了在UI上能展示出哪个班级 - var clsname = ''; - for (var d = 0; d -1，则是已有的配置方案。删除后再添加 - // 为什么尼？ - // 因为存在多个班级的问题，在修改过程中，如果添加了新的班级学生，则需要删除原来的，再添加新的。 - // 好，就这么愉快的决定 - // if (classWorkConfigForm.index > -1) { - // classWorkConfigForm.classWorkConfigList.splice(classWorkConfigForm.activeClassWorkIndex); - // } - // 处理小时和分钟 - var hh = classWorkConfigForm.deadhour; - hh = "0"+hh; - hh = hh.substr(hh.length-2, 2); - var mm = classWorkConfigForm.deadmin; - mm = "0"+mm; - mm = mm.substr(mm.length-2, 2); - - // 处理日期 - classWorkConfigForm.deaddate = '' + classWorkConfigForm.deaddate; - if (isNaN(classWorkConfigForm.deaddate.substring(0,4))) { - var dd = new Date(classWorkConfigForm.deaddate); - var year = dd.getFullYear(); //年份 - var month = dd.getMonth() + 1; //月份（0-11） - month = "0"+month; - month = month.substr(month.length-2,2); - var day = dd.getDate(); //天数（1到31） - day = "0"+day; - day = day.substr(day.length-2,2); - - classWorkConfigForm.deaddate = year+'-'+month+'-'+day; - } - - classWorkConfigForm.classWorkConfigList = []; - // 新建的配置方案 - for (var i=0; iitem.classid == clist[i].id); - classWorkConfigForm.classWorkConfigList.push({ - id: 0, - classid: clist[i].id, - classcaption: clist[i].caption, // 班级名称 - parentid: 0, - worktype: '', - workkey: classWorkConfigForm.workkey, - worktag: '', - entpcourseid: 0, - evalid: 0, - edusubject: '', - edudegree: '', - workdate: '', - title: '', - workcodes: '', - studentlist: clsStuList, - timelength: classWorkConfigForm.timelength, - weights: classWorkConfigForm.weights, - feedtype: classWorkConfigForm.feedtype, - deaddate: classWorkConfigForm.deaddate+' '+hh+":"+mm, - }); - } - - if(classWorkConfigForm.formRowsType == 'list'){ - // 一键推送：list推送 - for(var d=0;d { - if(classWorkConfigForm.studentlist.length == 0){ - return proxy.$modal.msgWarning('请选择需要推送的学生!'); - } - // this.classWorkToStudent_Loading = true; - - // 保存配置 - handleWorkConfigUpdate('submit', '') - const { chapterId } = await useGetHomework(courseObj.node) - // this.entpcourseid = chapterId - - console.log(taskList.value,'===============this.taskListthis.taskList') - var ttt = []; - for (var i=0; i { - console.log(response,'===============response'); - // this.classWorkToStudent_Loading = false; - workConfDialogOpen.value = false; - proxy.$modal.msgSuccess("作业推送成功"); - // 清空班级树状勾选项内容 - proxy.$refs.treeRef.setCheckedKeys([]); - // 刷新作业布置页面 - nextTick(() => { - getTaskList(); - }) - }).catch((error) =>{ - // this.classWorkToStudent_Loading = false; - workConfDialogOpen.value = false; }); -}; +} + +/** + * 推送作业配置 + * //改为list形式，有地方需要批量布置推送 + */ +// 打开布置作业窗口 +const openSet=(row, type)=> { + if(type == 'list'){ + // 批量布置推送 row 是多个rows，直接赋值 + rowsList.value = row; + setDialog.value = true; + }else{ + // 单个布置推送 row 是单个row,变成数组 + rowsList.value = [row]; + setDialog.value = true; + } +} +/** + * 关闭布置作业窗口 + */ +const closeHomework = () => { + rowsList.value = []; + setDialog.value = false; +} +/** + * 推送布置作业成功 + */ +const successHomework = () => { + rowsList.value = []; + setDialog.value = false; + // 刷新布置列表 + nextTick(() => { + getTaskList(); + }) +} /** * 一键推送 @@ -1113,7 +766,7 @@ const handleTaskAssignToAllClass = () => { proxy.$modal.confirm('是否确认推送选中的学习任务？').then(()=> { }).then(() => { // 弹出配置窗口 ，让用户配置推送策略 - openClassWorkConfigDialog(rows, -1,'list') + openSet(rows,'list'); }).catch(() => {}) }else{ return proxy.$modal.alertWarning("请选择需要推送的任务!"); @@ -1214,10 +867,16 @@ const selectable=(row, index)=>{ onMounted(() => { }) -watch(() => courseObj.node, (newVal) => { +watch(() => courseObj.node, (newVal,oldVal) => { console.log(courseObj,'课程选择') - // 习题资源 - getTaskList(); + if(newVal&&oldVal){ + console.log(newVal.id,'newVal') + console.log(oldVal.id,'oldVal') + if(newVal.id != oldVal.id){ + // 习题资源 + // getTaskList(); + } + } }) -- 2.44.0.windows.1 From e53731ac3f6157716bdfb735553bd696acc12965 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Thu, 17 Oct 2024 10:20:16 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=B8=BB=E9=A1=B5=EF=BC=9A=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E8=AE=BE=E8=AE=A1=E3=80=81=E4=BD=9C=E4=B8=9A=E5=B8=83?= =?UTF-8?q?=E7=BD=AE=E5=A4=96=E9=93=BE=E6=94=B9=E4=B8=BApc=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/desktop/index.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue index 065ea02..8352c8b 100644 --- a/src/renderer/src/views/desktop/index.vue +++ b/src/renderer/src/views/desktop/index.vue @@ -113,17 +113,17 @@ const menuList = [{ { name: '作业设计', icon: '#icon-zuoyesheji', - isOuter: true, - path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask', - // path: '/newClassTask', + // isOuter: true, + // path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask', + path: '/newClassTask', id: '2-1' }, { name: '作业布置', icon: '#icon-zuoyebuzhi', - isOuter: true, - path: '/teaching/classtaskassign?titleName=作业布置', - // path: '/classTaskAssign', + // isOuter: true, + // path: '/teaching/classtaskassign?titleName=作业布置', + path: '/classTaskAssign', id: '2-2' }, { -- 2.44.0.windows.1 From e57e643f67680ed38744c478f99729600c22f7b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com> Date: Thu, 17 Oct 2024 10:34:29 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=95=99=E5=AD=A6=E5=AE=9E=E8=B7=B5?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8Bui=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/src/views/prepare/container/file-list-item.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue index f617afb..eeb77d0 100644 --- a/src/renderer/src/views/prepare/container/file-list-item.vue +++ b/src/renderer/src/views/prepare/container/file-list-item.vue @@ -22,7 +22,8 @@