diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue index 2ca8a3b..b97b57a 100644 --- a/src/renderer/src/views/classTask/classTaskAssign.vue +++ b/src/renderer/src/views/classTask/classTaskAssign.vue @@ -99,7 +99,7 @@ - +
@@ -128,29 +128,20 @@
- - @@ -268,6 +262,8 @@ import { useGetHomework } from '@/hooks/useGetHomework' 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 useUserStore from '@/store/modules/user' const userStore = useUserStore().user const { proxy } = getCurrentInstance() @@ -284,7 +280,7 @@ const props = defineProps({ // --------------------------------------------------- const isCollapse = ref(false) - +const prevReadMsgDialogRef = ref(null);// 预览框ref const courseObj = reactive({ // 课程相关参数: 教材id,单元id,章节id,课程名称 @@ -308,9 +304,10 @@ const currentWorkEdit = reactive({ currentIndex: 0, })// 当前作业编辑 const currentTag = ref('');// 当前作业类型 - +// 作业列表-详情展示内容 const workConfObj = reactive({ quizlist: [], // 习题list + chooseWorkLists: [], // 框架梳理 }); // 推送相关 @@ -508,7 +505,7 @@ let classtaskObj = reactive({ /** * 作业内容-查看详情 * */ - const handleWorkEdit = (row, index) =>{ + const handleWorkEdit = (row, index) =>{ console.log(row, index) workEdit.value = true currentWorkEdit.currentTask = row; @@ -517,24 +514,28 @@ let classtaskObj = reactive({ // this.attainmentList = row.workcodesList?.attlist; // this.courseQualityList = row.workcodesList?.qualist; if (row.worktype == '框架梳理') { - this.$nextTick(()=>{ - this.getFlowData() + //TODO 待完善 框架梳理 详情 + //包含 entpcourseworklistarray 内容 + var listCourseWork = []; + for (var i=0; i < row.entpcourseworklistarray.length; i++) { + listCourseWork.push(row.entpcourseworklistarray[i]); + } + nextTick(()=>{ + // 框架梳理对应只有一个内容 默认读取第一个id即可 + getEvaluationclue(listCourseWork[0].id).then(res => { + if ( res.data==null || res.data==undefined ) { + return; + } + + res.data.worktype = '框架梳理'; + res.data.score = listCourseWork[0].score; + + console.log('框架梳理的列表', res.data); + // 预览list赋值 + workConfObj.chooseWorkLists = [res.data]; + }); }) } - // if (row.worktype == '学科定位') { - // // TODO 后续需要再迁 - // rootid:entpcoursework里的id rootid: row.entpcourseworklistarray[0].id, - // listEvaluationclue({ cluegroup: 'graph', edusubject: this.courseObj.edusubject, pageSize: 1000 }).then((res) => { - // var glist = []; - // for (var i = 0; i < res.rows.length; i++) { - // glist.push(res.rows[i]); - // } - // this.isEditable = false; - // this.preKnowList = glist; - // this.$refs.jsMind.updateFromParent(this.preKnowList, this.courseObj.edusubject); - // this.$refs.jsMind.initJsMindMap(); - // }) - // } // // 课标研读 目标设定 教材研读 框架梳理 学科定位 if (row.worktype == '习题训练') { @@ -572,7 +573,7 @@ let classtaskObj = reactive({ }) } - // 常规作业、课堂展示 + //TODO 待完善 常规作业、课堂展示 if(row.worktype == '常规作业' || row.worktype == '课堂展示'){ console.log(row,'常规作业-课堂展示'); // 老师布置的附件 workcodes ？？ 与批改哪里这个字段值不一样 @@ -1065,6 +1066,13 @@ const handleNewClassWorkDialog = () => { router.push({ path: '/newClassTask' }); } +/** + * 预览框 + */ +const prevRead = (item) => { + proxy.$refs.prevReadMsgDialogRef.openDialog(item); +} + // 作业说明编辑-确认 const submitWorkTitle = () => { if(currentWorkEdit.currentTask.title == currentWorkEdit.currentTitle){ diff --git a/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue new file mode 100644 index 0000000..a96cd04 --- /dev/null +++ b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue index 493c9f0..022bc4d 100644 --- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue +++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue @@ -222,25 +222,8 @@
- - - -
- -
- - - + +
@@ -260,16 +243,16 @@ import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; import { useGetHomework } from '@/hooks/useGetHomework' import { processList } from '@/hooks/useProcessList' import { getCurrentTime } from '@/utils/date' -import FlowChart from "@/components/Flowchart/index.vue"; import FileUpload from "@/components/FileUpload/index.vue"; import whiteboard from '@/components/whiteboard/whiteboard.vue' - +import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue' import { useToolState } from '@/store/modules/tool' import useUserStore from '@/store/modules/user' const userStore = useUserStore().user const { proxy } = getCurrentInstance() const router = useRouter() +const toolStore = useToolState() const props = defineProps({ bookobj: { @@ -286,12 +269,8 @@ const props = defineProps({ } }) +const prevReadMsgDialogRef = ref(null);// 预览框ref -const isDialogOpen = ref(false) -const toolStore = useToolState() -const openDialog = () => { - isDialogOpen.value = true -} const classWorkFormRef = ref(null); const entpCourseWorkTypeList = ref([ {value: 0, label: "不限"}, @@ -372,12 +351,6 @@ const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常 // 课堂展示------- const boardLoading = ref(false); -const prevReadMsg = reactive({ - visible: false, - type: "" -});// 预览msg -// 框架梳理---------- -const flowData = ref({})// 框架梳理 //常规作业---------- const fileLoading = ref(false); // 常规作业loading @@ -388,8 +361,6 @@ const changeFormType = (val) => { classWorkForm.worktype = val; } -console.log(props.propsformobj) -console.log(classWorkForm,'==============zizujian===================') /** * @desc: 根据查询参数查询试题 * @return: {*} @@ -565,61 +536,7 @@ const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => { * 预览资源 */ const prevRead = async (item) => { - prevReadMsg.visible = true; - prevReadMsg.type = item.worktype; - if (item.worktype==='课标研读'){ - //获取教材文件和批注信息 - listEvaluation({itemkey: 'subject', edusubject: userStore.edusubject, edustage: userStore.edustage}).then(res => { - // TODO 课标研读-还未接入 - console.log("课标研读-还未接入",res); - // this.versionObj = res.rows[0]; - // // 读取出课标文件的每一行 - // if (this.versionObj.fileurl.length > 0) { - // readFile({cluelink: this.versionObj.fileurl}).then(fileres => { - // this.versionObj.bookdata = fileres; - // this.activeTeachResOfStandard = item; - // }) - // } - }) - } - if (item.worktype==='目标设定'){ - // TODO 目标设定-还未接入 - // this.activeTeachResOfStandard = item; - } - if (item.worktype==='教材研读'){ - // TODO 教材研读-还未接入 - // getEvaluation(this.courseObj.evalrootid).then(bookres => { - // this.versionObj = bookres.data; - // if (this.versionObj.fileurl.length > 0) { - // readFile({cluelink: this.versionObj.fileurl}).then(fileres => { - // this.versionObj.bookdata = fileres; - // this.activeTeachResOfStandard = item; - // }) - // } - // }) - } - if (item.worktype==='框架梳理'){ - flowData.value = {}; - const { chapterId } = await useGetHomework(props.bookobj.node) - // this.entpcourseid = chapterId - let queryParams = { - entpcourseid: chapterId, - ppttype: '教材分析', - parentid: item.id, - title: '逻辑框架建构', - filetype: 'draw' - } - listEntpcoursefile(queryParams).then(response=>{ - if (response.rows.length == 0) { - return; - } - flowData.value = JSON.parse(response.rows[0].datacontent) - }) - } - if (item.worktype==='学科定位'){ - // TODO 学科定位-还未接入 - // this.activeTeachResOfStandard = item; - } + proxy.$refs.prevReadMsgDialogRef.openDialog(item); }; /** * 添加到作业 @@ -831,7 +748,10 @@ const handleClassWorkSave = async () => { } }); }; - +/** + * 编辑作业内容 + * @param cform 表单数据 + */ const editWork = async (cform) =>{ // 基础参数 cform.id= classWorkForm.id;