zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

常规作业改为主题作业，课堂展示改为创作展示 暂不修改

This commit is contained in:
白了个白 2024-10-22 17:27:02 +08:00
parent 35a00e2aca
commit a7a84b3738
12 changed files with 71 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/renderer/src/hooks/useClassTask.js
View File

@ -32,9 +32,9 @@ export const editListItem = (row, courseObj) => {
worktype: '', // 设计中的作业类型
quizlist: [], // 设计中的试题列表
chooseWorkLists: [],// 设计中的框架梳理list
fileHomeworkList: [],// 设计中的主题作业list
whiteboardObj: '',// 设计中的创作展示对象
question: '', // 设计中的[创作展示]的问题
fileHomeworkList: [],// 设计中的常规作业list
whiteboardObj: '',// 设计中的课堂展示对象
question: '', // 设计中的[课堂展示]的问题
};
console.log('编辑的行', row);
@ -53,8 +53,8 @@ export const editListItem = (row, courseObj) => {
classtaskObj.worktype= row.worktype; // 设计中的作业类型
classtaskObj.quizlist= []; // 设计中的试题列表
classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list
classtaskObj.fileHomeworkList = []; //设计中的 主题作业list
classtaskObj.whiteboardObj = ''; //设计中的 创作展示对象
classtaskObj.fileHomeworkList = []; //设计中的 常规作业list
classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象
if (row.worktype == '框架梳理') {
@ -96,19 +96,19 @@ export const editListItem = (row, courseObj) => {
}
})
}
else if (row.worktype == '创作展示') {
console.log('row.创作展示', row.workcodes);
else if (row.worktype == '课堂展示') {
console.log('row.课堂展示', row.workcodes);
const workcodes = JSON.parse(row.workcodes);
classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
classtaskObj.question = row.worktag;
// console.log('创作展示', classtaskObj);
// console.log('课堂展示', classtaskObj);
return resolve(classtaskObj);
}
else if (row.worktype == '主题作业') {
else if (row.worktype == '常规作业') {
if(isJson(row.workcodes)){
classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
//
// console.log('主题作业', classtaskObj);
// console.log('常规作业', classtaskObj);
return resolve(classtaskObj);
}
}

4
src/renderer/src/hooks/useGetHomework.js
View File

@ -86,11 +86,11 @@ const getHomeWorkList = async () => {
// res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
// } else
// 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加
if (res.rows[i].worktype == '创作展示') {
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 == '主题作业') {
} else if (res.rows[i].worktype == '常规作业') {
res.rows[i].workclass = 'info';
} else if (res.rows[i].worktype == '习题训练') {
res.rows[i].workclass = 'danger';

12
src/renderer/src/plugins/imChat/msgEnum.js
View File

@ -36,8 +36,8 @@ export class MsgEnum {
* | MSG_pushQuizOfClassWorkdata2Public | 老师端：把选中的学生习题作业，推到大屏 | pushQuizOfClassWorkdata2Public |
* | MSG_pushClassWorkdata2Public | 老师端：把选中的学生作业，推到大屏 | pushClassWorkdata2Public |
* | MSG_shareStudentPresentdata2All | 把某个学生的展示成果数据推给全班所有学生 | shareStudentPresentdata2All |
* | MSG_pushStudentPresentdata2Public | 老师端：创作展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public |
* | MSG_pushClassWorkPresentList2Public | 老师端：创作展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public |
* | MSG_pushStudentPresentdata2Public | 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 | pushStudentPresentdata2Public |
* | MSG_pushClassWorkPresentList2Public | 老师端：课堂展示活动，任务列表，推到大屏 | pushClassWorkPresentList2Public |
* | MSG_activePageType | 课标研读-分页切换 | activePageType |
* | MSG_slideFlapping | 幻灯片-切换 | slideFlapping |
* | MSG_anmationclick | 幻灯片-动画切换 | anmationclick |
@ -46,7 +46,7 @@ export class MsgEnum {
* | MSG_classtaskfeedback | 老师端：接收到学生反馈消息-课堂测练中的其他任务 | classtaskfeedback |
* | MSG_studentfeedback | 老师端：学生反馈的消息，具体要看其中的feedbackkey，类别较繁杂 | studentfeedback |
* | MSG_studentfeedbackcancel | 老师端：学生反馈的消息取消，如取消学会了，取消困惑 | studentfeedbackcancel |
* | MSG_classshowdata | 学生提交的创作展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata |
* | MSG_classshowdata | 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 | classshowdata |
* | MSG_classWorkOfPresentDataUpdate | 学生在公屏上展示并完善后，保存后，老师端要更新 | classWorkOfPresentDataUpdate |
* | MSG_classlecturePagesrc | 课堂讲授活动，选择不同的内容 | classlecturePagesrc |
* | --- | 以下为新定义-消息头 | --- |
@ -66,9 +66,9 @@ export class MsgEnum {
MSG_pushClassWorkdata2Public : 'pushClassWorkdata2Public',
/** @desc: 把某个学生的展示成果数据推给全班所有学生 */
MSG_shareStudentPresentdata2All : 'shareStudentPresentdata2All',
/** @desc: 老师端：创作展示活动，把选中的学生展示数据，推到大屏 */
/** @desc: 老师端：课堂展示活动，把选中的学生展示数据，推到大屏 */
MSG_pushStudentPresentdata2Public : 'pushStudentPresentdata2Public',
/** @desc: 老师端：创作展示活动，任务列表，推到大屏 */
/** @desc: 老师端：课堂展示活动，任务列表，推到大屏 */
MSG_pushClassWorkPresentList2Public : 'pushClassWorkPresentList2Public',
/** @desc: 课标研读-分页切换 */
MSG_activePageType : 'activePageType',
@ -86,7 +86,7 @@ export class MsgEnum {
MSG_studentfeedback : 'studentfeedback',
/** @desc: 老师端：学生反馈的消息取消，如取消学会了，取消困惑 */
MSG_studentfeedbackcancel : 'studentfeedbackcancel',
/** @desc: 学生提交的创作展示数据-要在老师端显示，再由老师选择推送到公屏上 */
/** @desc: 学生提交的课堂展示数据-要在老师端显示，再由老师选择推送到公屏上 */
MSG_classshowdata : 'classshowdata',
/** @desc: 学生在公屏上展示并完善后，保存后，老师端要更新 */
MSG_classWorkOfPresentDataUpdate : 'classWorkOfPresentDataUpdate',

2
src/renderer/src/views/classTask/classTask.vue
View File

@ -291,7 +291,7 @@ const getStudentClassWorkData = async() => {
}
for (var e = 0; e < evalarray.length; e++) {
if (res.rows[i].worktype == '主题作业') {
if (res.rows[i].worktype == '常规作业') {
evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
/"(\[.*\])"/g,
'$1'

30
src/renderer/src/views/classTask/classTaskAssign.vue
View File

@ -148,9 +148,9 @@
</template>
</div>
</div>
<!-- TODO 创作展示 预览待开发-->
<!-- 主题作业：包含多个格式（图片略缩图展示，点击放大；其他附件跳转另外弹窗查看） -->
<div v-if="currentTag=='主题作业'" :style="{'padding': '15px', 'overflow': 'auto'}">
<!-- TODO 课堂展示 预览待开发-->
<!-- 常规作业：包含多个格式（图片略缩图展示，点击放大；其他附件跳转另外弹窗查看） -->
<div v-if="currentTag=='常规作业'" :style="{'padding': '15px', 'overflow': 'auto'}">
<div style="margin: 5px; background-color: white">
<div v-if="workConfObj.teacherFeedContentList.length > 0">
<div class="image_list">
@ -362,9 +362,9 @@ const currentTag = ref('');// 当前作业类型
const workConfObj = reactive({
quizlist: [], // 习题list
chooseWorkLists: [], // 框架梳理
teacherFeedContentList: [],//主题作业
teachFileList: [], // 主题作业文件list
teachImageList: [],// 主题作业图片list
teacherFeedContentList: [],//常规作业
teachFileList: [], // 常规作业文件list
teachImageList: [],// 常规作业图片list
});
// 推送相关
@ -440,11 +440,11 @@ const queryPushRecords = (row) => {
// res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
// } else
// 课标研读 目标设定 教材研读 框架梳理 学科定位 TODO 后续接入在添加
if (res.rows[i].worktype == '创作展示') {
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 == '主题作业') {
} else if (res.rows[i].worktype == '常规作业') {
res.rows[i].workclass = 'info';
} else if (res.rows[i].worktype == '习题训练') {
res.rows[i].workclass = 'danger';
@ -686,9 +686,9 @@ const handleWorkTitleEdit = (row, index, type) => {
})
}
//TODO 待完善 创作展示
if(row.worktype == '主题作业'){
console.log(row,'主题作业');
//TODO 待完善 课堂展示
if(row.worktype == '常规作业'){
console.log(row,'常规作业');
workConfObj.teacherFeedContentList = [];
workConfObj.teachImageList = [];
workConfObj.teachFileList = [];
@ -795,13 +795,13 @@ const prevRead = (item) => {
proxy.$refs.prevReadMsgDialogRef.openDialog(item);
}
/**
* 主题作业：其他附件预览
* 常规作业：其他附件预览
*/
const openFile = () => {
const obj = {
teacherFeedContentList: workConfObj.teacherFeedContentList,//主题作业
teachFileList: workConfObj.teachFileList, // 主题作业文件list
teachImageList: workConfObj.teachImageList,// 主题作业图片list
teacherFeedContentList: workConfObj.teacherFeedContentList,//常规作业
teachFileList: workConfObj.teachFileList, // 常规作业文件list
teachImageList: workConfObj.teachImageList,// 常规作业图片list
}
proxy.$refs.prevReadImgFileDialogRef.acceptParams(obj);
}

28
src/renderer/src/views/classTask/container/classTask/item-dialog-score.vue
View File

@ -136,11 +136,11 @@
</div>
</div>
<!-- 题目内容：主题作业、创作展示 -->
<!-- 题目内容：常规作业、课堂展示 -->
<div
v-if="
dialogProps.studentObj.worktype == '主题作业' ||
dialogProps.studentObj.worktype == '创作展示' ||
dialogProps.studentObj.worktype == '常规作业' ||
dialogProps.studentObj.worktype == '课堂展示' ||
dialogProps.studentObj.worktype == '框架梳理'
"
>
@ -152,11 +152,11 @@
<span>{{ sIndex + 1 }}、{{ stuItem.score ? stuItem.score : 0 }}分</span>
</div>
</template>
<!-- 主题作业 -->
<!-- 常规作业 -->
<div
v-if="
dialogProps.studentObj.worktype == '主题作业' ||
dialogProps.studentObj.worktype == '创作展示' ||
dialogProps.studentObj.worktype == '常规作业' ||
dialogProps.studentObj.worktype == '课堂展示' ||
dialogProps.studentObj.worktype == '框架梳理'
"
>
@ -210,8 +210,8 @@
<!-- 学生答题展示 -->
<div v-if="feedContentList.length > 0">
<div v-if="dialogProps.studentObj.worktype == '主题作业' && stuItem.rightanswer != ''&& stuItem.rightanswer != null">
<!-- 主题作业：学生有的会答复 -->
<div v-if="dialogProps.studentObj.worktype == '常规作业' && stuItem.rightanswer != ''&& stuItem.rightanswer != null">
<!-- 常规作业：学生有的会答复 -->
<p style="padding: 10px 0;text-align: left;">学生答复内容</p>
<div style="padding: 0 20px;text-align: left;">{{stuItem.rightanswer}}</div>
</div>
@ -484,11 +484,11 @@ const dialogProps = ref({
studentQuizAllList: [], //学生答题的list
quizlist: [] // 当前学生的所有题目list
})
//学生主题作业list
//学生常规作业list
const feedContentList = ref([])
const imageList = ref([])
const fileList = ref([])
// 老师主题作业、创作展示布置题目附件list
// 老师常规作业、课堂展示布置题目附件list
const teacherFeedContentList = ref([])
const teachImageList = ref([])
const teachFileList = ref([])
@ -708,9 +708,9 @@ const acceptParams = async (params) => {
})
} else {
// 学生回答
if (params.studentObj.worktype == '主题作业') {
if (params.studentObj.worktype == '常规作业') {
try {
// 老师布置的附件 datacontent TODO：主题作业、其他类型还未接入
// 老师布置的附件 datacontent TODO：常规作业、其他类型还未接入
const res = await getClassworkdata(params.studentObj.id);
if(res.data.datacontent != ''){
const teachWorkFileList = JSON.parse(res.data.datacontent);
@ -762,7 +762,7 @@ const acceptParams = async (params) => {
}
})
} else if (
params.studentObj.worktype == '创作展示' ||
params.studentObj.worktype == '课堂展示' ||
params.studentObj.worktype == '框架梳理'
) {
params.studentQuizAllList.forEach((item) => {
@ -774,7 +774,7 @@ const acceptParams = async (params) => {
classWorkFormScore.teacherremark = item.teacherremark // 评价语
// 根据移动端返回定义：只返回一张图片：rightanswer："https://wzyzoss.eos-chongqing-3.cmecloud.cn/2024/9/5/c5d8e00a93364dd3b975f669afa217f9.png"
// 这里只有一张图片；
console.log(item.rightanswer, '----------创作展示学生答题------------------')
console.log(item.rightanswer, '----------课堂展示学生答题------------------')
if (item.rightanswer != '' && item.rightanswer != null) {
if (

2
src/renderer/src/views/classTask/container/classTask/prevReadImgFileDialog.vue
View File

@ -59,7 +59,7 @@ const props = defineProps({})
const fileReadopen = ref(false)
// 老师主题作业、创作展示布置题目附件list
// 老师常规作业、课堂展示布置题目附件list
const teacherFeedContentList = ref([])
const teachImageList = ref([])
const teachFileList = ref([])

2
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -428,7 +428,7 @@ const getStudentClassWorkDataDetail = (row) => {
// ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
// : wevalres.rows[w].feedcontent
if (classWorkAnalysis.row.worktype == '主题作业') {
if (classWorkAnalysis.row.worktype == '常规作业') {
wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
}
if (wevalres.rows[w].feedcontent != '') {

34
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -18,7 +18,7 @@
<!-- 作业资源 -->
<el-row class="middle">
<el-col :span="24" style="height: 100%; overflow: hidden;">
<div v-if="classWorkForm.worktype == '创作展示'" style="height: 100%; display: flex; flex-direction: column;">
<div v-if="classWorkForm.worktype == '课堂展示'" style="height: 100%; display: flex; flex-direction: column;">
<div style="flex: 0 0 auto;">
<el-form-item label="问题">
<el-input v-model="classWorkForm.question" type="text" placeholder="请输入问题" />
@ -130,7 +130,7 @@
<!-- 非习题训练：常规作业、 -->
<div v-if="classWorkForm.worktype!='习题训练'">
<div :style="{ 'overflow': 'auto'}">
<template v-if="classWorkForm.worktype!='主题作业'">
<template v-if="classWorkForm.worktype!='常规作业'">
<template v-for="(item, index) in workResource.teachResourceList" :key="item">
<div v-if="item.worktype==classWorkForm.worktype" style="border-bottom: 1px dotted;display: flex;justify-content: space-between;">
<div style="margin-bottom: 5px; padding-left: 15px;display: flex;flex-direction: row;align-items: center;">
@ -152,7 +152,7 @@
</div>
</template>
</template>
<template v-if="classWorkForm.worktype =='主题作业'">
<template v-if="classWorkForm.worktype =='常规作业'">
<div v-loading="fileLoading" class="upload-homework">
<FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
</div>
@ -208,7 +208,7 @@
<!-- 作业说明 -->
<el-row class="bottom">
<el-col :span="12">
<el-form-item v-if="classWorkForm.worktype != '创作展示'" label="作业说明" style="margin: 10px 0;">
<el-form-item v-if="classWorkForm.worktype != '课堂展示'" label="作业说明" style="margin: 10px 0;">
<el-col :span="15" style="padding: 0px">
<!-- <el-input v-model="classWorkForm.title" type="textarea" :rows="1" placeholder="请输入作业说明"/> -->
<el-input v-model="classWorkForm.title" style="width: 400px" placeholder="请输入作业说明"/>
@ -352,16 +352,16 @@ let classWorkForm = reactive({
quizlist: props.propsformobj.quizlist?cloneDeep(props.propsformobj.quizlist):[], // 作业习题列表内容
chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 创作展示 白板
question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 创作展示 输入的问题
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
}); // 提交的作业内容
// ---------------------------------------------------
// const listWorkType = ref(['习题训练', '框架梳理', '创作展示', '主题作业']); //作业类型
const listWorkType = ref(['习题训练', '创作展示', '主题作业']); //作业类型
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
const listWorkType = ref(['习题训练', '课堂展示', '常规作业']); //作业类型
// 创作展示-------
// 课堂展示-------
const boardLoading = ref(false);
//主题作业----------
//常规作业----------
const fileLoading = ref(false); // 常规作业loading
/***
@ -638,7 +638,7 @@ const handleClassWorkSave = async () => {
if (classWorkForm.worktype === "创作展示") {
if (classWorkForm.worktype === "课堂展示") {
boardLoading.value = true
let canvasJson = proxy.$refs.boardref.getCanvasJson()
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
@ -651,7 +651,7 @@ const handleClassWorkSave = async () => {
addClassworkReturnId(cform).then(() => {
ElMessage({ type: 'success', message: '作业设计成功!'});
// 重置提交表单
classWorkForm.worktype = "创作展示";
classWorkForm.worktype = "课堂展示";
classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
classWorkForm.title = "";
classWorkForm.question = "";
@ -667,7 +667,7 @@ const handleClassWorkSave = async () => {
boardLoading.value = false
}
}
else if(classWorkForm.worktype === "主题作业"){
else if(classWorkForm.worktype === "常规作业"){
fileLoading.value = true
cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
cform.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
@ -675,7 +675,7 @@ const handleClassWorkSave = async () => {
addClassworkReturnId(cform).then(() => {
ElMessage({ type: 'success', message: '作业设计成功!'});
// 重置提交表单
classWorkForm.worktype = "主题作业";
classWorkForm.worktype = "常规作业";
classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
classWorkForm.title = "";
classWorkForm.quizlist = [], // 作业习题列表内容
@ -757,7 +757,7 @@ const editWork = async (cform) =>{
ElMessage.error('请先添加作业资源!');
return;
}
}else if (classWorkForm.worktype == '创作展示' || classWorkForm.worktype == '主题作业') {
}else if (classWorkForm.worktype == '课堂展示' || classWorkForm.worktype == '常规作业') {
// 不做校验
}else {
@ -842,13 +842,13 @@ const editWork = async (cform) =>{
let res = await updateClassworkeval(uplParams);
}
}
else if (classWorkForm.worktype=='创作展示') {
else if (classWorkForm.worktype=='课堂展示') {
let canvasJson = proxy.$refs.boardref.getCanvasJson()
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
cform.worktag = classWorkForm.question;
}
else if (classWorkForm.worktype=='主题作业') {
else if (classWorkForm.worktype=='常规作业') {
// 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
}

4
src/renderer/src/views/classTask/newClassTask.vue
View File

@ -68,8 +68,8 @@ const classWorkForm = reactive({
quizlist: classtaskObj? JSON.parse(classtaskObj).quizlist : [], // 设计中的试题列表
chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 创作展示 板书作业
question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 创作展示 输入的问题
whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题
})

2
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -421,7 +421,7 @@ const getStudentClassWorkDataDetail = (row) => {
// ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
// : wevalres.rows[w].feedcontent
if (classWorkAnalysis.row.worktype == '主题作业') {
if (classWorkAnalysis.row.worktype == '常规作业') {
wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
}
if (wevalres.rows[w].feedcontent != '') {

2
src/renderer/src/views/tool/createHomework.js
View File

@ -11,7 +11,7 @@ export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) =>{
formObj.entpid = usertore.deptId;
formObj.level = 1;
formObj.parentid = 0;
formObj.worktype = '主题作业';
formObj.worktype = '常规作业';
formObj.workkey = '';
formObj.worktag = '';