Compare commits
No commits in common. "4e7b9f0a825c7ab4558f9ae9081b295542a28e21" and "7b4e6d0b10c298450bb301b44b28cc2c04d95f3b" have entirely different histories.
4e7b9f0a82
...
7b4e6d0b10
|
@ -34,7 +34,6 @@ export const editListItem = (row, courseObj) => {
|
||||||
chooseWorkLists: [],// 设计中的框架梳理list
|
chooseWorkLists: [],// 设计中的框架梳理list
|
||||||
fileHomeworkList: [],// 设计中的常规作业list
|
fileHomeworkList: [],// 设计中的常规作业list
|
||||||
whiteboardObj: '',// 设计中的课堂展示对象
|
whiteboardObj: '',// 设计中的课堂展示对象
|
||||||
question: '', // 设计中的[课堂展示]的问题
|
|
||||||
};
|
};
|
||||||
console.log('编辑的行', row);
|
console.log('编辑的行', row);
|
||||||
|
|
||||||
|
@ -100,7 +99,7 @@ export const editListItem = (row, courseObj) => {
|
||||||
console.log('row.课堂展示', row.workcodes);
|
console.log('row.课堂展示', row.workcodes);
|
||||||
const workcodes = JSON.parse(row.workcodes);
|
const workcodes = JSON.parse(row.workcodes);
|
||||||
classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
|
classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
|
||||||
classtaskObj.question = row.worktag;
|
//
|
||||||
// console.log('课堂展示', classtaskObj);
|
// console.log('课堂展示', classtaskObj);
|
||||||
return resolve(classtaskObj);
|
return resolve(classtaskObj);
|
||||||
}
|
}
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
|
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
|
||||||
@click="workHandle('quizStats')"
|
@click="workHandle('quizStats')"
|
||||||
>逐题讲评</el-button
|
>逐题分析</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
|
@ -141,7 +141,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 逐题讲评 -->
|
<!-- 逐题分析 -->
|
||||||
<div v-else-if="classWorkAnalysis.view == 'quizStats'">
|
<div v-else-if="classWorkAnalysis.view == 'quizStats'">
|
||||||
<quiz-stats :active-data="classWorkActiveData" />
|
<quiz-stats :active-data="classWorkActiveData" />
|
||||||
</div>
|
</div>
|
||||||
|
@ -193,7 +193,7 @@ const tableRadio = reactive({
|
||||||
const loading_dt_table = ref(false)
|
const loading_dt_table = ref(false)
|
||||||
const isopen_dtwk_table = ref(false)
|
const isopen_dtwk_table = ref(false)
|
||||||
|
|
||||||
// zdg: 逐题讲评
|
// zdg: 逐题分析
|
||||||
const classWorkActiveData = reactive({
|
const classWorkActiveData = reactive({
|
||||||
quizlist: [], // 当前习题列表
|
quizlist: [], // 当前习题列表
|
||||||
studentList: [], // 当前课程-所有学生
|
studentList: [], // 当前课程-所有学生
|
||||||
|
@ -536,7 +536,7 @@ const escapeHtmlQuotes = (str) => {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//#region 逐题讲评
|
//#region 逐题分析
|
||||||
// 查看学生-作业概览
|
// 查看学生-作业概览
|
||||||
const workHandle = (type) => {
|
const workHandle = (type) => {
|
||||||
// 关闭右侧批阅ui
|
// 关闭右侧批阅ui
|
||||||
|
@ -643,12 +643,12 @@ const closeDialog = () => {
|
||||||
watch(classWorkAnalysis, (newVal, oldVal) => {
|
watch(classWorkAnalysis, (newVal, oldVal) => {
|
||||||
if(newVal.view != 'quizStats'){
|
if(newVal.view != 'quizStats'){
|
||||||
console.log('关闭zdg: 定时执行')
|
console.log('关闭zdg: 定时执行')
|
||||||
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
|
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
|
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
|
||||||
})
|
})
|
||||||
|
|
||||||
defineExpose({
|
defineExpose({
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<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;">
|
<div style="flex: 0 0 auto;">
|
||||||
<el-form-item label="问题">
|
<el-form-item label="问题">
|
||||||
<el-input v-model="classWorkForm.question" type="text" placeholder="请输入问题" />
|
<el-input v-model="classWorkForm.title" type="text" placeholder="请输入问题" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
</div>
|
</div>
|
||||||
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
|
<div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
|
||||||
|
@ -349,7 +349,6 @@ let classWorkForm = reactive({
|
||||||
chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
|
chooseWorkLists: props.propsformobj.chooseWorkLists?cloneDeep(props.propsformobj.chooseWorkLists):[], // 作业框架梳理list
|
||||||
fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
|
fileHomeworkList: props.propsformobj.fileHomeworkList?cloneDeep(props.propsformobj.fileHomeworkList):[], // 常规作业文件列表
|
||||||
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
|
whiteboardObj: props.propsformobj.whiteboardObj?cloneDeep(props.propsformobj.whiteboardObj):'', // 作业资源 - 课堂展示 白板
|
||||||
question: props.propsformobj.question?cloneDeep(props.propsformobj.question):'', // 作业资源 - 课堂展示 输入的问题
|
|
||||||
}); // 提交的作业内容
|
}); // 提交的作业内容
|
||||||
// ---------------------------------------------------
|
// ---------------------------------------------------
|
||||||
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
|
// const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
|
||||||
|
@ -639,7 +638,6 @@ const handleClassWorkSave = async () => {
|
||||||
let canvasJson = proxy.$refs.boardref.getCanvasJson()
|
let canvasJson = proxy.$refs.boardref.getCanvasJson()
|
||||||
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
|
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
|
||||||
// 课堂展示提交内容
|
// 课堂展示提交内容
|
||||||
cform.worktag = classWorkForm.question;
|
|
||||||
cform.title = classWorkForm.title;
|
cform.title = classWorkForm.title;
|
||||||
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
|
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
|
||||||
cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
|
cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
|
||||||
|
@ -650,7 +648,6 @@ const handleClassWorkSave = async () => {
|
||||||
classWorkForm.worktype = "课堂展示";
|
classWorkForm.worktype = "课堂展示";
|
||||||
classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
|
classWorkForm.uniquekey = props.propsformobj.uniquekey, // 作业唯一标识 作业名称
|
||||||
classWorkForm.title = "";
|
classWorkForm.title = "";
|
||||||
classWorkForm.question = "";
|
|
||||||
classWorkForm.quizlist = [], // 作业习题列表内容
|
classWorkForm.quizlist = [], // 作业习题列表内容
|
||||||
|
|
||||||
// 情况选择的资源缓存
|
// 情况选择的资源缓存
|
||||||
|
@ -842,7 +839,6 @@ const editWork = async (cform) =>{
|
||||||
let canvasJson = proxy.$refs.boardref.getCanvasJson()
|
let canvasJson = proxy.$refs.boardref.getCanvasJson()
|
||||||
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
|
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
|
||||||
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
|
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
|
||||||
cform.worktag = classWorkForm.question;
|
|
||||||
}
|
}
|
||||||
else if (classWorkForm.worktype=='常规作业') {
|
else if (classWorkForm.worktype=='常规作业') {
|
||||||
// 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
|
// 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
|
||||||
|
|
|
@ -69,7 +69,6 @@ const classWorkForm = reactive({
|
||||||
chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
|
chooseWorkLists: classtaskObj? JSON.parse(classtaskObj).chooseWorkLists : [],// 设计中的框架梳理list
|
||||||
fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
|
fileHomeworkList: classtaskObj? JSON.parse(classtaskObj).fileHomeworkList : [],// 设计中的常规文件作业list
|
||||||
whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
|
whiteboardObj: classtaskObj? JSON.parse(classtaskObj).whiteboardObj : '',// 设计中的 课堂展示 板书作业
|
||||||
question: classtaskObj? JSON.parse(classtaskObj).question : '',// 设计中的 课堂展示 输入的问题
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
|
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
|
||||||
@click="workHandle('quizStats')"
|
@click="workHandle('quizStats')"
|
||||||
>逐题讲评</el-button
|
>逐题分析</el-button
|
||||||
>
|
>
|
||||||
<el-button
|
<el-button
|
||||||
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
v-if="classWorkAnalysis.row.worktype == '习题训练'"
|
||||||
|
@ -131,7 +131,7 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 逐题讲评 -->
|
<!-- 逐题分析 -->
|
||||||
<div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
|
<div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
|
||||||
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
|
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -180,7 +180,7 @@ const tableRadio = reactive({
|
||||||
const loading_dt_table = ref(false)
|
const loading_dt_table = ref(false)
|
||||||
const isopen_dtwk_table = ref(false)
|
const isopen_dtwk_table = ref(false)
|
||||||
|
|
||||||
// zdg: 逐题讲评
|
// zdg: 逐题分析
|
||||||
const classWorkActiveData = reactive({
|
const classWorkActiveData = reactive({
|
||||||
quizlist: [], // 当前习题列表
|
quizlist: [], // 当前习题列表
|
||||||
studentList: [], // 当前课程-所有学生
|
studentList: [], // 当前课程-所有学生
|
||||||
|
@ -528,7 +528,7 @@ const escapeHtmlQuotes = (str) => {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
//#region 逐题讲评
|
//#region 逐题分析
|
||||||
// 查看学生-作业概览
|
// 查看学生-作业概览
|
||||||
const workHandle = (type) => {
|
const workHandle = (type) => {
|
||||||
// 关闭右侧批阅ui
|
// 关闭右侧批阅ui
|
||||||
|
@ -646,12 +646,12 @@ onMounted(() => {
|
||||||
watch(classWorkAnalysis, (newVal, oldVal) => {
|
watch(classWorkAnalysis, (newVal, oldVal) => {
|
||||||
if(newVal.view != 'quizStats'){
|
if(newVal.view != 'quizStats'){
|
||||||
console.log('关闭zdg: 定时执行')
|
console.log('关闭zdg: 定时执行')
|
||||||
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
|
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
onUnmounted(() => {
|
onUnmounted(() => {
|
||||||
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
|
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
|
||||||
})
|
})
|
||||||
|
|
||||||
// defineExpose({
|
// defineExpose({
|
||||||
|
|
Loading…
Reference in New Issue