package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "An Electron application with Vue",
   "main": "./out/main/index.js",
   "author": "example.com",
@@ -29,6 +29,7 @@
     "@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",

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

@@ -88,6 +88,15 @@ 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,8 +3,7 @@
     <svg class="icon ai-icon" aria-hidden="true" @click="isOpen = true; isMax = false" v-if="!isOpen">
       <use xlink:href="#icon-aijiqiren"></use>
     </svg>
-    <el-card v-else shadow="always" class="chart-card" :class="[isMax ? 'card-max' : '']">
+    <div v-else v-drag 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">
@@ -17,7 +16,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">
@@ -55,12 +54,13 @@
             </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>
-    </el-card>
+      </div>
+      
+    </div>
   </div>
 </template>
 
@@ -75,7 +75,6 @@ import vDrag from '@/views/tool/directive/drag'
 
 
 const { ipcRenderer } = window.electron || {}
-
 const userStore = useUserStore().user
 
 
@@ -115,28 +114,28 @@ const outerAi = [
     id: 1,
     title: '生成图片',
     secondTit: '文生图大模型',
-    img: '../../../src/assets/images/ai-01.png',
+    img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
     path: '/ais/aisd3'
   },
   {
     id: 2,
     title: '教学大模型',
     secondTit: '中小学基础教学大模型',
-    img: '../../../src/assets/images/ai-02.png',
+    img: new URL('../../../src/assets/images/ai-02.png', import.meta.url).href,
     disabled: true,
   },
   {
     id: 3,
     title: '育人大模型',
     secondTit: '全场域育人大模型',
-    img: '../../../src/assets/images/ai-03.png',
+    img: new URL('../../../src/assets/images/ai-03.png', import.meta.url).href,
     path: '/ais/aimodel'
   },
   {
     id: 4,
     title: 'ChatTTS',
     secondTit: '文字转语音大模型',
-    img: '../../../src/assets/images/ai-04.png',
+    img: new URL('../../../src/assets/images/ai-04.png', import.meta.url).href,
     path: '/ais/aiChatTTS'
   }
 ]
@@ -218,6 +217,7 @@ onMounted(() => {
 }
 
 .page-ai-chart {
+
   .ai-icon {
     position: fixed;
     right: 30px;
@@ -227,41 +227,38 @@ onMounted(() => {
   }
 
   .chart-card {
+    background-color: #fff;
     position: fixed;
     bottom: 20px;
     right: 20px;
     width: 300px;
     height: calc(100% - 110px);
     border-radius: 10px;
-
+    z-index: 10;
-    :deep(.el-card__header) {
+    box-shadow: 0px 0px 12px rgba(0, 0, 0, .12);
-      padding: 10px;
-    }
-
-    :deep(.el-card__body) {
-      height: calc(100% - 50px);
-      padding: 10px 15px;
-    }
 
     .chart-body {
-      height: calc(100% - 60px);
+      padding: 10px 15px;
+      height: calc(100% - 110px);
+      -webkit-app-region: no-drag;
     }
   }
 
   .card-max {
     width: 100%;
     height: 100%;
-    left: 0;
+    left: 0 !important;
-    top: 0;
+    top: 0 !important;
   }
 
   .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;
@@ -354,7 +351,10 @@ onMounted(() => {
   }
 
   .chart-input {
-    position: relative;
+    position: absolute;
+    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 })
+  const { rows } = await listEvaluation({ itemkey: "version", edusubject, edustage,  pageSize: 10000,orderby: 'orderidx asc', })
 
   // subjectList.value = rows.filter(item => item.edustage == edustage && item.edusubject == edusubject)
   subjectList.value = rows

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

@@ -41,7 +41,9 @@ 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,6 +51,8 @@ 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,18 +12,6 @@
             <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>
@@ -32,15 +20,9 @@
       <WindowTools />
       <div class="user flex">
         <div class="avatar-container">
-          <el-dropdown
+          <div class="avatar-wrapper flex">
-            class="right-menu-item hover-effect"
+            <el-dropdown class="right-menu-item hover-effect" @command="handleCommand">
-            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>
@@ -52,6 +34,27 @@
                 </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>
@@ -59,22 +62,23 @@
 </template>
 
 <script setup>
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted } 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 routerStore from '@/store/modules/route'
+import { updateUserInfo } from '@/api/system/user'
 import outLink from '@/utils/linkConfig'
-
 import logoIco from '@/assets/images/logo.png'
+import { listEvaluation } from '@/api/classManage/index'
 
-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
@@ -133,29 +137,6 @@ const clickMenu = ({ id, disabled, path }) =>{
   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,
@@ -207,6 +188,35 @@ 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>
@@ -222,17 +232,20 @@ function setLayout() {
   align-items: flex-start;
   flex-direction: column;
   width: 50%;
+
   .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;
@@ -273,13 +286,16 @@ function setLayout() {
           color: #409eff;
         }
       }
+
       .disabled {
         cursor: not-allowed;
         color: #bfbfbf;
+
         &:hover {
           color: #bfbfbf;
         }
       }
+
       .active-li {
         color: #409eff;
       }
@@ -302,11 +318,25 @@ function setLayout() {
   flex-direction: column;
 
   .user {
+    padding-right: 10px;
+
     .user-info {
       padding-right: 5px;
-      align-items: center;
+      align-items: flex-start;
       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;
+      }
     }
   }
 }
@@ -316,12 +346,12 @@ function setLayout() {
 
   .avatar-wrapper {
     display: flex;
+    align-items: center;
 
     .user-avatar {
-      width: 30px;
+      width: 35px;
-      height: 30px;
+      height: 35px;
       border-radius: 10px;
-      margin-top: 8px;
       margin-right: 10px;
     }
 

src/renderer/src/plugins/shareStore.js

@@ -4,6 +4,7 @@
 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'):{}  // 远程模块
 
@@ -173,6 +174,7 @@ 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])
@@ -202,6 +204,6 @@ const findDifferences = (obj1, obj2) => {
   return differences;
 }
 // 对象克隆
-const objClone = (obj) => JSON.parse(JSON.stringify(obj))
+const objClone = (obj) => JSON.parse(CircularJSON.stringify(obj))
 // 转换为json
-const toJsonStr = (obj) => JSON.stringify(obj)
+const toJsonStr = (obj) => CircularJSON.stringify(obj)

src/renderer/src/utils/date.js

@@ -88,6 +88,9 @@ 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}`;
   }

src/renderer/src/views/classManage/aside.vue

@@ -34,7 +34,6 @@ 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/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'}">
+          <el-card style="width: 200px" class="el-card-demo" :style="{'min-height': (viewportHeight - 164) + 'px','max-height': (viewportHeight - 164) + 'px'}">
-            <div :style="{'max-height': (viewportHeight - 164) + 'px','overflow-y': 'auto'}">
+            <div >
               <Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
             </div>
 <!--            隐藏操作按钮-->
@@ -198,9 +198,14 @@
       }
     });
     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(response.rows, item => item.agekey);
+      gradeTree.value = groupByCondition(arr, item => item.agekey);
-      console.log(gradeTree.value,'gradeTree.value')
     })
   }
   //将所有班级筛选成二级的数组
@@ -293,13 +298,15 @@
   // }
   //新增班级
   const btnSave = () => {
-    addClasses({classIds:classids.value.join(','),regId:userStore.userId}).then(res => {
+    addClasses({classIds:classids.value.join(','),userId: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/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.worktype }}</el-tag>
+        <el-tag style="margin-left: 5px" :type="item.workclass?item.workclass:'info'"> {{ item.worktype }}</el-tag>
         <label style="margin-left: 10px">{{ item.uniquekey }}</label>
       </div>
 

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

@@ -1,22 +1,26 @@
 <template>
-  <div class="desktop-item">
+  <div class="desktop-work-item">
     <div class="item-title flex">
       <span>工作动态</span>
-      <el-radio-group v-model="type">
+      <el-radio-group v-model="type" @change="changeTab">
         <el-radio-button label="全部" :value="-1" />
-        <el-radio-button label="备课" :value="1" />
+        <el-radio-button label="备课" :value="1" disabled  />
-        <el-radio-button label="上课" :value="2" />
+        <el-radio-button label="上课" :value="2" disabled />
         <el-radio-button label="作业" :value="3" />
       </el-radio-group>
     </div>
-    <div class="item-content">
+    <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>{{ item.className }}</span>
+                  <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-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 }}
@@ -27,36 +31,100 @@
                 <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>
   </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 getClass = () =>{
+const getClass = async () => {
-    getSelfReserv().then((res) => {
+  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()
+  // getClass()
+  getHomework()
 })
 </script>
 
 <style lang="scss" scoped>
-  .desktop-item{
+.desktop-work-item {
-    margin-bottom: 20px;
   align-items: center;
+  height: 100%;
+
   .item-title {
     height: 32px;
     text-align: left;
@@ -66,27 +134,76 @@ import { getSelfReserv } from '@/api/classManage'
     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: #e2e4f4;
+      background: #eff5fa;
       border-radius: 5px;
       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;
+          }
+
+          .tag {
+            margin-left: 5px;
+            border: none;
+
+            :deep(.el-tag__content) {
+              font-size: 12px;
+            }
+          }
+        }
+
         .class-time {
           font-size: 13px;
-            color: #bfbfbf;
+          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>

src/renderer/src/views/login/components/Register.vue

@@ -1,12 +1,12 @@
 <template>
   <el-dialog
     v-model="dialogVisible"
-    title="注册账号"
+    :title="type==1?'注册账号':'找回密码'"
     :fullscreen="true"
     center
     :before-close="handleClose"
   >
-  <el-steps  style="max-width: 100%;-webkit-app-region: no-drag;height:35px" :active="activeIndex" finish-status="success" simple>
+  <el-steps v-if="type==1" 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="activeIndex==1">
+      <el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1">
         <el-input  v-model="ruleForm.name" />
       </el-form-item>
-      <el-form-item label="身份证号"  prop="idNumber" v-if="activeIndex==1">
+      <el-form-item label="身份证号"  prop="idNumber" v-if="type==1 && activeIndex==1">
         <el-input v-model="ruleForm.idNumber" />
       </el-form-item>
       <el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
@@ -67,7 +67,7 @@
       </el-form-item>
       <el-form-item v-if="activeIndex==1">
         <div  class="centerDiv">
-          <el-button  type="primary" @click="nextStep(ruleFormRef)">下一步</el-button>
+          <el-button  type="primary" @click="nextStep(ruleFormRef)">{{ ['下一步','重置密码'][type-1]||'未知异常' }}</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} from '@/api/login'
+import {captchaImg,sendCode,deptTree,getDept,listClassmain,listEvaluation,signIn, retrievePwd} from '@/api/login'
 import { ElMessage } from 'element-plus'
 import {setToken, removeToken } from '@/utils/auth'
 import { regionData, codeToText } from 'element-china-area-data'
@@ -225,8 +225,12 @@ const rules = reactive({
     },] 
 })
 const dialogVisible = ref(false)
+
+const type = ref(1) // 1注册 2找回密码
 // 打开弹窗
-const OpenModel = () =>{
+const OpenModel = v =>{
+  if (!v) return ElMessage.success('操作失败')
+  type.value = v
   dialogVisible.value=true
 }
 // 关闭弹窗
@@ -241,6 +245,23 @@ 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=>{
@@ -268,6 +289,7 @@ const nextStep = (formEl) => {
           console.log(res)
         })
         console.log('submit!')
+      }
     } else {
       console.log('error submit!')
     }
@@ -296,7 +318,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.itemtitle).join(','),
+        subject:ruleForm.discipline.map(o=>`${o.edustage}-${o.edusubject}`).join(','),
         areaIds:ruleForm.address.join(','),
         area:araname
       }
@@ -333,7 +355,7 @@ const sendcaptchaImg=()=>{
   if(ruleForm.phoneNumber){
     const pattern = /^1[3-9]\d{9}$/;
     if( pattern.test(ruleForm.phoneNumber) ){
-      captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
+      captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
         ruleForm.imgCode=null
         isImg.value=true
         isPeopleImg.value='data:image/jpg;base64,'+res.img
@@ -354,7 +376,7 @@ const sendcaptchaImg=()=>{
 }
 // 刷新
 const refreshImg=()=>{
-  captchaImg({mobile:ruleForm.phoneNumber}).then(res=>{
+  captchaImg({mobile:ruleForm.phoneNumber, type: type.value}).then(res=>{
     isPeopleImg.value='data:image/jpg;base64,'+res.img
     if(res.token){
           setToken(res.token)
@@ -365,7 +387,14 @@ const refreshImg=()=>{
 // 提交人机验证
 const sbmitImg=()=>{
    if(ruleForm.imgCode){
-    sendCode({mobile:ruleForm.phoneNumber,code:ruleForm.imgCode,uuid:resImg.imgData.uuid}).then(res=>{
+    // {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=>{
       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 style="margin-right: 10px;" @click="RegisterModel">注册账号</a>
+           <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
            <!-- | -->
-           <!-- <a style="margin-left: 10px;">忘记密码</a> -->
+           <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
         </div>
       </el-form>
     </div>
@@ -98,8 +98,8 @@ ipcRenderer.on('update-app-progress', (e, prop) => {
   showDownLoading.value = prop !== 100
 })
 // 打开弹窗
-const RegisterModel = () =>{
+const RegisterModel = type =>{
-  RegModel.value.OpenModel()
+  RegModel.value.OpenModel(type)
 }
 //登录
 const submitForm = async (formEl) => {

src/renderer/src/views/prepare/container/reserv.vue

@@ -270,6 +270,11 @@ 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,

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

@@ -40,7 +40,7 @@
 </template>
 
  <script setup>
-import { ref, getCurrentInstance } from 'vue'
+import { ref, getCurrentInstance,onMounted } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
@@ -90,9 +90,12 @@ const rules = ref({
 const subjectList = ref([])
 
 // 获取基础的学科
+const getSubject = () => {
   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 != '') {
@@ -150,4 +153,7 @@ const semeterChange = (item) => {
       props.user.edusubject = ''
     }
 }
+onMounted(() => {
+  getSubject()
+})
 </script>

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

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