zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge branch 'main' into zhuhao_dev

This commit is contained in:
朱浩 2024-10-23 17:45:37 +08:00
parent 79cb126728 8a759479bd
commit 521247f817
10 changed files with 458 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/renderer/src/components/set-homework/index.vue
View File

@ -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(() => {

82
src/renderer/src/hooks/useProcessList.js
View File

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

2
src/renderer/src/utils/tool.js
View File

@ -340,7 +340,7 @@ const eventHandles = (type, win) => {
// 监听窗口的激活事件
win.on('focus', async () => {
toolState.isTaskWin=true
win&&win.reload(); //刷新该窗口
// win&&win.reload(); //刷新该窗口
});
// 监听窗口关闭事件
win.on('closed', function () {

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

@ -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%' }">
<div class="teacher_content" :style="{ height: '100%',fontSize: '18px' }">
<div style="font-size: 18px; width: 100%; padding: 5px 10px; flex: 0 0 auto;">
{{ classWorkFormScore.name }} 答题详情
</div>
@ -284,59 +284,27 @@
<!-- 批改评价与评语 -->
<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="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>
<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;">
<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)"
>
{{ score.ratingValue }}
<el-text :style="{fontWeight:'bold', color: classWorkFormScore.rating == score.ratingKey ? 'rgb(225,12,8)':'rgb(131,131,131)' }">{{ score.ratingValue }}</el-text>
</div>
</div>
</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-select v-model="value" placeholder="常用评语" style="width: 240px" @change="onSelectOption">
<el-option
v-for="item in cities"
:key="item.value"
@ -354,23 +322,21 @@
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 label="评语说明">
<el-col :span="15" style="padding: 0px">
<el-input
v-model="classWorkFormScore.teacherremark"
type="textarea"
rows="1"
placeholder="请输入评语说明"
/>
<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>
</el-form-item>
</el-col>
@ -644,7 +610,33 @@ 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)
@ -665,7 +657,7 @@ const acceptParams = async (params) => {
teacherFeedContentList.value = []
teachImageList.value = []
teachFileList.value = []
checkWorkType(params)
// -----------------
dialogProps.value = params
classWorkFormScore.name = params.studentObj.studentname
@ -803,7 +795,7 @@ const acceptParams = async (params) => {
console.log(params.studentQuizAllList[0].rating, '----------------------------')
// 为null 或0 则默认为0
classWorkFormScore.rating =
params.studentQuizAllList[0].rating == 0 ? 0 : params.studentQuizAllList[0].rating
params.studentQuizAllList[0].rating == 0 ? classWorkFormScore.rating : params.studentQuizAllList[0].rating
}
analysisScoreOpen.value = true
@ -975,23 +967,23 @@ defineExpose({
}
.score-circle {
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;
border: 1px solid rgb(131,131,131,.5);
padding: 5px 0;
background-color: #fff;
cursor: pointer;
transition: background-color 0.3s;
margin-right: 5px;
width: 60px;
text-align: center;
}
.score-circle.active {
background-color: red;
background-color: rgb(253, 236, 224);
color: white;
border: 1px solid rgb(253, 236, 224);
}
.greenLine{
border-left: 5px solid rgb(14, 209, 22);
padding-left: 5px
}
.card-header{

1
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -261,6 +261,7 @@ const openDialog = (data) => {
}
classWorkAnalysis.quizlist = idres.rows
classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
processList(classWorkActiveData.quizlist);
// 统计每个题目的正误率
// 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100

83
src/renderer/src/views/classTask/container/quizStats.vue
View File

@ -1,9 +1,9 @@
<template>
<el-row class="c-warp" :gutter="10">
<el-col class="left" :span="14">
<el-collapse class="c-item" v-model="activeTopic">
<el-col class="left" :span="10">
<el-collapse class="c-item" v-model="activeTopic" accordion>
<template v-for="(item, index) in dataList">
<el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)">
<el-collapse-item class="collapse-item" :name="index+1" :id="'collapse-'+(index+1)" @click="clickItem(index)">
<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="10">
<el-col class="right" :span="14">
<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,7 +70,41 @@
</el-card>
</template>
</el-space>
</div>
</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>
@ -84,7 +118,9 @@ 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(0) // 展开的题
const activeTopic = ref(1) // 展开的题
const activeExam = ref({}) // 展开的试题
const activeExamFlag = ref(['1']) // 展开的试题
let dataList = ref([]) // 左侧数据
let studentList = ref([]) // 学生数据
const props = defineProps({ // 参数 defineProps
@ -115,7 +151,10 @@ colorArr = [
// === 初始加载完 ===
onMounted(() => {
activeTopic.value = dataList.value.map((_, index) => index + 1);
//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;
}
})
// === 方法(methods) ===
@ -285,6 +324,18 @@ 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 => {
@ -313,8 +364,14 @@ watchEffect(() => { initData() })
background: #F2F3F5;
height: 100%;
margin: 0 !important;
.left{padding-left: 0 !important; height: 100%;}
.right{padding-right: 0 !important;}
.left{
padding-left: 0 !important;
height: 100%;
}
.right{
padding-right: 0 !important;
height: 100%;
}
.c-item{
padding: 10px;
background: #fff;
@ -362,7 +419,7 @@ watchEffect(() => { initData() })
margin-bottom: 10px;
}
.respond{
height: calc(100% - 65px);
/* height: calc(100% - 65px);*/
overflow: auto;
.el-space{padding: 5px;}
.card-warp{

24
src/renderer/src/views/classTask/teachClassTask.vue
View File

@ -158,6 +158,7 @@ import quizStats from '@/views/classTask/container/quizStats.vue'
import ClassOverview from '@/views/classTask/container/classOverview.vue'
import {sessionStore} from '@/utils/store'
const { proxy } = getCurrentInstance()
const emit = defineEmits(['cle-click'])
const props = defineProps({
@ -248,6 +249,7 @@ const openDialog = (data) => {
}
classWorkAnalysis.quizlist = idres.rows
classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
processList(classWorkActiveData.quizlist);
// 统计每个题目的正误率
// 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
@ -343,7 +345,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)
@ -636,16 +638,29 @@ const closeDialog = () => {
emit('cle-click')
}
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();
})
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'){
@ -656,6 +671,7 @@ watch(classWorkAnalysis, (newVal, oldVal) => {
onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
clearInterval(reloadTimer.value) // 关闭定时器 查询作业id是否刷新了
})
// defineExpose({

31
src/renderer/src/views/tool/components/homework.vue
View File

@ -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();
@ -110,7 +111,13 @@ const curNode = reactive({
data: {}
})
const props = defineProps(['curNode'])
const emit = defineEmits(['closeActive'])
const sendHomework = (row,type) => {
if(type == 'item'){
// 布置推送单个作业
curRow.value = [row]
@ -124,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)=>{
@ -222,7 +246,8 @@ onMounted(async () => {
entpcourseid.value = route.query.entpcourseid
lesson.value = route.query.label
// 当前节点 mounted 的时候从缓存里拿
curNode.data = sessionStore.get('subject.curNode')
// curNode.data = sessionStore.get('subject.curNode')
curNode.data = props.curNode
getHomework()
getResource()
})

11
src/renderer/src/views/tool/components/side.vue
View File

@ -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'" />
<homework v-if="activeObj?.prop === 'resource'" :curNode="curNode" @closeActive="closeActive" />
<span v-else style="color:red;">{{activeObj}}</span>
</slot>
</div>
@ -35,6 +35,7 @@
</template>
<script setup>
import { computed, defineProps, ref, reactive, watchEffect, onMounted } from 'vue'
import { sessionStore } from '@/utils/store'
import homework from './homework.vue';
// 功能说明：侧边-工具栏
@ -63,6 +64,8 @@ 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)
@ -71,6 +74,8 @@ const list = computed(() => props.data.map((o,i) => {
onMounted(() => {
posBtnAll = btnRef.value.getBoundingClientRect()
hPost.value = posBtnAll.height
curNode = sessionStore.get('subject.curNode')
})
// === 方法 ===
// 获取颜色索引
@ -96,6 +101,10 @@ const clickHandel = (o, e) => {
}
emit('change', o)
}
const closeActive = () =>{
isVisible.value = false
}
</script>
<style lang="scss" scoped>
.warp{

237
src/renderer/src/views/tool/createHomework.js
View File

@ -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 = {};
formObj.id = 0;
formObj.deaddate = '';
formObj.entpid = usertore.deptId;
formObj.level = 1;
formObj.parentid = 0;
formObj.worktype = '常规作业';
formObj.workkey = '';
formObj.worktag = '';
export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
const usertore = useUserStore().user
formObj.uniquekey = uniquekey;
var formObj = {}
formObj.id = 0
formObj.classid = 0;
formObj.classcourseid = 0;
formObj.deaddate = ''
formObj.entpid = usertore.deptId
formObj.level = 1
formObj.parentid = 0
formObj.worktype = '常规作业'
formObj.workkey = ''
formObj.worktag = ''
formObj.entpcourseid = entpcourseid;
formObj.uniquekey = uniquekey
formObj.slideid = 0;
formObj.classid = 0
formObj.classcourseid = 0
formObj.workcodes = JSON.stringify(data);
formObj.entpcourseid = entpcourseid
formObj.edusubject = usertore.edusubject;
formObj.evalid = evalid
formObj.slideid = 0
formObj.edustage = usertore.edustage;
formObj.status = '';
formObj.edituserid = usertore.userId;
formObj.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
return addClassworkReturnId(formObj)
formObj.workcodes = JSON.stringify(data)
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' }])
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
}