src/renderer/src/api/classTask/index.js

@@ -1,22 +1,7 @@
 // 查询evaluation列表
 import request from '@/utils/request'
 
-// 查询作业列表
-export function listByDeadDate(query) {
-  return request({
-    url: '/education/classwork/listByDeadDate',
-    method: 'get',
-    params: query
-  })
-}
-//多个班级学生作业数据
-export function listClassworkdataByDeadDate(query) {
-  return request({
-    url: '/education/classworkdata/listByDeadDate',
-    method: 'get',
-    params: query
-  })
-}
+// 查询反馈列表
 
 // 查询classworkdata列表 班级作业列表
 export function listClassworkdata(query) {

src/renderer/src/store/modules/classTask.js

@@ -1,28 +0,0 @@
-import { defineStore } from 'pinia'
-import {  } from '@/api/classTask/index.js'
-import { listClassmain } from '@/api/classManage/index'
-
-const useClassTaskStore = defineStore('classTask',{
-  state: () => ({
-    classListIds: [],
-  }),
-  actions: {
-    listClassmain(params) {
-      // 获取班级列表
-      return new Promise((resolve, reject) => {
-        listClassmain(params)
-          .then((res) => {
-            this.classListIds = res.rows&&res.rows.map((item) => item.id)
-            resolve(res)
-          })
-          .catch((error) => {
-            reject(error)
-          })
-      })
-    },
-  },
-  persist: true
-})
-export default useClassTaskStore
-
-

src/renderer/src/utils/date.js

@@ -134,19 +134,3 @@ export function getTimeDate() {
   var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
   return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
 }
-
-/**
- * 获取明天日期
- * @returns 
- */
-export function getTomorrow() {
-  let date = new Date();
-  var year = date.getFullYear()
-  var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
-  var day = date.getDate()+1 < 10 ? '0' + date.getDate()+1 : date.getDate()+1
-
-  // 获取明天的日期 .getDate() + 1
-  let tomorrow = `${year}-${month}-${day}`;
-
-  return tomorrow;
-}

src/renderer/src/views/classManage/index.vue

@@ -198,14 +198,9 @@
       }
     });
     listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
-      //清除已有的班级
-      let arr = [...response.rows]
-      classList.value.forEach(item => {
-        const currentIndex = arr.findIndex(items => items.id === item.id)
-        if(currentIndex) arr.splice(currentIndex, 1)
-      })
       //这里获取组装所有班级
-      gradeTree.value = groupByCondition(arr, item => item.agekey);
+      gradeTree.value = groupByCondition(response.rows, item => item.agekey);
+      console.log(gradeTree.value,'gradeTree.value')
     })
   }
   //将所有班级筛选成二级的数组
@@ -298,15 +293,13 @@
   // }
   //新增班级
   const btnSave = () => {
-    addClasses({classIds:classids.value.join(','),userId:userStore.userId}).then(res => {
+    addClasses({classIds:classids.value.join(','),regId:userStore.userId}).then(res => {
       if (res.code === 200) {
         dialogVisible.value = false
         ElMessage({
           message: res.msg,
           type: 'success',
         })
-        //清空所选中的值
-        classids.value = []
       }else{
         ElMessage({
           message: res.msg,

src/renderer/src/views/classTask/classTask.vue

@@ -5,31 +5,10 @@
 -->
 <template>
   <el-container class="class-reserv-wrap">
-    <div style="display: flex; justify-content: space-between;">
     <div class="class-reserv-tabs">
       <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
     </div>
-      <div v-if="tabActive === '已结束'"> 
-        <div class="demo-date-picker">
-          <div class="block">
-            <el-date-picker
-              v-model="EndDate"
-              type="date"
-              format="YYYY-MM-DD"
-              value-format="YYYY-MM-DD"
-              placeholder="请选择截止日期"
-              size="large"
-              :disabled-date="disabledDate"
-              @change="changeEndDate"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
     <div class="class-reserv-body">
-      <!-- loading  <el-skeleton :rows="5" animated />-->
-      <el-skeleton :rows="5" :loading="loading" animated />
-      <div v-if="classWorkList.length > 0">
       <task-item
         v-for="(item, index) in activeDataList"
         v-show="tabActive === '进行中'"
@@ -49,44 +28,40 @@
         @delete-reserv="deleteReserv(item)"
       ></task-item>
     </div>
-      <div v-else> 
-        <el-empty
-          v-show="classWorkList.length == 0 && !loading"
-          :description="'暂无'+tabActive+'作业数据'"
-          style="width: 100%; height: 400px"
-        ></el-empty>
-      </div>
-    </div>
     <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog>
   </el-container>
 </template>
 
 <script setup>
 import { ref, onMounted, onUnmounted, computed, watch, reactive } from 'vue'
-import { listByDeadDate, listClassworkdataByDeadDate } from '@/api/classTask'
+import { getSelfReserv } from '@/api/classManage'
+import { listClassmain } from '@/api/classManage/index'
+import { listClassworkdata } from '@/api/classTask'
+import { homeworklist } from '@/api/teaching/classwork'
 
 import TaskItem from '@/views/classTask/container/task-item.vue'
 import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 import { useToolState } from '@/store/modules/tool'
-import { getCurrentTime, getTomorrow } from '@/utils/date'
+import { sessionStore } from '@/utils/tool'
 import useUserStore from '@/store/modules/user'
-import useClassTaskStore from "@/store/modules/classTask";
-
-const classTaskStore = useClassTaskStore()
 const userStore = useUserStore().user
 const itemDialogRef = ref(null)
 const tabOptions = ref(['进行中', '已结束'])
 const tabActive = ref('进行中')
 const dataList = ref([])
-const EndDate = ref(getCurrentTime('YYYY-MM-DD'))
 
+// 班级列表
+const classList = ref([])
+const classListIds = ref([])
 // 所有班级作业列表
 const classWorkList = ref([])
 const total = ref(0)
 const loading = ref(false)
 
 const activeDataList = computed(() => {
-  return classWorkList.value 
+  // return classWorkList.value
+  // 当前时间超过[作业任务]截止时间的跳过
+  return classWorkList.value && classWorkList.value.filter((item) => getDateTime > item.deaddate)
 })
 const deleteReserv = (item) => {
   console.log('删除待开发', item)
@@ -95,51 +70,31 @@ const deleteReserv = (item) => {
   // })
 }
 const doneDataList = computed(() => {
-  return classWorkList.value
+  // return classWorkList.value
+  return classWorkList.value && classWorkList.value.filter((item) => getDateTime < item.deaddate)
 })
 
-// 当日之后的日期禁用
-const disabledDate = (time) => {
-  return time.getTime() > Date.now()
-}
-// 截止日期改变
-const changeEndDate = (val) => {
-  console.log('截止日期改变', val)
-  getData() // 加载数据
-}
-
 // 获取数据
 const getData = () => {
-  classWorkList.value = []
-  loading.value = true
-  // 1、班级列表
-  getClassList()
-  // 2、班级作业
-  getClassWorkList()
-  // 3、班级学生作业 包含多个班级 
-  getStudentClassWorkData()
+  // 获取班级列表
+  listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then((res) => {
+    var clslist = []
+    for (var i = 0; i < res.rows.length; i++) {
+      if (res.rows[i].classstudentlist != '') {
+        var array = JSON.parse('[' + res.rows[i].classstudentlist + ']')
+        res.rows[i].classstudents = array
       }
-/**
- * 1、获取班级列表数据
- * TODO 这里暂时取班级id的list，后续需要在修改
- */
-const getClassList = () => {
-  if(classTaskStore.classListIds.length==0){
-    // 获取 班级列表ids 这里暂时取班级id的list，后续需要在修改
-    classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
+      classListIds.value.push(res.rows[i].id)
+      clslist.push(res.rows[i])
     }
-}
-/**
- * 2、获取班级作业
- */
-const getClassWorkList = () => {
-  if(classTaskStore.classListIds.length>0){
-    // 班级作业数据，包含多个班级 homeworklist
-    listByDeadDate({
-      classidarray: classTaskStore.classListIds.join(','),
+    classList.value = clslist
+
+    // 班级作业数据，包含多个班级
+    homeworklist({
+      classidarray: classListIds.value.join(','),
+      //entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
       edustage: userStore.edustage,// 学段
       edusubject: userStore.edusubject,//学科
-      deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
       orderby: 'uniquekey DESC',
       pageSize: 100
     }).then((response) => {
@@ -192,32 +147,145 @@ const getClassWorkList = () => {
       // 显示分配人数(workdatacount)>0 的
       if (response.rows && response.rows.length > 0) {
         classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0)
+        // classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0 && item.uniquekey == '语文-0808-1')
         //TODO： 这里没分页，貌似这个 total 不重要，后续看
         total.value = response.total
-      }else{
-        classWorkList.value = []
-        total.value = 0
       }
       loading.value = false
+
+      // 再查找多个班级里，每个学生的作业数据
+      getStudentClassWorkData()
     })
+  })
+
+  //--------------
+  // getSelfReserv().then((res) => {
+  //   const list = res.data || []
+  //   list.sort((a, b) => {
+  //     if (a.status == '上课中') return -1
+  //     else return 0
+  //   })
+  //   dataList.value = list
+  // })
+}
+const toolStore = useToolState()
+
+// 将标签中的双引号增加转义
+const escapeHtmlQuotes = (str) => {
+  // 后端已replace双引号, 故前端不用在处理
+  const regex1 = /\\+/g;  // 匹配多个反斜杠
+  let result = str.replace(regex1, '\\');
+
+  return result;
+}
+const pollingST = ref(null) //轮询定时器标识
+
+onMounted(() => {
+  getData() // 加载数据
+  // 轮询查询
+  getStudentClassWorkDataPolling()
+})
+
+// 轮询查询 学生作业进度
+const getStudentClassWorkDataPolling = () => {
+  // 先查询一次后，
+  getStudentVisible()
+  // 在轮询
+  pollingST.value = setInterval(() => {
+    getStudentVisible()
+  }, 1000 * 10)
+}
+
+const  closeDialog = () => {
+  console.log('关闭弹窗,开启作业进度轮询')
+  getStudentClassWorkDataPolling()
+}
+const onClickItem = (item) => {
+  console.log('开启弹窗,关闭作业进度轮询')
+  clearInterval(pollingST.value)
+  itemDialogRef.value.openDialog(item)
+}
+
+
+onUnmounted(() => {
+  clearInterval(pollingST.value)
+})
+
+const getDateTime = () => {
+  //获取当前时间
+  const now = new Date()
+  const year = now.getFullYear()
+  const month = String(now.getMonth() + 1).padStart(2, '0')
+  const day = String(now.getDate()).padStart(2, '0')
+  const hh = String(now.getHours()).padStart(2, '0')
+  const mm = String(now.getMinutes()).padStart(2, '0')
+  return `${year}-${month}-${day} ${hh}:${mm}`
+}
+
+// [作业反馈] - 实际查询逻辑
+const getStudentVisible = async () => {
+  if (classListIds.value.length <= 0) {
+    return
+  }
+  // 班级作业数据，多个班级
+  const response = await homeworklist({
+    classidarray: classListIds.value.join(','),
+    //entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
+    edustage: userStore.edustage,// 学段
+    edusubject: userStore.edusubject,//学科
+    orderby: 'uniquekey DESC',
+    pageSize: 100
+  })
+  const curWorkList = response.rows
+
+  /**
+   * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
+   *       故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
+   */
+  for (let t = 0; t < classWorkList.value.length; t++) {
+    // 当前时间超过[作业任务]截止时间的跳过
+    // if( getDateTime > classWorkList.value[t].deaddate ){
+    //   continue;
+    // }
+    // 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
+    let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
+    // workdataresultcount 完成人数 workdatacount人数要大于0 
+    if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
+      classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
+      // 桌面端貌似不需要进度条了？
+      classWorkList.value[t].finishpercent = parseInt(
+        (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
+      )
+      // 计算参与学习任务的平均用时
+      if (classWorkList.value[t].workdatafeedbackcount > 0) {
+        classWorkList.value[t].averagetime = (classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount).toFixed(0)
+      } else {
+        classWorkList.value[t].averagetime = 0
+      }
+      // 更新批阅数
+      classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
+    } else {
+      classWorkList.value[t].finishpercent = 0
     }
   }
 
-/**
- * 3、获取多个班级学生作业数据
- */
+  return 1
+}
+
+// 获取多个班级学生作业数据
 const getStudentClassWorkData = () => {
-  if(classTaskStore.classListIds.length>0){
-    listClassworkdataByDeadDate({
-      classids: classTaskStore.classListIds.join(','),
+  // 再查找多个班级里，每个学生的作业数据
+  listClassworkdata({
+    classids: classListIds.value.join(','),
+    //entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
-      deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-      orderby: "uniquekey DESC",
+    orderby: "deaddate DESC",
     pageSize: 1000
   }).then((res) => {
     for (var t = 0; t < classWorkList.value.length; t++) {
       for (var i = 0; i < res.rows.length; i++) {
+        //if (res.rows[i].uniquekey == classWorkList.value[t].uniquekey) {
         if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].resultcount > 0) {
           console.log('==================')
           // 有几个学生完成/正在完成学习任务
@@ -311,115 +379,16 @@ const getStudentClassWorkData = () => {
     }
   })
 }
-}
-
-
-
-const toolStore = useToolState()
-
-// 将标签中的双引号增加转义
-const escapeHtmlQuotes = (str) => {
-  // 后端已replace双引号, 故前端不用在处理
-  const regex1 = /\\+/g;  // 匹配多个反斜杠
-  let result = str.replace(regex1, '\\');
-
-  return result;
-}
-const pollingST = ref(null) //轮询定时器标识
-
-onMounted(() => {
-  getData() // 加载数据
-  // 轮询查询
-  getStudentClassWorkDataPolling()
-})
-
-// 轮询查询 学生作业进度
-const getStudentClassWorkDataPolling = () => {
-  // 先查询一次后，
-  getStudentVisible()
-  // 在轮询
-  pollingST.value = setInterval(() => {
-    getStudentVisible()
-  }, 1000 * 10)
-}
-
-const  closeDialog = () => {
-  console.log('关闭弹窗,开启作业进度轮询')
-  getStudentClassWorkDataPolling()
-}
-const onClickItem = (item) => {
-  console.log('开启弹窗,关闭作业进度轮询')
-  clearInterval(pollingST.value)
-  itemDialogRef.value.openDialog(item)
-}
-
-
-onUnmounted(() => {
-  clearInterval(pollingST.value)
-})
-
-// [作业反馈] - 实际查询逻辑
-const getStudentVisible = async () => {
-  if (classTaskStore.classListIds.length <= 0) {
-    return
-  }
-  // 班级作业数据，多个班级 
-  const response = await listByDeadDate({
-    classidarray: classTaskStore.classListIds.join(','),
-    edustage: userStore.edustage,// 学段
-    edusubject: userStore.edusubject,//学科
-    deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
-    orderby: 'uniquekey DESC',
-    pageSize: 100
-  })
-  const curWorkList = response.rows
-
-  /**
-   * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
-   *       故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度
-   */
-  for (let t = 0; t < classWorkList.value.length; t++) {
-    // 当前时间超过[作业任务]截止时间的跳过
-    // if( getDateTime > classWorkList.value[t].deaddate ){
-    //   continue;
-    // }
-    // 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界)
-    let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id)
-    // workdataresultcount 完成人数 workdatacount人数要大于0 
-    if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
-      classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
-      // 桌面端貌似不需要进度条了？
-      classWorkList.value[t].finishpercent = parseInt(
-        (classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
-      )
-      // 计算参与学习任务的平均用时
-      if (classWorkList.value[t].workdatafeedbackcount > 0) {
-        classWorkList.value[t].averagetime = (classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount).toFixed(0)
-      } else {
-        classWorkList.value[t].averagetime = 0
-      }
-      // 更新批阅数
-      classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount
-    } else {
-      classWorkList.value[t].finishpercent = 0
-    }
-  }
-
-  return 1
-}
-
-
 
 watch(
   () => [dataList, toolStore.isToolWin],
   () => {
     console.log('====', toolStore)
+    setTimeout(() => {
+      getData() // 加载数据
+    }, 300)
   }
 )
-watch(tabActive, (newVal,oldVal)=>{
-  console.log('newVal',newVal);
-  getData() // 加载数据
-})
 </script>
 
 <style scoped lang="scss">

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

@@ -325,14 +325,13 @@
                 <div style="display: flex; margin: 10px auto">
                   <span style="display: flex; align-items: center">
                     <span v-if="dialogProps.studentObj.worktype == '习题训练'">
-                      <span>得分： </span>
-                      <span style="margin: 0; color: red">{{
+                      得分：<span style="margin: 0; color: red">{{
                         classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
-                      }}</span>
-                      <span>分</span>
+                      }}</span
+                      >分
                     </span>
                     <span v-else>
-                      <span>得分： </span>
+                      得分：
                       <span v-if="classWorkFormScore.teacherRating.length > 0">
                         <el-input-number
                           v-model="classWorkFormScore.teacherRating[0].score"
@@ -345,7 +344,7 @@
                           @change="handleChange"
                         ></el-input-number>
                       </span>
-                      <span>分</span>
+                      分
                     </span>
                   </span>
                   <div class="score-container">

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

@@ -40,7 +40,7 @@
 </template>
 
  <script setup>
-import { ref, getCurrentInstance,onMounted } from 'vue'
+import { ref, getCurrentInstance } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
@@ -90,12 +90,9 @@ const rules = ref({
 const subjectList = ref([])
 
 // 获取基础的学科
-const getSubject = () => {
 listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
-    const arr = userStore.user.subject.split(',')
-    subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
+  subjectList.value = res.rows
 })
-}
 
 setTimeout(() => {
   if (props.user.edudegree != '') {
@@ -153,7 +150,4 @@ const semeterChange = (item) => {
       props.user.edusubject = ''
     }
 }
-onMounted(() => {
-  getSubject()
-})
 </script>

src/renderer/src/views/resource/container/third-list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="resource-list">
+  <div v-loading="sourceStore.loading" class="resource-list">
     <el-scrollbar>
       <el-empty v-if="!sourceStore.thirdResult.list.length" description="暂无数据" />
       <ul>