.env.production

@@ -18,4 +18,4 @@ VITE_APP_RES_FILE_PATH = 'https://prev.ysaix.com:7868/src/assets/textbook/booktx
 
 VITE_APP_BUILD_BASE_PATH = 'https://prev.ysaix.com:7868/'
 
-VITE_SHOW_DEV_TOOLS = 'false'
+VITE_SHOW_DEV_TOOLS = 'true'

package.json

@@ -1,9 +1,9 @@
 {
   "name": "aix-win",
-  "version": "2.1.18",
+  "version": "2.1.12",
   "description": "",
   "main": "./out/main/index.js",
-  "author": "上海交大重庆人工智能研究院",
+  "author": "example.com",
   "homepage": "https://electron-vite.org",
   "scripts": {
     "format": "prettier --write .",

src/main/index.js

@@ -271,13 +271,12 @@ app.on('window-all-closed', () => {
 function handleAll() {
   const chatInstance = chat.initialize() // im-chat 实例
   // 新窗口创建-监听
-  ipcMain.handle('new-window', (e, data) => {
+  ipcMain.on('new-window', (e, data) => {
     const { id, type } = data
     const win = BrowserWindow.fromId(id)
     win.type = type // 绑定独立标识
     remote.enable(win.webContents)        // 开启远程服务
     chatInstance.enable(win.webContents)  // 开启im-chat
-    console.log(`主进程 [${type}]: 窗口注册-远程代理-完毕(${Date.now()})`)
   })
   // 用于监听-状态管理变化-同步所有窗口
   ipcMain.handle('pinia-state-change', (e, storeName, jsonStr) => {

src/renderer/src/components/exam-question/examDetailsDrawer.vue

@@ -1,74 +0,0 @@
-<template>
-  <!-- 试题详情 -->
-  <el-drawer 
-    v-model="activeExamInfoDrawer" 
-    title="题目详情" 
-    :with-header="false" 
-    direction="rtl" 
-    size="60%"
-  >
-    <div style="height: calc(100% - 50px);">
-      <el-scrollbar style="background: #F3F5F8;border-radius: 8px;">
-        <el-row class="drawer-main">
-          <el-col :span="24">
-            <span>{{activeExam.worktag}}</span>
-            <span style="margin-left: 4px" v-html="activeExam.titleFormat" ></span>
-          </el-col>
-          <el-col :span="24" style="padding: 4px" v-html="activeExam.workdescFormat">
-          </el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【答案】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.workanswerFormat"></el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【分析】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.method"></el-col>
-          <el-col :span="3"  class="drawer-main-col"><em>【解答】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.analyse"></el-col>
-          <el-col :span="3"  class="drawer-main-col" ><em>【点评】</em></el-col>
-          <el-col :span="20" class="drawer-main-col" v-html="activeExam.discuss"></el-col>
-        </el-row>
-      </el-scrollbar>
-    </div>
-    <div class="drawer-footer">
-      <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
-    </div>
-  </el-drawer>
-</template>
-
-
-<script setup name="examDetailsDrawerRef">
-import {ref, reactive, watch} from 'vue'
-
-const props = defineProps({
-});
-
-
-const activeExamInfoDrawer = ref(false);
-const activeExam = ref({});
-
-//接收父组件传过来的参数
-const acceptParams = (params) => {
-  activeExamInfoDrawer.value = true;
-  activeExam.value = params.activeExam;
-}
-defineExpose({
-  acceptParams
-})
-
-</script>
-
-<style lang="scss" scoped>
-  .drawer-main{
-    margin: 1%; 
-    padding: 2%; 
-    display: flex;
-    text-align: left;
-    .drawer-main-col{
-      padding: 10px 0px;
-    }
-  }
-  .drawer-footer{
-    padding-top: 15px;
-    display: flex;
-    justify-content: flex-end;
-    box-sizing: border-box;
-  }
-</style>

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

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

src/renderer/src/hooks/useProcessList.js

@@ -16,9 +16,8 @@ export const isJson = (str) => {
 /**
  * @description processList 格式化试题
  * @param {*} row
- * @param {*} aloneOption 选择题中选项是否为每行一个
  */
-export const processList = (row, aloneOption=false) => {
+export const processList = (row) => {
   for (var i = 0; i < row.length; i++) {
     if (isJson(row[i].workanalysis)) {
       //1、先默认格式化 格式化各项内容(待优化, 后续界面显示的为format的值)
@@ -57,24 +56,18 @@ export const processList = (row, aloneOption=false) => {
             let tmp = ''
             let j = 0
             for (; j < workDescArr.length; j++) {
-              const char = String.fromCharCode(65+j);
-              if (aloneOption) {
-                tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
-              }
-              else {
               if (j % 2 == 0) {
-                  tmp += `<div style='width:100%;display:flex;'>`;
+                tmp += `<div style='width:80%;display:flex;'>`
               }
-                
-                tmp += `<div style='padding-left:10px;width:50%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`;
+              const char = String.fromCharCode(65 + j)
+              tmp += `<div style='display:flex;margin-left:2%;width:35%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`
               if (j % 2 == 1) {
-                  tmp += '</div>';
-                }
+                tmp += '</div>'
               }
             }
             // j此刻已自增1, 故当选项为单数时, 需要补充结束标签
-            if(!aloneOption && j%2 == 1){
-              tmp += '</div>';
+            if (j % 2 == 1) {
+              tmp += '</div>'
             }
 
             // workDescArr为 [''] 表示为 判断题或者填空题，这里不需要选项
@@ -143,36 +136,31 @@ export const processList = (row, aloneOption=false) => {
            * ]
            */
           let workDescArr = JSON.parse(row[i].workdesc)
-          let workDescHtml = `<div style='width:100%;display:flex;>`
+          let workDescHtml = `<div style='width:80%;display:flex;>`
           workDescArr.map((item, index) => {
             if (item.type == '单选题' || item.type == '多选题') {
-              workDescHtml += `<div style='width:100%;display:flex;'>${index + 1}. ${item.title}</div>`
+              workDescHtml += `<div style='width:80%;display:flex;'>${index + 1}. ${item.title}</div>`
               let tmp = ''
               let j = 0
               let optionsArr = item.options
               for (; j < optionsArr.length; j++) {
-                const char = String.fromCharCode(65+j);
-                if (aloneOption) {
-                  tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${optionsArr[j]}</div>`;
-                }
-                else {
                 if (j % 2 == 0) {
-                    tmp += `<div style='width:100%;display:flex;'>`;
+                  tmp += `<div style='width:80%;display:flex;'>`
                 }
-                  
-                  tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${optionsArr[j]}</div>`;
+                const char = String.fromCharCode(65 + j)
+                tmp += `<div style='display:flex;margin-left: 2%; width: 36%'>${char}.${optionsArr[j]}</div>`
                 if (j % 2 == 1) {
-                    tmp += '</div>';
-                  }
+                  tmp += '</div>'
                 }
               }
               // j此刻已自增1, 故当选项为单数时, 需要补充结束标签
-              if(!aloneOption && j%2 == 1){
-                tmp += '</div>';
+              if (j % 2 == 1) {
+                tmp += '</div>'
               }
+
               workDescHtml += tmp
             } else if (item.type == '填空题' || item.type == '判断题' || item.type == '主观题') {
-              workDescHtml += `<div style='width:100%;display:flex;'>${index + 1}. ${item.title}</div>`
+              workDescHtml += `<div style='width:80%;display:flex;'>${index + 1}. ${item.title}</div>`
             }
           })
           workDescHtml += '</div>'
@@ -278,23 +266,17 @@ export const processList = (row, aloneOption=false) => {
           let tmp = ''
           let j = 0
           for (; j < workDescArr.length; j++) {
-            const char = String.fromCharCode(65+j);
-            if (aloneOption) {
-              tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
-            }
-            else {
             if (j % 2 == 0) {
-                tmp += `<div style='width:100%;display:flex;'>`;
+              tmp += `<div style='width:80%;display:flex;'>`
             }
-              
-              tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${workDescArr[j]}</div>`;
+            const char = String.fromCharCode(65 + j)
+            tmp += `<div style='display:flex;margin-left: 2%; width: 36%'>${char}.${workDescArr[j]}</div>`
             if (j % 2 == 1) {
-                tmp += '</div>';
+              tmp += '</div>'
             }
           }
-          }
-          if(!aloneOption && j%2== 0){
-            tmp += '</div>';
+          if (j % 2 == 0) {
+            tmp += '</div>'
           }
           row[i].workdescFormat = tmp
 

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

@@ -33,7 +33,7 @@
               <template #dropdown>
                 <el-dropdown-menu>
                   <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
-<!--                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>-->
+                  <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
                   <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
                   <el-dropdown-item divided command="logout">
                     <span>退出登录</span>

src/renderer/src/store/modules/overview.js

@@ -4,17 +4,12 @@ const overviewStore = defineStore(
     {
         state: () => {
             return {
-                tableList:[],
-                allData:[]
+                tableList:[]
             }
         },
         actions: {
            getTableList(data){
                this.tableList = [...data]
-           },
-           //整理的所有列表
-           getAllData(data){
-            this.allData = [...data]
            }
         }
     })

src/renderer/src/utils/ppt-request.js

@@ -3,8 +3,8 @@ import { getSignature } from "./index";
 import { ElMessage } from "element-plus";
 import request from '@/utils/request'
 
-let appId = "a3c84da2";
-let secret = "OTZkZDdhNDQ4MDk0NTZiYjcyY2RjZmYz";
+let appId = "01ec9aa3";
+let secret = "M2QxMDAxMjYyYTEzODMwMGRkZTQ4NmUy";
 let timestamp = Math.floor(Date.now() / 1000);
 let signature = getSignature(appId, secret, timestamp);
 let req = (url, type, data)=>{

src/renderer/src/utils/tool.js

@@ -131,7 +131,7 @@ export const createWindow = async (type, data) => {
       data.isConsole = true // 是否开启控制台
       data.isWeb = false    // 是否开启web安全
       data.option = {...defOption, ...option}
-      wins_tool = await toolWindow(type, data)
+      wins_tool = await toolWindow(data)
       wins_tool.type = type  // 唯一标识
       wins_tool.show()
       wins_tool.setFullScreen(true) // 设置窗口为全屏
@@ -161,7 +161,7 @@ export const createWindow = async (type, data) => {
       }
       data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
-      const win = await toolWindow(type, data)
+      const win = await toolWindow(data)
       win.type = type  // 唯一标识
       win.show()
       win.setFullScreen(true) // 设置窗口为全屏
@@ -193,7 +193,7 @@ export const createWindow = async (type, data) => {
       }
       data.isConsole = true // 是否开启控制台
       data.option = {...defOption, ...option}
-      winChild = await toolWindow(type, data)
+      winChild = await toolWindow(data)
       winChild.type = type  // 唯一标识
       winChild.show()
       winChild.setFullScreen(false) // 设置窗口为全屏
@@ -213,7 +213,7 @@ export const createWindow = async (type, data) => {
  * @author: zdg
  * @date 2021-07-05 14:07:01
  */
-export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
+export function toolWindow({url, isConsole, isWeb=true, option={}}) {
   // width = window.screen.width
   let width = option?.width || 800
   let height = option?.height || 600
@@ -221,7 +221,7 @@ export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
   const devUrl = `${BaseUrl}${url}`
   const buildUrl = path.join(__dirname, 'index.html')
   const urlAll = isDev ? devUrl : buildUrl
-  return new Promise(async(resolve) => {
+  return new Promise((resolve) => {
     const config = {
       width, height,
       icon: path.join(appPath, '/resources/logo2.ico'),
@@ -236,9 +236,6 @@ export function toolWindow(type, {url, isConsole, isWeb=true, option={}}) {
     }
     // 创建-新窗口
     let win = new Remote.BrowserWindow(config)
-    // 新窗口-创建事件(如:主进程加载远程服务)
-    await ipcMsgInvoke('new-window', {id:win.id, type})
-    console.log(`渲染进程 [${type}]: 窗口创建-成功${Date.now()}`)
     if (!isDev) win.loadFile(urlAll,{hash: url})  // 加载文件
     else win.loadURL(urlAll)                      // 加载url
     win.once('ready-to-show', () => {             // 窗口加载完成
@@ -284,7 +281,7 @@ const eventHandles = (type, win) => {
     })
 
     // 新窗口-创建事件(如:主进程加载远程服务)
-    // ipcRenderer.send('new-window', {id:win.id, type})
+    ipcRenderer.send('new-window', {id:win.id, type})
   }
   switch(type) {
     case 'tool-sphere': { // 创建-悬浮球
@@ -343,7 +340,7 @@ const eventHandles = (type, win) => {
       // 监听窗口的激活事件
       win.on('focus', async () => {
         toolState.isTaskWin=true
-        // win&&win.reload(); //刷新该窗口
+        win&&win.reload(); //刷新该窗口
       });
       // 监听窗口关闭事件
       win.on('closed', function () {

src/renderer/src/views/classTask/container/classOverview.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="common-layout" style="width: 100%">
+  <div class="common-layout" style="width: 100%; height: 73vh;">
     <el-container>
       <el-container>
         <el-header style="height: auto">
@@ -7,7 +7,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                等级分布
+                学情分布
               </div>
             </template>
             <Distribution></Distribution>
@@ -18,7 +18,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                用时分析
+                时长分析
               </div>
             </template>
             <TimeAnalyse></TimeAnalyse>
@@ -29,7 +29,7 @@
           <el-card>
             <template #header>
               <div style="font-size: 20px;font-weight: bold">
-                价值透析
+                知识点概览
               </div>
             </template>
             <Konwledge></Konwledge>
@@ -43,12 +43,12 @@
 </template>
 
 <script setup>
-import {ref,watchEffect,provide } from 'vue'
-import Distribution from './classOverview/distribution.vue'
-import Konwledge from './classOverview/knowledge.vue'
-import TimeAnalyse from './classOverview/timeAnalyse.vue'
+import Distribution from '@/views/classTask/container/classOverview/distribution.vue'
+import Konwledge from '@/views/classTask/container/classOverview/knowledge.vue'
+import TimeAnalyse from '@/views/classTask/container/classOverview/timeAnalyse.vue'
 import {defineProps,watch} from 'vue'
 import overviewStore from "@/store/modules/overview";
+// import {getBindlist} from "@/api/education/knowledgePoint";
 const useOverview = overviewStore()
 const props = defineProps({
   tableList: {
@@ -57,205 +57,12 @@ const props = defineProps({
       return []
     }
   },
-  evalId:{
-    type: Number,
-    default: 0
-  },
-  activeData: {                   // 数据
-    type: Object,
-    // required: true,               // 必传
-    default: () => ({
-      quizlist: [],                // 当前习题列表
-      studentList: [],             // 当前课程-所有学生
-      workFeedList: []             // 当前课程-所有学生反馈数据
-    })
-  },
-})
-let studentList = ref([])         // 学生数据
-
-// 初始-数据处理
-const initData = () => {
-  console.log('xxx', props)
-  // window.test = activeCourse
-  studentList.value = props.activeData.studentList || []
-  const activeWorkFeedList = props.activeData.workFeedList || []
-  const quizlist = props.activeData.quizlist || []
-  const timeArr = groupByField(props.activeData.workFeedList,'entpcourseworkid')
-  // 习题特殊处理
-  let data = quizlist.map(o => {
-    // 解析题选项 
-    const workdesc = o.workdesc || ''
-    let accSum = 0                  // 该题总人数
-    let activeIds = []              // 已做答学生
-    let rightIds = []               // 正确学生
-    let hasAnswers= []              // 答过题的学生
-    let timeAnalyse = []            // 平均时长和编号
-    const quizFeedList = activeWorkFeedList.filter(f => f.entpcourseworkid == o.id) // 做该题的列表
-    // 获取所有的做题时间
-    timeArr.forEach((item,index) => {
-      const arr = item.reduce((acc, cur) => {
-          return acc + (cur.timelength ? Number(cur.timelength) : 0);
-      },0)
-      timeAnalyse.push(arr)
-    })
-    let children = []
-    const allStudents = [];
-    if (o.worktype == '单选题') { // '单选题','多选题'
-      const list = workdesc.includes('#&') ? workdesc.split('#&') : isJson(workdesc)?JSON.parse(workdesc):[];
-      children = list.map((v,i) => {
-        const code = toCode(i)          // 转换 A-Z
-        const isOk = (isJson(workdesc)?JSON.parse(o.workanswer):o.workanswer||'').includes(i+'')  // 是否(包含)正确答案
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => f.feedcontent==v&&f.finishtimelength!='0').map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        if (isOk) {
-          activeIds.push(...studentIds)
-        }
-        hasAnswers.push(...studentIds)
-        return { def: v, code, isOk, studentIds }
-      })
-    }
-    else if (o.worktype == '多选题') {
-      // 多选题的正确率单独处理
-      rightIds = quizFeedList.filter(f => {
-        const workanswer = (isJson(o.workanswer)) ? JSON.parse(o.workanswer) : o.workanswer || [];
-        const res = isSame((f.feedcontent||'').split(','), workanswer);
-        return f.entpcourseworkid  == o.id && f.finishtimelength!='0' && res;
-      });
-
-      const list = workdesc.includes('#&') ? workdesc.split('#&') : isJson(workdesc)?JSON.parse(workdesc):[];
-      children = list.map((v,i) => {
-        const isOne = o.worktype == '单选题'
-        const code = toCode(i)          // 转换 A-Z
-        // const isOk = isOne ? i == o.workanswer : o.workanswer.includes(i)  // 是否(包含)正确答案
-        const isOk = (isJson(workdesc)?JSON.parse(o.workanswer):o.workanswer||'').includes(i+'')  // 是否(包含)正确答案
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => f.feedcontent.includes(i)&&f.finishtimelength!='0').map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        if (studentIds.length>0) {
-          allStudents.push(...studentIds);
-        }
-        if(isOk) {
-          activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-        }
-        hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-        return { def: v, code, isOk, studentIds }
-      })
-    }
-    else if (o.worktype == '填空题') { // 填空题
-      const regex = /<!--BA-->(.*?)<!--EA-->/g // 定义正则表达式，匹配 <!--BA-->xxx<!--EA--> 格式的内容
-      children = (o.title||'').match(regex).map((v,i) => {
-        const def = `填空项 ${i+1}`
-        //const code = '(&emsp;)'
-        const code = '(略)', txt=v
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => !!(f.feedcontent||'').replace(/#$/,'').split('#')[i] && f.finishtimelength!='0').map(f => f.studentid)||[]
-        activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-        hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-        accSum = activeIds.length
-        return { def, code, txt, isOk:true, studentIds }
-      })
-    } else if (o.worktype == '判断题') { // 判断题
-      const list = ['正确', '错误'];
-      children = list.map((v,i) => {
-        const workanswer = o.workanswer
-          .replace('×', '0')
-          .replace('√', '1')
-          .replace('错误', '0')
-          .replace('正确', '1')
-          .replace('正确。', '1')
-          .replace('F', '0')
-          .replace('T', '1')
-          .replace('错', '0')
-          .replace('对', '1');
-        const workanswerFormat = isJson(workanswer) ? JSON.parse(workanswer) : workanswer||''
-        const code = v=='正确' ? '1' : '0'
-        let isOk = (workanswerFormat).includes(code)
-        // warn: 看是否需要转为回答正常的显示， 当前为学生实际回答字面的正确和错误
-        // if (workanswerFormat == '0') {
-        //   isOk = !isOk;
+  // evalId:{
+  //   type: Number,
+  //   default: 0
   // }
-        // 改选项的学生id
-        const studentIds = quizFeedList.filter(f => {
-          const feedcontent = f.feedcontent
-            .replace('×', '0')
-            .replace('√', '1')
-            .replace('错误', '0')
-            .replace('正确', '1')
-            .replace('正确。', '1')
-            .replace('F', '0')
-            .replace('T', '1')
-            .replace('错', '0')
-            .replace('对', '1');
-          if(feedcontent == code&&f.finishtimelength!='0'){
-            return f
-          }
-        }).map(f => f.studentid)||[];
-        accSum += studentIds.length;
-        if(isOk) activeIds.push(...studentIds)
-        hasAnswers.push(...studentIds)
-        return { def: v, code: v, isOk, studentIds }
 })
-    } else { // 论述题
-      // code = '(&emsp;)'
-      const code = '(略)', def = '解答内容'
-      const studentIds = quizFeedList.filter(f => !!(f.feedcontent||'').replace(/#$/,'')&&f.finishtimelength!='0').map(f => f.studentid)||[]
-      activeIds=[...new Set(activeIds.concat(studentIds))] // 多选去重
-      hasAnswers=[...new Set(hasAnswers.concat(studentIds))]
-      accSum = activeIds.length
-      children = [{ def, code, isOk:true, studentIds }]
-    }
-
-    const studentSum = studentList.value.length || 0                // 当前推送答题人数
-    let points = percent((activeIds.length / (studentSum||1)).toFixed(2)) // 计算得分率
-    let rightSum = activeIds.length;                                // 回答正确人数
-    
-    // 多选题单独处理
-    if (o.worktype == '多选题') {
-      // 单独重新处理人数问题
-      const uniqueTmpStuents = [...new Set(allStudents)];
-      accSum = uniqueTmpStuents.length;
-      // 单独处理得分率
-      points = percent((rightIds.length / (studentSum||1)).toFixed(2)) // 计算得分率
-      // 回答正确人数
-      rightSum = rightIds.length;
-    }
-
-    // def: 原始题数据 type 类型 active: 选中 points: 得分率, accSum 题解答人数
-    return { def: o, id: o.id, type: o.worktype, active: [], points, accSum, rightSum, children,hasAnswers,timeAnalyse }
-  })
-  if (data.length === 0) return
-  useOverview.getAllData([...data])
-}
-// 百分比现在 0-100
-const percent = v => v > 1 ? 1 : v < 0 ? 0 : Math.round(v * 100)
-// Unicode 转 字符 差值65
-const toCode = (v, b) => b ? v.charCodeAt() - 65 : String.fromCharCode(v + 65)
-// 判断是否为json字符串
-const isJson = str => {if(typeof str == 'string'){
-  try {
-    const res = JSON.parse(str)
-    if(typeof res == 'object' && res) return true
-  } catch (error) {}}return false
-}
-// 获取到学生的平均回答时间
-const groupByField = (array, field) => {
-  const groupedMap = {};
-  array.forEach(item => {
-    const key = item[field];
-    if (!groupedMap[key]) {
-      groupedMap[key] = [];
-    }
-    groupedMap[key].push(item);
-  });
-
-  // 将映射对象转换为二维数组
-  return Object.values(groupedMap);
-}
-
 watch(() => props.tableList,() => {
   useOverview.getTableList(props.tableList)
 },{deep:true})
-// === 监听器 ===
-watchEffect(() => { initData() })
 </script>

src/renderer/src/views/classTask/container/classOverview/distribution.vue

@@ -14,8 +14,8 @@
 </template>
 
 <script setup>
-import Echarts from './distribution/echarts.vue'
-import StuList from "./distribution/stuList.vue";
+import Echarts from '@/views/classTask/container/classOverview/distribution/echarts.vue'
+import StuList from "@/views/classTask/container/classOverview/distribution/stuList.vue";
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue

@@ -1,39 +1,32 @@
 <template>
-  <div class="chart-container">
-    <div ref="chartRef" class="chart"></div>
+  <div className="chart-container">
+    <div ref="chartRef" className="chart"></div>
   </div>
 </template>
 
 <script setup>
 import {ref,nextTick,watch} from 'vue';
 import * as echarts from 'echarts';
-import overviewStore from '@/store/modules/overview';
-const useOverview = overviewStore();
+import overviewStore from '@/store/modules/overview'
+const useOverview = overviewStore()
 
 // 获取图表容器的引用
 const chartRef = ref(null);
 
 // 数据源
 const dataList = ref([
-  { name: '完美', value: 0, rating: 1, max: 100, min: 100 },
-  { name: '优秀', value: 0, rating: 2, max: 99, min: 80 },
-  { name: '良好', value: 0, rating: 3, max: 79, min: 70 },
-  { name: '及格', value: 0, rating: 4, max: 69, min: 60 },
-  { name: '不及格', value: 0, rating: 5, max: 59, min: 0 },
+  {name: '完美', value: 0,rating:1,max:100,min:100,},
+  {name: '优秀', value: 0,rating:2,max:99,min:80,},
+  {name: '良好', value: 0,rating:3,max:79,min:70,},
+  {name: '及格', value: 0,rating:4,max:69,min:60,},
+  {name: '不及格', value: 0,rating:5,max:59,min:0,},
 ]);
-// 答过题的学生才进行统计
-const hasStudents = ref([])
 
 // 根据数据生成不同的颜色
-function getColor(name) {
-  const colorMap = {
-    '完美': '#d14a61',
-    '优秀': '#675bba',
-    '良好': '#e89110',
-    '及格': '#008c8c',
-    '不及格': '#5793f3'
-  };
-  return colorMap[name];
+function getColor(index) {
+  // 这里可以根据值生成不同的颜色
+  const colors = ['#d14a61','#675bba', '#e89110','#008c8c','#5793f3'];
+  return colors[index];
 }
 
 // 初始化图表
@@ -41,75 +34,75 @@ function initChart() {
   const myChart = echarts.init(chartRef.value);
   const total = dataList.value.reduce((acc, cur) => acc + cur.value, 0); // 计算总数
 
-  // 过滤掉值为0的数据项
-  const filteredData = dataList.value.filter(item => item.value > 0);
-
   const options = {
     tooltip: {
-      trigger: 'item',
-      formatter: params => {
-        const value = params.value;
-        const percentage = value ? ((value / total) * 100).toFixed(2) : 0; // 计算百分比并保留两位小数
-        return `${params.name}: ${value}人 (${percentage}%)`; // 显示为百分比形式
+      trigger: 'axis',
+      axisPointer: {
+        type: 'shadow'
       }
     },
+    grid: {
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      data: dataList.value.map(item => item.name),
+      axisTick: {
+        alignWithLabel: true
+      }
+    },
+    yAxis: {
+      type: 'value'
+    },
     series: [{
       name: '数据',
-      type: 'pie',
-      radius: '50%', // 设置饼图的半径为实心
-      data: filteredData.map(item => ({
-        name: item.name,
-        value: item.value,
+      type: 'bar',
+      barWidth: '30%',
+      data: dataList.value.map(item => item.value),
       itemStyle: {
-          color: getColor(item.name)
+        color: function (params) {
+          // 确保这里返回正确的颜色
+          return getColor(params.dataIndex);
         }
-      })),
+      },
+      // 显示柱子顶部的值
       label: {
         show: true,
-        position: 'inside', // 将标签显示在饼图内部
+        position: 'top',
         formatter: params => {
-          const value = params.value;
-          const percentage = value ? ((value / total) * 100).toFixed(2) : 0; // 计算百分比并保留两位小数
-          return `${params.name}\n${value}人 (${percentage}%)`; // 显示为百分比形式，换行显示
+          const value = dataList.value[params.dataIndex].value;
+          const percentage = value ? ((value / total) * 100).toFixed() : 0; // 计算百分比并保留两位小数
+          return `${value}人 ${percentage}%`; // 显示为百分比形式
         },
         color: '#333',
         fontSize: 12
-      },
-      labelLine: {
-        show: false // 不显示标签线
       }
     }]
   };
 
   myChart.setOption(options);
 }
-
 // 获取表的数据
 const showEcharts =() => {
-  hasStudents.value.forEach((item, index) => {
-    if (item.rating === 0) {
+  useOverview.tableList.forEach((item,index) => {
+    if(item.rating === 0) return // 没批改不计数
     dataList.value.forEach((item1,index1) => {
       if(item1.min <= Number(item.scoingRate) && Number(item.scoingRate) <= item1.max ){
-          item1.value++;
+        item1.value ++
       }
-      });
-    } else {
-      dataList.value.forEach((item1, index1) => {
-        if (item1.rating === item.rating) {
-          item1.value++;
+    })
+  })
 }
-      });
-    }
-  });
-}
-//执行
 watch(() => useOverview.tableList,() => {
-  hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
-  showEcharts();
+  showEcharts()
   nextTick(() => {
     initChart();
-  });
-},{deep: true})
+  })
+})
+
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/distribution/stuList.vue

@@ -16,14 +16,11 @@
 </template>
 
 <script setup>
-import {ref, watch} from 'vue'
+import {nextTick, ref, watch} from 'vue'
 import overviewStore from '@/store/modules/overview'
 
 const useOverview = overviewStore()
 const tabPosition = ref('left')
-
-//答过题的学生才进行统计
-const hasStudents = ref([])
 const leftList = ref([
   {
     label:'完美',
@@ -68,22 +65,17 @@ const handelChange = (item) => {
 }
 //取区域的学生
 const showStudents = (index) => {
-  leftList.value[index].stuList = hasStudents.value.filter(item => {
-    if(item.rating === 0){
+  leftList.value[index].stuList = useOverview.tableList.filter(item => {
+    if(item.rating > 0){
       if(leftList.value[index].min <= Number(item.scoingRate || 0) && Number(item.scoingRate || 0) <= leftList.value[index].max ){
         return item
       }
-    }else{
-      if(item.rating == leftList.value[index].rating){
-        return item
-      }
     }
   })
 }
 watch(() => useOverview.tableList,() => {
-  hasStudents.value = useOverview.tableList.filter(item => useOverview.allData[0].hasAnswers.includes(item.studentid)).map(item => item);
   showStudents(0)
-},{deep: true})
+})
 </script>
 
 <style scoped>

src/renderer/src/views/classTask/container/classOverview/timeAnalyse.vue

@@ -14,124 +14,156 @@ const useOverview = overviewStore()
 // 获取图表容器的引用
 const chartRef = ref(null);
 
+const estimateTime = ref([]);
+
+const avaterTime = ref([]);
+// x轴
+const xAxisData = ref([]);
+
+// 获得 y 轴的数据
+const getyAxisData = () => {
+  estimateTime.value = [];
+  avaterTime.value = [];
+  useOverview.tableList.forEach(item => {
+    if (item.rating !== 0) {
+      estimateTime.value.push({
+        name: item.scoingRate ? item.scoingRate + '%' : 0 + '%',
+        value: Number(item.timelength)
+      });
+      avaterTime.value.push({
+        name: item.scoingRate ? item.scoingRate + '%' : 0 + '%',
+        value: Number(item.finishtimelength)
+      });
+    }
+  });
+
+  // x 轴排序
+  xAxisData.value.sort((a, b) => {
+    const aPercentage = parseInt(a.replace('%', ''));
+    const bPercentage = parseInt(b.replace('%', ''));
+    return aPercentage - bPercentage;
+  });
+
+  // 生成 x 轴数据
+  generateXAxisData();
+};
+
+// 生成 x 轴数据
+function generateXAxisData() {
+  // 超过8条开始计算x轴
+  if(estimateTime.value.length > 8){
+    const minScoreRate = 0;
+    const maxScoreRate = 100;
+    const numPoints = 6; // x 轴上的点数
+    const step = (maxScoreRate - minScoreRate) / (numPoints - 1);
+
+    xAxisData.value = [];
+    for (let i = 0; i < numPoints; i++) {
+      const scoreRate = minScoreRate + i * step;
+      xAxisData.value.push(scoreRate + '%');
+    }
+  }else{
+    let uniqueXAxisData = new Set();
+    estimateTime.value.forEach(item => {
+      // 添加元素到 Set 中，自动处理重复问题
+      uniqueXAxisData.add(item.name);
+    });
+    // 将 Set 转换成数组
+    xAxisData.value = Array.from(uniqueXAxisData);
+    // 对数组进行排序
+    xAxisData.value.sort((a, b) => {
+      const aPercentage = parseInt(a.replace('%', ''));
+      const bPercentage = parseInt(b.replace('%', ''));
+      return aPercentage - bPercentage;
+    });
+  }
+}
+
 // 初始化图表
 function initChart() {
   const myChart = echarts.init(chartRef.value);
-      // 指定图表的配置项和数据
-      let option = {
+  const options = {
     tooltip: {
-          trigger: "axis",
+      trigger: 'axis',
       axisPointer: {
-            type: "shadow", // 默认为直线，可选为：'line' | 'shadow'
+        type: 'cross'
+      }
     },
-          formatter: function(parms) {
-            let str =
-              parms[0].axisValue +
-              "</br>" +
-              parms[0].marker +
-              "平均用时：" +
-              parms[0].value + 's'
-            return str;
+    legend: {
+      data: ['预估时长', '平均用时']
     },
-  
-        },
-        textStyle: {
-          color: "#333",
-        },
-        color: ["#7BA9FA", "#4690FA"],
     grid: {
-          containLabel: true,
-          left: "10%",
-          top: "20%",
-          bottom: "10%",
-          right: "10%",
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      top: '10%',
+      containLabel: true
     },
     xAxis: {
-          type: "category",
-          data: getXValue(),
-          axisLine: {
-            lineStyle: {
-              color: "#333",
+      type: 'category',
+      boundaryGap: false,
+      name: '得分率',
+      nameTextStyle: {
+        color: '#999',
+        fontSize: 12,
+        padding: [0, 0, 10, 0]
       },
-          },
-          axisTick: {
-            show: false,
-          },
-          axisLabel: {
-            margin: 20, //刻度标签与轴线之间的距离。
-            textStyle: {
-              color: "#000",
-            },
-          },
-          name:'题目编号'
+      data: xAxisData.value
     },
     yAxis: {
-          type: "value",
-          axisLine: {
-            show: true,
+      type: 'value',
+      name: '作业时长',
+      nameTextStyle: {
+        color: '#999',
+        fontSize: 12,
+        padding: [0, 0, 10, 0]
+      },
+    },
+    series: [
+      {
+        name: `预估时长`,
+        type: 'line',
+        smooth: true,
+        symbol: 'circle',
+        symbolSize: 10,
         lineStyle: {
-              color: "#B5B5B5",
+          color: '#5793f3'
         },
-          },
-          name:'平均时长',
-          splitLine: {
-            lineStyle: {
-              // 使用深浅的间隔色
-              color: ["#B5B5B5"],
-              type: "dashed",
-              opacity: 0.5,
-            },
-          },
-          axisLabel: {},
-        },
-        series: [{
-          data: getYValue(),
-          stack: "zs",
-          type: "bar",
-          barMaxWidth: "auto",
-          barWidth: 60,
-          itemStyle: {
-            color: {
-              x: 0,
-              y: 0,
-              x2: 0,
-              y2: 1,
-              type: "linear",
-              global: false,
-              colorStops: [{
-                offset: 0,
-                color: "#5EA1FF",
+        data: estimateTime.value.map(item => ({
+          name: item.name,
+          value: item.value
+        }))
       },
       {
-                  offset: 1,
-                  color: "#90BEFF",
+        name: `平均用时`,
+        type: 'line',
+        smooth: true,
+        symbol: 'circle',
+        symbolSize: 10,
+        lineStyle: {
+          color: '#d14a61'
         },
-              ],
-            },
-          },
-        },
-        ],
+        data: avaterTime.value.map(item => ({
+          name: item.name,
+          value: item.value
+        }))
+      }
+    ]
   };
-  myChart.setOption(option);
+  myChart.setOption(options);
 }
-  //获取平均时长纵坐标
-const getYValue = () => {
-  const arr =  [...useOverview.allData[0].timeAnalyse]
-  const num = useOverview.allData[0].hasAnswers.length
-  
-  return arr.map(item => {
-    return item ? (item / num).toFixed(2) : 0
-  })
+//获取平均时长
+const getAvaterTime = () => {
+  return useOverview.tableList.reduce((acc, cur) => acc + cur.finishtimelength, 0) / useOverview.tableList.length;
 }
-   // 获取横纵轴坐标数据
-const getXValue = () => {
-  return useOverview.allData.map(item => item.id)
+const getEstimateTime = () => {
+  return useOverview.tableList.reduce((acc, cur) => acc + cur.timelength, 0) / useOverview.tableList.length;
 }
 
 
 
 watch(() => useOverview.tableList,() => {
-  //获取横纵坐标
+  getyAxisData()
   nextTick(() => {
     initChart();
   })

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

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="classWorkFormScoreRef" :model="classWorkFormScore" style="height: 100%">
     <!-- <div class="teacher_content" :style="{ height: dialogProps.maxheight + 'px' }"> -->
-    <div class="teacher_content" :style="{ height: '100%',fontSize: '18px' }">
+    <div class="teacher_content" :style="{ height: '100%' }">
       <div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
         {{ classWorkFormScore.name }} 答题详情
       </div>
@@ -284,27 +284,58 @@
 
         <!-- 批改评价与评语 -->
         <div class="tacher_conten_foot">
-          <el-row style=" padding: 1% 4%; border: 2px dotted;">
-            <el-col :span="24" style="display: flex;flex-direction: column;">
+          <el-row style="padding: 1% 4%; border: 2px dotted">
+            <el-col :span="24" style="display: flex; flex-direction: column">
               <el-row>
-                <el-col :span="24"> 
-                  <div class="greenLine" style="text-align: left;" v-if="dialogProps.studentObj.worktype == '习题训练'">
-                      <span style="font-weight: bold;">老师点评：</span>
-                      <span style="margin: 0;">{{ classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)}}</span>分
-                  </div>
-                  <div style="display: flex; margin: 10px auto;align-items: center;justify-content: space-between;">
+                <el-col :span="14">
+                  <div style="display: flex; margin: 10px auto">
+                    <span style="display: flex; align-items: center">
+                      <span v-if="dialogProps.studentObj.worktype == '习题训练'">
+                        <span>得分： </span>
+                        <span style="margin: 0; color: red">{{
+                          classWorkFormScore.teacherRating.reduce((a, b) => a + b.score, 0).toFixed(2)
+                        }}</span>
+                        <span>分</span>
+                      </span>
+                      <span v-else>
+                        <span>得分： </span>
+                        <span v-if="classWorkFormScore.teacherRating.length > 0">
+                          <el-input-number
+                            v-model="classWorkFormScore.teacherRating[0].score"
+                            :controls="false"
+                            type="number"
+                            :min="0"
+                            :max="classWorkFormScore.teacherRating[0].maxScore"
+                            size="small"
+                            style="width: 60px"
+                            @change="handleChange"
+                          ></el-input-number>
+                        </span>
+                        <span>分</span>
+                      </span>
+                    </span>
                     <div class="score-container">
                       <div
                         v-for="(score, index) in teacherRatingList"
                         :key="index"
-                        style="white-space: nowrap;"
-                        :class="['score-circle', { 'active': classWorkFormScore.rating == score.ratingKey }]"
+                        :class="[
+                          'score-circle',
+                          { active: classWorkFormScore.rating == score.ratingKey }
+                        ]"
                         @click="selectScore(score)"
                       >
-                        <el-text :style="{fontWeight:'bold', color: classWorkFormScore.rating == score.ratingKey ? 'rgb(225,12,8)':'rgb(131,131,131)' }">{{ score.ratingValue }}</el-text>
+                        {{ score.ratingValue }}
                       </div>
                     </div>
-                    <el-select v-model="value" placeholder="常用评语" style="width: 240px" @change="onSelectOption">
+                  </div>
+                </el-col>
+                <el-col :span="10" style="display: flex; align-items: center">
+                  <el-select
+                    v-model="value"
+                    placeholder="常用评语"
+                    style="width: 240px"
+                    @change="onSelectOption"
+                  >
                     <el-option
                       v-for="item in cities"
                       :key="item.value"
@@ -322,21 +353,23 @@
                           placeholder="输入新的常用语"
                           size="small"
                         />
-                        <el-button type="primary" size="small" @click="onConfirm">
-                          确定
-                        </el-button>
+                        <el-button type="primary" size="small" @click="onConfirm"> 确定 </el-button>
                         <el-button size="small" @click="clear">取消</el-button>
                       </template>
                     </template>
                   </el-select>
-                  </div>
                 </el-col>
               </el-row>
             </el-col>
-            <el-col :span="24" style="display: flex;flex-direction: column;">
-              <el-form-item>
-                <el-col :span="24" style="padding: 0px">
-                  <el-input row="5" type="textarea" v-model="classWorkFormScore.teacherremark" rows="1" placeholder="输入评语" />
+            <el-col :span="24" style="display: flex; flex-direction: column">
+              <el-form-item label="评语说明">
+                <el-col :span="15" style="padding: 0px">
+                  <el-input
+                    v-model="classWorkFormScore.teacherremark"
+                    type="textarea"
+                    rows="1"
+                    placeholder="请输入评语说明"
+                  />
                 </el-col>
               </el-form-item>
             </el-col>
@@ -468,11 +501,11 @@ const classWorkFormScore = reactive({
   teacherremark: '' //评分说明
 })
 const teacherRatingList = ref([
-  { ratingKey: '1', ratingValue: '完美' },
-  { ratingKey: '2', ratingValue: '优秀' },
-  { ratingKey: '3', ratingValue: '良好' },
-  { ratingKey: '4', ratingValue: '及格' },
-  { ratingKey: '5', ratingValue: '不及格' }
+  { ratingKey: '1', ratingValue: '优' },
+  { ratingKey: '2', ratingValue: '优-' },
+  { ratingKey: '3', ratingValue: '良' },
+  { ratingKey: '4', ratingValue: '良-' },
+  { ratingKey: '5', ratingValue: '差' }
 ])
 // 确定的线上图片数据
 //#region 文件内容相关
@@ -610,33 +643,7 @@ const selectScore = (score) => {
   console.log(score, 'score----')
   classWorkFormScore.rating = score.ratingKey
 }
-const checkWorkType = (params) => {
-  //这里判断题目类型
-  const subType = params.quizlist.map(item => item.worktype)
-  const objectiveQuestion = ['单选题','多选题','判断题']
-  //判断题目是不是客观题
-  if(subType.every(item => objectiveQuestion.includes(item))){
-    // 获取学生答题列表
 
-    const score = extractedNumber(params.studentObj.scoingRate)
-    if(0<=score<=59){
-      classWorkFormScore.rating = 5
-    }else if(60<=score<=69){
-      classWorkFormScore.rating = 4 
-    }else if(70<=score<=79){
-      classWorkFormScore.rating = 3
-    }else if(80<=score<=99){
-      classWorkFormScore.rating = 2
-    }else{
-      classWorkFormScore.rating = 1
-    }
-  }
-}
-// 获取百分比的数字
-const extractedNumber = (score) => {
-  const match = score.match(/\d+/);
-  return match ? parseInt(match[0], 10) : null;
-}
 // 接收父组件传过来的参数
 const acceptParams = async (params) => {
   console.log(params)
@@ -657,7 +664,7 @@ const acceptParams = async (params) => {
   teacherFeedContentList.value = []
   teachImageList.value = []
   teachFileList.value = []
-  checkWorkType(params)
+
   // -----------------
   dialogProps.value = params
   classWorkFormScore.name = params.studentObj.studentname
@@ -795,7 +802,7 @@ const acceptParams = async (params) => {
     console.log(params.studentQuizAllList[0].rating, '----------------------------')
     // 为null 或0 则默认为0
     classWorkFormScore.rating =
-      params.studentQuizAllList[0].rating == 0 ? classWorkFormScore.rating : params.studentQuizAllList[0].rating
+      params.studentQuizAllList[0].rating == 0 ? 0 : params.studentQuizAllList[0].rating
   }
 
   analysisScoreOpen.value = true
@@ -827,10 +834,8 @@ const formatFeedContent = (stuItem, quItem) => {
     const list = quizStrToList(quItem.workdesc);
     format = list.map((item,index) =>{
       if (quItem.worktype == '单选题') {
-        // const workdesc = item.replace(/<[^>]*>/g,'');
-        // const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,'');
-        const workdesc = item;
-        const feedcontent = stuItem.feedcontent;
+        const workdesc = item.replace(/<[^>]*>/g,'');
+        const feedcontent = stuItem.feedcontent.replace(/<[^>]*>/g,'');
         if(workdesc == feedcontent){
           return (String.fromCharCode(65+Number(index)))
         }
@@ -967,23 +972,23 @@ defineExpose({
 }
 
 .score-circle {
-  border: 1px solid rgb(131,131,131,.5);
-  padding: 5px 0;
-  background-color: #fff;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  background-color: pink;
+  color: red;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 13px;
+  margin: 0 10px;
   cursor: pointer;
-  margin-right: 5px;
-  width: 60px;
-  text-align: center;
+  transition: background-color 0.3s;
 }
 
 .score-circle.active {
-  background-color: rgb(253, 236, 224);
+  background-color: red;
   color: white;
-  border: 1px solid rgb(253, 236, 224);
-}
-.greenLine{
-  border-left: 5px solid rgb(14, 209, 22);
-  padding-left: 5px
 }
 
 .card-header{

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

@@ -94,19 +94,19 @@
               </template>
               <!-- 1-优 2-优减 3-良 4-良减 5-差 -->
               <template v-if="scope.row.teacherRating == 1"
-                ><el-tag type="danger">完美</el-tag></template
+                ><el-tag type="danger">优</el-tag></template
               >
               <template v-if="scope.row.teacherRating == 2"
-                ><el-tag type="danger">优秀</el-tag></template
+                ><el-tag type="danger">优-</el-tag></template
               >
               <template v-if="scope.row.teacherRating == 3"
-                ><el-tag type="warning">良好</el-tag></template
+                ><el-tag type="warning">良</el-tag></template
               >
               <template v-if="scope.row.teacherRating == 4"
-                ><el-tag type="info">及格</el-tag></template
+                ><el-tag type="info">良-</el-tag></template
               >
               <template v-if="scope.row.teacherRating == 5"
-                ><el-tag type="info">不及格</el-tag></template
+                ><el-tag type="info">差</el-tag></template
               >
             </template>
           </el-table-column>
@@ -261,7 +261,6 @@ const openDialog = (data) => {
     }
     classWorkAnalysis.quizlist = idres.rows
     classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
-    processList(classWorkActiveData.quizlist);
 
     // 统计每个题目的正误率
     // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100

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

@@ -99,7 +99,7 @@
                             </div>
                           </template>
                           <template #default="scope">
-                            <div @click="showExamAnalyseDrawer(scope.row)">
+                            <div>
                               <div style="overflow: hidden; text-overflow: ellipsis" v-html="scope.row.titleFormat"></div>
                               <div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="scope.row.workdescFormat"></div>
                               <el-col :span="24" style="display: flex">
@@ -224,9 +224,6 @@
 
     <!-- 预览框 -->
     <prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="props.bookobj"/>
-
-    <!-- 试题详细信息 -->
-    <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
   </div>
 </template>
 
@@ -249,7 +246,6 @@ import { getCurrentTime } from '@/utils/date'
 import FileUpload from "@/components/FileUpload/index.vue";
 import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
-import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
 
 import { useToolState } from '@/store/modules/tool'
 import useUserStore from '@/store/modules/user'
@@ -862,19 +858,6 @@ const editWork = async (cform) =>{
   }
 }
 
-/**
- * 查看试题详细信息
- * @param row 单题数据
- */
-const showExamAnalyseDrawer = (row) => {
-  nextTick(() => {
-    const activeParams = {
-      activeExam: row,
-    }
-    proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
-  })
-}
-
 
 
 onMounted(() => {

src/renderer/src/views/classTask/container/quizStats.vue

@@ -1,9 +1,9 @@
 <template>
   <el-row class="c-warp" :gutter="10">
-    <el-col class="left" :span="10">
-      <el-collapse class="c-item" v-model="activeTopic" accordion>
+    <el-col class="left" :span="14">
+      <el-collapse class="c-item" v-model="activeTopic">
         <template v-for="(item, index) in dataList">
-          <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)" @click="clickItem(index)">
+          <el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)">
             <template #title>
               <el-popover :width="500" placement="right">
                 <p>{{item.def?.titletext}}</p>
@@ -54,13 +54,13 @@
         </template>
       </el-collapse>
     </el-col>
-    <el-col class="right" :span="14">
+    <el-col class="right" :span="10">
       <div class="c-item">
-        <!-- <div class="title">提交情况</div>
+        <div class="title">提交情况</div>
         <div class="respond">
-          <el-space wrap> -->
+          <el-space wrap>
             <!-- <template v-for="it in 11"> -->
-            <!-- <template v-for="(item, index) in dataList">
+            <template v-for="(item, index) in dataList">
               <el-card shadow="hover" class="card-warp">
                 <div class="card-body">
                   <el-progress type="dashboard" :color="colorArr" :width="80" :percentage="ratio_2(item)" />
@@ -70,41 +70,7 @@
               </el-card>
             </template>
           </el-space>
-        </div> -->
-
-        <div class="title">试题详情</div>
-        <!-- 习题训练 -->
-        <el-card style="max-width: 100%; margin-bottom: 10px; text-align: left;">
-          <el-row>
-            <el-col :span="24" style="padding: 10px">
-              <!-- 题源、题目标题、题目选项 -->
-              <span>{{ activeExam.worktag }}</span>
-              <span style="margin-left: 4px" v-html="activeExam.titleFormat"></span>
-              <div :span="24" style="padding: 6px" v-html="activeExam.workdescFormat"></div>
-              <!-- 折叠： 详情分析解答 -->
-              <div class="demo-collapse">
-                <el-collapse v-model="activeExamFlag">
-                  <el-collapse-item title="详情分析解答" name="1">
-                    <el-row style=" padding: 6px 10px; border: 2px dotted;">
-                      <template #default="scope">
-                        <el-col :span="2" style="padding: 6px 0px"><em>【答案】</em></el-col>
-                        <el-col :span="21" style="padding: 6px 0px" v-html="activeExam.workanswerFormat"></el-col>
-                        <el-col :span="2" style="padding: 6px 0px"><em>【分析】</em></el-col>
-                        <el-col :span="21" style="padding: 6px 0px"  v-html="activeExam.method"></el-col>
-                        <el-col :span="2" style="padding: 6px 0px"><em>【解答】</em></el-col>
-                        <el-col :span="21" style="padding: 6px 0px" v-html="activeExam.analyse"></el-col>
-                        <el-col :span="2" style="padding: 6px 0px"><em>【点评】</em></el-col>
-                        <el-col :span="21" style="padding: 6px 0px" v-html="activeExam.discuss"></el-col>
-                        <!-- <el-col :span="21" style="padding: 6px 0px" v-html="dataList[activeTopic-1].def.discuss"></el-col> -->
-                      </template>
-                    </el-row>
-                  </el-collapse-item>
-                </el-collapse>
         </div>
-            </el-col>
-          </el-row>
-        </el-card>
-        
       </div>
     </el-col>
   </el-row>
@@ -118,9 +84,7 @@ import { ref, defineExpose, onMounted, reactive, computed, watch, nextTick, watc
 // import * as elementPlus from 'element-plus' // ElMessage ElMessageBox
 let colorArr = []                 // 进度颜色值         -- 静态数据
 // const attrs = useAttrs()          // props中未定义属性
-const activeTopic = ref(1)        // 展开的题
-const activeExam = ref({})     // 展开的试题
-const activeExamFlag = ref(['1'])     // 展开的试题
+const activeTopic = ref(0)        // 展开的题
 let dataList = ref([])            // 左侧数据
 let studentList = ref([])         // 学生数据
 const props = defineProps({       // 参数 defineProps
@@ -151,10 +115,7 @@ colorArr = [
 
 // === 初始加载完 ===
 onMounted(() => {
-  //activeTopic.value = dataList.value.map((_, index) => index + 1);
-  if (dataList.value[activeTopic.value-1].def != null && dataList.value[activeTopic.value-1].def != undefined) {
-    activeExam.value = dataList.value[activeTopic.value-1].def;
-  }
+  activeTopic.value = dataList.value.map((_, index) => index + 1);
 })
 
 // === 方法(methods) ===
@@ -324,18 +285,6 @@ const clickInfo = async ind => {
   setTimeout(() => {scrollToElement('collapse-' + ind)}, 300);
   // elementPlus.ElMessage.warning('功能未开放!')
 }
-
-// 点击试题
-const clickItem = async (index) => {
-  if (index > dataList.length-1 ) {
-    return
-  }
-  if (dataList.value[index].def == null || dataList.value[index].def == undefined) {
-    return;
-  }
-  activeExam.value = dataList.value[index].def;
-}
-
 // === 通用工具 ===
 // 滚动到指定位置
 const scrollToElement = id => {
@@ -364,14 +313,8 @@ watchEffect(() => { initData() })
   background: #F2F3F5;
   height: 100%;
   margin: 0 !important;
-  .left{
-    padding-left: 0 !important; 
-    height: 100%;
-  }
-  .right{
-    padding-right: 0 !important; 
-    height: 100%;
-  }
+  .left{padding-left: 0 !important; height: 100%;}
+  .right{padding-right: 0 !important;}
   .c-item{
     padding: 10px;
     background: #fff;
@@ -419,7 +362,7 @@ watchEffect(() => { initData() })
       margin-bottom: 10px;
     }
     .respond{
-      /* height: calc(100% - 65px);*/
+      height: calc(100% - 65px);
       overflow: auto;
       .el-space{padding: 5px;}
       .card-warp{

src/renderer/src/views/classTask/teachClassTask.vue

@@ -84,19 +84,19 @@
                 </template>
                 <!-- 1-优 2-优减 3-良 4-良减 5-差 -->
                 <template v-if="scope.row.teacherRating == 1"
-                  ><el-tag type="danger">完美</el-tag></template
+                  ><el-tag type="danger">优</el-tag></template
                 >
                 <template v-if="scope.row.teacherRating == 2"
-                  ><el-tag type="danger">优秀</el-tag></template
+                  ><el-tag type="danger">优-</el-tag></template
                 >
                 <template v-if="scope.row.teacherRating == 3"
-                  ><el-tag type="warning">良好</el-tag></template
+                  ><el-tag type="warning">良</el-tag></template
                 >
                 <template v-if="scope.row.teacherRating == 4"
-                  ><el-tag type="info">及格</el-tag></template
+                  ><el-tag type="info">良-</el-tag></template
                 >
                 <template v-if="scope.row.teacherRating == 5"
-                  ><el-tag type="info">不及格</el-tag></template
+                  ><el-tag type="info">差</el-tag></template
                 >
               </template>
             </el-table-column>
@@ -139,7 +139,7 @@
       <!-- 训练报告-->
       <div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
         <!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
-        <ClassOverview :active-data="classWorkActiveData" :table-list="overviewData" style="width: 100%;"></ClassOverview>
+        <ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
       </div>
 
     </div>
@@ -157,8 +157,6 @@ import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-s
 import quizStats from '@/views/classTask/container/quizStats.vue'
 import ClassOverview from '@/views/classTask/container/classOverview.vue'
 import {sessionStore} from '@/utils/store'
-import Chat from '@/utils/chat' // im 登录初始化
-
 
 const { proxy } = getCurrentInstance()
 const emit = defineEmits(['cle-click'])
@@ -205,10 +203,9 @@ const classWorkAnalysisScore = reactive({
 //     form.name = newValue.label
 //   }
 // )
-const openDialog = (data, isInit=true) => {
+const openDialog = (data) => {
   console.log(data, '点击的item完成情况')
 
-  if (isInit) {
   classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
   classWorkAnalysis.worktype = data.worktype
   classWorkAnalysis.workclass = data.workclass
@@ -235,8 +232,6 @@ const openDialog = (data, isInit=true) => {
     ? JSON.parse(`[${data.classworkdatastudentids}]`)
     : []
   classWorkActiveData.studentList = studentArr
-  }
-  
   /** 学生完成情况分析--获取作业学生list数据 */
   getClassWorkStudentList(data.id)
 
@@ -253,7 +248,6 @@ const openDialog = (data, isInit=true) => {
     }
     classWorkAnalysis.quizlist = idres.rows
     classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
-    processList(classWorkActiveData.quizlist);
 
     // 统计每个题目的正误率
     // 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
@@ -349,7 +343,7 @@ const getClassWorkStudentList = (rowId) => {
           response.rows[i].classworkevallist != 'null'
         ) {
           // 将标签中双引号改为转义, 测试数据: "{\"id\":172910, \"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>。\"}"
-          // 主题作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
+          // 常规作业（去除【】前后引号）.replace(/"(\[.*\])"/g, '$1'); ：eg: "feedcontent\":\"[{\"name\":\"Bliss.jpg\",\"url\":\"https://wzyzoss.3b8daa474.jpg\"}]\",
           // json转换会报错； .replace(/""/g, '"')   eg:  ""宇宙环境安全""
           response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
           //console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
@@ -576,10 +570,6 @@ const getWorkFeedList = async() =>{
   function: 训练报告的处理
 */
 const handleClassOverviewOpen = (type) =>{
-  // 每次进来都重新调用一次
-  if(type == 'report') {
-    getWorkFeedList();
-  }
   // 关闭右侧批阅ui
   isopen_dtwk_table.value = false;
   classWorkAnalysis.view = type
@@ -642,62 +632,16 @@ const closeDialog = () => {
   emit('cle-click')
 }
 
-// im监听消息回调
-const msgHandle = (msg) => {
-  const { type, data } = msg
-  switch(type) {
-    case 'TIMAddRecvNewMsgCallback': // 收到新消息 data=[]
-      {
-        (data||[]).forEach(o => {
-          const msgArr = o?.message_elem_array||[]
-          msgArr.forEach(info => {
-            const msgType = info?.elem_type // 消息类型 TIMElemType
-            const msgData = !!info.text_elem_content ? JSON.parse(info.text_elem_content)||'' : ''
-            // 处理学生端反馈得消息
-            //console.log('msgData->', msgData);
-            if (msgData.msgKey == "finishHomework"){
-              // 刷新
-              const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-              //console.log('data->', data);
-              openDialog(data, false);
-            }
-          })
-        })
-      }
-      break
-  }
-}
-
-const reloadTimer = ref(0); // 开启定时查询，作业id是否刷新了，刷新了就重新获取
-const cutid = ref(0); // 当前初始化的作业id
 onMounted(() => {
+
   const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
   // const data = sessionStore.get('teachClassWorkItem');
+  // const data = localStorage.getItem('teachClassWorkItem');
+  console.log(data,'????????????????????' )
   if(data){
     openDialog(data)
   }
-  // 开始定时查询
-  cutid.value = data.id;
-  isReloadTimer();
-
-  // im监听消息
-  if (!Chat.imChat) {
-    Chat.init(true, true, msgHandle);
-  } else {
-    Chat.listenMsg(msgHandle);
-  }
 })
-const isReloadTimer = () =>{
-  clearInterval(reloadTimer.value) // 关闭定时器 
-  // 开启定时查询，作业id是否刷新了，刷新了就重新获取
-  reloadTimer.value = setInterval(() => {
-    const data = JSON.parse(localStorage.getItem('teachClassWorkItem'));
-    if(cutid.value != data.id){
-      cutid.value = data.id;
-      openDialog(data)
-    }
-  }, 1000)
-}
 
 watch(classWorkAnalysis, (newVal, oldVal) => {
   if(newVal.view != 'quizStats'){
@@ -708,7 +652,6 @@ watch(classWorkAnalysis, (newVal, oldVal) => {
 
 onUnmounted(() => {
   clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
-  clearInterval(reloadTimer.value) // 关闭定时器 查询作业id是否刷新了
 })
 
 // defineExpose({
@@ -754,7 +697,7 @@ onUnmounted(() => {
       overflow: hidden;
 
       .classwork-score{
-        /* overflow-y: auto; */
+        // overflow-y: auto;
         height: 100%;
       }
     }

src/renderer/src/views/examReport/container/examReview.vue

@@ -17,12 +17,10 @@
     <el-table-column align="center" prop="worktag" width="120"></el-table-column>
   </el-table>
 
-  <!-- 试题详细信息 -->
-  <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
-  
-  <!-- <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
+  <!-- 试题详情 -->
+  <el-drawer v-model="activeExamInfoDrawer" title="题目详情" :with-header="false" direction="rtl" size="60%">
     <div style="height: calc(100% - 50px);">
-      <el-scrollbar style="background: #F3F5F8;border-radius: 8px;">
+      <el-scrollbar style="background: #e9e9e9;border-radius: 8px;">
         <el-row class="drawer-main">
           <el-col :span="24">
             <span>{{activeExam.worktag}}</span>
@@ -44,13 +42,11 @@
     <div class="drawer-footer">
       <el-button type="primary" @click="activeExamInfoDrawer = false">关闭</el-button>
     </div>
-  </el-drawer> -->
+  </el-drawer>
 </template>
 
 <script setup>
-import {ref, reactive, getCurrentInstance, nextTick} from 'vue'
-import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
-const { proxy } = getCurrentInstance()
+import {ref, reactive} from 'vue'
 
 const props = defineProps({
   listExamQuestion: {type: Array},
@@ -61,12 +57,8 @@ const activeExamInfoDrawer = ref(false);
 const activeExam = ref({});
 
 const showExamAnalyseDrawer = (row) => {
-  nextTick(() => {
-    const activeParams = {
-      activeExam: row,
-    }
-    proxy.$refs.examDetailsDrawerRef.acceptParams(activeParams);
-  })
+  activeExam.value = row;
+  activeExamInfoDrawer.value = true;
 }
 
 

src/renderer/src/views/prepare/container/ai-ppt.vue

@@ -620,7 +620,7 @@ const changeCursor = (cursorStyle) => {
 };
 
 onMounted(() => {
-  // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFileba724e0344f74e1480535eedf3ebec661601807661085006275/%E9%87%91%E9%A9%AC%E5%A5%96%E5%B0%B4%E5%B0%AC%E4%BA%8B%E4%BB%B6%E5%88%86%E6%9E%90%E4%B8%8E%E5%BA%94%E5%AF%B9%E7%AD%96%E7%95%A5.pptx"
+  // let url = "https://bjcdn.openstorage.cn/xinghuo-privatedata/%2Ftmp/apiTempFiledf28bf990a4c40ffb7477ed4b65392c27232357022409613439/%E3%80%8A%E9%9D%99%E5%A5%B3%E3%80%8B%E6%B7%B1%E5%BA%A6%E8%A7%A3%E8%AF%BB%E4%B8%8E%E7%A0%94%E7%A9%B6.pptx"
   // creatAIPPT(props.currentNode.itemtitle + '.pptx',url, props.uploadData).then((res) => {
   //   emit('addSuccess',res)
   // })

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

@@ -226,7 +226,7 @@ const getClasscourseList = async type => {
   const {classid} = classForm.form
   const {entpcourseid} = myClassActive.value
   if (!classid || !entpcourseid) return
-  const params = {classid, entpcourseid, entpcoursefileid: 0, pageSize: 1000}
+  const params = {classid, entpcourseid, entpcoursefileid: 0}
   const res = await Http_Classcourse.listClasscourse(params)
   if (res.code == 200) {
     // zdg: 排序id大的在前(最新的)
@@ -255,9 +255,9 @@ const createClasscourse = async () => {
     entpcourseid, evalid, coursetitle,
     plandate: curDate, opendate: curDate
   }
-  teacherForm.form.classcourseid = await Http_Classcourse.addClasscourseReturnId(params)
+  await Http_Classcourse.addClasscourseReturnId(params)
   dt.loading = false
-  // getClasscourseList('update') // 更新列表
+  getClasscourseList('update') // 更新列表
   ElMessage.success('创建课程-成功')
 
 }

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

@@ -85,11 +85,10 @@ 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, getClassWorkList, getStudentClassWorkData } from '../createHomework'
+import { createHomework } from '../createHomework'
 import { sessionStore } from '@/utils/store'
 
 const route = useRoute();
@@ -111,13 +110,7 @@ const curNode = reactive({
   data: {}
 })
 
-const props = defineProps(['curNode'])
-const emit = defineEmits(['closeActive'])
-
-
 const sendHomework = (row,type) => {
-
-  
   if(type == 'item'){
     // 布置推送单个作业
     curRow.value = [row]
@@ -131,28 +124,11 @@ const sendHomework = (row,type) => {
 const closeHomework = async() => {
   ipcMsgSend('tool-sphere:set:ignore', true)
 }
-
-
 // 推送成功
-const successHomework = async (data)=>{
-  // data.msg
+const successHomework = (data)=>{
   // 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)=>{
@@ -246,8 +222,7 @@ onMounted(async () => {
   entpcourseid.value = route.query.entpcourseid
   lesson.value = route.query.label
   // 当前节点  mounted 的时候从缓存里拿
-  // curNode.data = sessionStore.get('subject.curNode')
-  curNode.data = props.curNode
+  curNode.data = sessionStore.get('subject.curNode')
   getHomework()
   getResource()
 })

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" @closeActive="closeActive" />
+            <homework v-if="activeObj?.prop === 'resource'" />
             <span v-else style="color:red;">{{activeObj}}</span>
           </slot>
         </div>
@@ -35,7 +35,6 @@
 </template>
 <script setup>
 import { computed, defineProps, ref, reactive, watchEffect, onMounted } from 'vue'
-import { sessionStore } from '@/utils/store'
 import homework from './homework.vue';
 
 // 功能说明：侧边-工具栏
@@ -64,8 +63,6 @@ const topPos = ref(30)        // 顶部距离-内容的距离
 const hPost = ref(0)         // 顶部距离-内容的距离
 const isFold = ref(false)    // 是否折叠
 let posBtnAll = {}  // 存储位置
-
-let curNode = null // 当前节点（作业需要）
 // === 计算属性 ===
 const list = computed(() => props.data.map((o,i) => {
   o.style = getStyle(o.style, i)
@@ -74,8 +71,6 @@ const list = computed(() => props.data.map((o,i) => {
 onMounted(() => {
   posBtnAll = btnRef.value.getBoundingClientRect()
   hPost.value = posBtnAll.height
-
-  curNode = sessionStore.get('subject.curNode')
 })
 // === 方法 ===
 // 获取颜色索引
@@ -101,10 +96,6 @@ 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,226 +1,37 @@
-
 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 = {}
-  formObj.id = 0
+    var formObj = {};
+    formObj.id = 0;
 
-  formObj.deaddate = ''
-  formObj.entpid = usertore.deptId
-  formObj.level = 1
-  formObj.parentid = 0
-  formObj.worktype = '常规作业'
-  formObj.workkey = ''
-  formObj.worktag = ''
+    formObj.deaddate = '';
+    formObj.entpid = usertore.deptId;
+    formObj.level = 1;
+    formObj.parentid = 0;
+    formObj.worktype = '常规作业';
+    formObj.workkey = '';
+    formObj.worktag = '';
 
-  formObj.uniquekey = uniquekey
+    formObj.uniquekey = uniquekey;
     
-  formObj.classid = 0
-  formObj.classcourseid = 0
+    formObj.classid = 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.status = ''
-  formObj.edituserid = usertore.userId
-  formObj.entpcourseworklist = JSON.stringify([{ id: -2, score: '10' }])
+    formObj.edustage = usertore.edustage;
+    formObj.status = '';
+    formObj.edituserid = usertore.userId;
+    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
-}