Merge branch 'main' into zouyf_dev

# Conflicts:
#	src/renderer/src/components/set-homework/index.vue

src/renderer/src/components/set-homework/index.vue

@@ -244,7 +244,7 @@ const onSubmit = (formEl) => {
           teachername: userInfo.nickName,
           unixstamp: new Date().getTime(),
           worktype: props.row.worktype,
-          status: '1',  //将推送的作业状态改为1
+          status: '1'
         }
         ary.push(obj)
       }

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/classTask/classTask.vue

@@ -220,7 +220,7 @@ const getStudentClassWorkData = () => {
     }).then((res) => {
       for (var t = 0; t < classWorkList.value.length; t++) {
         for (var i = 0; i < res.rows.length; i++) {
-          if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].resultcount > 0) {
+          if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
             console.log('==================')
             // 有几个学生完成/正在完成学习任务
             // 至少resultcount不是0

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

@@ -79,60 +79,17 @@
                   <template #footer>
                     <el-row>
                       <el-col :span="6" style="padding: 10px">
-                        <span
-                          >参考答案：
+                        <span>参考答案：
                           <span v-if="quItem.workanswerFormat != ''">
-                            <sapn
-                              style="
-                                background-color: #0ed116;
-                                color: white;
-                                padding: 0 5px;
-                                border-radius: 5px;
-                              "
-                              >{{ quItem.workanswerFormat.replace(/<[^>]+>/g, '') }}</sapn
-                            >
+                            <sapn style="background-color: #0ed116; color: white; padding: 0 5px; border-radius: 5px;">{{ formatWorkAnswer(quItem) }}</sapn>
                           </span>
                         </span>
                       </el-col>
                       <el-col :span="6" style="padding: 10px">
                         <!-- <span>学生答案：{{ stuItem.feedcontent }}</span> -->
-                        <span
-                          >学生答案：
-                          <span v-if="quItem.workdesc == ''|| quItem.workdesc == '[]' ">
-                            <!-- quItem.workdesc 没值，说明是非选择题 -->
-                            <span
-                              v-if="stuItem.feedcontent != ''"
-                              style="
-                                background-color: red;
-                                color: white;
-                                padding: 0 5px;
-                                border-radius: 5px;
-                              "
-                            >
-                              {{ stuItem.feedcontent.replace('#', '、') }}
-                            </span>
-                          </span>
-                          <span v-else>
-                            <!-- 选择题类型：学生答题转换为 ABCD格式 -->
-                            <span
-                              v-if="stuItem.feedcontent != ''"
-                              style="
-                                background-color: red;
-                                color: white;
-                                padding: 0 5px;
-                                border-radius: 5px;
-                              "
-                            >
-                              {{
-                                JSON.parse(quItem.workdesc)
-                                  .map((item, index) => {
-                                    if (item == stuItem.feedcontent) {
-                                      return String.fromCharCode(65 + Number(index))
-                                    }
-                                  })
-                                  .filter(Boolean)[0]
-                              }}
-                            </span>
+                        <span>学生答案：
+                          <span v-if="stuItem.feedcontent !=''" style="background-color: red; color: white; padding: 0 5px; border-radius: 5px;">
+                            {{ formatFeedContent(stuItem, quItem) }} 
                           </span>
                         </span>
                       </el-col>
@@ -499,6 +456,7 @@ import { ElMessageBox, ElMessage } from 'element-plus'
 import { updateClassworkeval, updateClassworkdata } from '@/api/classTask'
 import { getTimeDate } from '@/utils/date'
 import ReFilePreview from '@/components/refile-preview/index.vue'
+import { quizStrToList } from '@/utils/comm';
 
 
 const userStore = useUserStore()
@@ -842,6 +800,47 @@ const acceptParams = (params) => {
   analysisScoreOpen.value = true
 }
 
+const formatWorkAnswer = (quItem) => {
+  let format = '';
+  if (!Array.isArray(quItem.workanswerFormat)) {
+    format = quItem.workanswerFormat.replace(/<[^>]+>/g, '')
+  } else {
+    format = quItem.workanswerFormat.map(item => item.replace(/<[^>]+>/g, '')).join('、');
+  }
+  return format;
+}
+// 根据题型处理学生答案
+const formatFeedContent = (stuItem, quItem) => {
+  let format = '';
+
+  if (quItem.workdesc == '' || quItem.workdesc == '[]') {
+    // 非单选题和多选题
+    const arr = stuItem.feedcontent.split('#');
+    return arr.map(item => {
+      if (item == '') {
+        item = '空';
+      }
+      return item;
+    }).join('、');
+  }else {
+    const list = quizStrToList(quItem.workdesc);
+    format = list.map((item,index) =>{
+      if (quItem.worktype == '单选题') {
+        const workdesc = item.replace(/<[^>]*>/g,'');
+        const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,'');
+        if(workdesc == feedcontent){
+          return (String.fromCharCode(65+Number(index)))
+        }
+      } else if (quItem.worktype == '多选题') {
+        const arr = stuItem.feedcontent.split(',');
+        return arr.map(item => String.fromCharCode(65+Number(item))).join('');
+      }
+    }).filter(Boolean)[0];
+  }
+  
+  return format;
+}
+
 // 提交批改评分
 const onClassWorkFormScoreSave = () => {
   console.log(classWorkFormScore)

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

@@ -383,7 +383,7 @@ const getClassWorkStudentList = (rowId) => {
       // 默认获取已交的学生列表
       tableRadio.list =
         classWorkAnalysis.classworkdata &&
-        classWorkAnalysis.classworkdata.filter((item) => item.resultcount > 0)
+        classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
       tableRadio.value = '1'
       tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
       tableRadio.num1 = tableRadio.list.length
@@ -506,12 +506,12 @@ const tableRadioChange = (e) => {
   console.log(e,'??????')
   console.log("学生列表：", classWorkAnalysis.classworkdata)
   if(e=='1'){
-    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.resultcount > 0)
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
     tableRadio.value = '1';
     tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
     tableRadio.num1 = tableRadio.list.length;
   }else if(e=='0'){
-    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.resultcount == 0)
+    tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
     tableRadio.value = '0';
     tableRadio.num0 = tableRadio.list.length;
     tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;

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

@@ -119,71 +119,22 @@ onMounted(() => {
  */
 const open = async (id) => {
   visible.value = true
+  if (id) {
+    // 重置数据
+    reset()
     // 获取apt详情
-  if (id) await getAptInfo(id)
-  // 模拟数据
-  // myClassActive.value = {
-  //   "createBy": null,
-  //   "createTime": null,
-  //   "updateBy": null,
-  //   "updateTime": null,
-  //   "remark": null,
-  //   "id": 14740,
-  //   "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
-  // }
+    await getAptInfo(id)
     // 获取班级列表
     getClassList()
-
     // 初始化im-chat
-  // nextTick(async() => {
-  //   chat = await imChatRef.value?.initImChat()
-  // })
+    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)">
+                <div class="item-popover-item">
                   <el-button text @click="editTalk(item, index)">
                     <i class="iconfont icon-bianji"></i>
                     <span>标签</span>
                   </el-button>
                 </div>
-              <div v-if="userInfo.userId === Number(item.createUserId)" class="item-popover-item">
-                <el-button text @click="deleteTalk(item)">
+                <div class="item-popover-item">
+                  <el-button text @click="deleteTalk(item)" :disabled="activeClassId==item.id">
                     <i class="iconfont icon-shanchu"></i>
                     <span>删除</span>
                   </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
-        const { fileId: aptId } = item
-        this.$refs.calssRef.open(aptId)
+        //TODO 打开apt - fileId: aptId
+        this.$refs.calssRef.open(item.fileId)
       }
+      // 当前上课-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)">