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

Merge pull request 'zouyf_dev' (#304) from zouyf_dev into main 

Reviewed-on: #304
This commit is contained in:
zouyf 2024-10-10 15:37:11 +08:00
parent 0cd00809ed 6038ae3bd6
commit ad541fd929
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,13 +33,13 @@
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
@click="workHandle('quizStats')"
>作业概况</el-button
>逐题分析</el-button
>
<el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
@click="handleClassOverviewOpen('report')"
>作业报告</el-button
>整体分析</el-button
>
</el-button-group>
</el-row>
@ -136,12 +136,12 @@
</div>
</div>
<!-- 作业概况 -->
<!-- 逐题分析 -->
<div v-else-if="classWorkAnalysis.view == 'quizStats'">
<quiz-stats :active-data="classWorkActiveData" />
</div>
<!-- 作业报告-->
<!-- 整体分析-->
<div v-else-if="classWorkAnalysis.view == 'report'" style="overflow-y: scroll">
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
<ClassOverview :table-list="overviewData"></ClassOverview>
@ -188,7 +188,7 @@ const tableRadio = reactive({
const loading_dt_table = ref(false)
const isopen_dtwk_table = ref(false)
// zdg: 作业概况
// zdg: 逐题分析
const classWorkActiveData = reactive({
quizlist: [], // 当前习题列表
studentList: [], // 当前课程-所有学生
@ -531,7 +531,7 @@ const escapeHtmlQuotes = (str) => {
return result;
}
//#region 作业概况
//#region 逐题分析
// 查看学生-作业概览
const workHandle = (type) => {
// 关闭右侧批阅ui
@ -566,11 +566,11 @@ const getWorkFeedList = async() =>{
//#endregion
//#regin 作业报告
//#regin 整体分析
/*
author: yangws
time: 2024-8-06 16:35:33
function:作业报告的处理
function: 整体分析的处理
*/
const handleClassOverviewOpen = (type) =>{
// 关闭右侧批阅ui
@ -638,12 +638,12 @@ const closeDialog = () => {
watch(classWorkAnalysis, (newVal, oldVal) => {
if(newVal.view != 'quizStats'){
console.log('关闭zdg: 定时执行')
clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
}
})
onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
})
defineExpose({

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

@ -1,6 +1,6 @@
<template>
<el-row class="c-warp" :gutter="10">
<el-col class="left" :span="12">
<el-col class="left" :span="14">
<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)">
@ -54,9 +54,9 @@
</template>
</el-collapse>
</el-col>
<el-col class="right" :span="12">
<el-col class="right" :span="10">
<div class="c-item">
<div class="title">答题情况</div>
<div class="title">提交情况</div>
<div class="respond">
<el-space wrap>
<!-- <template v-for="it in 11"> -->
@ -114,7 +114,9 @@ colorArr = [
]
// === 初始加载完 ===
onMounted(() => {})
onMounted(() => {
activeTopic.value = dataList.value.map((_, index) => index + 1);
})
// === 方法(methods) ===
@ -311,7 +313,7 @@ watchEffect(() => { initData() })
background: #F2F3F5;
height: 100%;
margin: 0 !important;
.left{padding-left: 0 !important;}
.left{padding-left: 0 !important; height: 100%;}
.right{padding-right: 0 !important;}
.c-item{
padding: 10px;
@ -360,7 +362,7 @@ watchEffect(() => { initData() })
margin-bottom: 10px;
}
.respond{
height: calc(70vh - 65px);
height: calc(100% - 65px);
overflow: auto;
.el-space{padding: 5px;}
.card-warp{

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

@ -23,13 +23,13 @@
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
@click="workHandle('quizStats')"
>作业概况</el-button
>逐题分析</el-button
>
<el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
@click="handleClassOverviewOpen('report')"
>作业报告</el-button
>整体分析</el-button
>
</el-button-group>
</div>
@ -126,12 +126,12 @@
</div>
</div>
<!-- 作业概况 -->
<!-- 逐题分析 -->
<div v-else-if="classWorkAnalysis.view == 'quizStats'" style="width: 100%;">
<quiz-stats :active-data="classWorkActiveData" style="width: 100%;height: 100%;"/>
</div>
<!-- 作业报告-->
<!-- 整体分析-->
<div v-else-if="classWorkAnalysis.view == 'report'" style="width: 100%;overflow-y: scroll">
<!-- <ClassOverview :table-list="overviewData" :eval-id="courseObj.evalid"></ClassOverview> -->
<ClassOverview :table-list="overviewData" style="width: 100%;"></ClassOverview>
@ -175,7 +175,7 @@ const tableRadio = reactive({
const loading_dt_table = ref(false)
const isopen_dtwk_table = ref(false)
// zdg: 作业概况
// zdg: 逐题分析
const classWorkActiveData = reactive({
quizlist: [], // 当前习题列表
studentList: [], // 当前课程-所有学生
@ -523,7 +523,7 @@ const escapeHtmlQuotes = (str) => {
return result;
}
//#region 作业概况
//#region 逐题分析
// 查看学生-作业概览
const workHandle = (type) => {
// 关闭右侧批阅ui
@ -558,11 +558,11 @@ const getWorkFeedList = async() =>{
//#endregion
//#regin 作业报告
//#regin 整体分析
/*
author: yangws
time: 2024-8-06 16:35:33
function:作业报告的处理
function: 整体分析的处理
*/
const handleClassOverviewOpen = (type) =>{
// 关闭右侧批阅ui
@ -640,12 +640,12 @@ onMounted(() => {
watch(classWorkAnalysis, (newVal, oldVal) => {
if(newVal.view != 'quizStats'){
console.log('关闭zdg: 定时执行')
clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
}
})
onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 作业概况的
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题分析的
})
// defineExpose({