Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into baigl

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

@@ -6,7 +6,7 @@
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
+        <el-tree ref="refTree" :data="treeData" accordion :props="defaultProps" node-key="id"
           :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
           @node-click="handleNodeClick">
           <template #default="{ node }">
@@ -109,6 +109,8 @@ const getSubjectContent = async () => {
     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
@@ -134,6 +136,10 @@ const changeBook = ({ id, itemtitle, avartar, fileurl }) => {
   curBookName.value = itemtitle
   curBookImg.value = BaseUrl + avartar
   curBookPath.value = fileurl
+
+  localStorage.removeItem('defaultExpandedKeys')
+  localStorage.removeItem('currentNodeId')
+  localStorage.setItem('curBook', JSON.stringify({id, itemtitle, avartar, fileurl}))
   getTreeData()
   setTimeout(() => {
     dialogVisible.value = false
@@ -144,7 +150,6 @@ const getTreeData = () => {
   //数据过滤
   let upData = transData(evaluationList.value)
 
-
   if(upData.length){
     treeData.value = [...upData]
   }
@@ -153,10 +158,22 @@ const getTreeData = () => {
     return
   }
   nextTick(() => {
-    defaultExpandedKeys.value = [treeData.value[0].id]
+
-    currentNode.data = getLastLevelData(treeData.value)[0]
+    let defaultCurNodeId = localStorage.getItem('currentNodeId')
-    currentNodeId.value = getLastLevelData(treeData.value)[0].id
+    if(defaultCurNodeId){
-    currentNodeName.value = getLastLevelData(treeData.value)[0].label
+      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()
   })
 
@@ -183,6 +200,9 @@ const emitChangeBook = () => {
     },
     node: curNode
   }
+
+  localStorage.setItem('defaultExpandedKeys', JSON.stringify(defaultExpandedKeys.value))
+  localStorage.setItem('currentNodeId', JSON.stringify(currentNodeId.value))
   emit('changeBook', data)
 }
 
@@ -230,6 +250,11 @@ 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 => {
@@ -281,10 +306,21 @@ const getSubject = async () => {
 
   // 默认第一个
   if(!subjectList.value.length) return
-  curBookName.value = subjectList.value[0].itemtitle
+  let curBook = localStorage.getItem('curBook')
-  curBookId.value = subjectList.value[0].id
+  if(curBook){
-  curBookImg.value = BaseUrl + subjectList.value[0].avartar
+    curBook = JSON.parse(curBook)
-  curBookPath.value = subjectList.value[0].fileurl
+    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)
+  }
 }
 
 
@@ -321,7 +357,12 @@ const handleNodeClick = (data, node) => {
     node: toRaw(nodeData)
   }
   currentNode.data = curData
+
+  localStorage.setItem('defaultExpandedKeys', nodeData.parentNode ? JSON.stringify([parentNode.id]) : JSON.stringify([data.id]))
+  localStorage.setItem('currentNodeId', JSON.stringify(data.id))
+
   emit('nodeClick', curData)
+
 }
 onMounted(() => {
   getSubjectContent()

src/renderer/src/plugins/shareStore.js

@@ -66,9 +66,10 @@ function stateSyncWatch(storeName, newState) {
       const keyArr = key.split('.') || []
       keyArr.reduce((o,c,i)=>{o[c] = i === keyArr.length-1 ? value : {};return o[c]}, newValue)
       const jsonStr = JSON.stringify(newValue) // 从新组装-json数据
-      // // 更新本地数据-session
+      // 更新本地数据-session
+      // console.log('state-change-update:', key, value)
       sessionStore.set(key, value)
-      // // 通知主线程更新
+      // 通知主线程更新
       ipcRenderer?.invoke('pinia-state-change', storeName, jsonStr)
       // console.log('======',key, value, jsonStr )
     }

src/renderer/src/views/desktop/index.vue

@@ -87,7 +87,7 @@ const menuList = [{
       //   path: '/prepare'
       // },
       {
-        name: '教学实施',
+        name: '教学实践',
         icon: 'icon-jiaoxuefenxi',
         path: '/prepare'
       },

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

@@ -119,71 +119,22 @@ onMounted(() => {
  */
 const open = async (id) => {
   visible.value = true
-  // 获取apt详情
+  if (id) {
-  if (id) await getAptInfo(id)
+    // 重置数据
-  // 模拟数据
+    reset()
-  // myClassActive.value = {
+    // 获取apt详情
-  //   "createBy": null,
+    await getAptInfo(id)
-  //   "createTime": null,
+    // 获取班级列表
-  //   "updateBy": null,
+    getClassList()
-  //   "updateTime": null,
+    // 初始化im-chat
-  //   "remark": null,
+    nextTick(async() => {
-  //   "id": 14740,
+      chat = await imChatRef.value?.initImChat()
-  //   "idarray": null,
+    })
-  //   "jsonarray": null,
+  } 
-  //   "entpid": 255,
-  //   "parentid": 14741,
-  //   "linkids": "",
-  //   "linklist": "",
-  //   "entpcourseid": 7300,
-  //   "entpcourseidarray": null,
-  //   "evalid": 39952,
-  //   "evaltitle": " 质点 参考系",
-  //   "coursetitle": " 质点 参考系",
-  //   "classid": 0,
-  //   "ppttype": "file",
-  //   "title": " 质点 参考系",
-  //   "fileidx": 0,
-  //   "fileurl": "",
-  //   "pathfile": null,
-  //   "filetype": "ppt",
-  //   "filesize": null,
-  //   "datacontent": "",
-  //   "filekey": "",
-  //   "filetag": "",
-  //   "dflag": 0,
-  //   "status": "",
-  //   "edituserid": 2781,
-  //   "editusername": "张雪林",
-  //   "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
-  //   "edituserentpname": "AIx数字平台内测中心",
-  //   "editstudentid": null,
-  //   "editstudentname": null,
-  //   "timestamp": "2024-09-10 15:07:20",
-  //   "token": null,
-  //   "base64Code": null,
-  //   "orderby": null,
-  //   "childcount": 4,
-  //   "commentlikecount": 0,
-  //   "commenttextcount": 0,
-  //   "commentusecount": 0,
-  //   "commentvisitcount": 90,
-  //   "unixstamp": null,
-  //   "classworkcount": 0,
-  //   "classworklist": "",
-  //   "authjson": "",
-  //   "defaultslide": null
-  // }
-  // 获取班级列表
-  getClassList()
-
-  // 初始化im-chat
-  // nextTick(async() => {
-  //   chat = await imChatRef.value?.initImChat()
-  // })
 }
 // 关闭弹窗
 const handleClose = async () => {
+  reset() // 重置数据
   await chat?.logout()
   chat = null
 }
@@ -204,6 +155,15 @@ const initData = () => {
     { label: '故障备用', prop: 'backup', show: false },
   ]
 }
+// 重置数据
+const reset = () => {
+  // 初始化-表单数据
+  classForm.form = {}
+  teacherForm.form = { classcourseid: 0 }
+  dt.isCreate = false
+  dt.isHistory = false
+  dt.atCourse = {}
+}
 // 获取课件APT
 const getAptInfo = async (id) => {
   const res = await Http_Entpcoursefile.getEntpcoursefile(id)

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

@@ -52,7 +52,8 @@
       </div>
     </div>
     <div class="prepare-body-main-item-btn">
-      <el-button type="primary" @click="clickStartClass(item)">上课</el-button>
+      <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>
     </div>
     <div class="prepare-body-main-item-tool">
       <el-popover
@@ -65,18 +66,20 @@
         <template #default>
           <div style="width: 100%">
             <div class="item-popover" @click="closePopver(index)">
-              <div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
+              <template v-if="userInfo.userId === Number(item.createUserId)">
-                <el-button text @click="editTalk(item, index)">
+                <div class="item-popover-item">
-                  <i class="iconfont icon-bianji"></i>
+                  <el-button text @click="editTalk(item, index)">
-                  <span>标签</span>
+                    <i class="iconfont icon-bianji"></i>
-                </el-button>
+                    <span>标签</span>
-              </div>
+                  </el-button>
-              <div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
+                </div>
-                <el-button text @click="deleteTalk(item)">
+                <div class="item-popover-item">
-                  <i class="iconfont icon-shanchu"></i>
+                  <el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
-                  <span>删除</span>
+                    <i class="iconfont icon-shanchu"></i>
-                </el-button>
+                    <span>删除</span>
-              </div>
+                  </el-button>
+                </div>
+              </template>
             </div>
           </div>
         </template>
@@ -98,6 +101,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
 import outLink from '@/utils/linkConfig'
+import { sessionStore } from '@/utils/store'
 
 const { ipcRenderer } = window.electron || {}
 export default {
@@ -115,6 +119,10 @@ export default {
       default: function () {
         return 0
       }
+    },
+    activeClassId: { // 当前上课id
+      type: String,
+      default: ''
     }
   },
   emits: { 'on-start-class': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null,'on-filearg': null },

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

@@ -20,6 +20,7 @@
               :key="index"
               :item="item"
               :index="index"
+              :activeClassId="activeClass?.id"
               @on-delete="deleteTalk"
               @on-start-class="startClass"
             >
@@ -192,7 +193,7 @@ import { getClassInfo, getSelfReserv } from '@/api/classManage'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
 import ClassReserv from '@/views/classManage/classReserv.vue'
-import classStart from '@/views/desktop/container/class-start.vue' // 预备上课
+import classStart from './container/class-start.vue' // 预备上课
 const toolStore = useToolState()
 
 const fs = require('fs')
@@ -246,7 +247,9 @@ export default {
       // 布置作业弹窗
       setDialog: false,
       row: '',
-      isOpenHomework: false
+      isOpenHomework: false,
+      // 当前上课课程
+      activeClass: null,
     }
   },
   computed: {
@@ -272,6 +275,9 @@ export default {
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
     // this.initReserv()
+
+    // zdg: 获取缓存中的当前课程
+    this.activeClass = sessionStore.get('activeClass') || null
   },
   mounted() {
     this.$watch(
@@ -298,15 +304,20 @@ export default {
   // },
   methods: {
     startClass(item) {
-      console.log(item)
+      // console.log(item, sessionStore)
       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') {
-        //TODO 打开apt
+        //TODO 打开apt - fileId: aptId
-        const { fileId: aptId } = item
+        this.$refs.calssRef.open(item.fileId)
-        this.$refs.calssRef.open(aptId)
       }
+      // 当前上课-store
+      sessionStore.set('activeClass', item)
+      this.activeClass = item
     },
     initReserv(id) {
       getClassInfo(id).then((res) => {

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

@@ -10,7 +10,7 @@
     <upvote-vue ref="upvoteRef" type="2"></upvote-vue>
 
     <!-- im-chat 聊天组件 -->
-    <im-chat ref="imChatRef" @change="chatChange" isGroup />
+    <im-chat ref="imChatRef" @change="chatChange" group />
 
     <!-- 底部工具栏 -->
     <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">