+
预览
删除
@@ -362,7 +362,7 @@ const fileLoading = ref(false); // 常规作业loading
* 作业类型切换
*/
const changeFormType = (val) => {
- classWorkForm.worktype = val;
+ classWorkForm.worktype = val;
}
/**
@@ -371,7 +371,7 @@ const changeFormType = (val) => {
* @param {*} queryType
* 1 - 按条件查询
* 2 - 按关键词查询
- */
+ */
const handleQueryParamFromEntpCourseWork = (queryType) => {
// 确保更改了搜索参数后从第一页开始查询
// this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
@@ -410,7 +410,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
}
-
+
// 分页参数
// pageNum: paginationParams.pageNum,
// pageSize: paginationParams.pageSize,
@@ -420,7 +420,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
// // [初中+政治]需改为[初中+道德与法治]
// queryForm.edusubject = '道德与法治';
// }
-
+
listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
// if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
// // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
@@ -431,7 +431,7 @@ const handleQueryFromEntpCourseWork= (queryType) => {
// } else {
// workResource.entpCourseWorkList = entpcourseworkres.rows;
// }
-
+
if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
workResource.entpCourseWorkList = entpcourseworkres.data;
workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
@@ -509,7 +509,7 @@ const getEntpCourseWorkPointList = () => {
/**
* 添加资源
* @param fromsrc - 试题来源
- * @param entpcourseworkid
+ * @param entpcourseworkid
*/
const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => {
var exist = false;
@@ -608,11 +608,11 @@ const handleClassWorkSave = async () => {
uniquekey: classWorkForm.uniquekey,// 作业名称、编码
classid: 0,
classcourseid: 0,
- entpcourseid: chapterId, // 这个字段很特别
+ entpcourseid: chapterId, // 这个字段很特别
slideid: 0,
title: classWorkForm.title, // 作业说明？
workcodes: JSON.stringify(classWorkForm.workcodes), // 作业内容？
- edusubject: userStore.edusubject, // 学科 语文 数学
+ edusubject: userStore.edusubject, // 学科 语文 数学
evalid: props.bookobj.levelSecondId, //userStore.evalid, // // 单元下的课ID
edustage: userStore.edustage, // 学段 年纪 高中,初中,小学
status: '10', //2024-09-11 作业布置分离后的 新模版数据； 之前老版本为空
@@ -628,16 +628,16 @@ const handleClassWorkSave = async () => {
return;
}
-
-
+
+
if (classWorkForm.worktype === "课堂展示") {
boardLoading.value = true
let canvasJson = proxy.$refs.boardref.getCanvasJson()
let canvasBase64 = await proxy.$refs.boardref.getCanvasBase64()
// 课堂展示提交内容
- cform.title = classWorkForm.title;
+ cform.title = classWorkForm.title;
cform.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
cform.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
try {
@@ -667,7 +667,7 @@ const handleClassWorkSave = async () => {
} finally {
boardLoading.value = false
}
- }
+ }
else if(classWorkForm.worktype === "常规作业"){
fileLoading.value = true
cform.workcodes = JSON.stringify(classWorkForm.fileHomeworkList);
@@ -725,7 +725,7 @@ const handleClassWorkSave = async () => {
}
console.log(cform,'提交的数据');
if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
-
+
addClassworkReturnId(cform).then(workres => {
ElMessage({ type: 'success', message: '作业设计成功!'});
// 重置提交表单
@@ -743,7 +743,7 @@ const handleClassWorkSave = async () => {
})
}
-
+
if(props.isback){
// 其他页面进入的 返回上一页
router.back();
@@ -782,20 +782,20 @@ const editWork = async (cform) =>{
// 根据作业类型分类处理
if (classWorkForm.worktype=='习题训练'){
-
+
// 1.判断当前添加的作业是否与原来不同（跟父组件传来的值对比）
let needUplEval = false;
if (classWorkForm.quizlist.length != props.propsformobj.quizlist.length) {
needUplEval = true;
}else {
// 只要有一个不一致则说明需要更新
- needUplEval = classWorkForm.quizlist.some(cur =>
- !props.propsformobj.quizlist.some(last =>
+ needUplEval = classWorkForm.quizlist.some(cur =>
+ !props.propsformobj.quizlist.some(last =>
last.id === cur.id && last.score === cur.score
)
);
}
-
+
// 2.需要重新更新eval的数据
if (needUplEval) {
// 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
@@ -806,7 +806,7 @@ const editWork = async (cform) =>{
arrEvalids.push(element.id);
});
const ids = arrEvalids.join(',');
-
+
// 2.2.删除原作业
const delRes = await delClassworkeval(ids);
@@ -837,8 +837,8 @@ const editWork = async (cform) =>{
needUplEval = true;
}else {
// 只要有一个不一致则说明需要更新
- needUplEval = classWorkForm.chooseWorkLists.some(cur =>
- !props.propsformobj.chooseWorkLists.some(last =>
+ needUplEval = classWorkForm.chooseWorkLists.some(cur =>
+ !props.propsformobj.chooseWorkLists.some(last =>
last.id === cur.id && last.score === cur.score
)
);
@@ -902,15 +902,15 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
.container {
display: flex;
flex-direction: column;
- height: 100%;
+ height: 100%;
}
.top, .bottom {
- flex: 0 0 auto;
+ flex: 0 0 auto;
}
.middle {
- flex: 1;
+ flex: 1;
height: 100%;
overflow: hidden;
}
@@ -937,8 +937,8 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
.work-right {
height: 100%;
- padding: 0 0 0 5px;
- overflow: auto;
+ padding: 0 0 0 5px;
+ overflow: auto;
line-height: 26px;
overflow: hidden;
}
@@ -949,19 +949,19 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
display: flex;
flex-direction: column;
align-items: center;
- margin-bottom: 5px;
+ margin-bottom: 5px;
.choose-work-title{
- font-size: 1.2em;
+ font-size: 1.2em;
font-weight: bold;
margin-right: 5px
}
.choose-work-content{
- width: 100%;
+ width: 100%;
display: flex;
justify-content: space-around;
- flex-direction: column;
+ flex-direction: column;
flex: 1;
:deep(.el-form-item__label){
width: 50px !important;
diff --git a/src/renderer/src/views/classTask/newClassTask.vue b/src/renderer/src/views/classTask/newClassTask.vue
index b1d8236..ee78857 100644
--- a/src/renderer/src/views/classTask/newClassTask.vue
+++ b/src/renderer/src/views/classTask/newClassTask.vue
@@ -6,7 +6,7 @@
:collapse="isCollapse"
>
-
+
diff --git a/src/renderer/src/views/classTask/teachClassTask.vue b/src/renderer/src/views/classTask/teachClassTask.vue
index 9ad1ad0..fa5ba08 100644
--- a/src/renderer/src/views/classTask/teachClassTask.vue
+++ b/src/renderer/src/views/classTask/teachClassTask.vue
@@ -633,7 +633,7 @@ const closeDialog = () => {
}
onMounted(() => {
-
+
// const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
const data = sessionStore.get('teachClassWorkItem');
console.log(data,'????????????????????' )
@@ -657,8 +657,6 @@ onUnmounted(() => {
// })
-
-
-
+
diff --git a/src/renderer/src/views/examReport/index.vue b/src/renderer/src/views/examReport/index.vue
index 9a4c791..ff4b637 100644
--- a/src/renderer/src/views/examReport/index.vue
+++ b/src/renderer/src/views/examReport/index.vue
@@ -14,7 +14,7 @@
-
+
@@ -24,7 +24,7 @@
-
+
@@ -51,15 +51,15 @@
-
-