Compare commits

..

No commits in common. "e144fbe36a006e650a1e1968e00f858aa97d977d" and "610aac6985e7176ee815bc91c7d9c191187e4e0f" have entirely different histories.

4 changed files with 19 additions and 31 deletions

View File

@ -104,16 +104,11 @@ const getSubjectContent = async () => {
pageSize: 10000 pageSize: 10000
} }
let data;
if(localStorage.getItem('evaluationList')){
evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
}
else{
const { rows } = await listEvaluation(params) const { rows } = await listEvaluation(params)
localStorage.setItem('evaluationList', JSON.stringify(rows)) localStorage.setItem('evaluationList', JSON.stringify(rows))
evaluationList.value = rows evaluationList.value = rows
} data = rows
treeLoading.value = false treeLoading.value = false
// //
@ -268,16 +263,12 @@ const transData = (data) => {
// //
const getSubject = async () => { const getSubject = async () => {
if(localStorage.getItem('subjectList')){
subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
}
else{
const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', }) const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage, pageSize: 10000,orderby: 'orderidx asc', })
// subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject) // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
subjectList.value = rows subjectList.value = rows
localStorage.setItem('subjectList', JSON.stringify(subjectList.value)) localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
}
// //
if(!subjectList.value.length) return if(!subjectList.value.length) return

View File

@ -10,7 +10,7 @@
destory-on-close destory-on-close
:before-close="onBeforeClose" :before-close="onBeforeClose"
> >
<template #header> <template #title>
<div style="font-size: 18px; display: flex; flex-wrap: nowrap"> <div style="font-size: 18px; display: flex; flex-wrap: nowrap">
<div style="flex: 1"> <div style="flex: 1">
{{ classWorkAnalysis.title }}答题情况 {{ classWorkAnalysis.title }}答题情况

View File

@ -24,7 +24,6 @@
<div>已交</div> <div>已交</div>
</div> </div>
</li> </li>
<el-empty v-if="!homeworkList.length" description="暂无数据" />
</ul> </ul>
</el-scrollbar> </el-scrollbar>
</div> </div>
@ -63,9 +62,9 @@ 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: 'uniquekey 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.forEach((item) => { homeworkList.value.forEach((item) => {
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
// //
@ -115,8 +114,7 @@ onMounted(() => {
font-weight: bold; font-weight: bold;
margin-bottom: 10px; margin-bottom: 10px;
align-items: center; align-items: center;
.title{
.title {
margin-right: 5px; margin-right: 5px;
} }
} }
@ -187,7 +185,8 @@ onMounted(() => {
} }
.class-grade { .class-grade {
padding-top: 3px } padding-top: 3px
}
} }
} }

View File

@ -135,8 +135,6 @@ function submit() {
userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => { userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
userStore.getInfo().then(res => { userStore.getInfo().then(res => {
if(res.code === 200){ if(res.code === 200){
localStorage.removeItem('subjectList')
localStorage.removeItem('evaluationList')
ElMessage.success('修改成功') ElMessage.success('修改成功')
}else{ }else{
ElMessage.error(response.msg) ElMessage.error(response.msg)