fix:2.0.4bug修改;

Reviewed-on: #242

package.json

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

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

@@ -2,12 +2,12 @@
   <div class="book-wrap">
     <el-scrollbar height="100%">
       <div class="book-name flex" @click="dialogVisible = true">
-        <span>{{ curBookName }}</span>
+        <span>{{ curBook.data.itemtitle }}</span>
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
-          :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
+        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
+          :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
           @node-click="handleNodeClick">
           <template #default="{ node }">
             <span :title="node.label" class="tree-label">{{ node.label }}</span>
@@ -28,9 +28,9 @@
 
     <div class="textbook-container">
       <el-scrollbar height="450px">
-        <div class="textbook-item flex" v-for="item in subjectList" :class="curBookId == item.id ? 'active-item' : ''"
+        <div class="textbook-item flex" v-for="item in subjectList" :class="curBook.data.id == item.id ? 'active-item' : ''"
           :key="item.id" @click="changeBook(item)">
-          <img v-if="item.avartar" :src="BaseUrl + item.avartar" class="textbook-img" alt="">
+          <img v-if="item.avartar" :src="item.avartar.indexOf('http') === 0 ? item.avartar : BaseUrl + item.avartar" class="textbook-img" alt="">
           <div v-else class="textbook-img">
             <i class="iconfont icon-jiaocaixuanze" style="font-size: 40px;"></i>
           </div>
@@ -43,166 +43,85 @@
 
 <script setup>
 import { onMounted, ref, nextTick, toRaw, reactive } from 'vue';
-import useUserStore from '@/store/modules/user'
-import { listEvaluation } from '@/api/subject'
+import { cloneDeep } from 'lodash'
+import { useGetSubject } from '@/hooks/useGetSubject'
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
 // 定义要发送的emit事件
 const emit = defineEmits(['nodeClick', 'changeBook'])
-// store
-const userStore = useUserStore()
-const { edustage, edusubject, userId } = userStore.user
-//
+let useSubject = null
 const subjectList = ref([])
-const evaluationList = ref([])
 const dialogVisible = ref(false)
 // 当前教材下面单元内容数据
 const treeData = ref([])
 const defaultProps = {
   children: 'children',
-  label: 'label',
+  label: 'itemtitle',
   class: 'textbook-tree'
 }
-
-const treeLoading = ref(false)
-//当前教材ID
-const curBookId = ref(-1)
-//当前教材名称
-const curBookName = ref('')
-//当前教材封面图
-const curBookImg = ref('')
-//当前教材文件路径
-const curBookPath = ref('')
-// 上册
-const volumeOne = ref([])
-//
-const volumeTwo = ref([])
-
+// 当前选中的教材
+const curBook = reactive({
+  data: {}
+})
 // 当前节点
-const currentNode = reactive({
+const curNode = reactive({
   data:{}
 })
-// 当前选中的节点ID
-const currentNodeId = ref(0)
-// 当前选中的节点名称
-const currentNodeName = ref('')
+const treeLoading = ref(false)
 // 默认展开的节点
 const defaultExpandedKeys = ref([])
-// tree
-const refTree = ref(null)
-
-
-//获取教材下面的单元 + 章节
-const getSubjectContent = async () => {
-  treeLoading.value = true
-  const params = {
-    edusubject,
-    edustage,
-    // entpcourseedituserid: userId,
-    itemgroup: 'textbook',
-    orderby: 'orderidx asc',
-    pageSize: 10000
-  }
-
-
-  if(localStorage.getItem('evaluationList')){
-    evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
-  }
-  else{
-    localStorage.removeItem('defaultExpandedKeys')
-    localStorage.removeItem('currentNodeId')
-    const { rows } = await listEvaluation(params)
-    localStorage.setItem('evaluationList', JSON.stringify(rows))
-    evaluationList.value = rows
-  }
- 
-  treeLoading.value = false
-
-  //获取教材版本
-  await getSubject()
-  //上册
-  /**
-   * 不区分上下册
-   * 2024/08/20调整
-   */
-  // volumeOne.value = data.filter(item => item.level == 1 && item.semester == '上册')
-  // volumeTwo.value = data.filter(item => item.level == 1 && item.semester == '下册')
-  getTreeData()
-}
 
 //选择教材
-const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
-  curBookId.value = id
-  curBookName.value = itemtitle
-  curBookImg.value = BaseUrl + avartar
-  curBookPath.value = fileurl
+const changeBook = (data) => {
+  curBook.data = data
 
-  localStorage.removeItem('defaultExpandedKeys')
-  localStorage.removeItem('currentNodeId')
-  localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
-  getTreeData()
+  localStorage.setItem('curBook', JSON.stringify(data))
+  treeData.value = useSubject.getTreeData(data.id)
+
+  //切换教材后默认展开第一个并选中
+  nextTick(() =>{
+    defaultExpandedKeys.value = [treeData.value[0].id]
+    curNode.data = getLastLevelData(treeData.value)[0]
+
+    localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
+    localStorage.setItem('curNode',JSON.stringify(curNode.data))
+    emitChangeBook()
+  })
+  // 延迟关闭 视觉上选中
   setTimeout(() => {
     dialogVisible.value = false
   }, 100);
 }
 
-const getTreeData = () => {
-  //数据过滤
-  let upData = transData(evaluationList.value)
-
-  if(upData.length){
-    treeData.value = [...upData]
-  }
-  else{
-    treeData.value = []
-    return
-  }
-  nextTick(() => {
-
-    let defaultCurNodeId = localStorage.getItem('currentNodeId')
-    if(defaultCurNodeId){
-      defaultCurNodeId = JSON.parse(defaultCurNodeId)
-      const data = findNode(defaultCurNodeId)
-      currentNode.data = findNode(defaultCurNodeId)
-      currentNodeId.value = data.id
-      currentNodeName.value = data.label
-    }
-    else{
-      defaultExpandedKeys.value = [treeData.value[0].id]
-      currentNode.data = getLastLevelData(treeData.value)[0]
-      currentNodeId.value = getLastLevelData(treeData.value)[0].id
-      currentNodeName.value = getLastLevelData(treeData.value)[0].label
-    }
-    
-    emitChangeBook()
-  })
-
-}
-
-const emitChangeBook = () => {
-  let curNode = {
-    id: currentNodeId.value,
-    label: currentNodeName.value,
-    itemtitle: currentNode.data.itemtitle,
-    edudegree: currentNode.data.edudegree,
-    edustage: currentNode.data.edustage,
-    edusubject: currentNode.data.edusubject,
-  }
-  let parentNode = findParentByChildId(treeData.value, currentNodeId.value)
-  curNode.parentNode = toRaw(parentNode)
 
+const emitChangeBook = async () => {
+  let curData = cloneDeep(toRaw(curNode.data))
+  let parentNode = findParentByChildId(treeData.value, curData.id)
+  curData.parentNode = toRaw(parentNode)
+  //怎加一个label 之前取的label
+  curData.label = curData.itemtitle
   const data = {
     textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value,
-      curBookImg: curBookImg.value,
-      curBookPath: curBookPath.value
+      curBookId: curBook.data.id,
+      curBookName: curBook.data.itemtitle,
+      curBookImg: BaseUrl + curBook.data.avartar,
+      curBookPath: curBook.data.fileurl
     },
-    node: curNode
+    node: curData
   }
-
-  localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
-  localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
+  /**
+   * 临时用 后续删除 unitId
+   */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (curData.parentNode) {
+    levelFirstId = curData.parentNode.id
+    levelSecondId = curData.id
+  } else {
+    levelFirstId = curData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
   emit('changeBook', data)
 }
 
@@ -250,122 +169,94 @@ const findParentByChildId = (treeData, targetNodeId) => {
   return null;
 }
 
-const findNode = (id) =>{
-  if(!id) return
-  return evaluationList.value.find( item => item.id == id)
-}
-
-const transData = (data) => {
-  let ary = []
-  data.forEach(item => {
-    let obj = {}
-    // 根据当前教材ID 过滤出对应的单元、章节
-    if (item.rootid == curBookId.value) {
-      if(item.level == 1){
-        obj.label = item.itemtitle
-        obj.id = item.id
-        obj.itemtitle = item.itemtitle
-        obj.edudegree = item.edudegree
-        obj.edustage = item.edustage
-        obj.edusubject = item.edusubject
-        let ary2 = []
-        evaluationList.value.forEach(el => {
-          let obj2 = {}
-          if (item.id == el.parentid) {
-            obj2 = {
-              label: el.itemtitle,
-              id: el.id,
-              itemtitle : el.itemtitle,
-              edudegree : el.edudegree,
-              edustage : el.edustage,
-              edusubject : el.edusubject,
-            }
-            ary2.push(obj2)
-          }
-          obj.children = ary2
-        })
-        ary.push(obj)
-      }
-    }
-  })
-  return ary
-}
-
-//获取教材
-const getSubject = async () => {
-  if(localStorage.getItem('subjectList')){
-    subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
-  }
-  else{
-    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
-    localStorage.setItem('subjectList', JSON.stringify(subjectList.value))
-  }
-
-  // 默认第一个
-  if(!subjectList.value.length) return
-  let curBook = localStorage.getItem('curBook')
-  if(curBook){
-    curBook = JSON.parse(curBook)
-    curBookName.value = curBook.itemtitle
-    curBookId.value = curBook.id
-    curBookImg.value = BaseUrl + curBook.avartar
-    curBookPath.value = curBook.fileurl
-  }
-  else{
-    curBookName.value = subjectList.value[0].itemtitle
-    curBookId.value = subjectList.value[0].id
-    curBookImg.value = BaseUrl + subjectList.value[0].avartar
-    curBookPath.value = subjectList.value[0].fileurl
-    localStorage.setItem('curBookId', curBookId.value)
-  }
-}
-
-
-const isHaveUnit = (id) => {
-  return evaluationList.value.some(item => {
-    return item.rootid == id
-  })
-}
-
 
 const handleNodeClick = (data, node) => {
   /**
    * data : 当前节点数据
    * node : 当前节点对象 包含当前节点所有数据  parent属性 指向父节点Node对象
    */
-
-  const nodeData = data;
+  let nodeData = cloneDeep(toRaw(data));
+  //怎加一个label 之前取的label
+  nodeData.label = nodeData.itemtitle
   const parentNode = node.parent.data;
-
+  // parentNode 为数组 则点击的是一级节点
   if (Array.isArray(parentNode)) {
+    // 
     nodeData.parentNode = null
   }
   else {
-    nodeData.parentNode = parentNode
+    // 否则 点击的为二级节点 parentNode 为它的父级节点
+    nodeData.parentNode = toRaw(parentNode)
   }
 
   let curData = {
     textBook: {
-      curBookId: curBookId.value,
-      curBookName: curBookName.value,
-      curBookImg: curBookImg.value,
-      curBookPath: curBookPath.value
+      curBookId: curBook.data.id,
+      curBookName: curBook.data.itemtitle,
+      curBookImg: BaseUrl + curBook.data.avartar,
+      curBookPath: curBook.data.fileurl
     },
     node: toRaw(nodeData)
   }
-  currentNode.data = curData
+  localStorage.setItem('defaultExpandedKeys', parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
+  localStorage.setItem('curNode', JSON.stringify(nodeData))
 
-  localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
-  localStorage.setItem('currentNodeId', JSON.stringify(data.id))
+  /**
+ * 临时用 后续删除 unitId
+ */
+  let levelFirstId = null
+  let levelSecondId = null
+   if (nodeData.parentNode) {
+    levelFirstId = nodeData.parentNode.id
+    levelSecondId = nodeData.id
+  } else {
+    levelFirstId = nodeData.id
+    levelSecondId = ''
+  }
+  localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
 
   emit('nodeClick', curData)
 
 }
-onMounted(() => {
-  getSubjectContent()
+onMounted( async () => {
+  treeLoading.value = true
+
+  try{
+    useSubject = await useGetSubject()
+    subjectList.value = useSubject.subjectList
+
+    let book = localStorage.getItem('curBook')
+    if(book){
+      book = JSON.parse(book)
+      curBook.data = book
+      treeData.value = useSubject.getTreeData(book.id)
+    }
+    else{
+      curBook.data = useSubject.subjectList[0]
+      treeData.value = useSubject.treeData
+    }
+    // 设置展开并选中
+    nextTick(() =>{
+      // 取缓存
+      let node = localStorage.getItem('curNode')
+      if(node){
+        curNode.data = JSON.parse(node)
+        defaultExpandedKeys.value = JSON.parse(localStorage.getItem('defaultExpandedKeys'))
+      }
+      else{
+        defaultExpandedKeys.value = [treeData.value[0].id]
+        curNode.data = getLastLevelData(treeData.value)[0]
+        //缓存记录当前展开以及选中节点
+        localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
+        localStorage.setItem('curNode', JSON.stringify(curNode.data))
+      }
+      emitChangeBook()
+    })
+  
+  } finally{
+    treeLoading.value = false
+  }
+
 })
 
 </script>

src/renderer/src/components/move-file/index.vue

@@ -137,7 +137,7 @@ const getSubjectContent = async () => {
 }
 
 const getSubject = async () => {
-  subjectList.value = JSON.parse(localStorage.getItem('subjectList'))
+
 
   if (localStorage.getItem('subjectList')) {
     subjectList.value = JSON.parse(localStorage.getItem('subjectList'))

src/renderer/src/hooks/useGetSubject.js

@@ -0,0 +1,82 @@
+import { ref } from 'vue'
+import useUserStore from '@/store/modules/user'
+import { listEvaluation } from '@/api/subject'
+
+export const useGetSubject = async () =>{
+
+  // user store
+  const userStore = useUserStore()
+  const { edustage, edusubject, userId } = userStore.user
+  const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+  // 章节List
+  const unitList = ref([])
+  // 教材List
+  let subjectList = null
+  // 单元章节树结构
+  let treeData = null
+
+
+  // 根据 学科 + 学段 获取所有单元章节 
+  const getSubjectUnit = async () =>{
+    let strUnit = localStorage.getItem('unitList')
+    if(strUnit){
+      unitList.value = JSON.parse(strUnit)
+    }
+    else{
+      const unitParams = {
+        edusubject,
+        edustage,
+        itemgroup: 'textbook',
+        orderby: 'orderidx asc',
+        pageSize: 10000
+      }
+      const { rows } = await listEvaluation(unitParams)
+      unitList.value = rows
+      localStorage.setItem('unitList', JSON.stringify(rows))
+    }
+   
+    await getSubject()
+  }
+
+  // 获取 学科 + 学段 获取教材
+  const getSubject = async () =>{
+
+    let strSubject = localStorage.getItem('subjectList')
+    if(strSubject){
+      subjectList = JSON.parse(strSubject)
+    }
+    else{
+      const subjectParams = { 
+        itemkey: "version",
+        edusubject,
+        edustage,
+        pageSize: 10000,
+        orderby: 'orderidx asc'
+      }
+      const { rows } = await listEvaluation(subjectParams)
+      subjectList = rows
+      localStorage.setItem('subjectList', JSON.stringify(rows))
+    }
+  
+    // 默认选中第一个教材
+    if(subjectList && subjectList.length){
+      treeData = getTreeData(subjectList[0].id)
+    }
+  }
+
+  // 单元章节数据转为“树”结构
+  const getTreeData = (bookId) =>{
+    // 根据当前教材的id 查找出对应的章节 
+    let data = unitList.value.filter(item => item.rootid == bookId && item.level == 1)       
+    data.forEach( item => {
+      item.children = unitList.value.filter( item2 => item2.parentid == item.id && item2.level == 2)
+    }) 
+    return data
+
+  }
+
+  await getSubjectUnit()
+
+  return { subjectList, treeData, getTreeData }
+
+}

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

@@ -37,7 +37,7 @@
             <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 />
@@ -52,6 +52,7 @@
                   </template>
                 </el-dropdown>
               </div>
+              <div class="user-depname">{{ userStore.user.deptName }}</div>
             </div>
           </div>
 
@@ -72,6 +73,7 @@ import { updateUserInfo } from '@/api/system/user'
 import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
+import { clearBookInfo } from '@/utils/ruoyi'
 
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -190,6 +192,7 @@ function setLayout() {
 }
 // 切换学科
 const changeSubject = async (command) =>{
+  clearBookInfo()
   const { userId, userName, phonenumber, plainpwd  } = userStore.user
   const data = {
     userId,
@@ -329,7 +332,7 @@ onMounted(() => {
       justify-content: space-around;
 
       .user-depname {
-        margin-right: 5px;
+        margin-right: 0;
       }
 
       .user-subject {
@@ -349,8 +352,8 @@ onMounted(() => {
     align-items: center;
 
     .user-avatar {
-      width: 35px;
-      height: 35px;
+      width: 45px;
+      height: 45px;
       border-radius: 10px;
       margin-right: 10px;
     }

src/renderer/src/plugins/shareStore.js

@@ -61,7 +61,7 @@ function stateSyncWatch(storeName, newState) {
   // console.log('state-change-diffData', diffData)
   try {
     for(const key in diffData) {
-      const value = diffData[key]
+      const value = diffData[key] || null
       const newValue = {} // 重新组装pinia需要的数据 {a:{b:1}} 这种
       const keyArr = key.split('.') || []
       keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
@@ -172,6 +172,8 @@ const getObjValue = (obj, key) => {
 const findDifferences = (obj1, obj2) => {
   const differences = {};
   function compareObjects(o1, o2, path = '') {
+    if (o1 == null) return
+    if (o2 == null) return
     for (const key in o1) {
       if (o1.hasOwnProperty(key)) {
         const newPath = path ? `${path}.${key}` : key;

src/renderer/src/utils/ruoyi.js

@@ -257,3 +257,17 @@ export const getFileName = (filename) => {
   if(!filename) return
   return filename.replace(/\.[^/.]+$/, "");
 }
+
+// 清除当前选中的教材 章节 相关信息
+export const clearBookInfo = () =>{
+  //当前选中的教材
+  localStorage.removeItem('curBook')
+  // 当前选中的节点
+  localStorage.removeItem('curNode')
+  // 所有章节单元数据
+  localStorage.removeItem('unitList')
+  // 所有教材数据
+  localStorage.removeItem('subjectList')
+  // 展开的节点
+  localStorage.removeItem('defaultExpandedKeys')
+}

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

@@ -1,10 +1,10 @@
 <template>
   <el-card style="width: 100%;height: 100%;overflow: auto">
-<!--    <template #header>-->
-<!--      <div class="card-header" style="text-align: left">-->
-<!--        <el-button type="primary" @click="addGroup">新建分组</el-button>-->
-<!--      </div>-->
-<!--    </template>-->
+    <template #header>
+      <div class="card-header" style="text-align: left">
+        <el-button type="primary" @click="addGroup">新建分组</el-button>
+      </div>
+    </template>
     <template v-if="groupList.length > 0">
       <div style="font-size: 16px;font-weight: bold;color: #000;text-align: left;margin-bottom: 5px">可用分组</div>
       <div class="groupList">

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

@@ -186,7 +186,8 @@
   ])
   //选择的班级
   const classids = ref('')
-
+  // 未加入的班级
+  const classesNotAMemberOf = ref([])
   // 获取班级信息
   const getClassInfo = () => {
     classList.value = []
@@ -199,13 +200,13 @@
     });
     listClassmain({entpid: userStore.deptId, status: 'open', pageSize: 100}).then(response => {
       //清除已有的班级
-      let arr = [...response.rows]
+      classesNotAMemberOf.value = [...response.rows]
       classList.value.forEach(item => {
-        const currentIndex = arr.findIndex(items => items.id === item.id)
-        if(currentIndex) arr.splice(currentIndex, 1)
+        const currentIndex = classesNotAMemberOf.value.findIndex(items => items.id === item.id)
+        if(currentIndex) classesNotAMemberOf.value.splice(currentIndex, 1)
       })
       //这里获取组装所有班级
-      gradeTree.value = groupByCondition(arr, item => item.agekey);
+      gradeTree.value = groupByCondition(classesNotAMemberOf.value, item => item.agekey);
     })
   }
   //将所有班级筛选成二级的数组

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

@@ -8,15 +8,15 @@
       <div class="teacher_content_con">
         <!-- 题目内容：习题训练 -->
         <div v-if="dialogProps.studentObj.worktype == '习题训练'">
-          <div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
-            <div v-for="quItem in dialogProps.quizlist" :key="quItem.id">
+          <div v-for="(quItem, qIndex) in dialogProps.quizlist" :key="quItem.id">
+            <div v-for="(stuItem, sIndex) in dialogProps.studentQuizAllList" :key="stuItem.id">
               <div v-if="stuItem.entpcourseworkid == quItem.id">
                 <el-card style="max-width: 100%; margin-bottom: 10px">
                   <!-- 题型 分值 -->
                   <template #header>
                     <div class="card-header">
                       <span
-                        >{{ sIndex + 1 }}、{{ quItem.worktype }}
+                        >{{ qIndex + 1 }}、{{ quItem.worktype }}
                         {{ stuItem.score ? stuItem.score : 0 }}分</span
                       >
                     </div>
@@ -94,21 +94,19 @@
                         </span>
                       </el-col>
                       <el-col :span="6" style="padding: 10px">
-                        <div
-                          v-for="(imageItem, index) in stuItem.imagefile"
-                          v-if="stuItem.imagefile && stuItem.imagefile.length > 0"
-                          :key="index"
-                        >
-                          <el-image
-                            style="width: 30px; height: 30px"
-                            :src="imageItem"
-                            :zoom-rate="1.2"
-                            :max-scale="7"
-                            :min-scale="0.2"
-                            :preview-src-list="stuItem.imagefile"
-                            :initial-index="4"
-                            fit="contain"
-                          />
+                        <div v-if="stuItem.imagefile && stuItem.imagefile.length > 0"> 
+                          <div v-for="(imageItem, index) in stuItem.imagefile" :key="index">
+                            <el-image
+                              style="width: 30px; height: 30px"
+                              :src="imageItem"
+                              :zoom-rate="1.2"
+                              :max-scale="7"
+                              :min-scale="0.2"
+                              :preview-src-list="stuItem.imagefile"
+                              :initial-index="4"
+                              fit="contain"
+                            />
+                          </div>
                         </div>
                       </el-col>
                       <el-col :span="6" style="padding: 10px">

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -34,7 +34,7 @@
                   </el-col>
                   <el-col :span="11">
                     <el-form-item label="知识点" label-width="70">
-                      <el-cascader 
+                      <el-cascader
                         v-model="entpCourseWorkQueryParams.point"
                         clearable
                         style="width: 100%"
@@ -59,15 +59,15 @@
                   <el-col :span="15">
                     <el-form-item label="关键词" label-width="70">
                       <el-input
-                        v-model="entpCourseWorkQueryParams.keyWord" 
-                        style="width: 70%" type="text" 
+                        v-model="entpCourseWorkQueryParams.keyWord"
+                        style="width: 70%" type="text"
                         placeholder="请输入关键词"
                       />
                       <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button>
                     </el-form-item>
                   </el-col>
                 </el-row>
-                
+
                 <el-table :data="workResource.entpCourseWorkList" style="width: 100%;">
                   <el-table-column type="index" width="60" />
                   <el-table-column align="left" >
@@ -96,10 +96,10 @@
                 <div style="height: 55px;">
                   <!-- 分页 -->
                   <pagination
-                    v-show="entpCourseWorkTotal > 0" 
-                    v-model:page="paginationParams.pageNum" 
+                    v-show="entpCourseWorkTotal > 0"
+                    v-model:page="paginationParams.pageNum"
                     v-model:limit="paginationParams.pageSize"
-                    :total="entpCourseWorkTotal" 
+                    :total="entpCourseWorkTotal"
                     :style="{ position: 'relative', 'margin-top': '5px' }"
                     @pagination="getPaginationList" />
                 </div>
@@ -266,7 +266,7 @@ const entpCourseWorkTypeList = ref([
   {value: 5, label: "主观题"},
   {value: 6, label: "复合题"},
 ]); // 习题查询条件 - 题型
-    
+
 const entpCourseWorkGroupList = ref([{
   Key: -1,
   Value: '不限',
@@ -323,7 +323,7 @@ const workResource = reactive({
 const classWorkForm =  reactive({
   worktype: '习题训练', //作业类型
   // uniquekey: userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1),
-  
+
 })
 const entpCourseWorkList = ref([]); // 习题列表
 const entpCourseWorkTotal = ref(0); // 习题总数
@@ -344,7 +344,7 @@ const queryForm = reactive({
   sectionName: props.bookobj.coursetitle,
   edusubject: userStore.edusubject,
   edustage: userStore.edustage,
-  // 
+  //
   // 题类
   worktype: entpCourseWorkQueryParams.worktype.label,
   workTypeId: entpCourseWorkQueryParams.worktype.value,
@@ -381,8 +381,8 @@ const queryForm = reactive({
   //   // [初中+政治]需改为[初中+道德与法治]
   //   queryForm.edusubject = '道德与法治';
   // }
-  
- 
+
+
   console.log(queryForm)
   listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
     // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
@@ -411,8 +411,6 @@ const queryForm = reactive({
       entpCourseWorkTotal.value = entpcourseworkres.data.length;
     }
 
-    if()
-    
     //格式化试题信息
     processList(workResource.entpCourseWorkList);
   })
@@ -447,8 +445,8 @@ onMounted(() => {
       border-radius:5px;
     }
 
-  
+
   }
-  
+
 }
 </style>

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

@@ -2,9 +2,9 @@
   <div class="desktop-work-item">
     <div class="item-title flex">
       <span class="title">工作动态</span>
-      <el-radio-group v-model="type">
+      <!-- <el-radio-group v-model="type">
         <el-radio-button label="全部" :value="-1" />
-      </el-radio-group>
+      </el-radio-group> -->
     </div>
     <div class="item-content" v-loading="loading">
       <el-scrollbar height="500px">

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

@@ -211,12 +211,6 @@ const rules = reactive({
       message: '请选择地址',
       trigger: 'change',
   },],
-  class:[ {
-      type:'array',
-      required: true,
-      message: '请选择班级',
-      trigger: 'change',
-  },],
   discipline:[ {
       type: 'array',
       required: true,

src/renderer/src/views/prepare/container/class-start.vue

@@ -89,6 +89,8 @@ const userStore = useUserStore()
 const visible = ref(false)      // 是否打开窗口
 const myClassActive = ref({})   // 我的课件：准备上课的APT课件
 const imChatRef = ref(null)     // im-chat ref
+const emit = defineEmits(['close'])
+
 const classForm = reactive({    // 班级(左侧)：表单数据 表单配置
   form: {}, itemOption: [], option: {}
 })
@@ -137,6 +139,7 @@ const handleClose = async () => {
   reset() // 重置数据
   await chat?.logout()
   chat = null
+  emit('close')
 }
 // 初始化-数据
 const initData = () => {

src/renderer/src/views/prepare/container/file-oper-batch.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="file-oper-batch-wrap">
-    <div style="margin: 0 20px; line-height: 40px">
+    <div style="line-height: 40px">
       <el-checkbox
         v-model="isCheckAll"
         :indeterminate="indeterminate"
@@ -15,7 +15,7 @@
 </template>
 <script>
 import { deleteSmarttalkBatch } from '@/api/file'
-import { ElMessage, ElMessageBox } from 'element-plus'
+import { ElMessage } from 'element-plus'
 import { exportFile } from '@/utils/talkFile'
 export default {
   name: 'FileOperBatch',

src/renderer/src/views/prepare/container/kj-list-item.vue

@@ -52,8 +52,8 @@
       </div>
     </div>
     <div class="prepare-body-main-item-btn">
-      <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button>
-      <el-button v-else type="primary" @click="clickStartClass(item)">上课</el-button>
+      <!-- <el-button v-if="activeClassId==item.id" type="success" @click="clickStartClass(item)">上课中</el-button> -->
+      <el-button type="primary" @click="clickStartClass(item)">上课</el-button>
     </div>
     <div class="prepare-body-main-item-tool">
       <el-popover
@@ -74,7 +74,7 @@
                   </el-button>
                 </div>
                 <div class="item-popover-item">
-                  <el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
+                  <el-button text @click="deleteTalk(item)">
                     <i class="iconfont icon-shanchu"></i>
                     <span>删除</span>
                   </el-button>

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

@@ -86,7 +86,7 @@ import useUserStore from '@/store/modules/user'
 import { ElMessage } from 'element-plus'
 import { getCurrentTime, getAfterMinutes } from '@/utils/date'
 
-const emit = defineEmits(['addSuccess'])
+const emit = defineEmits(['addSuccess','close'])
 const props = defineProps({
   bookId: {
     type: Number,
@@ -115,7 +115,7 @@ const updateForm = ref({})
 watch(
   () => props.currentNode,
   (newValue, oldValue) => {
-    form.name = newValue.label
+    form.name = newValue.itemtitle
   }
 )
 const ruleForm = reactive({
@@ -216,7 +216,9 @@ const openDialog = (data) => {
 const closeDialog = () => {
   ruleFormDialog.value.resetFields()
   centerDialogVisible.value = false
-  form.name = props.currentNode.label
+  form.name = props.currentNode.itemtitle
+  emit('close')
+
 }
 const classList = ref([])
 onMounted(() => {

src/renderer/src/views/prepare/index.vue

@@ -20,7 +20,6 @@
               :key="index"
               :item="item"
               :index="index"
-              :activeClassId="activeClass?.id"
               @on-delete="deleteTalk"
               @on-start-class="startClass"
             >
@@ -69,7 +68,7 @@
           <el-tab-pane label="素材" name="素材">
             <div class="prepare-body-header">
               <div>
-                <label style="font-size: 15px">共{{ currentFileList.length }}个文件</label>&nbsp;
+                <label style="font-size: 15px">共{{ currentFileList.filter(ite=>ite.fileFlag!=='apt'&&ite.fileFlag!=='课件').length }}个文件</label>&nbsp;
                 <el-popover placement="top-start" :width="250" trigger="hover">
                   <template #default>
                     <div>
@@ -141,7 +140,7 @@
       </div>
       <file-oper-batch
         v-show="checkFileList.length > 0"
-        :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
+        :indeterminate="checkFileList.length > 0 && checkFileList.length < currentSCFileList.length"
         :choose="checkFileList"
         :check-all="isCheckAll"
         @click-delete="clickDelete"
@@ -159,9 +158,10 @@
     :current-node="currentNode"
     :book-id="uploadData.textbookId"
     @add-success="initReserv"
+    @close="closeChange"
   ></reserv>
   <!-- 上课配置 -->
-  <class-start ref="calssRef"/>
+  <class-start ref="calssRef" @close="closeChange"/>
 </template>
 <script setup>
 import { Check,Plus } from '@element-plus/icons-vue'
@@ -255,7 +255,7 @@ export default {
   computed: {
     isCheckAll() {
       return (
-        this.checkFileList.length > 0 && this.checkFileList.length === this.currentFileList.length
+        this.checkFileList.length > 0 && this.checkFileList.length === this.currentSCFileList.length
       )
     },
     currentKJFileList() {
@@ -305,10 +305,10 @@ export default {
   methods: {
     startClass(item) {
       // console.log(item, sessionStore)
+      // 关闭状态，打开上课相关功能(已打开，忽略)
+      const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
+      if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
       if(item.fileFlag === '课件') {
-        // 关闭状态，打开上课相关功能(已打开，忽略)
-        const id = sessionStore.has('activeClass.id') ? sessionStore.get('activeClass.id') : null
-        if (id && id == item.id) return ElMessage.warning('当前正在上课，请勿重复操作')
         this.openReserv()
       }
       if(item.fileFlag === 'apt') {
@@ -319,6 +319,11 @@ export default {
       sessionStore.set('activeClass', item)
       this.activeClass = item
     },
+    closeChange() { // 上课弹窗被关闭-触发
+      console.log('关闭上课弹窗')
+      this.activeClass = null
+      sessionStore.delete('activeClass')
+    },
     initReserv(id) {
       getClassInfo(id).then((res) => {
         this.curClassReserv = res.data
@@ -363,7 +368,7 @@ export default {
       this.downloadNum = num
     },
     createFile() {
-      creatPPT(this.currentNode.label + '.pptx', this.uploadData).then((res) => {
+      creatPPT(this.currentNode.itemtitle + '.pptx', this.uploadData).then((res) => {
         this.currentFileList.unshift(res.resData)
       })
     },
@@ -443,7 +448,7 @@ export default {
             creatAPT({
               ...this.uploadData,
               fileId: slideid,
-              fileShowName: this.currentNode.label + '.apt'
+              fileShowName: this.currentNode.itemtitle + '.apt'
             }).then((res) => {
               this.currentFileList.unshift(res.resData)
             })
@@ -660,7 +665,7 @@ export default {
           '/tool/sphere?entpcourseid=' +
           this.entpcourseid +
           '&label=' +
-          this.currentNode.label +
+          this.currentNode.itemtitle +
           '&reservId=' +
           id
       })

src/renderer/src/views/profile/index.vue

@@ -30,9 +30,9 @@
               <li class="list-group-item">
                 <div class="left-align">
                   <Message class="Message"/>
-                  <span>用户邮箱</span>
+                  <span>身份证号</span>
                 </div>
-                <div class="right-align">{{ state.user.email }}</div>
+                <div class="right-align">{{ state.user.identity }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">
@@ -48,7 +48,7 @@
                   <Avatar class="Avatar"/>
                   <span>所属角色</span>
                 </div>
-                <div class="right-align">{{ state.roleGroup }}</div>
+                <div class="right-align">{{ state.roleGroup || '教师' }}</div>
               </li>
               <li class="list-group-item">
                 <div class="left-align">

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

@@ -6,10 +6,10 @@
     <el-form-item label="手机号码" prop="phonenumber">
       <el-input v-model="user.phonenumber" maxlength="11" />
     </el-form-item>
-    <el-form-item label="邮箱" prop="email">
-      <el-input v-model="user.email" maxlength="50" />
+    <el-form-item label="身份证号" prop="identity">
+      <el-input v-model="user.identity" maxlength="50" />
     </el-form-item>
-    <el-form-item label="性别">
+    <el-form-item label="性别" style="display: none">
       <el-radio-group v-model="user.sex">
         <el-radio value="0">男</el-radio>
         <el-radio value="1">女</el-radio>
@@ -18,8 +18,8 @@
     <el-form-item label="学段">
       <el-radio-group v-model="user.edustage" @change="semeterChange">
         <template v-for="(item,index) in semesterList" :key="index">
-          <el-radio :value="item.title">
-            {{item.title }}
+          <el-radio :value="item.label">
+            {{item.label }}
           </el-radio>
         </template>
       </el-radio-group>
@@ -42,9 +42,11 @@
  <script setup>
 import { ref, getCurrentInstance,onMounted } from 'vue'
 import {updateUserInfo } from '@/api/system/user'
+import {getDept } from '@/api/login'
 import { listEvaluation } from '@/api/subject/index'
 import useUserStore from '@/store/modules/user'
 import {ElMessage} from 'element-plus'
+import { clearBookInfo } from '@/utils/ruoyi'
 
 const props = defineProps({
   user: {
@@ -59,21 +61,30 @@ const userStore = useUserStore()
 const semesterList = ref([
   {
     id:1,
-    title:'幼儿园'
+    label:'幼儿园'
   },
   {
     id:2,
-    title:'小学'
+    label:'小学'
   },
   {
     id:3,
-    title:'初中'
+    label:'初中'
   },
   {
     id:4,
-    title:'高中'
+    label:'高中'
   },
 ])
+// 获取学校所存在的学段
+
+const getTheSection = () => {
+  getDept({deptId:userStore.user.deptId}).then(res => {
+    //获取该学校可以选择的学科
+    const arr = res.data.studying.split(',')
+    semesterList.value = semesterList.value.filter(items => {return arr.includes(items.label)}).map(item => item)
+  })
+}
 
 const rules = ref({
   nickName: [{ required: true, message: '用户昵称不能为空', trigger: 'blur' }],
@@ -137,8 +148,7 @@ function submit() {
           userStore.login({username:props.user.userName,password:props.user.plainpwd}).then(() => {
             userStore.getInfo().then(res => {
               if(res.code === 200){
-                localStorage.removeItem('subjectList')
-                localStorage.removeItem('evaluationList')
+                clearBookInfo()
                 ElMessage.success('修改成功')
               }else{
                 ElMessage.error(response.msg)
@@ -159,5 +169,6 @@ const semeterChange = (item) => {
 }
 onMounted(() => {
   getSubject()
+  getTheSection()
 })
 </script>

src/renderer/src/views/tool/components/lesson.vue

@@ -38,7 +38,7 @@ const curBookId = ref('')
 const evaluationList = ref([])
 
 const getTreeData = () => {
-  evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+  evaluationList.value = JSON.parse(localStorage.getItem('unitList'))
 
     //上册
         /**

src/renderer/src/views/tool/directive/drag.js

@@ -57,6 +57,8 @@ class Drag {
     document.removeEventListener('mouseup', this.up);
     document.addEventListener('touchmove', this.move);
     document.addEventListener('touchend', this.up);
+    // 手动-触发事件 v-drag-start
+    this.el.dispatchEvent(new CustomEvent('v-drag-end', {detail:{drag: this}}))
   }
   // 业务逻辑
   updatePosition(e) {
@@ -108,6 +110,7 @@ export default {
     // const { style } = binding.value
     const drag = new Drag(el, binding)
     const dragStart = (e) => {
+      // console.log('start', e)
       drag.down(e)
       document.addEventListener('mousemove', drag.move);
       document.addEventListener('mouseup', drag.up);

src/renderer/src/views/tool/sphere.vue

@@ -13,7 +13,8 @@
     <im-chat ref="imChatRef" @change="chatChange" group />
 
     <!-- 底部工具栏 -->
-    <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
+    <div class="tool-bottom-all"
+      @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
         @v-drag-start="dragtime = Date.now()">
         <div class="c-logo" @click="logoHandle" title="拖动 | 折叠 | 展开">
@@ -106,7 +107,7 @@ const getClassInfo = async () => {
 const tabChange = (val) => {
   const bool = !toolStore.isPdfWin && !toolStore.showBoardAll
   if(bool) toolStore.showBoardAll = true
-  console.log('tabChange:', val, bool)
+  // console.log('tabChange:', val, bool)
   toolStore.model = val // 存储当前tab
 }
 // logo 点击-事件 折叠|展开
@@ -143,9 +144,12 @@ const mouseChange = (bool) => {
     const isPdf = !resBool && toolStore.isPdfWin
     if (isPdf) resBool = true
   }
-  // console.log('mouseChange:', bool, resBool)
+  console.log('mouseChange:', bool, resBool)
   setIgnore(resBool)
 }
+const touchChange = (e) => {
+  console.log(e)
+}
 // im-chat: 聊天事件 {type, data}
 const chatChange = (type, data, ...args) => {
   if (type == 'createGroup') {  // 创建群-监听