package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.2.2",
+  "version": "1.2.0",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",

src/main/index.js

@@ -53,7 +53,7 @@ function createLoginWindow() {
     updateInit(loginWindow)
   }
 
-  loginWindow.webContents.openDevTools()
+  // loginWindow.webContents.openDevTools()
   loginWindow.once('ready-to-show', () => {
     loginWindow.show()
   })

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/api/login.js

@@ -88,15 +88,6 @@ export function signIn(data) {
   })
 }
 
-//登录模块-找回密码
-export function retrievePwd(data) {
-  return request({
-    url: '/smarttalk/register/authRetrievePwd',
-    method: 'post',
-    data
-  })
-}
-
 //注册模块-获取学校
 export function deptTree(data) {
   return request({

src/renderer/src/components/ai-chart/index.vue

@@ -3,7 +3,8 @@
     <svg class="icon ai-icon" aria-hidden="true" @click="isOpen = true; isMax = false" v-if="!isOpen">
       <use xlink:href="#icon-aijiqiren"></use>
     </svg>
-    <div v-else v-drag shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
+    <el-card v-else shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
+      <template #header>
         <div class="flex chart-header">
           <div class="header-name flex">
             <svg class="icon header-icon" aria-hidden="true">
@@ -16,7 +17,7 @@
             <i class="iconfont icon-close icon-tool" @click="closeChart"></i>
           </div>
         </div>
-
+      </template>
       <div class="chart-body">
         <el-scrollbar ref="chatref">
           <div class="default-chart flex">
@@ -54,13 +55,12 @@
             </div>
           </div>
         </el-scrollbar>
+      </div>
       <div class="chart-input">
         <el-input v-model="msgVal" size="large" class="chart-ipt" @keyup.enter="sendMsg" @focus="isFocus = true" @blur="isFocus = false" />
         <i class="iconfont icon-tujing" :class="[isFocus ? 'icon-focus' : '']" @click="sendMsg"></i>
       </div>
-      </div>
+    </el-card>
-      
-    </div>
   </div>
 </template>
 
@@ -75,6 +75,7 @@ import vDrag from '@/views/tool/directive/drag'
 
 
 const { ipcRenderer } = window.electron || {}
+
 const userStore = useUserStore().user
 
 
@@ -114,28 +115,28 @@ const outerAi = [
     id: 1,
     title: '生成图片',
     secondTit: '文生图大模型',
-    img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
+    img: '../../../src/assets/images/ai-01.png',
     path: '/ais/aisd3'
   },
   {
     id: 2,
     title: '教学大模型',
     secondTit: '中小学基础教学大模型',
-    img: new URL('../../../src/assets/images/ai-02.png', import.meta.url).href,
+    img: '../../../src/assets/images/ai-02.png',
     disabled: true,
   },
   {
     id: 3,
     title: '育人大模型',
     secondTit: '全场域育人大模型',
-    img: new URL('../../../src/assets/images/ai-03.png', import.meta.url).href,
+    img: '../../../src/assets/images/ai-03.png',
     path: '/ais/aimodel'
   },
   {
     id: 4,
     title: 'ChatTTS',
     secondTit: '文字转语音大模型',
-    img: new URL('../../../src/assets/images/ai-04.png', import.meta.url).href,
+    img: '../../../src/assets/images/ai-04.png',
     path: '/ais/aiChatTTS'
   }
 ]
@@ -217,7 +218,6 @@ onMounted(() => {
 }
 
 .page-ai-chart {
-
   .ai-icon {
     position: fixed;
     right: 30px;
@@ -227,38 +227,41 @@ onMounted(() => {
   }
 
   .chart-card {
-    background-color: #fff;
     position: fixed;
     bottom: 20px;
     right: 20px;
     width: 300px;
     height: calc(100% - 110px);
     border-radius: 10px;
-    z-index: 10;
+
-    box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
+    :deep(.el-card__header) {
+      padding: 10px;
+    }
+
+    :deep(.el-card__body) {
+      height: calc(100% - 50px);
+      padding: 10px 15px;
+    }
 
     .chart-body {
-      padding: 10px 15px;
+      height: calc(100% - 60px);
-      height: calc(100% - 110px);
-      -webkit-app-region: no-drag;
     }
   }
 
   .card-max {
     width: 100%;
     height: 100%;
-    left: 0 !important;
+    left: 0;
-    top: 0 !important;
+    top: 0;
   }
 
   .chart-header {
     justify-content: space-between;
     font-size: 14px;
-    padding: 10px;
+
-    border-bottom: 1px solid #e4e7ed;
-    -webkit-app-region: no-drag;
     .header-name {
       align-items: center;
+
       .header-icon {
         font-size: 28px;
         align-items: center;
@@ -351,10 +354,7 @@ onMounted(() => {
   }
 
   .chart-input {
-    position: absolute;
+    position: relative;
-    width: 90%;
-    left: 5%;
-    bottom: 15px;
     display: flex;
     align-items: center;
     padding-top: 15px;

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

@@ -264,7 +264,7 @@ const transData = (data) => {
 //获取教材
 const getSubject = async () => {
 
-  const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
+  const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000 })
 
   // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
   subjectList.value = rows

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

@@ -41,9 +41,7 @@ const getSubject = (value) => {
           gradeName:gradeList[currentIndex].label
         }
       })
-      //判断是否有名称或者包括名称就对应哪个学科
+      const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject)
-      const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject || item.subjectName.includes(useStore.user.edusubject))
-      if(nameIndex === -1) return;
       getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
       if(textbookVersionId.value === 0){
         getTagId(subjectList.value[0])

src/renderer/src/components/window-tools/index.vue

@@ -51,8 +51,6 @@ const closeWindow = () => {
 
 <style lang="scss" scoped>
 .header-tool {
-  width: 100%;
-  justify-content: flex-end;
   -webkit-app-region: no-drag;
 
   span {

src/renderer/src/layout/components/Header.vue

@@ -12,6 +12,18 @@
             <i class="iconfont" :class="menu.icon"></i>
             <span class="text">{{ menu.name }}</span>
           </li>
+     
+          <!-- <li
+            v-for="(item, index) in routeHeader.nowRouter"
+            :key="index"
+            class="flex"
+            :style="{'color' : item.color}"
+            :class="currentRoute === item.url ? 'active-li' : ''"
+            @click="handleOutLink(item.url,item.type, item.name)"
+          >
+            <i :class="item.img"></i>
+            <span class="text">{{ item.name }}</span>
+          </li> -->
         </ul>
       </div>
     </div>
@@ -20,9 +32,15 @@
       <WindowTools />
       <div class="user flex">
         <div class="avatar-container">
-          <div class="avatar-wrapper flex">
+          <el-dropdown
-            <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
+            class="right-menu-item hover-effect"
+            trigger="click"
+            @command="handleCommand"
+          >
+            <div class="avatar-wrapper">
               <img :src="dev_api + userStore.user.avatar" class="user-avatar" style="float: left" />
+              <div style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
+            </div>
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
@@ -34,27 +52,6 @@
               </el-dropdown-menu>
             </template>
           </el-dropdown>
-            <div class="user-info flex">
-              <span class="user-name">{{ userStore.user.nickName }}</span>
-              <div class="flex">
-                <div class="user-depname">{{ userStore.user.deptName }}</div>
-                <el-dropdown @command="changeSubject">
-                  <div class="user-subject">{{ userStore.user.edusubject }}
-                    <el-icon class="el-icon--right"><arrow-down />
-                    </el-icon>
-                  </div>
-                  <template #dropdown>
-                    <el-dropdown-menu>
-                      <el-dropdown-item v-for="item in userSubjectList" :key="item.id" :command="item">
-                        {{ item.edustage }}-{{ item.edusubject }}
-                      </el-dropdown-item>
-                    </el-dropdown-menu>
-                  </template>
-                </el-dropdown>
-              </div>
-            </div>
-          </div>
-
         </div>
       </div>
     </div>
@@ -62,23 +59,22 @@
 </template>
 
 <script setup>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { ElMessageBox } from 'element-plus'
-import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
-import { updateUserInfo } from '@/api/system/user'
+import routerStore from '@/store/modules/route'
 import outLink from '@/utils/linkConfig'
-import logoIco from '@/assets/images/logo.png'
-import { listEvaluation } from '@/api/classManage/index'
 
+import logoIco from '@/assets/images/logo.png'
+
+const routeHeader = routerStore()
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
 const router = useRouter()
 const currentRoute = ref('')
 const dev_api = ref(import.meta.env.VITE_APP_BASE_API)
-const userSubjectList = ref([])
 
 const handleOutLink = (path, type, name) => {
   if (!path) return
@@ -90,8 +86,8 @@ const handleOutLink = (path, type, name) => {
     let fullPath = configObj.fullPath + path
     fullPath = fullPath.replaceAll('//', '/')
     const { levelFirstId, levelSecondId } = JSON.parse(localStorage.getItem('unitId'))
-    let unitId = levelSecondId ? levelSecondId : levelFirstId
+    let unitId = levelSecondId ? levelSecondId :levelFirstId
-    if (name == '教材分析' || name == '考试分析') {
+    if(name == '教材分析' || name == '考试分析'){
        fullPath += `?unitId=${unitId}`
     }
     // 通知主进程
@@ -131,12 +127,35 @@ const headerMenus = [
   }
 ]
 
-const clickMenu = ({ id, disabled, path }) => {
+const clickMenu = ({ id, disabled, path }) =>{
-  if (disabled) return
+  if(disabled) return
   activeId.value = id
   router.push(path)
 } 
 
+/*const menus = ref([
+  {
+    icon: 'icon-zhuye2 icon-homepage',
+    name: '主页',
+    path: '/homepage'
+  },
+  {
+    icon: 'icon-jiaoxueziyuan icon-resource',
+    name: '资源',
+    path: '/resource'
+  },
+  {
+    icon: 'icon-beike icon-prepare',
+    name: '备课',
+    path: '/prepare'
+  },
+  {
+    icon: 'icon-jiangke1 icon-teach',
+    name: '授课',
+    path: '/teach'
+  }
+])*/
+
 // 监听当前路由
 watch(
   () => router.currentRoute.value,
@@ -181,42 +200,13 @@ function logout() {
           ipcRenderer && ipcRenderer.send('openLoginWindow')
         })
     })
-    .catch(() => { })
+    .catch(() => {})
 }
 
 const emits = defineEmits(['setLayout'])
 function setLayout() {
   emits('setLayout')
 }
-// 切换学科
-const changeSubject = async (command) =>{
-  const { userId, userName, phonenumber, plainpwd  } = userStore.user
-  const data = {
-    userId,
-    userName,
-    edustage: command.edustage,
-    edusubject:  command.edusubject
-  }
-  await updateUserInfo(data)
-  await userStore.login({username: phonenumber, password: plainpwd})
-  await userStore.getInfo()
-  router.go()
-}
-
-// 获取学科
-const getAllSubject = async () => {
-  const { rows } = await listEvaluation({ itemkey: "subject", pageSize: 500 })
-  if(!userStore.user.subject) return
-  const subject = userStore.user.subject.split(',')
-  userSubjectList.value = rows.filter(item =>
-    subject.some(el => item.id == el)
-  )
-}
-
-
-onMounted(() => {
-  getAllSubject()
-})
 </script>
 
 <style lang="scss" scoped>
@@ -232,20 +222,17 @@ onMounted(() => {
   align-items: flex-start;
   flex-direction: column;
   width: 50%;
-
+  .title-box{
-  .title-box {
     padding-top: 8px;
     box-sizing: border-box;
     align-items: center;
     padding-left: 20px;
-
     .title {
       color: #4b73df;
       font-size: 13px;
       padding: 0 5px;
     }
   }
-
   .change-tab {
     -webkit-app-region: no-drag;
     margin-left: 20px;
@@ -286,16 +273,13 @@ onMounted(() => {
           color: #409eff;
         }
       }
-
+      .disabled{
-      .disabled {
         cursor: not-allowed;
         color: #bfbfbf;
-
+        &:hover{
-        &:hover {
           color: #bfbfbf;
         }
       }
-
       .active-li {
         color: #409eff;
       }
@@ -318,25 +302,11 @@ onMounted(() => {
   flex-direction: column;
 
   .user {
-    padding-right: 10px;
-
     .user-info {
       padding-right: 5px;
-      align-items: flex-start;
+      align-items: center;
       flex-direction: column;
       font-size: 12px;
-      height: 100%;
-      justify-content: space-around;
-
-      .user-depname {
-        margin-right: 5px;
-      }
-
-      .user-subject {
-        display: flex;
-        align-items: center;
-        font-size: 12px;
-      }
     }
   }
 }
@@ -346,12 +316,12 @@ onMounted(() => {
 
   .avatar-wrapper {
     display: flex;
-    align-items: center;
 
     .user-avatar {
-      width: 35px;
+      width: 30px;
-      height: 35px;
+      height: 30px;
       border-radius: 10px;
+      margin-top: 8px;
       margin-right: 10px;
     }
 

src/renderer/src/router/index.js

@@ -71,7 +71,7 @@ export const constantRoutes = [
       {
         path: '/classTask',
         component: () => import('@/views/classTask/classTask.vue'),
-        name: 'classCorrect',
+        name: 'class',
         meta: {title: '作业批改'},
       },
       {

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/aside.vue

@@ -4,7 +4,6 @@
     class="el-menu-vertical-demo"
     :default-active="activeIndex"
     @select="handleSelect"
-    unique-opened
   >
     <template v-for="(item,index) in classList" :key="index">
       <el-sub-menu :index="`${index}`">
@@ -34,6 +33,7 @@ const emits = defineEmits(['handleSelect'])
 
 //点击跳转路由
 const handleSelect = (itemDom,pathKey) => {
+  console.log(itemDom,pathKey)
   const parts = pathKey[1].split("-")
   const result = parts.slice(0, 2).join("-")
   const index = props.menuItems.findIndex(item=>item.index===result)

src/renderer/src/views/classManage/basicGroup.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-card style="width: 100%;height: 100%;overflow: auto">
+  <el-card style="width: 100%;height: 100%">
 <!--    <template #header>-->
 <!--      <div class="card-header" style="text-align: left">-->
 <!--        <el-button type="primary" @click="addGroup">新建分组</el-button>-->

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

@@ -2,8 +2,8 @@
   <div class="common-layout">
     <el-container>
       <el-aside style="width: 200px;margin-top: 20px">
-          <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px','max-height': (viewportHeight - 164) + 'px'}">
+          <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 120) + 'px'}">
-            <div >
+            <div :style="{'max-height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
               <Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
             </div>
 <!--            隐藏操作按钮-->
@@ -19,9 +19,9 @@
             </template>
           </el-card>
       </el-aside>
-      <el-main :style="{'min-height': (viewportHeight - 204) + 'px'}">
+      <el-main :style="{'min-height': (viewportHeight - 160) + 'px'}">
 <!--        <router-view :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}" :key="route.path"></router-view>-->
-        <div :style="{'height': (viewportHeight - 164) + 'px','overflow-y': 'auto'}">
+        <div :style="{'height': (viewportHeight - 120) + 'px','overflow-y': 'auto'}">
           <!--        班级概况-->
           <ClassInfo v-if="currentIndex==0" :classId="classId"></ClassInfo>
           <!--        学生列表-->
@@ -192,21 +192,13 @@
     classList.value = []
     listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then(response => {
       classList.value = [...response.rows]
+      //这里获取组装所有班级
+      gradeTree.value = groupByCondition(response.rows, item => item.agekey);
       if(classList.value.length > 0){
         classId.value = classList.value[0].id
         currentIndex.value = 0
       }
     });
-    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);
-    })
   }
   //将所有班级筛选成二级的数组
   function groupByCondition(arr, condition) {
@@ -298,15 +290,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
+  listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' }).then((res) => {
-  // 1、班级列表
+    var clslist = []
-  getClassList()
+    for (var i = 0; i < res.rows.length; i++) {
-  // 2、班级作业
+      if (res.rows[i].classstudentlist != '') {
-  getClassWorkList()
+        var array = JSON.parse('[' + res.rows[i].classstudentlist + ']')
-  // 3、班级学生作业 包含多个班级 
+        res.rows[i].classstudents = array
-  getStudentClassWorkData()
-}
-/**
- * 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、获取班级作业
+    }
- */
+    classList.value = clslist
-const getClassWorkList = () => {
+
-  if(classTaskStore.classListIds.length>0){
+    // 班级作业数据，包含多个班级
-    // 班级作业数据，包含多个班级 homeworklist
+    homeworklist({
-    listByDeadDate({
+      classidarray: classListIds.value.join(','),
-      classidarray: classTaskStore.classListIds.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 = () => {
- * 3、获取多个班级学生作业数据
+  console.log('关闭弹窗,开启作业进度轮询')
- */
+  getStudentClassWorkDataPolling()
-const getStudentClassWorkData = () => {
+}
-  if(classTaskStore.classListIds.length>0){
+const onClickItem = (item) => {
-    listClassworkdataByDeadDate({
+  console.log('开启弹窗,关闭作业进度轮询')
-      classids: classTaskStore.classListIds.join(','),
+  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,//学科
-      deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    orderby: 'uniquekey DESC',
-      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
+}
+
+// 获取多个班级学生作业数据
+const getStudentClassWorkData = () => {
+  // 再查找多个班级里，每个学生的作业数据
+  listClassworkdata({
+    classids: classListIds.value.join(','),
+    //entpcourseid: '', // 章节id？ 这里要全课程的作业 不分章节？ 根据学段学科查询所有的作业
+    edustage: userStore.edustage,// 学段
+    edusubject: userStore.edusubject,//学科
+    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('==================')
           // 有几个学生完成/正在完成学习任务
@@ -310,116 +378,17 @@ 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/login/components/Register.vue

@@ -1,12 +1,12 @@
 <template>
   <el-dialog
     v-model="dialogVisible"
-    :title="type==1?'注册账号':'找回密码'"
+    title="注册账号"
     :fullscreen="true"
     center
     :before-close="handleClose"
   >
-  <el-steps v-if="type==1" style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
+  <el-steps  style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
     <el-step title="1.基本信息" @click="activeIndex=1" />
     <el-step title="2.在校信息" />
   </el-steps>
@@ -18,10 +18,10 @@
       status-icon
       ref="ruleFormRef"
     >
-      <el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1">
+      <el-form-item label="姓名" prop="name" v-if="activeIndex==1">
         <el-input  v-model="ruleForm.name" />
       </el-form-item>
-      <el-form-item label="身份证号"  prop="idNumber" v-if="type==1 && activeIndex==1">
+      <el-form-item label="身份证号"  prop="idNumber" v-if="activeIndex==1">
         <el-input v-model="ruleForm.idNumber" />
       </el-form-item>
       <el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
@@ -60,14 +60,14 @@
       <el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
         <div v-for="item in schoolSubject" style="display: flex;">
                 <span style="width:50px">{{ item.name }}：</span>
-                <el-checkbox-group style="width:100%" v-model="ruleForm.discipline"> 
+                <el-checkbox-group style="width:100%" v-model="ruleForm.discipline" > 
                   <el-checkbox style="margin-right:10px" v-for="el in item.children" :key="el.id" :label="el.itemtitle" :value="el" />
                 </el-checkbox-group>
           </div>
       </el-form-item>
       <el-form-item v-if="activeIndex==1">
         <div  class="centerDiv">
-          <el-button  type="primary" @click="nextStep(ruleFormRef)">{{ ['下一步','重置密码'][type-1]||'未知异常' }}</el-button>
+          <el-button  type="primary" @click="nextStep(ruleFormRef)">下一步</el-button>
         </div>
       </el-form-item>
       <el-form-item v-if="activeIndex==2">
@@ -109,7 +109,7 @@
 
 <script  setup>
 import { ref, defineExpose, reactive ,onMounted} from 'vue'
-import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn, retrievePwd} from '@/api/login'
+import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn} from '@/api/login'
 import { ElMessage } from 'element-plus'
 import {setToken, removeToken } from '@/utils/auth'
 import { regionData, codeToText } from 'element-china-area-data'
@@ -225,12 +225,8 @@ const rules = reactive({
     },] 
 })
 const dialogVisible = ref(false)
-
-const type = ref(1) // 1注册 2找回密码
 // 打开弹窗
-const OpenModel = v =>{
+const OpenModel = () =>{
-  if (!v) return ElMessage.success('操作失败')
-  type.value = v
   dialogVisible.value=true
 }
 // 关闭弹窗
@@ -245,23 +241,6 @@ const nextStep = (formEl) => {
   if (!formEl) return
   formEl.validate((valid) => {
     if (valid) {
-      // 如果 type 1 注册，2 找回密码
-      if (type.value == 2) {
-        let params = {
-          mobile:ruleForm.phoneNumber,
-          code:ruleForm.Code,
-          password:ruleForm.password,
-          confirmPassword:ruleForm.confirmPassword,
-        }
-        retrievePwd(params).then(res=>{
-          if(res.code==200){
-            ElMessage.success(res.msg)
-            handleClose()
-          }else{
-            ElMessage.error(res.msg)
-          }
-        })
-      } else {
       activeIndex.value=2
       // 获取部门列表
       deptTree({phone:ruleForm.phoneNumber}).then(res=>{
@@ -289,7 +268,6 @@ const nextStep = (formEl) => {
         console.log(res)
       })
       console.log('submit!')
-      }
     } else {
       console.log('error submit!')
     }
@@ -318,7 +296,7 @@ const submitForm = async (formEl) => {
         schoolId:ruleForm.school[2],
         classIds:ruleForm.class.join(','),
         subjectIds:ruleForm.discipline.map(o=>o.id).join(','),
-        subject:ruleForm.discipline.map(o=>`${o.edustage}-${o.edusubject}`).join(','),
+        subject:ruleForm.discipline.map(o=>o.itemtitle).join(','),
         areaIds:ruleForm.address.join(','),
         area:araname
       }
@@ -355,7 +333,7 @@ const sendcaptchaImg=()=>{
   if(ruleForm.phoneNumber){
     const pattern = /^1[3-9]\d{9}$/;
     if( pattern.test(ruleForm.phoneNumber) ){
-      captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
+      captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
         ruleForm.imgCode=null
         isImg.value=true
         isPeopleImg.value='data:image/jpg;base64,'+res.img
@@ -376,7 +354,7 @@ const sendcaptchaImg=()=>{
 }
 // 刷新
 const refreshImg=()=>{
-  captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
+  captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
     isPeopleImg.value='data:image/jpg;base64,'+res.img
     if(res.token){
           setToken(res.token)
@@ -387,14 +365,7 @@ const refreshImg=()=>{
 // 提交人机验证
 const sbmitImg=()=>{
    if(ruleForm.imgCode){
-    // {mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}
+    sendCode({mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}).then(res=>{
-    const { phoneNumber:mobile,imgCode:code } = ruleForm
-    const params = {
-      mobile, code,
-      uuid: resImg.imgData.uuid,
-      type: type.value
-    }
-    sendCode(params).then(res=>{
       if(res.code==200){
         ruleForm.Code=res.data
         isImg.value=false

src/renderer/src/views/login/index.vue

@@ -32,9 +32,9 @@
           >
         </el-form-item>
         <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
-           <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
+           <a style="margin-right: 10px;" @click="RegisterModel">注册账号</a>
            <!-- | -->
-           <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
+           <!-- <a style="margin-left: 10px;">忘记密码</a> -->
         </div>
       </el-form>
     </div>
@@ -98,8 +98,8 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
   showDownLoading.value = prop !== 100
 })
 // 打开弹窗
-const RegisterModel = type =>{
+const RegisterModel = () =>{
-  RegModel.value.OpenModel(type)
+  RegModel.value.OpenModel()
 }
 //登录
 const submitForm = async (formEl) => {

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) => {
-  listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
+  subjectList.value = res.rows
-    const arr = userStore.user.subject.split(',')
+})
-    subjectList.value = res.rows.filter(item => arr.includes(String(item.id))).map(items => items)
-  })
-}
 
 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>