Merge pull request 'ppt 上课 推送玩作业 打开作业批改弹窗' (#358) from lyc-dev into main

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

@@ -259,9 +259,10 @@ const onSubmit = (formEl) => {
         classworkarray: JSON.stringify(ary)
       })
         .then((res) => {
+          
           setLoading.value = false
           ElMessage.success('操作成功')
-          emit('on-success', res.data)
+          emit('on-success', res)
           cloneDialog(formEl)
         })
         .catch(() => {

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

@@ -85,10 +85,11 @@ import FileImage from '@/components/file-image/index.vue'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { ipcMsgSend, ipcMsgInvoke } from '@/utils/tool'
 import { useToolState } from '@/store/modules/tool'
+import {createWindow} from '@/utils/tool'
 import Lesson from './lesson.vue';
 import { parseCataByNode } from '@/utils/talkFile'
 import MsgEnum from '@/plugins/imChat/msgEnum' // 消息枚举
-import { createHomework } from '../createHomework'
+import { createHomework, getClassWorkList, getStudentClassWorkData } from '../createHomework'
 import { sessionStore } from '@/utils/store'
 
 const route = useRoute();
@@ -111,10 +112,12 @@ const curNode = reactive({
 })
 
 const props = defineProps(['curNode'])
-
+const emit = defineEmits(['closeActive'])
 
 
 const sendHomework = (row,type) => {
+
+  
   if(type == 'item'){
     // 布置推送单个作业
     curRow.value = [row]
@@ -128,11 +131,28 @@ const sendHomework = (row,type) => {
 const closeHomework = async() => {
   ipcMsgSend('tool-sphere:set:ignore', true)
 }
+
+
 // 推送成功
-const successHomework = (data)=>{
+const successHomework = async (data)=>{
+  // data.msg
   // console.log('推送成功', data)
   // 发送im消息-推送作业(app|平板)
   // ipcMsgInvoke('im-chat:msg', data, MsgEnum.HEADS.MSG_0016)
+
+  /**
+   * 推送成功 打开作业批改
+   * 2024/10/23
+   * 以下两个函数 代码 参照"作业批改" 页面
+   */
+  let result = await getClassWorkList(data.msg)
+  result = await getStudentClassWorkData()
+  localStorage.setItem('teachClassWorkItem', JSON.stringify(result[0]));
+  toolStore.isTaskWin=true; // 设置打开批改窗口
+  emit('closeActive')
+  createWindow('open-taskwin',{url:'/teachClassTask'}); // 调用新窗口批改页面
+ 
+
 }
 // 章节目录change
 const changeChapter = async (data)=>{

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

@@ -25,7 +25,7 @@
       <div class="c-popover" :style="`--top: ${topPos}px;--height:${hPost}px;`" v-show="isVisible">
         <div class="content" v-if="isVisible">
           <slot name="content">
-            <homework v-if="activeObj?.prop === 'resource'" :curNode="curNode" />
+            <homework v-if="activeObj?.prop === 'resource'" :curNode="curNode" @closeActive="closeActive" />
             <span v-else style="color:red;">{{activeObj}}</span>
           </slot>
         </div>
@@ -101,6 +101,10 @@ const clickHandel = (o, e) => {
   }
   emit('change', o)
 }
+
+const closeActive = () =>{
+  isVisible.value = false
+}
 </script>
 <style lang="scss" scoped>
 .warp{

src/renderer/src/views/tool/createHomework.js

@@ -1,37 +1,226 @@
+
 import useUserStore from '@/store/modules/user'
 import { addClassworkReturnId } from '@/api/teaching/classwork'
+import { listClassworkdata } from '@/api/classTask'
+import { homeworklist } from '@/api/teaching/classwork'
+
+
 
 export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
   const usertore = useUserStore().user
 
-    var formObj = {};
+  var formObj = {}
-    formObj.id = 0;
+  formObj.id = 0
 
-    formObj.deaddate = '';
+  formObj.deaddate = ''
-    formObj.entpid = usertore.deptId;
+  formObj.entpid = usertore.deptId
-    formObj.level = 1;
+  formObj.level = 1
-    formObj.parentid = 0;
+  formObj.parentid = 0
-    formObj.worktype = '常规作业';
+  formObj.worktype = '常规作业'
-    formObj.workkey = '';
+  formObj.workkey = ''
-    formObj.worktag = '';
+  formObj.worktag = ''
 
-    formObj.uniquekey = uniquekey;
+  formObj.uniquekey = uniquekey
 
-    formObj.classid = 0;
+  formObj.classid = 0
-    formObj.classcourseid = 0;
+  formObj.classcourseid = 0
 
-    formObj.entpcourseid = entpcourseid;
+  formObj.entpcourseid = entpcourseid
 
-    formObj.slideid = 0;
+  formObj.slideid = 0
 
-    formObj.workcodes = JSON.stringify(data);
+  formObj.workcodes = JSON.stringify(data)
 
-    formObj.edusubject = usertore.edusubject;
+  formObj.edusubject = usertore.edusubject
   formObj.evalid = evalid
 
-    formObj.edustage = usertore.edustage;
+  formObj.edustage = usertore.edustage
-    formObj.status = '';
+  formObj.status = ''
-    formObj.edituserid = usertore.userId;
+  formObj.edituserid = usertore.userId
-    formObj.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
+  formObj.entpcourseworklist = JSON.stringify([{ id: -2, score: '10' }])
   return addClassworkReturnId(formObj)
 }
+
+let classWorkList = []
+
+/**
+ * 获取班级作业
+ */
+export const getClassWorkList = async (id) => {
+  // 班级作业数据，包含多个班级 homeworklist
+  const response = await homeworklist({ id })
+
+  /**
+   * 2024-10-17 由于 后面截止时间加了 时分，特加判断
+   * 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
+   * 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
+   */
+
+  let list = response.rows
+
+  for (var i = 0; i < list.length; i++) {
+    // 初始化部分新增字段值
+    list[i].workdatalist = []
+    list[i].workdatacount = 0 // 人数
+    list[i].workdatalistVisible = false
+    list[i].workdatafeedbackcount = 0 // 已交人数
+    list[i].feedtimelength = 0
+    list[i].rightAnswerCount = 0
+    list[i].scoingRate = 0 + '%' // 得分率
+    list[i].averagetime = 0 // 平均用时
+
+    // ----------------------------------------------
+    // 处理任务类型的UI
+    if (list[i].worktype == '学习目标定位') {
+      list[i].workclass = 'success'
+      list[i].workcodesList = JSON.parse(list[i].workcodes)
+    } else if (list[i].worktype == '教材研读') {
+      list[i].workclass = 'primary'
+    } else if (list[i].worktype == '框架梳理') {
+      list[i].workclass = 'warning'
+    } else if (list[i].worktype == '学科定位') {
+      list[i].workclass = 'info'
+    } else if (list[i].worktype == '习题训练') {
+      list[i].workclass = 'danger'
+    } else {
+      list[i].workclass = ''
+    }
+    // 如果是习题训练任务，则检查一共有多少道
+    if (list[i].entpcourseworklist != '') {
+      list[i].entpcourseworklistarray = JSON.parse('[' + list[i].entpcourseworklist + ']')
+    } else {
+      list[i].entpcourseworklistarray = []
+    }
+    // 根据 classworkdatastudentids 初始化判断分配的人数
+    if (
+      list[i].classworkdatastudentids != '' &&
+      list[i].classworkdatastudentids != null &&
+      list[i].classworkdatastudentids != 'null'
+    ) {
+      const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
+      list[i].workdatacount = stuList.length
+    }
+  }
+  // 显示分配人数(workdatacount)>0 的
+  if (list && list.length > 0) {
+    classWorkList = list && list.filter((item) => item.workdatacount > 0)
+    //TODO： 这里没分页，貌似这个 total 不重要，后续看
+  } else {
+    classWorkList = []
+  }
+
+  return classWorkList
+}
+
+export const getStudentClassWorkData = async () => {
+  const ids = classWorkList.map((item) => item.id).join(',')
+  if (ids == '') {
+    return
+  }
+  const res = await listClassworkdata({
+    classworkids: ids,
+    pageSize: 1000
+  })
+
+  for (var t = 0; t < classWorkList.length; t++) {
+    for (var i = 0; i < res.rows.length; i++) {
+      if (
+        res.rows[i].classworkid == classWorkList[t].id &&
+        res.rows[i].finishtimelength != '0'
+      ) {
+        console.log('==================')
+        // 有几个学生完成/正在完成学习任务
+        // 至少resultcount不是0
+        classWorkList[t].workdatafeedbackcount++
+
+        // 在参与学习任务的人中，汇总计算用时
+        classWorkList[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
+
+        // 计算得分率
+        if (
+          res.rows[i].classworkevallist != '' &&
+          res.rows[i].classworkevallist != null &&
+          res.rows[i].classworkevallist != 'null'
+        ) {
+          let replacedString = res.rows[i].classworkevallist.replace(/""/g, '"')
+          // 将标签中双引号改为转义, 测试数据: "{\"id\":172907, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358520, \"feedcontent\":\"④①⑤③②\", \"score\":4, \"rightanswer\":\"④①⑤③②\"},{\"id\":172908, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":358521, \"feedcontent\":\"气壮山威，鲲鹏展翅楚云飞\", \"score\":4, \"rightanswer\":\"志远天高，春风杨柳麓山青\"},{\"id\":172909, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363096, \"feedcontent\":\"《红烛》化用“蜡矩”这一古典意象，赋予它新的含义，赞美了红烛以“蜡炬成灰”来点亮世界的奉献精神。\", \"score\":4, \"rightanswer\":\"《立在地球边上放号》中，全诗采用间接抒情的方式，描绘了太平洋的浪潮，吟唱了一曲惊心动魄的力的颂歌，意在赞美摧毁旧世界、创造新生活的“五四”精神。\"},{\"id\":172910, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363098, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"},{\"id\":172911, \"rating\":0, \"teacherRating\":0, \"entpcourseworkid\":363100, \"feedcontent\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\", \"score\":4, \"rightanswer\":\"毛泽东重游橘子洲，面对如画的秋色和大好的革命形势，回忆过去战斗的岁月，不禁心潮起伏，<bdo class=\"mathjye-underpoint2\">浮想联翩</bdo>。\"}"
+          replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist).replace(
+            /"(\[.*\])"/g,
+            '$1'
+          )
+          replacedString = escapeHtmlQuotes(res.rows[i].classworkevallist)
+          var evalarray
+          try {
+            evalarray = JSON.parse('[' + res.rows[i].classworkevallist + ']')
+          } catch {
+            evalarray = JSON.parse('[' + replacedString + ']')
+          }
+
+          for (var e = 0; e < evalarray.length; e++) {
+            if (res.rows[i].worktype == '常规作业') {
+              evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
+                /"(\[.*\])"/g,
+                '$1'
+              )
+              evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent)
+            }
+            if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
+              // 正确，得分
+              classWorkList[t].rightAnswerCount++
+            }
+          }
+        }
+      }
+      // 当前这个学习任务，共推送给了几个学生，workdatacount
+      if (res.rows[i].classworkid == classWorkList[t].id) {
+        classWorkList[t].workdatalist.push(res.rows[i])
+      }
+    }
+    // 计算完成进度     workdatacount人数要大于0
+    if (
+      classWorkList[t].workdataresultcount > 0 &&
+      classWorkList[t].workdatacount > 0
+    ) {
+      classWorkList[t].finishpercent = parseInt(
+        (classWorkList[t].workdataresultcount / classWorkList[t].workdatacount) * 100
+      )
+    } else {
+      classWorkList[t].finishpercent = 0
+    }
+
+    // 以下四个参数，都要计算
+    // 2024-04-12，酉阳，by jackyshen
+
+    // 计算参与学习任务的平均用时
+    if (classWorkList[t].workdatafeedbackcount > 0) {
+      classWorkList[t].averagetime = Math.ceil(
+        classWorkList[t].feedtimelength / classWorkList[t].workdatafeedbackcount / 60
+      ).toFixed(0)
+    } else {
+      classWorkList[t].averagetime = 0
+    }
+
+    // 计算批阅异常，需要获取每个题目的类型，找出主观题
+    // 暂缓
+
+    // 计算平均得分率： 正确题数/（题目总数*学生人数）*100
+    if (
+      classWorkList[t].entpcourseworklistarray &&
+      classWorkList[t].entpcourseworklistarray.length > 0
+    ) {
+      var dd =
+        (classWorkList[t].rightAnswerCount /
+          (classWorkList[t].entpcourseworklistarray.length *
+            classWorkList[t].workdatacount)) *
+        100
+      classWorkList[t].scoingRate = dd.toFixed(0) + '%'
+    } else {
+      classWorkList[t].scoingRate = '0%'
+    }
+
+    
+    // 设定典型作答，需要获取每个题目的类型，找出主观题
+    // 暂缓
+    }
+    return classWorkList
+}