Merge pull request 'lyc-dev' (#209) from lyc-dev into main

src/renderer/src/components/choose-textbook/index.vue

@@ -104,11 +104,16 @@ const getSubjectContent = async () => {
     pageSize: 10000
   }
 
-  let data;
-  const { rows } = await listEvaluation(params)
-  localStorage.setItem('evaluationList', JSON.stringify(rows))
-  evaluationList.value = rows
-  data = rows
+
+  if(localStorage.getItem('evaluationList')){
+    evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+  }
+  else{
+    const { rows } = await listEvaluation(params)
+    localStorage.setItem('evaluationList', JSON.stringify(rows))
+    evaluationList.value = rows
+  }
+ 
   treeLoading.value = false
 
   //获取教材版本
@@ -263,12 +268,16 @@ const transData = (data) => {
 
 //获取教材
 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
-  localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
+    // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
+    subjectList.value = rows
+    localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
+  }
 
   // 默认第一个
   if(!subjectList.value.length) return

src/renderer/src/views/classTask/container/item-dialog.vue

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

src/renderer/src/views/desktop/container/work-trend.vue

@@ -10,7 +10,7 @@
       <el-scrollbar height="500px">
         <ul>
           <!--作业-->
-          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id"  @click="onClickItem(item)">
+          <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id" @click="onClickItem(item)">
             <div class="class-left flex">
               <div class="class-name flex">
                 <span class="name">{{ item.uniquekey }}</span>
@@ -24,6 +24,7 @@
               <div>已交</div>
             </div>
           </li>
+          <el-empty v-if="!homeworkList.length" description="暂无数据" />
         </ul>
       </el-scrollbar>
     </div>
@@ -49,7 +50,7 @@ const itemDialogRef = ref(null)
 const getClass = async () => {
   loading.value = true
   try {
-    const res =  await getSelfReserv()
+    const res = await getSelfReserv()
     let list = res.data || []
     list.sort((a, b) => { if (a.status == '上课中') return -1; else return 0 })
     classList.value = list.filter(item => item.status !== '已结束')
@@ -62,9 +63,9 @@ const getHomework = async () => {
   loading.value = true
   const { edustage, edusubject } = user
   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) => {
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
       // 如果是习题训练任务，则检查一共有多少道
@@ -86,7 +87,7 @@ const onClickItem = (item) => {
   itemDialogRef.value.openDialog(item)
 }
 // 批阅关闭
-const  closeDialog = () => {
+const closeDialog = () => {
   console.log('关闭弹窗,查询一下作业数据，更新界面')
   getHomework()
 }
@@ -114,7 +115,8 @@ onMounted(() => {
     font-weight: bold;
     margin-bottom: 10px;
     align-items: center;
-    .title{
+
+    .title {
       margin-right: 5px;
     }
   }
@@ -185,8 +187,7 @@ onMounted(() => {
     }
 
     .class-grade {
-      padding-top: 3px
-    }
+      padding-top: 3px }
 
   }
 }

src/renderer/src/views/profile/userInfo.vue

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