19 changed files with 238 additions and 450 deletions
--- a/package.json
+++ b/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",
@ -29,7 +29,6 @@
    "@vue-office/excel": "^1.7.11",
    "@vue-office/pdf": "^2.0.2",
    "@vueuse/core": "^10.11.0",
-    "circular-json": "^0.5.9",
    "cropperjs": "^1.6.2",
    "crypto-js": "^4.2.0",
    "echarts": "^5.5.1",
--- a/src/main/index.js
+++ b/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()
  })
@ -297,4 +297,4 @@ function appWatchError() {
  app.on('child-process-gone', async (event, details) => {
    console.error(`APP-ERROR:child-process-gone; event: ${JSON.stringify(event)}; details:${JSON.stringify(details)}`)
  })
-}
+}
--- a/src/renderer/src/api/login.js
+++ b/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({
--- a/src/renderer/src/components/ai-chart/index.vue
+++ b/src/renderer/src/components/ai-chart/index.vue
@ -3,20 +3,21 @@
    <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' : '']">
-      <div class="flex chart-header">
-        <div class="header-name flex">
-          <svg class="icon header-icon" aria-hidden="true">
-            <use xlink:href="#icon-aijiqiren"></use>
-          </svg>
-          <span>教学助手</span>
+    <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">
+              <use xlink:href="#icon-aijiqiren"></use>
+            </svg>
+            <span>教学助手</span>
+          </div>
+          <div class="header-tool">
+            <i class="iconfont icon-window-max_line icon-tool" @click="isMax = !isMax"></i>
+            <i class="iconfont icon-close icon-tool" @click="closeChart"></i>
+          </div>
        </div>
-        <div class="header-tool">
-          <i class="iconfont icon-window-max_line icon-tool" @click="isMax = !isMax"></i>
-          <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 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>
-      
-    </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>
+    </el-card>
  </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% - 110px);
-      -webkit-app-region: no-drag;
+      height: calc(100% - 60px);
    }
  }

  .card-max {
    width: 100%;
    height: 100%;
-    left: 0 !important;
-    top: 0 !important;
+    left: 0;
+    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;
-    width: 90%;
-    left: 5%;
-    bottom: 15px;
+    position: relative;
    display: flex;
    align-items: center;
    padding-top: 15px;
--- a/src/renderer/src/components/choose-textbook/index.vue
+++ b/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
--- a/src/renderer/src/components/choose-textbook/third/index.vue
+++ b/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 || item.subjectName.includes(useStore.user.edusubject))
-      if(nameIndex === -1) return;
+      const nameIndex = subjectList.value.findIndex(item => item.subjectName === useStore.user.edusubject)
      getTagId({subjectId:subjectList.value[nameIndex].subjectId,subjectName:subjectList.value[nameIndex].subjectName})
      if(textbookVersionId.value === 0){
        getTagId(subjectList.value[0])
--- a/src/renderer/src/components/window-tools/index.vue
+++ b/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 {
--- a/src/renderer/src/layout/components/Header.vue
+++ b/src/renderer/src/layout/components/Header.vue
@ -2,16 +2,28 @@
  <div class="title-bar flex">
    <div class="left-section">
      <div class="flex title-box">
-        <el-image style="width: 23px; height: 23px" :src="logoIco" />
+        <el-image style="width: 23px; height: 23px" :src="logoIco"  />
        <span class="title" @click="changeTab">AIX智慧课堂</span>
      </div>
      <div class="change-tab">
        <ul class="flex">
-          <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']"
-            v-for="menu in headerMenus" :key="menu.id" @click="clickMenu(menu)">
+          <li class="flex" :class="[activeId == menu.path ? 'active-li' : '', menu.disabled ? 'disabled' : '']" 
+          v-for="menu in headerMenus" :key="menu.id"  @click="clickMenu(menu)">
            <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,41 +32,26 @@
      <WindowTools />
      <div class="user flex">
        <div class="avatar-container">
-          <div class="avatar-wrapper flex">
-            <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
+          <el-dropdown
+            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" />
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
-                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
-                  <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
-                  <el-dropdown-item divided command="logout">
-                    <span>退出登录</span>
-                  </el-dropdown-item>
-                </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 style="margin-top: 18px; font-size: 0.8em">{{ userStore.user.nickName }}</div>
            </div>
-          </div>
-
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
+                <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
+                <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
+                <el-dropdown-item divided command="logout">
+                  <span>退出登录</span>
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
        </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,9 +86,9 @@ 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
-    if (name == '教材分析' || name == '考试分析') {
-      fullPath += `?unitId=${unitId}`
+    let unitId = levelSecondId ? levelSecondId :levelFirstId
+    if(name == '教材分析' || name == '考试分析'){
+       fullPath += `?unitId=${unitId}`
    }
    // 通知主进程
    ipcRenderer.send('openWindow', {
@ -131,11 +127,34 @@ const headerMenus = [
  }
 ]

-const clickMenu = ({ id, disabled, path }) => {
-  if (disabled) return
+const clickMenu = ({ id, disabled, path }) =>{
+  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(
@ -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;
      }
@ -306,7 +290,7 @@ onMounted(() => {
    -webkit-app-region: no-drag;
  }

-
+  
 }

 .right-section {
@ -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;
-      height: 35px;
+      width: 30px;
+      height: 30px;
      border-radius: 10px;
+      margin-top: 8px;
      margin-right: 10px;
    }

--- a/src/renderer/src/plugins/shareStore.js
+++ b/src/renderer/src/plugins/shareStore.js
@ -4,7 +4,6 @@
 const isNode = typeof require !== 'undefined' // 是否支持node函数
 const { ipcRenderer } = isNode?require('electron'):{} // app使用
 import { sessionStore } from '@/utils/store'
-import CircularJSON from 'circular-json'
 // import { diff } from 'jsondiffpatch'
 // const Remote = isNode?require('@electron/remote'):{}  // 远程模块

@ -174,7 +173,6 @@ const findDifferences = (obj1, obj2) => {
    for (const key in o1) {
      if (o1.hasOwnProperty(key)) {
        const newPath = path ? `${path}.${key}` : key;
-        if(!o2) return
        if (o2.hasOwnProperty(key)) {
          const v1 = toJsonStr(o1[key])
          const v2 = toJsonStr(o2[key])
@ -204,6 +202,6 @@ const findDifferences = (obj1, obj2) => {
  return differences;
 }
 // 对象克隆
-const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
+const objClone = (obj) => JSON.parse(JSON.stringify(obj))
 // 转换为json
-const toJsonStr = (obj) => CircularJSON.stringify(obj)
+const toJsonStr = (obj) => JSON.stringify(obj)
--- a/src/renderer/src/utils/date.js
+++ b/src/renderer/src/utils/date.js
@ -88,9 +88,6 @@ export const getCurrentTime = (format)=> {
  const day = now.getDate().toString().padStart(2, '0');
  const hours = now.getHours().toString().padStart(2, '0');
  const minutes = now.getMinutes().toString().padStart(2, '0');
-  if(format == 'YYYY-MM-DD HH:mm'){
-    return `${year}-${month}-${day} ${hours}:${minutes}`;
-  } 
  if(format == 'YYYY-MM-DD'){
    return `${year}-${month}-${day}`;
  }
--- a/src/renderer/src/views/classManage/aside.vue
+++ b/src/renderer/src/views/classManage/aside.vue
@ -34,6 +34,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)
--- a/src/renderer/src/views/classManage/index.vue
+++ b/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'}">
-            <div >
+          <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px'}">
+            <div :style="{'max-height': (viewportHeight - 164) + 'px','overflow-y': 'auto'}">
              <Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
            </div>
 <!--            隐藏操作按钮-->
@ -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,
--- a/src/renderer/src/views/classTask/container/task-item.vue
+++ b/src/renderer/src/views/classTask/container/task-item.vue
@ -2,7 +2,7 @@
  <div class="class-reserv-item">
    <div class="class-reserv-item-body">
      <div class="class-reserv-item-title1">
-        <el-tag style="margin-left: 5px" :type="item.workclass?item.workclass:'info'"> {{ item.worktype }}</el-tag>
+        <el-tag style="margin-left: 5px" :type="item.workclass"> {{ item.worktype }}</el-tag>
        <label style="margin-left: 10px">{{ item.uniquekey }}</label>
      </div>

--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@ -1,209 +1,92 @@
 <template>
-  <div class="desktop-work-item">
+  <div class="desktop-item">
    <div class="item-title flex">
      <span>工作动态</span>
-      <el-radio-group v-model="type" @change="changeTab">
+      <el-radio-group v-model="type">
        <el-radio-button label="全部" :value="-1" />
-        <el-radio-button label="备课" :value="1" disabled  />
-        <el-radio-button label="上课" :value="2" disabled />
+        <el-radio-button label="备课" :value="1" />
+        <el-radio-button label="上课" :value="2" />
        <el-radio-button label="作业" :value="3" />
      </el-radio-group>
    </div>
-    <div class="item-content" v-loading="loading">
-      <el-scrollbar height="500px">
-        <ul>
-           <!--上课-->
-          <template v-if="type == 2 || type == -1">
-            <li class="flex class-item" v-for="item in classList" :key="item.id">
-              <div class="class-left flex">
-                <div class="class-name flex">
-                  <span class="name">{{ item.className }}</span>
-                </div>
-                <div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{
-                  item.endTime }}</div>
-                <div class="class-grade">
-                  <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
-                    {{ index === 0 ? tag.name : '、' + tag.name }}
-                  </span>
-                </div>
-              </div>
-              <div class="class-right">
-                <el-button type="primary" size="small">上课</el-button>
-              </div>
-            </li>
-          </template>
-          <!--作业-->
-          <template v-if="type == 3 || type == -1">
-            <li class="flex class-item home-list" v-for="item in homeworkList" :key="item.id">
-              <div class="class-left flex">
-                <div class="class-name flex">
-                  <span class="name">{{ item.uniquekey }}</span>
-                  <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
-                    getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
-                </div>
-                <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
-              </div>
-              <div class="class-right">
-                <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div>
-                <div>已交</div>
-              </div>
-            </li>
-          </template>
-        </ul>
-      </el-scrollbar>
+    <div class="item-content">
+      <ul>
+        <li class="flex class-item" v-for="item in classList" :key="item.id">
+          <div class="class-left flex">
+            <div class="class-name flex">
+              <span>{{ item.className }}</span>
+            </div>
+            <div class="class-time"> {{ item.classDay }}&nbsp;{{ item.startTime }} ~ {{ item.classDay }}&nbsp;{{ item.endTime }}</div>
+            <div class="class-grade">
+              <span v-for="(tag, index) in item.classItemList" :key="index" style="margin-left: 5px">
+                {{ index === 0 ? tag.name : '、' + tag.name }}
+              </span>
+            </div>
+          </div>
+          <div class="class-right">
+            <el-button type="primary" size="small">上课</el-button>
+          </div>
+        </li>
+      </ul>
    </div>
  </div>
 </template>
 <script setup>
 import { ref, onMounted } from 'vue'
-import useUserStore from '@/store/modules/user'
 import { getSelfReserv } from '@/api/classManage'
-import { homeworklist } from '@/api/teaching/classwork'
-import { getCurrentTime } from '@/utils/date'

-const type = ref(-1)
-const user = useUserStore().user
-const loading = ref(false)
-const classList = ref([])
-const homeworkList = ref([])
+  const type = ref(-1)
+  const classList = ref([])
+
+  // 获取上课
+  const getClass = () =>{
+    getSelfReserv().then((res) => {
+      let list = res.data || []
+      list.sort((a,b) => { if(a.status=='上课中') return -1; else return 0 })
+      classList.value = list.filter(item => item.status !== '已结束')

-// 获取上课
-const getClass = async () => {
-  loading.value = true
-  try {
-    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 !== '已结束')
-  } finally {
-    loading.value = false
-  }
-}
-// 获取作业
-const getHomework = async () => {
-  loading.value = true
-  const { edustage, edusubject } = user
-  try {
-    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, orderby: 'uniquekey DESC', pageSize: 500 })
-    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey)
-    homeworkList.value.forEach((item) => {
-      item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
    })
-  } finally {
-    loading.value = false
  }
-}

-const tagType = (time) => {
-  return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
-}
-// 切换
-const changeTab = (val) =>{
-  switch(val){
-    case -1:
-      // getClass()
-      getHomework()
-      break;
-    case 1:
-      break;
-    case 2:
-      getClass()
-      break;
-    default: 
-      getHomework()
-  }
-}
-
-onMounted(() => {
-  // getClass()
-  getHomework()
-})
+  onMounted(()=>{
+    getClass()
+  })
 </script>

 <style lang="scss" scoped>
-.desktop-work-item {
-  align-items: center;
-  height: 100%;
-
-  .item-title {
-    height: 32px;
-    text-align: left;
-    font-size: 18px;
-    font-weight: bold;
-    margin-bottom: 10px;
+  .desktop-item{
+    margin-bottom: 20px;
    align-items: center;
-    justify-content: space-between;
-  }
-
-  .item-content {
-    background-color: #fff;
-    border-radius: 5px;
-    padding: 10px 15px;
-    font-size: 13px;
-    height: calc(100% - 60px);
-
-    .class-item {
-      justify-content: space-between;
-      align-items: center;
-      background: #eff5fa;
-      border-radius: 5px;
+    .item-title{
+      height: 32px;
+      text-align: left;
+      font-size: 18px;
+      font-weight: bold;
      margin-bottom: 10px;
-      padding: 10px;
-
-      .class-left {
-        flex-direction: column;
-        align-items: flex-start;
-        width: 90%;
-
-        .class-name {
-          display: flex;
-          align-items: center;
-
-          .name {
-            font-size: 14px;
-            font-weight: bold;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .item-content{
+      background-color: #fff;
+      border-radius: 5px;
+      padding: 10px 15px;
+      font-size: 13px;
+      .class-item{
+        justify-content: space-between;
+        align-items: center;
+        background: #e2e4f4;
+        border-radius: 5px;
+        margin-bottom: 10px;
+        padding: 10px;
+        .class-left{
+          flex-direction: column;
+          align-items: flex-start;
+          .class-time{
+            font-size: 13px;
+            color: #bfbfbf;
          }
-
-          .tag {
-            margin-left: 5px;
-            border: none;
-
-            :deep(.el-tag__content) {
-              font-size: 12px;
-            }
-          }
-        }
-
-        .class-time {
-          font-size: 13px;
-          color: #a5a4a4;
-          padding-top: 3px;
-          width: 100%;
-          white-space: nowrap;
-          overflow: hidden;
-          text-overflow: ellipsis;
-          text-align: left;
-        }
-      }
-
-      .class-right {
-        font-size: 12px;
-        color: #a5a4a4;
-        flex-shrink: 0;
-        font-size: 13px;
-
-        .num {
-          font-size: 14px;
-          color: #409EFF;
-          font-weight: bold;
        }
      }
    }
-
-    .class-grade {
-      padding-top: 3px
-    }
-
  }
-}
 </style>
--- a/src/renderer/src/views/login/components/Register.vue
+++ b/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 =>{
-  if (!v) return ElMessage.success('操作失败')
-  type.value = v
+const OpenModel = () =>{
  dialogVisible.value=true
 }
 // 关闭弹窗
@ -245,51 +241,33 @@ 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)
+      activeIndex.value=2
+      // 获取部门列表
+      deptTree({phone:ruleForm.phoneNumber}).then(res=>{
+        optionsSchool.value=res.data
+        optionsSchool.value.forEach(item=>{
+          item.value=item.id
+          if(!item.children){
+            item.disabled=true
+          }
+          if(item.children){
+            item.children.forEach(child=>{
+              child.value=child.id
+              if(!child.children){
+                child.disabled=true
+              }
+              if(child.children){
+                child.children.forEach(grandson=>{
+                  grandson.value=grandson.id
+                })
+              }
+            })
          }
        })
-      } else {
-        activeIndex.value=2
-        // 获取部门列表
-        deptTree({phone:ruleForm.phoneNumber}).then(res=>{
-          optionsSchool.value=res.data
-          optionsSchool.value.forEach(item=>{
-            item.value=item.id
-            if(!item.children){
-              item.disabled=true
-            }
-            if(item.children){
-              item.children.forEach(child=>{
-                child.value=child.id
-                if(!child.children){
-                  child.disabled=true
-                }
-                if(child.children){
-                  child.children.forEach(grandson=>{
-                    grandson.value=grandson.id
-                  })
-                }
-              })
-            }
-          })
-          getSubject()
-          console.log(res)
-        })
-        console.log('submit!')
-      }
+        getSubject()
+        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}
-    const { phoneNumber:mobile,imgCode:code } = ruleForm
-    const params = {
-      mobile, code,
-      uuid: resImg.imgData.uuid,
-      type: type.value
-    }
-    sendCode(params).then(res=>{
+    sendCode({mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}).then(res=>{
      if(res.code==200){
        ruleForm.Code=res.data
        isImg.value=false
--- a/src/renderer/src/views/login/index.vue
+++ b/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 =>{
-  RegModel.value.OpenModel(type)
+const RegisterModel = () =>{
+  RegModel.value.OpenModel()
 }
 //登录
 const submitForm = async (formEl) => {
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@ -270,11 +270,6 @@ const updateClassReserv = (formData) => {
 }
 const addClassReserv = (formData) => {
  let ids = formData.resource.join(',')
-  // 判断是否添加教材
-  if(!props.bookId){
-    ElMessage.warning('请选择教材')
-    return
-  }
  let param = {
    className: formData.name,
    classType: formData.type,
--- a/src/renderer/src/views/profile/userInfo.vue
+++ b/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)
-  })
-}
+listEvaluation({ itemkey: 'subject', pageSize: 500 }).then((res) => {
+  subjectList.value = res.rows
+})

 setTimeout(() => {
  if (props.user.edudegree != '') {
@ -153,7 +150,4 @@ const semeterChange = (item) => {
      props.user.edusubject = ''
    }
 }
-onMounted(() => {
-  getSubject()
-})
 </script>
--- a/src/renderer/src/views/resource/container/third-list.vue
+++ b/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>