9 changed files with 160 additions and 231 deletions
--- 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,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>
-      
-    </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/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
@ -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 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" />
+              <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
-    if (name == '教材分析' || name == '考试分析') {
+    let unitId = levelSecondId ? levelSecondId :levelFirstId
+    if(name == '教材分析' || name == '考试分析'){
       fullPath += `?unitId=${unitId}`
    }
    // 通知主进程
@ -131,12 +127,35 @@ 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(
  () => 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;
-      height: 35px;
+      width: 30px;
+      height: 30px;
      border-radius: 10px;
+      margin-top: 8px;
      margin-right: 10px;
    }

--- 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>
 <!--            隐藏操作按钮-->
--- 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,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}
-    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) => {