Merge branch 'main' into zhuhao_dev

This commit is contained in:
朱浩 2024-10-18 16:32:42 +08:00
commit 6de43cbab3
14 changed files with 708 additions and 818 deletions

View File

@ -62,8 +62,8 @@ const props = defineProps({
entpcourseid: { entpcourseid: {
default: '' default: ''
}, },
row: { rows: {
default: '' default: []
}, },
title: { title: {
type: String, type: String,
@ -225,32 +225,34 @@ const onSubmit = (formEl) => {
let ary = [] let ary = []
for (const value in gradeObj) { for (const value in gradeObj) {
// AIx web // AIx web
let obj = { for (var i = 0; i < props.rows.length; i++) {
id: 0, let obj = {
parentid: props.row.id, id: 0,
classid: value, parentid: props.rows[i].id,
classcourseid: 0, // id-ppt使 classid: value,
classReservId: classRoomId, // id classcourseid: 0, // id-ppt使
entpcourseid: props.entpcourseid, classReservId: classRoomId, // id
studentlist: JSON.stringify(gradeObj[value]), entpcourseid: props.entpcourseid,
feedback: form.feedback, studentlist: JSON.stringify(gradeObj[value]),
workkey: '', feedback: form.feedback,
timelength: form.timelength, workkey: '',
weights: 1, timelength: form.timelength,
deaddate: form.deaddate, weights: 1,
workdate: getCurrentTime('YYYY-MM-DD'), deaddate: form.deaddate,
uniquekey: props.row.uniquekey, workdate: getCurrentTime('YYYY-MM-DD'),
entpcourseworklist: '[' + props.row.entpcourseworklist + ']', uniquekey: props.rows[i].uniquekey,
needMsgNotifine: 'false', entpcourseworklist: '[' + props.rows[i].entpcourseworklist + ']',
msgkey: 'newclasswork', needMsgNotifine: 'false',
title: '作业任务', msgkey: 'newclasswork',
msgcontent: '', title: '作业任务',
teachername: userInfo.nickName, msgcontent: '',
unixstamp: new Date().getTime(), teachername: userInfo.nickName,
worktype: props.row.worktype, unixstamp: new Date().getTime(),
status: '1' worktype: props.rows[i].worktype,
status: '1'
}
ary.push(obj)
} }
ary.push(obj)
} }
setLoading.value = true setLoading.value = true
saveByClassWorkArray({ saveByClassWorkArray({
@ -284,8 +286,9 @@ const cloneDialog = (formEl) => {
} }
onMounted(() => { onMounted(() => {
// // 3
form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm') // form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm')
form.deaddate = `${getCurrentTime('YYYY-MM-DD')} ${getCurrentTime('HH+3')}:${getCurrentTime('mm')}`;
}) })
</script> </script>

View File

@ -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: '',// 设计中的课堂展示对象
};
console.log('编辑的行', row);
//重新更新[新任务]中右侧列表数据
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<idres.rows.length; i++) {
// idres.rows[i].titletext = idres.rows[i].title.replace(/<[^>]+>/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);
}
}
}
});
}

View File

@ -71,6 +71,7 @@ const getHomeWorkList = async () => {
return await homeworklist({ return await homeworklist({
entpcourseid: chapterId, entpcourseid: chapterId,
edituserid: userStore.user.userId, edituserid: userStore.user.userId,
orderby: "timestamp DESC",
pageSize: 100, pageSize: 100,
status: '10' status: '10'
}).then((res) => { }).then((res) => {
@ -79,7 +80,25 @@ const getHomeWorkList = async () => {
for (var i = 0; i < res.rows.length; i++) { for (var i = 0; i < res.rows.length; i++) {
res.rows[i].taskconfig = [] 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++) { for (var j = 0; j < res.rows.length; j++) {
if (res.rows[j].parentid == res.rows[i].id) { if (res.rows[j].parentid == res.rows[i].id) {
var ss = [] var ss = []

View File

@ -58,17 +58,17 @@
<script setup> <script setup>
import { ref, onMounted, onUnmounted, computed, watch } from 'vue' import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
import { listByDeadDate, listClassworkdata, listClassworkdataNew } from '@/api/classTask' import { listByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/classTask/task-item.vue' import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
// import ItemDialog from '@/views/classTask/container/item-dialog.vue' // import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import { getCurrentTime, getTomorrow } from '@/utils/date' import { getCurrentTime } from '@/utils/date'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask"; import useClassTaskStore from "@/store/modules/classTask";
import {createWindow} from '@/utils/tool' import {createWindow} from '@/utils/tool'
import {sessionStore} from '@/utils/store' import {sessionStore} from '@/utils/store'
import {throttle,debounce } from '@/utils/comm' import {debounce } from '@/utils/comm'
const toolState = useToolState(); const toolState = useToolState();
@ -141,67 +141,80 @@ const getClassWorkList = async () => {
{ {
// homeworklist // homeworklist
const response = await listByDeadDate({ const response = await listByDeadDate({
//classidarray: classTaskStore.classListIds.join(','),
edituserid: userStore.userId, // id edituserid: userStore.userId, // id
edustage: userStore.edustage, // edustage: userStore.edustage, //
edusubject: userStore.edusubject,// edusubject: userStore.edusubject,//
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
deaddate: EndDate.value,//
status: '1', // 1- status: '1', // 1-
// orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100, pageSize: 100,
}) })
for (var i = 0; i < response.rows.length; i++) { /**
* 2024-10-17 由于 后面截止时间加了 时分特加判断
* 1进行中以前是以明天判断现改为传当天的日期并根据当前日期的时分与截止日期进行判断
* 2已结束以前默认是以明天判断现依然以明天为判断并根据当前日期时分大于截止日期时分判断
*/
let list = [];
if(tabActive.value === '进行中'){
//
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); //
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); //
}
for (var i = 0; i < list.length; i++) {
// //
response.rows[i].workdatalist = [] list[i].workdatalist = []
response.rows[i].workdatacount = 0 // list[i].workdatacount = 0 //
response.rows[i].workdatalistVisible = false list[i].workdatalistVisible = false
response.rows[i].workdatafeedbackcount = 0 // list[i].workdatafeedbackcount = 0 //
response.rows[i].feedtimelength = 0 list[i].feedtimelength = 0
response.rows[i].rightAnswerCount = 0 list[i].rightAnswerCount = 0
response.rows[i].scoingRate = 0 + '%' // list[i].scoingRate = 0 + '%' //
response.rows[i].averagetime = 0 // list[i].averagetime = 0 //
// ---------------------------------------------- // ----------------------------------------------
// UI // UI
if (response.rows[i].worktype == '学习目标定位') { if (list[i].worktype == '学习目标定位') {
response.rows[i].workclass = 'success' list[i].workclass = 'success'
response.rows[i].workcodesList = JSON.parse(response.rows[i].workcodes) list[i].workcodesList = JSON.parse(list[i].workcodes)
} else if (response.rows[i].worktype == '教材研读') { } else if (list[i].worktype == '教材研读') {
response.rows[i].workclass = 'primary' list[i].workclass = 'primary'
} else if (response.rows[i].worktype == '框架梳理') { } else if (list[i].worktype == '框架梳理') {
response.rows[i].workclass = 'warning' list[i].workclass = 'warning'
} else if (response.rows[i].worktype == '学科定位') { } else if (list[i].worktype == '学科定位') {
response.rows[i].workclass = 'info' list[i].workclass = 'info'
} else if (response.rows[i].worktype == '习题训练') { } else if (list[i].worktype == '习题训练') {
response.rows[i].workclass = 'danger' list[i].workclass = 'danger'
} else { } else {
response.rows[i].workclass = '' list[i].workclass = ''
} }
// //
if (response.rows[i].entpcourseworklist != '') { if (list[i].entpcourseworklist != '') {
response.rows[i].entpcourseworklistarray = JSON.parse( list[i].entpcourseworklistarray = JSON.parse(
'[' + response.rows[i].entpcourseworklist + ']' '[' + list[i].entpcourseworklist + ']'
) )
} else { } else {
response.rows[i].entpcourseworklistarray = [] list[i].entpcourseworklistarray = []
} }
// classworkdatastudentids // classworkdatastudentids
if ( if (
response.rows[i].classworkdatastudentids != '' && list[i].classworkdatastudentids != '' &&
response.rows[i].classworkdatastudentids != null && list[i].classworkdatastudentids != null &&
response.rows[i].classworkdatastudentids != 'null' list[i].classworkdatastudentids != 'null'
) { ) {
const stuList = JSON.parse('[' + response.rows[i].classworkdatastudentids + ']') const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
response.rows[i].workdatacount = stuList.length list[i].workdatacount = stuList.length
} }
} }
// (workdatacount)>0 // (workdatacount)>0
if (response.rows && response.rows.length > 0) { if (list && list.length > 0) {
classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0) classWorkList.value = list && list.filter((item) => item.workdatacount > 0)
//TODO total //TODO total
total.value = response.total total.value = 0
}else{ }else{
classWorkList.value = [] classWorkList.value = []
total.value = 0 total.value = 0
@ -222,6 +235,7 @@ const getStudentClassWorkData = async() => {
// classids: classTaskStore.classListIds.join(','), // classids: classTaskStore.classListIds.join(','),
// edusubject: userStore.edusubject,// // edusubject: userStore.edusubject,//
// deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,// // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
// deaddate: EndDate.value,//
// //status: '1', // 1- // //status: '1', // 1-
// orderby: "deaddate DESC",// TODO deaddate // orderby: "deaddate DESC",// TODO deaddate
// pageSize: 1000, // pageSize: 1000,
@ -407,13 +421,28 @@ const getStudentVisible = async () => {
edituserid: userStore.userId, // id edituserid: userStore.userId, // id
edustage: userStore.edustage,// edustage: userStore.edustage,//
edusubject: userStore.edusubject,// edusubject: userStore.edusubject,//
deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// // deaddate: tabActive.value === ''? getTomorrow() : EndDate.value,//
deaddate: EndDate.value,//
status: '1', // 1- status: '1', // 1-
// orderby: 'concat(deaddate,uniquekey) DESC', // orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100 pageSize: 100
}) })
const curWorkList = response.rows
/**
* 2024-10-17 由于 后面截止时间加了 时分特加判断
* 1进行中以前是以明天判断现改为传当天的日期并根据当前日期的时分与截止日期进行判断
* 2已结束以前默认是以明天判断现依然以明天为判断并根据当前日期时分大于截止日期时分判断
*/
let list = [];
if(tabActive.value === '进行中'){
//
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); //
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); //
}
const curWorkList = list
/** /**
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致, * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,

File diff suppressed because it is too large Load Diff

View File

@ -74,8 +74,8 @@ function initChart() {
position: 'top', position: 'top',
formatter: params => { formatter: params => {
const value = dataList.value[params.dataIndex].value; const value = dataList.value[params.dataIndex].value;
const percentage = ((value / total) * 100).toFixed(2); // const percentage = value ? ((value / total) * 100).toFixed() : 0; //
return `${percentage}%`; // return `${value}${percentage}%`; //
}, },
color: '#333', color: '#333',
fontSize: 12 fontSize: 12

View File

@ -125,7 +125,7 @@ onMounted(() => {
watch(() => props.bookobj.levelSecondId, (newVal) => { watch(() => props.bookobj.levelSecondId, (newVal) => {
console.log(props.bookobj,'课程选择') // console.log(props.bookobj,'')
}) })

View File

@ -266,6 +266,10 @@ const props = defineProps({
isedit: { isedit: {
type: Boolean, type: Boolean,
default: false default: false
},
isback:{
type: Boolean,
default: false
} }
}) })
@ -737,14 +741,16 @@ const handleClassWorkSave = async () => {
// //
// this.getClassWorkAllList(); // this.getClassWorkAllList();
// TODO
//TODO 3
// this.newWorkSpace = false;
// this.newWorkSpaceEdit = false;
// this.workEdit = false;
}) })
} }
if(props.isback){
//
router.back();
}else{
//
router.push({ path: '/classTaskAssign' });
}
} }
}); });
}; };
@ -976,3 +982,4 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style>

View File

@ -16,6 +16,7 @@
<el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto"> <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
<el-col :span="12" style="padding-left: 20px; text-align: left;"> <el-col :span="12" style="padding-left: 20px; text-align: left;">
<div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook"> <div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
<i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
<i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i> <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
<span>课程目录</span> <span>课程目录</span>
<i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i> <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
@ -35,7 +36,7 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 作业类型:内容 --> <!-- 作业类型:内容 -->
<task-type-view :bookobj="courseObj" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/> <task-type-view :bookobj="courseObj" :isback="isback" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/>
</div> </div>
</div> </div>
</template> </template>
@ -53,6 +54,7 @@ const route = useRoute();
const router = useRouter() const router = useRouter()
const { proxy } = getCurrentInstance() const { proxy } = getCurrentInstance()
const isback = ref(route.query.isBack?true:false);
const classtaskObj = route.query.classtaskObj;// const classtaskObj = route.query.classtaskObj;//
const bookTitle = ref(classtaskObj? JSON.parse(classtaskObj).bookName: '');// const bookTitle = ref(classtaskObj? JSON.parse(classtaskObj).bookName: '');//
const isOpenLeftBook = ref(classtaskObj? JSON.parse(classtaskObj).id ? true : false: false ); // const isOpenLeftBook = ref(classtaskObj? JSON.parse(classtaskObj).id ? true : false: false ); //
@ -183,3 +185,4 @@ onMounted(() => {
} }
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style>

View File

@ -16,6 +16,7 @@
<span class="name">{{ item.uniquekey }}</span> <span class="name">{{ item.uniquekey }}</span>
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{ <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag> getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
</div> </div>
<div class="class-time">{{ item.classcaption }} | 截止时间{{ item.deaddate }} </div> <div class="class-time">{{ item.classcaption }} | 截止时间{{ item.deaddate }} </div>
</div> </div>
@ -50,11 +51,27 @@ const getHomework = async () => {
loading.value = true loading.value = true
const { edustage, edusubject } = user const { edustage, edusubject } = user
try { try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 }) const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
// //
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) //
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) // // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //
homeworkList.value.forEach((item) => { homeworkList.value.forEach((item) => {
// UI
if (item.worktype == '学习目标定位') {
item.workclass = 'success'
item.workcodesList = JSON.parse(item.workcodes)
} else if (item.worktype == '教材研读') {
item.workclass = 'primary'
} else if (item.worktype == '框架梳理') {
item.workclass = 'warning'
} else if (item.worktype == '学科定位') {
item.workclass = 'info'
} else if (item.worktype == '习题训练') {
item.workclass = 'danger'
} else {
item.workclass = ''
}
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
// //
if (item.entpcourseworklist != '') { if (item.entpcourseworklist != '') {

View File

@ -113,17 +113,17 @@ const menuList = [{
{ {
name: '作业设计', name: '作业设计',
icon: '#icon-zuoyesheji', icon: '#icon-zuoyesheji',
isOuter: true, // isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask', // path: '/teaching/classtaskassign?titleName=&openDialog=newClassTask',
// path: '/newClassTask', path: '/newClassTask',
id: '2-1' id: '2-1'
}, },
{ {
name: '作业布置', name: '作业布置',
icon: '#icon-zuoyebuzhi', icon: '#icon-zuoyebuzhi',
isOuter: true, // isOuter: true,
path: '/teaching/classtaskassign?titleName=作业布置', // path: '/teaching/classtaskassign?titleName=',
// path: '/classTaskAssign', path: '/classTaskAssign',
id: '2-2' id: '2-2'
}, },
{ {

View File

@ -22,7 +22,8 @@
<div class="prepare-item-info-message"> <div class="prepare-item-info-message">
<div style="width: 60px"> <div style="width: 60px">
<template v-if="item.uniquekey"> <template v-if="item.uniquekey">
{{ item.worktype }} <!-- {{ item.worktype }} -->
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
</template> </template>
<template v-else> <template v-else>
<el-icon <el-icon

View File

@ -95,7 +95,8 @@
<div class="prepare-body-header"> <div class="prepare-body-header">
<div> <div>
<label style="font-size: 15px">{{ currentWorkList.length }}个作业</label>&nbsp; <label style="font-size: 15px">{{ currentWorkList.length }}个作业</label>&nbsp;
<el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button> <!-- <el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button> -->
<el-button size="small" @click="goNewClassTask()">作业设计</el-button>
</div> </div>
</div> </div>
<div class="prepare-work-wrap"> <div class="prepare-work-wrap">
@ -105,7 +106,7 @@
:item="item" :item="item"
:index="index" :index="index"
@on-set="openSet" @on-set="openSet"
@on-reSet="openReSet" @on-reSet="openReSet"
@on-delhomework="delhomework" @on-delhomework="delhomework"
> >
</file-list-item> </file-list-item>
@ -126,7 +127,7 @@
</div> </div>
<MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" /> <MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
<uploadDialog v-model="isDialogOpen" @submit-file="submitFile" /> <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
<SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" /> <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :rows="rows" />
</div> </div>
<reserv <reserv
ref="reservDialog" ref="reservDialog"
@ -171,6 +172,7 @@ import { delClasswork, listEntpcourse } from '@/api/teaching/classwork'
import { updateClasscourse } from '@/api/teaching/classcourse' import { updateClasscourse } from '@/api/teaching/classcourse'
import { getClassInfo, getSelfReserv, endClass } from '@/api/classManage' import { getClassInfo, getSelfReserv, endClass } from '@/api/classManage'
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { editListItem } from '@/hooks/useClassTask'
import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile' import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
import ClassReserv from '@/views/classManage/classReserv.vue' import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from './container/class-start.vue' // import classStart from './container/class-start.vue' //
@ -229,7 +231,7 @@ export default {
entpcourseid: '', entpcourseid: '',
// //
setDialog: false, setDialog: false,
row: '', rows: '',
isOpenHomework: false, isOpenHomework: false,
// //
activeClass: null, activeClass: null,
@ -655,34 +657,44 @@ export default {
this.$refs['reservDialog'].openDialog() this.$refs['reservDialog'].openDialog()
}, },
// //
handleOutLink(key) { // handleOutLink(key) {
if (key == 'homeWork') { // if (key == 'homeWork') {
this.isOpenHomework = true // this.isOpenHomework = true
} // }
// key linkConfig.js // // key linkConfig.js
let configObj = outLink()[key] // let configObj = outLink()[key]
let fullPath = configObj.fullPath // let fullPath = configObj.fullPath
// urlunitId ID // // urlunitId ID
if (key != 'standard' && key != 'aiModel') { // if (key != 'standard' && key != 'aiModel') {
let unitId = this.uploadData.levelSecondId // let unitId = this.uploadData.levelSecondId
? this.uploadData.levelSecondId // ? this.uploadData.levelSecondId
: this.uploadData.levelFirstId // : this.uploadData.levelFirstId
let bookId = this.uploadData.textbookId; // let bookId = this.uploadData.textbookId;
if(fullPath.indexOf('?') == -1){ // if(fullPath.indexOf('?') == -1){
fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` // fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
} // }
else{ // else{
fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask` // fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
} // }
} // }
// // //
ipcRenderer.send('openWindow', { // ipcRenderer.send('openWindow', {
key, // key,
fullPath: fullPath, // fullPath: fullPath,
cookieData: { ...configObj.data } // cookieData: { ...configObj.data }
}) // })
// },
//
goNewClassTask(){
// router.push({ path: '/newClassTask' });
this.$router.push({
path: '/newClassTask',
query: {
isBack: true,
}
});
}, },
getWeekday1(date) { getWeekday1(date) {
const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'] const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
@ -691,29 +703,51 @@ export default {
}, },
// //
openSet(row) { openSet(row) {
this.row = row // row list
this.rows = [row]
this.setDialog = true this.setDialog = true
}, },
// //
openReSet(row) { openReSet(row) {
// //
this.isOpenHomework = true; const courseObj = {
// key linkConfig.js textbookId: this.uploadData.textbookId,
let configObj = outLink()['homeWork'] levelFirstId: this.uploadData.levelFirstId,
let fullPath = configObj.fullPath 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 // let unitId = this.uploadData.levelSecondId
? this.uploadData.levelSecondId // ? this.uploadData.levelSecondId
: this.uploadData.levelFirstId // : this.uploadData.levelFirstId
let bookId = this.uploadData.textbookId; // let bookId = this.uploadData.textbookId;
fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}` // fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}`
// // //
ipcRenderer.send('openWindow', { // ipcRenderer.send('openWindow', {
key: 'homeWork', // key: 'homeWork',
fullPath: fullPath, // fullPath: fullPath,
cookieData: { ...configObj.data } // cookieData: { ...configObj.data }
}) // })
}, },
// //
delhomework(item) { delhomework(item) {

View File

@ -47,7 +47,7 @@
</div> </div>
</div> </div>
</div> </div>
<el-button color="#349d44" @click="sendHomework(item)">推送</el-button> <el-button color="#349d44" @click="sendHomework(item,'item')">推送</el-button>
</li> </li>
<div class="no-data flex" v-if="!dataList.length && !resourceList.length"> <div class="no-data flex" v-if="!dataList.length && !resourceList.length">
<i class="iconfont icon-zanwushuju"></i> <i class="iconfont icon-zanwushuju"></i>
@ -56,7 +56,7 @@
</ul> </ul>
</el-scrollbar> </el-scrollbar>
</div> </div>
<SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :row="curRow" <SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :rows="curRow"
@on-close="closeHomework" @on-success="successHomework"/> @on-close="closeHomework" @on-success="successHomework"/>
</div> </div>
<div class="homework flex" v-else> <div class="homework flex" v-else>
@ -110,8 +110,11 @@ const curNode = reactive({
data: {} data: {}
}) })
const sendHomework = (row) => { const sendHomework = (row,type) => {
curRow.value = row if(type == 'item'){
//
curRow.value = [row]
}
setTimeout(() => { setTimeout(() => {
ipcMsgSend('tool-sphere:set:ignore', false) ipcMsgSend('tool-sphere:set:ignore', false)
}, 200) }, 200)