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

Merge branch 'main' into zhuhao_dev 

# Conflicts:
#	package.json
This commit is contained in:
朱浩 2024-11-12 09:59:52 +08:00
parent 2d75ae6cb8 f0fcbed61e
commit e31904ed9f
20 changed files with 831 additions and 1328 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "aix-win", "name": "aix-win",
"version": "2.1.27", "version": "2.1.28",
"description": "", "description": "",
"main": "./out/main/index.js", "main": "./out/main/index.js",
"author": "上海交大重庆人工智能研究院", "author": "上海交大重庆人工智能研究院",

1
src/main/index.js
View File

@ -175,6 +175,7 @@ async function createLinkWin(data) {
data.fullPath += '?urlSource=smarttalk&t' + Date.now() data.fullPath += '?urlSource=smarttalk&t' + Date.now()
} }
linkWin[data.key].loadURL(data.fullPath) linkWin[data.key].loadURL(data.fullPath)
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') linkWin[data.key].webContents.openDevTools()
linkWin[data.key].once('ready-to-show', () => { linkWin[data.key].once('ready-to-show', () => {
linkWin[data.key].show() linkWin[data.key].show()

77
src/renderer/src/api/classTask/index.js
View File

@ -89,6 +89,13 @@ export function updateClassworkdata(data) {
data: data data: data
}) })
} }
export function updateClassWorkDataAutoFinish(data) {
return request({
url: '/education/classworkdata/updAutoFinish',
method: 'put',
data: data
})
}
// 修改classwork // 修改classwork
export function updateClasswork(data) { export function updateClasswork(data) {
@ -118,90 +125,90 @@ export function addClassworkeval(data) {
// 查询evaluationclue列表 // 查询evaluationclue列表
export function listEvaluationclue(query) { export function listEvaluationclue(query) {
return request({ return request({
url: '/education/evaluationclue/list', url: '/education/evaluationclue/list',
method: 'get', method: 'get',
params: query params: query
}) })
} }
// 查询evaluationclue详细 // 查询evaluationclue详细
export function getEvaluationclue(id) { export function getEvaluationclue(id) {
return request({ return request({
url: '/education/evaluationclue/' + id, url: '/education/evaluationclue/' + id,
method: 'get' method: 'get'
}) })
} }
// 新增evaluationclue // 新增evaluationclue
export function addEvaluationclueReturnId(data) { export function addEvaluationclueReturnId(data) {
return request({ return request({
url: '/education/evaluationclue/addReturnId', url: '/education/evaluationclue/addReturnId',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 新增evaluationclue // 新增evaluationclue
export function addEvaluationclue(data) { export function addEvaluationclue(data) {
return request({ return request({
url: '/education/evaluationclue', url: '/education/evaluationclue',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 修改evaluationclue // 修改evaluationclue
export function updateEvaluationclue(data) { export function updateEvaluationclue(data) {
return request({ return request({
url: '/education/evaluationclue', url: '/education/evaluationclue',
method: 'put', method: 'put',
data: data data: data
}) })
} }
// 删除evaluationclue // 删除evaluationclue
export function delEvaluationclue(id) { export function delEvaluationclue(id) {
return request({ return request({
url: '/education/evaluationclue/' + id, url: '/education/evaluationclue/' + id,
method: 'delete' method: 'delete'
}) })
} }
// 新增evaluationclue，保存base64图片 // 新增evaluationclue，保存base64图片
export function saveBase64File(data) { export function saveBase64File(data) {
return request({ return request({
url: '/education/evaluationclue/saveBase64File', url: '/education/evaluationclue/saveBase64File',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 新增evaluationclue，上传 // 新增evaluationclue，上传
export function saveEvaluationClueUploadFile(data) { export function saveEvaluationClueUploadFile(data) {
return request({ return request({
url: '/education/evaluationclue/saveUploadFile', url: '/education/evaluationclue/saveUploadFile',
method: 'post', method: 'post',
data: data data: data
}) })
} }
// 读取文件内容 // 读取文件内容
export function readFile(data) { export function readFile(data) {
return fetch(import.meta.env.VITE_APP_RES_FILE_PATH + data.cluelink, { return fetch(import.meta.env.VITE_APP_RES_FILE_PATH + data.cluelink, {
method: "get", method: "get",
headers: { headers: {
'Content-Type': 'text/plain', // 请求头设置为纯文本 'Content-Type': 'text/plain', // 请求头设置为纯文本
'Accept': 'text/plain' // 接受头设置为纯文本 'Accept': 'text/plain' // 接受头设置为纯文本
}, },
}) })
.then(response => response.text()) .then(response => response.text())
.then(text => { .then(text => {
return Promise.resolve(text); return Promise.resolve(text);
}) })
.catch(error => { .catch(error => {
console.error('读取文件出错:', error); console.error('读取文件出错:', error);
return Promise.reject(); return Promise.reject();
}); });
/*return request({ /*return request({
url: '/education/evaluationclue/readFile', url: '/education/evaluationclue/readFile',
method: 'post', method: 'post',

2
src/renderer/src/plugins/shareStore.js
View File

@ -60,7 +60,7 @@ function stateSyncWatch(storeName, newState) {
const diffData = findDifferences(oldState, newState) const diffData = findDifferences(oldState, newState)
if(!_.keys(diffData).length) return // 没有变化就终止执行 if(!_.keys(diffData).length) return // 没有变化就终止执行
// 数据处理: 找出差异 // 数据处理: 找出差异
console.log('state-change-diffData', diffData, newState) // console.log('state-change-diffData', diffData, newState)
try { try {
let pinaValue = {} // store pina状态管理需要的数据格式 let pinaValue = {} // store pina状态管理需要的数据格式
// 数据转换处理 // 数据转换处理

28
src/renderer/src/store/modules/classTask.js
View File

@ -1,28 +0,0 @@
import { defineStore } from 'pinia'
import { } from '@/api/classTask/index.js'
import { listClassmain } from '@/api/classManage/index'
const useClassTaskStore = defineStore('classTask',{
state: () => ({
classListIds: [],
}),
actions: {
listClassmain(params) {
// 获取班级列表
return new Promise((resolve, reject) => {
listClassmain(params)
.then((res) => {
this.classListIds = res.rows&&res.rows.map((item) => item.id)
resolve(res)
})
.catch((error) => {
reject(error)
})
})
},
},
persist: true
})
export default useClassTaskStore

58
src/renderer/src/utils/date.js
View File

@ -167,3 +167,61 @@ export function getTomorrow() {
return tomorrow; return tomorrow;
} }
/**
* 当前日期的 前几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtherDay(index, format=true) {
let date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()- index < 10 ? '0' + (date.getDate()- index) : date.getDate()- index
// 前 index 天的时间
if(format){
let tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
let tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* 当前日期的 后几天
* @param {*} index 天数
* @param {*} format true 返回中国标准时间：Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 格式； false 返回标准时间格式 YYYY-MM-DD
* @returns
*/
export function getTheOtheNextDay(index, format=true) {
const date = new Date();
var year = date.getFullYear()
var month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
var day = date.getDate()+ index < 10 ? '0' + (date.getDate()+ index) : date.getDate()+ index
// 前 index 天的时间
if(format){
const tomorrow = `${year}-${month}-${day}`;
return new Date(tomorrow);
}else{
const tomorrow = `${year}-${month}-${day}`;
return tomorrow;
}
}
/**
* Wed Oct 02 2024 08:00:00 GMT+0800 (中国标准时间) 转为日期格式: YYYY-MM-DD
*
* @param {*} format
* @returns
*/
export const getDateFormatDate = (newDate)=> {
const now = newDate; // new Date();
const year = now.getFullYear();
const month = (now.getMonth() + 1).toString().padStart(2, '0');
const day = now.getDate().toString().padStart(2, '0');
return `${year}-${month}-${day}`;
}

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

@ -200,6 +200,25 @@ export const createWindow = async (type, data) => {
eventHandles(type, winChild) // 事件监听处理 eventHandles(type, winChild) // 事件监听处理
return winChild return winChild
} }
case 'open-win': { // 创建-新窗口
const option = data.option||{}
const defOption = {
show: false,
frame: true, // 无边框
autoHideMenuBar: true,
maximizable: false,
}
data.isConsole = true // 是否开启控制台
data.option = {...defOption, ...option}
const win = await toolWindow(type, data)
win.type = type // 唯一标识
win.show()
win.maximize();
// win.setFullScreen(true) // 设置窗口为全屏
if (import.meta.env.VITE_SHOW_DEV_TOOLS === 'true') win.webContents.openDevTools() // 打开调试工具
eventHandles(type, win) // 事件监听处理
break
}
default: default:
break break
} }
@ -360,6 +379,18 @@ const eventHandles = (type, win) => {
publicMethods(on) // 加载公共方法 publicMethods(on) // 加载公共方法
break; break;
} }
case 'open-win': { // 打开新窗口
// 监听窗口关闭事件
win.on('closed', function () {
win&&win.destroy()
});
const on = {
onClosed: () => {
}
}
publicMethods(on) // 加载公共方法
break
}
default: default:
break break
} }

562
src/renderer/src/views/classTask/classTask.vue
View File

@ -4,20 +4,16 @@
<div class="class-reserv-tabs"> <div class="class-reserv-tabs">
<el-segmented v-model="tabActive" block :options="tabOptions" size="large" /> <el-segmented v-model="tabActive" block :options="tabOptions" size="large" />
</div> </div>
<div v-if="tabActive === '已结束'"> <div v-if="tabActive === '已批改'">
<div class="demo-date-picker"> <div class="demo-date-picker">
<div class="block"> <el-date-picker
<el-date-picker v-model="startEndDate"
v-model="EndDate" type="daterange"
type="date" start-placeholder="Start Date"
format="YYYY-MM-DD" end-placeholder="End Date"
value-format="YYYY-MM-DD" :default-time="defaultTime"
placeholder="请选择截止日期" @change="changeStartEndDate"
size="large" />
:disabled-date="disabledDate"
@change="changeEndDate"
/>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -27,7 +23,7 @@
<div v-if="classWorkList.length > 0"> <div v-if="classWorkList.length > 0">
<task-item <task-item
v-for="(item, index) in activeDataList" v-for="(item, index) in activeDataList"
v-show="tabActive === '进行中'" v-show="tabActive === '待批改'"
:key="index" :key="index"
:item="item" :item="item"
:tabactive="tabActive" :tabactive="tabActive"
@ -36,7 +32,7 @@
></task-item> ></task-item>
<task-item <task-item
v-for="(item, index) in doneDataList" v-for="(item, index) in doneDataList"
v-show="tabActive === '已结束'" v-show="tabActive === '已批改'"
:key="index" :key="index"
:item="item" :item="item"
:tabactive="tabActive" :tabactive="tabActive"
@ -52,7 +48,6 @@
></el-empty> ></el-empty>
</div> </div>
</div> </div>
<!-- <item-dialog ref="itemDialogRef" @cle-click="closeDialog"></item-dialog> -->
</el-container> </el-container>
</template> </template>
@ -61,25 +56,29 @@ import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
import { listByDeadDate, listClassworkdata } from '@/api/classTask' import { listByDeadDate, listClassworkdata } from '@/api/classTask'
import TaskItem from '@/views/classTask/container/classTask/task-item.vue' import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
// import ItemDialog from '@/views/classTask/container/item-dialog.vue'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import { getCurrentTime } from '@/utils/date' import { getDateFormatDate, getTheOtherDay, getTheOtheNextDay } from '@/utils/date'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
import useClassTaskStore from "@/store/modules/classTask";
import {createWindow} from '@/utils/tool' import {createWindow} from '@/utils/tool'
import {sessionStore} from '@/utils/store'
import {debounce } from '@/utils/comm' import {debounce } from '@/utils/comm'
const toolState = useToolState(); const toolState = useToolState();
const classTaskStore = useClassTaskStore()
const userStore = useUserStore().user const userStore = useUserStore().user
// const itemDialogRef = ref(null)
const tabOptions = ref(['进行中', '已结束']) const tabOptions = ref(['待批改', '已批改'])
const tabActive = ref('进行中') const tabActive = ref('待批改')
const dataList = ref([]) const dataList = ref([])
const EndDate = ref(getCurrentTime('YYYY-MM-DD')) // 默认起止时间：当前日期前2天后3天；默认查询一周的数据
const startEndDate = ref([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
const defaultTime = ref<[Date, Date]>([
getTheOtherDay(3),
getTheOtheNextDay(3),
])
// 所有班级作业列表 // 所有班级作业列表
const classWorkList = ref([]) const classWorkList = ref([])
@ -91,23 +90,18 @@ const loading = ref(false)
const activeDataList = computed(() => { const activeDataList = computed(() => {
return classWorkList.value return classWorkList.value
}) })
const doneDataList = computed(() => {
return classWorkList.value
})
const deleteReserv = (item) => { const deleteReserv = (item) => {
console.log('删除待开发', item) console.log('删除待开发', item)
// dataList.value = dataList.value.filter((is) => { // dataList.value = dataList.value.filter((is) => {
// return is.id !== item.id // return is.id !== item.id
// }) // })
} }
const doneDataList = computed(() => {
return classWorkList.value
})
// 当日之后的日期禁用 const changeStartEndDate = (val) => {
const disabledDate = (time) => { console.log('起止日期改变', val)
return time.getTime() > Date.now()
}
// 截止日期改变
const changeEndDate = (val) => {
console.log('截止日期改变', val)
getData() // 加载数据 getData() // 加载数据
} }
@ -115,245 +109,202 @@ const changeEndDate = (val) => {
const getData = async () => { const getData = async () => {
classWorkList.value = [] classWorkList.value = []
loading.value = true loading.value = true
// 1、班级列表 // 1、班级作业
// getClassList()
// 2、班级作业
await getClassWorkList() await getClassWorkList()
// 3、班级学生作业 包含多个班级 // 2、班级学生作业 包含多个班级
getStudentClassWorkData() getStudentClassWorkData()
loading.value = false loading.value = false
} }
/** /**
* 1、获取班级列表数据 * 1、获取班级作业
* TODO 这里暂时取班级id的list，后续需要在修改
*/
const getClassList = () => {
if(classTaskStore.classListIds.length==0){
// 获取 班级列表ids 这里暂时取班级id的list，后续需要在修改
classTaskStore.listClassmain({ classuserid: userStore.userId, pageSize: 100, status: 'open' })
}
}
/**
* 2、获取班级作业
*/ */
const getClassWorkList = async () => { const getClassWorkList = async () => {
//if(classTaskStore.classListIds.length>0){ // 班级作业数据，包含多个班级 homeworklist
{ const response = await listByDeadDate({
// 班级作业数据，包含多个班级 homeworklist edituserid: userStore.userId, // 老师的id
const response = await listByDeadDate({ edustage: userStore.edustage, // 学段
edituserid: userStore.userId, // 老师的id edusubject: userStore.edusubject,//学科
edustage: userStore.edustage, // 学段 startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
edusubject: userStore.edusubject,//学科 deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 弃用 status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期 orderby: 'deaddate DESC',
status: '1', // 作业状态：1-已发布 pageSize: 100,
orderby: 'deaddate DESC', })
pageSize: 100,
})
/** let list = response.rows || [];
* 2024-10-17 由于 后面截止时间加了 时分，特加判断 for (var i = 0; i < list.length; i++) {
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断， // 初始化部分新增字段值
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。 list[i].workdatalist = [] // 当前任务中有多少个学生的数据集合
*/ list[i].workdatalistVisible = false
let list = []; list[i].feedtimelength = 0 // 已交的学生人中，汇总计算用时
if(tabActive.value === '进行中'){ list[i].rightAnswerCount = 0
// 进行中 当前日期时间 小于 截止 日期时间 list[i].scoingRate = 0 + '%' // 得分率
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中 list[i].averagetime = 0 // 平均用时
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束 // ----------------------------------------------
// 处理任务类型的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 != '') {
for (var i = 0; i < list.length; i++) { list[i].entpcourseworklistarray = JSON.parse(
// 初始化部分新增字段值 '[' + list[i].entpcourseworklist + ']'
list[i].workdatalist = [] )
list[i].workdatacount = 0 // 人数 } else {
list[i].workdatalistVisible = false list[i].entpcourseworklistarray = []
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.value = list && list.filter((item) => item.workdatacount > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = 0
}else{
classWorkList.value = []
total.value = 0
}
loading.value = false
} }
// 显示分配人数(workdataresultsum)>0 的
if (list && list.length > 0) {
classWorkList.value = list && list.filter((item) => item.workdataresultsum > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看
total.value = 0
}else{
classWorkList.value = []
total.value = 0
}
loading.value = false
} }
/** /**
* 3、获取多个班级学生作业数据 * 2、获取多个班级学生作业数据
* 查询已交的列表
* @param workList ：需要更新的作业list
* @param Refresh ：true 不用刷新，false 需要刷新
*/ */
const getStudentClassWorkData = async() => { const getStudentClassWorkData = async(workList = [], Refresh = true) => {
// const { chapterId } = await useGetHomework(props.bookobj.node) // 获取 已交的 列表数据(workdataresultcount 已交的学生数)
// this.entpcourseid = chapterId let SubmitClWorkList = [];
//if(classTaskStore.classListIds.length>0){ if(Refresh){
// listClassworkdataByDeadDate({ SubmitClWorkList = classWorkList.value.filter((item) => item.workdataresultcount > 0) ;
// edituserid: userStore.userId, // 老师的id }else{
// classids: classTaskStore.classListIds.join(','), SubmitClWorkList = workList;
// edusubject: userStore.edusubject,//学科 }
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
// deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
// //status: '1', // 作业状态：1-已发布
// orderby: "deaddate DESC",//
// pageSize: 1000,
// })
// listClassworkdataNew({ console.log('有提交的作业', SubmitClWorkList)
// classworkids: ids, // 作业id const ids = SubmitClWorkList&&SubmitClWorkList.map((item) => item.id).join(',');
// edituserid: userStore.userId, // 老师的id if (ids == '') {
// edusubject: userStore.edusubject,//学科 return;
// evalStatus: 1, }
// pageSize: 1000, listClassworkdata({
// }) classworkids: ids,
pageSize: 1000,
}).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) {
for (var i = 0; i < res.rows.length; i++) {
// finishtimelength != '0' 已交
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
console.log('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
//classWorkList.value[t].workdataresultcount++
// 已交的学生人中，汇总计算用时
{ classWorkList.value[t].feedtimelength += parseInt(res.rows[i].finishtimelength)
const ids = classWorkList.value.map((item) => item.id).join(',');
if (ids == '') {
return;
}
listClassworkdata({
classworkids: ids,
pageSize: 1000,
}).then((res) => {
for (var t = 0; t < classWorkList.value.length; t++) {
for (var i = 0; i < res.rows.length; i++) {
if (res.rows[i].classworkid == classWorkList.value[t].id && res.rows[i].finishtimelength != '0') {
console.log('==================')
// 有几个学生完成/正在完成学习任务
// 至少resultcount不是0
classWorkList.value[t].workdatafeedbackcount++
// 在参与学习任务的人中，汇总计算用时 // 计算得分率
classWorkList.value[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 ( if (res.rows[i].worktype == '常规作业') {
res.rows[i].classworkevallist != '' && evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent).replace(
res.rows[i].classworkevallist != null && /"(\[.*\])"/g,
res.rows[i].classworkevallist != 'null' '$1'
) { )
let replacedString = res.rows[i].classworkevallist.replace(/""/g, '"') evalarray[e].feedcontent = escapeHtmlQuotes(evalarray[e].feedcontent)
// 将标签中双引号改为转义, 测试数据: "{\"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 + ']')
} }
if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
for (var e = 0; e < evalarray.length; e++) { // 正确，得分
if (res.rows[i].worktype == '常规作业') { classWorkList.value[t].rightAnswerCount++
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.value[t].rightAnswerCount++
}
} }
} }
} }
// 当前这个学习任务，共推送给了几个学生，workdatacount
if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdatalist.push(res.rows[i])
}
} }
// 计算完成进度 workdatacount人数要大于0 // 当前这个学习任务，共推送给了几个学生，workdataresultsum
if ( if (res.rows[i].classworkid == classWorkList.value[t].id) {
classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdatalist.push(res.rows[i])
classWorkList.value[t].workdatacount > 0
) {
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
} else {
classWorkList.value[t].finishpercent = 0
} }
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
}
// 计算批阅异常，需要获取每个题目的类型，找出主观题
// 暂缓
// 计算平均得分率： 正确题数/（题目总数*学生人数）*100
if (
classWorkList.value[t].entpcourseworklistarray &&
classWorkList.value[t].entpcourseworklistarray.length > 0
) {
var dd =
(classWorkList.value[t].rightAnswerCount /
(classWorkList.value[t].entpcourseworklistarray.length *
classWorkList.value[t].workdatacount)) *
100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else {
classWorkList.value[t].scoingRate = '0%'
}
// 设定典型作答，需要获取每个题目的类型，找出主观题
// 暂缓
} }
})
}
// 计算完成进度: workdataresultcount 学生提交了的个数; workdataresultsum 人数要大于0;
if (classWorkList.value[t].workdataresultcount > 0 && classWorkList.value[t].workdataresultsum > 0 ) {
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].finishpercent = 0
}
/** 计算 已批阅进度 */
// workdataresultsum 人数 teacherrationgcount 已批阅人数
// 已批阅百分比： (人数-已批阅数) / 人数 * 100
if (classWorkList.value[t].workdataresultsum > 0) {
classWorkList.value[t].teacherCorrectionProgress = parseInt(
((classWorkList.value[t].teacherrationgcount) / classWorkList.value[t].workdataresultsum) * 100
)
} else {
classWorkList.value[t].teacherCorrectionProgress = 0
}
// 以下四个参数，都要计算
// 2024-04-12，酉阳，by jackyshen
// 计算参与学习任务的平均用时：学生总用时/ 提交学生数
if (classWorkList.value[t].workdataresultcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdataresultcount / 60).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
}
// 计算平均得分率： 正确题数/（题目总数*学生人数）*100
if (
classWorkList.value[t].entpcourseworklistarray &&
classWorkList.value[t].entpcourseworklistarray.length > 0
) {
var dd =
(classWorkList.value[t].rightAnswerCount /
(classWorkList.value[t].entpcourseworklistarray.length *
classWorkList.value[t].workdataresultsum)) *
100
classWorkList.value[t].scoingRate = dd.toFixed(0) + '%'
} else {
classWorkList.value[t].scoingRate = '0%'
}
}
})
} }
@ -379,6 +330,7 @@ const getStudentClassWorkDataPolling = () => {
getStudentVisible() getStudentVisible()
// 在轮询 // 在轮询
pollingST.value = setInterval(() => { pollingST.value = setInterval(() => {
console.log('轮询查询学生作业进度')
getStudentVisible() getStudentVisible()
}, 1000 * 10) }, 1000 * 10)
} }
@ -413,75 +365,56 @@ onUnmounted(() => {
// [作业反馈] - 实际查询逻辑 // [作业反馈] - 实际查询逻辑
const getStudentVisible = async () => { const getStudentVisible = async () => {
if (classTaskStore.classListIds.length <= 0) { if(!classWorkList.value.length>0){
return return;
} }
// 班级作业数据，多个班级
const response = await listByDeadDate({ const response = await listByDeadDate({
classidarray: classTaskStore.classListIds.join(','),
edituserid: userStore.userId, // 老师的id edituserid: userStore.userId, // 老师的id
edustage: userStore.edustage,// 学段 edustage: userStore.edustage, // 学段
edusubject: userStore.edusubject,//学科 edusubject: userStore.edusubject,//学科
// deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 startdate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[0]),
deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期 deaddate: tabActive.value === '待批改'? '' : getDateFormatDate(startEndDate.value[1]),// 待批改：明天，已批改：选择的日期
status: '1', // 作业状态：1-已发布 status: tabActive.value === '待批改'? '1' : '2', // 作业状态：1-已发布
// orderby: 'concat(deaddate,uniquekey) DESC',
orderby: 'deaddate DESC', orderby: 'deaddate DESC',
pageSize: 100 pageSize: 100,
}) })
/** let list = response.rows || [];
* 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/
let list = [];
if(tabActive.value === '进行中'){
// 进行中 当前日期时间 小于 截止 日期时间
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
}else{
list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
}
const curWorkList = list let newList = [];
for(let i = 0; i < classWorkList.value.length; i++){
/** // 父list的id与子list的id相等，在进行对比；若是不等？ 有可能是老师批阅完了这个list数据，变成了已批改状态中，则父list数据需要删除
* warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致, const isList = list.filter((item) => item.id === classWorkList.value[i].id);
* 故这里需循环this.classWorkList且只更新当前页面中的存在的任务进度 if(isList.length === 0){
*/ // 父list的id与子list的id不相等，则删除父list数据
for (let t = 0; t < classWorkList.value.length; t++) { classWorkList.value.splice(i,1);
// 当前时间超过[作业任务]截止时间的跳过 }
// if( getDateTime > classWorkList.value[t].deaddate ){ for(let j = 0; j < list.length; j++){
// continue; // workdataresultcount 学生提交了的个数;
// } if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].workdataresultcount != list[j].workdataresultcount){
// 确保当前拿到的任务与页面中存在的任务能一对一(避免因删除其他操作而删除作业任务导致两个数组的index不统一而越界) // 学生提交数 ！= 学生提交数？
let curWork = curWorkList.find((work) => work.id === classWorkList.value[t].id) newList.push(list[j]);
// workdataresultcount 完成人数 workdatacount人数要大于0
if (curWork && curWork.workdataresultcount > 0 && classWorkList.value[t].workdatacount > 0) {
classWorkList.value[t].workdataresultcount = curWork.workdataresultcount
// 桌面端貌似不需要进度条了？
classWorkList.value[t].finishpercent = parseInt(
(classWorkList.value[t].workdataresultcount / classWorkList.value[t].workdatacount) * 100
)
// 计算参与学习任务的平均用时
if (classWorkList.value[t].workdatafeedbackcount > 0) {
classWorkList.value[t].averagetime = Math.ceil(classWorkList.value[t].feedtimelength / classWorkList.value[t].workdatafeedbackcount / 60).toFixed(0)
} else {
classWorkList.value[t].averagetime = 0
} }
// 更新批阅数 // teacherrationgcount 已批阅人数
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount if(classWorkList.value[i].id === list[j].id && classWorkList.value[i].teacherrationgcount != list[j].teacherrationgcount){
} else { // 更新批阅进度条
// 学生未完成，但是老师批改了？ if (classWorkList.value[i].workdataresultsum > 0) {
if(curWork && curWork.workdataresultcount == 0){ // 更新批阅数、 进度条
// 更新批改数 classWorkList.value[i].teacherrationgcount = list[j].teacherrationgcount;
classWorkList.value[t].teacherrationgcount = curWork.teacherrationgcount classWorkList.value[i].teacherCorrectionProgress = parseInt(
((list[j].teacherrationgcount) / list[j].workdataresultsum) * 100
)
} else {
classWorkList.value[i].teacherCorrectionProgress = 0
}
} }
classWorkList.value[t].finishpercent = 0
} }
} }
if(newList.length>0){
return 1 // 更新学生提交后的数据？ 作业进度条、平均用时、得分率
const list = newList&&newList.filter((item) => item.workdataresultcount > 0) ;
getStudentClassWorkData(list,false);
}
} }
@ -489,16 +422,27 @@ const getStudentVisible = async () => {
watch( watch(
() => [dataList, toolState.isTaskWin], () => [dataList, toolState.isTaskWin],
() => { () => {
console.log('=监听到批改窗口打开了===', toolState.isTaskWin) console.log('监听--批改窗口是否打开===', toolState.isTaskWin)
if(!toolState.isTaskWin){ if(!toolState.isTaskWin){
if(tabActive.value === '待批改'){
closeDialog();// 开启轮询 closeDialog();// 开启轮询
}
} }
} }
) )
watch(tabActive, (newVal,oldVal)=>{ watch(tabActive, (newVal,oldVal)=>{
console.log('newVal',newVal); console.log('newVal',newVal);
getData() // 加载数据 getData() // 加载数据
if(newVal === '待批改'){
// 轮询查询
console.log('监听---开启轮询')
closeDialog();
}else{
// 关闭轮询
console.log('监听---关闭轮询')
clearInterval(pollingST.value);
}
}) })
</script> </script>

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

@ -427,7 +427,7 @@ import useUserStore from '@/store/modules/user'
import { ref, reactive } from 'vue' import { ref, reactive } from 'vue'
// import { Plus } from '@element-plus/icons-vue' // import { Plus } from '@element-plus/icons-vue'
import { ElMessageBox, ElMessage } from 'element-plus' import { ElMessageBox, ElMessage } from 'element-plus'
import { updateClassworkeval, updateClassworkdata, getClassworkdata, updateClassworkevalList } from '@/api/classTask' import { updateClassworkeval,updateClasswork, updateClassWorkDataAutoFinish, getClassworkdata, updateClassworkevalList } from '@/api/classTask'
import { getTimeDate } from '@/utils/date' import { getTimeDate } from '@/utils/date'
import ReFilePreview from '@/components/refile-preview/index.vue' import ReFilePreview from '@/components/refile-preview/index.vue'
import { quizStrToList } from '@/utils/comm'; import { quizStrToList } from '@/utils/comm';
@ -871,6 +871,13 @@ const onSubmit = () => {
}) })
return return
} }
/** 1、 更新当前作业是否已经批阅完成 */
// TODO updateClasswork
/** 2、 更新每个学生的批阅 */
var formd = { var formd = {
id: dialogProps.value.studentObj.id, // this.activeClassWork.id; id: dialogProps.value.studentObj.id, // this.activeClassWork.id;
@ -878,7 +885,7 @@ const onSubmit = () => {
updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm; updatedate: getTimeDate(),// = year+'-'+month+'-'+day+' '+hh+':'+mm;
}; };
// 更新作业批改状态 // 更新作业批改状态
updateClassworkdata(formd).then(res => { updateClassWorkDataAutoFinish(formd).then(res => {
}) })
// 更新题目批改 // 更新题目批改

60
src/renderer/src/views/classTask/container/classTask/task-item.vue
View File

@ -14,31 +14,40 @@
&nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }} &nbsp;|&nbsp; 截止时间：{{ item.deaddate }} &nbsp;|&nbsp;{{ tabactive }}
</div> </div>
</div> </div>
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.finishpercent" :color="'#000fff'" style="cursor: pointer"></el-progress>
<span>
已交(
<span>
<span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
<span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
/{{ item.workdataresultsum }}
</span>
)
</span>
</div>
<div v-if=" tabactive == '待批改' " class="class-reserv-item-progress">
<el-progress :text-inside="true" :stroke-width="26" :percentage="item.teacherCorrectionProgress" :color="'#ff7f00'" style="cursor: pointer"></el-progress>
<span>
已批阅(<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount}}</span>)
</span>
</div>
<!-- TODO 练习次数、引用次数 这里随便的假数据-->
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultsum }}</span>
<span>练习次数</span>
</div>
<div v-if=" tabactive == '已批改' " class="class-reserv-item-tool">
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdataresultsum - item.teacherrationgcount:item.workdataresultsum }}</span>
<span>引用次数</span>
</div>
<div class="class-reserv-item-tool"> <div class="class-reserv-item-tool">
<span> <span>
<span v-if="item.workdataresultcount!=0" style="color:#000fff; font-weight: 900; font-size: 15px">{{ item.workdataresultcount }}</span>
<span v-if="item.workdataresultcount==0">{{ item.workdataresultcount }}</span>
/{{ item.workdatacount }}</span>
<span>已交</span>
</div>
<div class="class-reserv-item-tool">
<!-- 总人数-已批阅人数 -->
<span style="color: #ff7f00; font-weight: 900; font-size: 15px">{{ item.teacherrationgcount?item.workdatacount - item.teacherrationgcount:item.workdatacount }}</span>
<span>待批阅</span>
</div>
<div class="class-reserv-item-tool">
<span>
<!-- {{ item.averagetime?item.averagetime:0 }} -->
<!-- <span v-if=" item.averagetime<60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span>
<span v-if=" item.averagetime==60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">1</span>小时
</span>
<span v-if=" item.averagetime>60 ">
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime / 60)}}</span>小时
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ Math.floor(item.averagetime % 60)}}</span>分钟
</span> -->
<span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟 <span style="color: #007fff; font-weight: 900; font-size: 15px">{{ item.averagetime }}</span>分钟
</span> </span>
<span>平均用时</span> <span>平均用时</span>
@ -97,6 +106,11 @@ const props = defineProps({
} }
} }
} }
.class-reserv-item-progress {
width: 200px;
padding: 0 10px;
font-size: 14px;
}
.class-reserv-item-tool { .class-reserv-item-tool {
margin-left: 10px; margin-left: 10px;
display: flex; display: flex;

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

@ -1,821 +0,0 @@
<template>
<el-dialog
v-model="classWorkAnalysis.open"
:modal-append-to-body="false"
class="clwk_dialog"
style="width: 90%; height: 85vh"
:show-close="false"
top="8vh"
append-to-body
destory-on-close
:before-close="onBeforeClose"
>
<template #header>
<div style="font-size: 18px; display: flex; flex-wrap: nowrap">
<div style="flex: 1">
{{ classWorkAnalysis.title }}完成情况
<el-tag :type="classWorkAnalysis.workclass" size="large" style="height: 25px">{{
classWorkAnalysis.worktype
}}</el-tag>
</div>
<!-- classWorkAnalysis.entpcourseworklistarray 当前学习任务所包含的试题ID -->
<el-row
v-if="classWorkAnalysis.entpcourseworklistarray.length > 0"
style="margin: 0 auto; flex: 1"
>
<el-button-group style="margin-bottom: 10px">
<el-button
:type="classWorkAnalysis.view == 'studentview' ? 'success' : ''"
@click="classWorkAnalysis.view = 'studentview'"
>作业批阅</el-button
>
<el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'quizStats' ? 'success' : ''"
@click="workHandle('quizStats')"
>逐题讲评</el-button
>
<el-button
v-if="classWorkAnalysis.row.worktype == '习题训练'"
:type="classWorkAnalysis.view == 'report' ? 'success' : ''"
@click="handleClassOverviewOpen('report')"
>训练报告</el-button
>
</el-button-group>
</el-row>
<div style="flex: 1">
<div
style="float: right; padding: 0 10px; cursor: pointer"
icon="el-icon-close"
@click="closeDialog"
>
x
</div>
</div>
</div>
</template>
<!-- 如果当前学习没有试题 :height="mainHeight"-->
<div
v-if="classWorkAnalysis.view == 'studentview'"
style="width: 100%; height:73vh; "
class="clwk_dialog_view"
>
<div class="view_table">
<el-radio-group
v-model="tableRadio.value"
style="margin-bottom: 1px"
@change="tableRadioChange"
>
<el-radio-button :value="1" :label="'已交' + '（' + tableRadio.num1 + '）'" />
<el-radio-button :value="0" :label="'未交' + '（' + tableRadio.num0 + '）'" />
</el-radio-group>
<!-- 学生列表：classWorkAnalysis.classworkdata; 已交未交：tableRadio.list -->
<el-table
v-loading="loading_dt_table"
:data="tableRadio.list"
row-key="id"
style="height: 69vh;"
highlight-current-row
@row-click="getStudentClassWorkDataDetail"
>
<el-table-column type="index" label="序号" width="52" reserve-selection align="center" />
<el-table-column label="姓名" prop="studentname" width="100" align="center" />
<el-table-column :label="tableRadio.value==0?'提交状态':'提交时间'" prop="updatedate" width="170" align="center">
<template #default="scope">
<span v-if="tableRadio.value==0" style="color: #2196f3">未提交</span>
<span v-if="tableRadio.value==1">{{ scope.row.updatedate }}</span>
</template>
</el-table-column>
<el-table-column :label="tableRadio.value==0?'':'得分'" prop="score" width="80" align="center" >
<template #default="scope" v-if="tableRadio.value==1">
<span style="color: #2196f3">{{scope.row.getScore || 0}}</span>
</template>
</el-table-column>
<el-table-column label="批阅状态" prop="teacherRating" align="center" width="120" sortable>
<template #default="scope">
<template v-if="scope.row.teacherRating == 0">
<span v-if="tableRadio.value==1" style="color: #2196f3">待批阅</span>
</template>
<!-- 1-优 2-优减 3-良 4-良减 5-差 -->
<template v-if="scope.row.teacherRating == 1"
><el-tag type="danger">完美</el-tag></template
>
<template v-if="scope.row.teacherRating == 2"
><el-tag type="danger">优秀</el-tag></template
>
<template v-if="scope.row.teacherRating == 3"
><el-tag type="warning">良好</el-tag></template
>
<template v-if="scope.row.teacherRating == 4"
><el-tag type="info">及格</el-tag></template
>
<template v-if="scope.row.teacherRating == 5"
><el-tag type="info">不及格</el-tag></template
>
</template>
</el-table-column>
</el-table>
</div>
<div class="view_teachrting">
<div class="classwork-score">
<div v-if="classWorkAnalysis.activeStudentQuizlist.length == 0">
<el-empty
description="点击左侧表格学生信息可查看批阅详情"
style="width: 100%; height: 500px"
></el-empty>
</div>
<div v-else>
<div v-if="isopen_dtwk_table">
<div v-show="classWorkAnalysis.activeStudentQuizlist.length > 0">
<item-dialog-score
ref="classWorkAnalysisScoreDialogRef"
@class_work_score_submit="onClassWorkScoreSubmit"
/>
</div>
</div>
<div v-else>
<el-empty
description="点击左侧表格学生信息可查看批阅详情"
style="width: 100%; height: 500px"
></el-empty>
</div>
</div>
</div>
</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 :active-data="classWorkActiveData" :table-list="overviewData"></ClassOverview>
</div>
<!-- <template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="classWorkAnalysis.open=false">关 闭</el-button>
</div>
</template> -->
</el-dialog>
</template>
<script setup name="itemDialogRef">
import { ref, defineExpose, onMounted, reactive, computed, watch, onUnmounted, nextTick, getCurrentInstance } from 'vue'
import { addSmartClassReserv, updateSmartClassReserv, listClassmain } from '@/api/classManage'
import { listClassworkdata, listEntpcoursework, listClassworkeval } from '@/api/classTask'
import useUserStore from '@/store/modules/user'
import { ElMessage } from 'element-plus'
import { getCurrentTime, getAfterMinutes } from '@/utils/date'
import { processList } from '@/hooks/useProcessList'
import ItemDialogScore from '@/views/classTask/container/classTask/item-dialog-score.vue'
// zdg: 组件导入
import quizStats from '@/views/classTask/container/quizStats.vue'
import ClassOverview from '@/views/classTask/container/classOverview.vue'
const { proxy } = getCurrentInstance()
const emit = defineEmits(['cle-click'])
const props = defineProps({
bookId: {
type: Number,
default: 0
},
})
const mainHeight = ref(document.documentElement.clientHeight - 110)
const classWorkAnalysis = reactive({
open: false
})
const tableRadio = reactive({
value: '1', // 已交
list: [], // 已交list
num1: 0, // 已交人数
num0: 0 // 未交人数
}) // 批阅 是否已交
const loading_dt_table = ref(false)
const isopen_dtwk_table = ref(false)
// zdg: 逐题讲评
const classWorkActiveData = reactive({
quizlist: [], // 当前习题列表
studentList: [], // 当前课程-所有学生
workFeedList: [], // 当前课程-所有学生反馈数据
timerId: 0 // 定时器id
})
//所选学生题目- 答题题目分析与评价
const classWorkAnalysisScore = reactive({
studentObj: {}, // 当前学生的作业题型等信息
studentQuizAllList: [], // 选择学生的回答list
quizlist: [] // 选择学生的题目list
})
//查看学生概况数据
const overviewData = ref([])
// watch(
// // () => props.currentNode,
// (newValue, oldValue) => {
// form.name = newValue.label
// }
// )
const openDialog = (data) => {
console.log(data, '点击的item完成情况')
classWorkAnalysis.title = data.uniquekey ? data.uniquekey + '--' : ''
classWorkAnalysis.worktype = data.worktype
classWorkAnalysis.workclass = data.workclass
// 重置学生列表
tableRadio.list = []
tableRadio.value = '1'
tableRadio.num0 = 0
tableRadio.num1 = 0
classWorkAnalysis.open = true
// 默认显示是学生作业反馈
classWorkAnalysis.view = 'studentview'
// 当前学习任务所包含的试题ID
classWorkAnalysis.entpcourseworklistarray = data.entpcourseworklistarray
// 默认选中的学生
classWorkAnalysis.activeStudentQuizlist = []
// 默认选中的试题
classWorkAnalysis.activeQuizAnalysisData = []
classWorkAnalysis.row = data
// window.test = this
// zdg: 学生列表
const studentArr = data.classworkdatastudentids
? JSON.parse(`[${data.classworkdatastudentids}]`)
: []
classWorkActiveData.studentList = studentArr
/** 学生完成情况分析--获取作业学生list数据 */
getClassWorkStudentList(data.id)
// 课程列表idlist
var ids = []
for (var i = 0; i < data.entpcourseworklistarray.length; i++) {
ids.push(data.entpcourseworklistarray[i].id)
}
// 课程作业列表
listEntpcoursework({ ids: ids.join(','), pageSize: 500 }).then((idres) => {
for (var i = 0; i < idres.rows.length; i++) {
// //新增了 复合题、主观题（背景+小题目） 题目标题优化一下 .replace(/!@#\$%/g,'')
idres.rows[i].titletext = idres.rows[i].title.replace(/!@#\$%/g, '')
}
classWorkAnalysis.quizlist = idres.rows
classWorkActiveData.quizlist = idres.rows // zdg: 作业概览组件使用
processList(classWorkActiveData.quizlist);
// 统计每个题目的正误率
// 这个学习任务所有题目+所有学生的答题数据 , pageSize: 100
listClassworkeval({ workid: data.id, pageSize: 1000 }).then((wevalres) => {
for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
// 分析每一道题目
var scoingCount = 0
var feedcount = 0
// 全部人数
var evalCount = 0
for (var w = 0; w < wevalres.rows.length; w++) {
if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
evalCount++
// 只统计有回答的题目
if (wevalres.rows[w].feedcontent != '') {
// 已经作答的人数
feedcount++
// 简单判断正误
if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
wevalres.rows[w].scoingStatus = true
scoingCount++
// 学生回答与参考答案一样，则：得分=分值
wevalres.rows[w].teacherRating = wevalres.rows[w].score
} else {
wevalres.rows[w].scoingStatus = false
}
}
}
}
classWorkAnalysis.quizlist[i].evalCount = evalCount
// 作答人数
classWorkAnalysis.quizlist[i].feedcount = feedcount
// 得分率 这里优化一下（没回答会是NaN%） scoingRate
if (scoingCount == 0 && feedcount == 0) {
classWorkAnalysis.quizlist[i].scoingRate = '0%'
} else {
classWorkAnalysis.quizlist[i].scoingRate =
((scoingCount / feedcount) * 100).toFixed(0) + '%'
}
}
// zdg: 所有反馈数据
const getStudentid = (workdataid) => {
// 获取学生id
const classworkdata = (classWorkAnalysis.classworkdata || []).find(
(o) => o.id === workdataid
)
return classworkdata ? classworkdata.studentid : ''
}
wevalres.rows.forEach((o) => {
o.studentid = getStudentid(o.workdataid)
})
classWorkActiveData.workFeedList = wevalres.rows
})
})
console.log(classWorkAnalysis, '点击进度后获得的数据')
}
//#region 学生完成情况分析
/** 1、获取作业学生列表 */
const getClassWorkStudentList = (rowId) => {
// 本地保存这个rowid，老师批改后续中使用
localStorage.setItem('activeClassWorkRowId', rowId)
// 先清空表格中的数据
classWorkAnalysis.classworkdata = []
// 加载中_
loading_dt_table.value = true
// 找当前学习任务的classworkdata数据
listClassworkdata({ classworkid: rowId, pageSize: 100 })
.then((response) => {
for (var i = 0; i < response.rows.length; i++) {
if (response.rows[i].entpcourseworklist != '') {
response.rows[i].entpcourseworkarray = JSON.parse(
'[' + response.rows[i].entpcourseworklist + ']'
)
} else {
response.rows[i].entpcourseworkarray = []
}
// 老师批阅状态 默认0 未批改
response.rows[i].teacherRating = 0
// 计算每个学生的得分率
if (
response.rows[i].classworkevallist != '' &&
response.rows[i].classworkevallist != null &&
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\"}]\",
// json转换会报错； .replace(/""/g, '"') eg: ""宇宙环境安全""
response.rows[i].classworkevallist = escapeHtmlQuotes(response.rows[i].classworkevallist)
//console.log('学生完成情况分析classworkevallist', response.rows[i].classworkevallist)
const evalarray = JSON.parse('[' + response.rows[i].classworkevallist + ']')
var scoingCount = 0
var feedcount = 0
let score = 0
for (var e = 0; e < evalarray.length; e++) {
if (evalarray[e].feedcontent != '') {
feedcount++
// 与答案对比正误。注意注意，这里仅限单选题
if (evalarray[e].feedcontent == evalarray[e].rightanswer) {
scoingCount++
score += evalarray[e].score;
evalarray[e].teacherRating = evalarray[e].score
}
}
}
const allScore = evalarray.reduce((acc, cur) => acc + cur.score, 0)
//console.log(evalarray, 'evalarray------------------------------------')
if (feedcount > 0) {
// 多个题目的总得分率: 正确题数/（题目数*100）
response.rows[i].scoingRate = ((score / allScore) * 100).toFixed(0) + '%'
response.rows[i].getScore = score
} else {
response.rows[i].scoingRate = '0%'
response.rows[i].getScore = 0
}
// 批阅状态 优良类 :注意：这里题目中的评价都是一样的，所以取第一个
if (evalarray[0].rating != '') {
response.rows[i].teacherRating = evalarray[0].rating
}
} else {
response.rows[i].scoingRate = '0%'
response.rows[i].getScore = 0
}
}
classWorkAnalysis.classworkdata = response.rows
loading_dt_table.value = false
// 默认获取已交的学生列表
tableRadio.list =
classWorkAnalysis.classworkdata &&
classWorkAnalysis.classworkdata.filter((item) => item.finishtimelength != '0')
tableRadio.value = '1'
tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length
tableRadio.num1 = tableRadio.list.length
tableRadio.list = tableRadio.list.map((item) => {
return {
...item,
teacherRating : checkWorkType(item)
}
})
})
.catch(() => {
loading_dt_table.value = false
})
}
const checkWorkType = (item) => {
//这里判断题目类型
const subType = classWorkActiveData.quizlist.map(item => item.worktype)
const objectiveQuestion = ['单选题','多选题','判断题']
let rating = 0
//判断题目是不是客观题
if(subType.every(item => objectiveQuestion.includes(item))){
// 获取学生答题列表
const score = extractedNumber(item.scoingRate)
if(0<=score && score<=59){
rating = 5
}else if(60<=score && score<=69){
rating = 4
}else if(70<=score && score<=79){
rating = 3
}else if(80<=score && score<=99){
rating = 2
}else{
rating = 1
}
}
return rating
}
// 获取百分比的数字
const extractedNumber = (score) => {
const match = score.match(/\d+/);
return match ? parseInt(match[0], 10) : null;
}
/** 2、查看某一个学生的学习任务完成详情*/
const getStudentClassWorkDataDetail = (row) => {
// 这里取出的是学生完成情况
// 具体的题目数据在this.classWorkAnalysis.quizlist里
console.log(row, '点击了左侧学生')
//更新到待批改的学生信息中
classWorkAnalysisScore.studentObj = row
listClassworkeval({ workdataid: row.id, pageSize: 100 })
.then((wevalres) => {
for (var i = 0; i < classWorkAnalysis.quizlist.length; i++) {
// 分析每一道题目
for (var w = 0; w < wevalres.rows.length; w++) {
if (wevalres.rows[w].entpcourseworkid == classWorkAnalysis.quizlist[i].id) {
wevalres.rows[w].quiztitle = classWorkAnalysis.quizlist[i].title
wevalres.rows[w].quiztitletext = classWorkAnalysis.quizlist[i].title.replace(
/<[^>]*>/g,
''
)
wevalres.rows[w].score = wevalres.rows[w].score ? wevalres.rows[w].score : 0
// 参考答案 去除下html标签
// wevalres.rows[w].rightanswer =
// wevalres.rows[w].rightanswer != '' && wevalres.rows[w].rightanswer != null
// ? wevalres.rows[w].rightanswer.replace(/<[^>]+>/g, '')
// : wevalres.rows[w].rightanswer
// // 学生回答 去除下html标签
// wevalres.rows[w].feedcontent =
// wevalres.rows[w].feedcontent != '' && wevalres.rows[w].feedcontent != null
// ? wevalres.rows[w].feedcontent.replace(/<[^>]+>/g, '')
// : wevalres.rows[w].feedcontent
if (classWorkAnalysis.row.worktype == '常规作业') {
wevalres.rows[w].feedcontent = JSON.parse(wevalres.rows[w].feedcontent)
}
if (wevalres.rows[w].feedcontent != '') {
if (wevalres.rows[w].feedcontent == wevalres.rows[w].rightanswer) {
wevalres.rows[w].scoingStatus = true
// 学生回答与参考答案一样，则：得分=分值
wevalres.rows[w].teacherRating = wevalres.rows[w].score
} else {
wevalres.rows[w].scoingStatus = false
}
} else {
wevalres.rows[w].scoingStatus = ''
}
// 计算得分
}
// "回答" prop="feedcontent" width="200" align="center"></el-table-column>
// <el-table-column label="参考答案" prop="rightanswer"
//新增了 复合题、主观题（背景+小题目） 题目标题优化一下
wevalres.rows[w].worktitle = wevalres.rows[w].worktitle.replace(/!@#\$%/g, '')
// 将feedcontent中的\r替换为<br />
wevalres.rows[w].feedcontent = wevalres.rows[w].feedcontent.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
}
}
classWorkAnalysis.activeStudentQuizlist = wevalres.rows
// 加载右边表格
isopen_dtwk_table.value = true
// 加载右边评语区域
if (wevalres.rows.length > 0) {
handleClassWorkAnalysissScoreOpen(row)
} else {
ElMessage({
type: 'warning',
message: '未获取到答题信息，请稍后再看，或者联系管理员查看情况！'
})
}
})
.catch(() => {
console.log('获取完成情况失败')
ElMessage({
type: 'warning',
message: '未获取到答题信息！'
})
})
}
/** 3、教师批改后返回的方法*/
const onClassWorkScoreSubmit = () => {
console.log('批改后返回的方法')
loading_dt_table.value = true
isopen_dtwk_table.value = false
// 1、清空完成情况的两个table数据，- 左侧学生列表：classWorkAnalysis.classworkdata；- 右侧学生回答题目列表：classWorkAnalysis.activeStudentQuizlist
// - 左侧学生列表
classWorkAnalysis.classworkdata = []
classWorkAnalysis.activeStudentQuizlist = []
// 2、刷新左侧学生列表数据，更新批改状态
const rowid = localStorage.getItem('activeClassWorkRowId')
getClassWorkStudentList(rowid)
}
// 查看并批改一个学生的题目作答(答题题目分析与评价)
const handleClassWorkAnalysissScoreOpen = (row) => {
console.log(row, '所选点击的信息')
// 当前学生的回答list
classWorkAnalysisScore.studentQuizAllList = classWorkAnalysis.activeStudentQuizlist
// 当前学生的所有题目list
classWorkAnalysisScore.quizlist = classWorkAnalysis.quizlist
// 格式化试题格式信息
processList(classWorkAnalysisScore.quizlist)
// 屏幕高度
classWorkAnalysisScore.maxheight = mainHeight.value - 100
// 防止组件未渲染完成 调用里面方法报错
nextTick(() => {
proxy.$refs.classWorkAnalysisScoreDialogRef.acceptParams(classWorkAnalysisScore)
})
}
//#endregion
/** 批阅：已交未交事件 */
const tableRadioChange = (e) => {
// 关闭右侧批阅ui
isopen_dtwk_table.value = false;
console.log(e,'??????')
console.log("学生列表：", classWorkAnalysis.classworkdata)
if(e=='1'){
tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength != '0')
tableRadio.value = '1';
tableRadio.num0 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
tableRadio.num1 = tableRadio.list.length;
}else if(e=='0'){
tableRadio.list = classWorkAnalysis.classworkdata.filter(item => item.finishtimelength == '0')
tableRadio.value = '0';
tableRadio.num0 = tableRadio.list.length;
tableRadio.num1 = classWorkAnalysis.classworkdata.length - tableRadio.list.length;
}
}
// 将标签中的双引号增加转义
const escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
result = str.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
return result;
}
//#region 逐题讲评
// 查看学生-作业概览
const workHandle = (type) => {
// 关闭右侧批阅ui
isopen_dtwk_table.value = false;
classWorkAnalysis.view = type
const isClose = type != 'quizStats' && !! classWorkActiveData.timerId
const isOpen = type == 'quizStats' && !classWorkActiveData.timerId
// 每次进来都重新调用一次
if(type == 'quizStats') {
getWorkFeedList();
}
if (isClose) clearInterval(classWorkActiveData.timerId) // 关闭定时器
if (isOpen) {
// 轮询 更新学生作答数据
classWorkActiveData.timerId = setInterval(() => {
console.log('zdg: 定时执行')
getWorkFeedList()
}, 20 * 1000);
}
}
// 获取学生答题回馈数据-更新
const getWorkFeedList = async() =>{
const workid = classWorkAnalysis.row.id
const res = await listClassworkeval({workid, isFinish: 1, pageSize: 1000})
const getStudentid = (workdataid) => { // 获取学生id
const classworkdata = (classWorkAnalysis.classworkdata||[]).find(o => o.id === workdataid)
return classworkdata ? classworkdata.studentid : ''
}
res.rows.forEach(o => { o.studentid = getStudentid(o.workdataid) })
classWorkActiveData.workFeedList = res.rows
}
//#endregion
//#regin 训练报告
/*
author: yangws
time: 2024-8-06 16:35:33
function: 训练报告的处理
*/
const handleClassOverviewOpen = (type) =>{
// 关闭右侧批阅ui
isopen_dtwk_table.value = false;
classWorkAnalysis.view = type
const data = classWorkAnalysis.row
//获取所有学生列表
listClassworkdata({classworkid: data.id, pageSize: 100}).then((response) => {
if(response.code === 200){
response.rows.forEach(item => {
let rightAnswer = 0
let answers = 0
let score = 0
if(!item.classworkevallist) return
// 使用正则表达式替换字符串值中的双引号为单引号
let replacedString = item.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(item.classworkevallist);
let allTopic
try{
allTopic = JSON.parse(`[${item.classworkevallist}]`)
}catch{
allTopic = JSON.parse(`[${replacedString}]`)
}
if(item.classworkevallist != ''){
allTopic.forEach(itemTopic => {
if(itemTopic.feedcontent != ''){
answers ++
//正确答案，仅限单选题
if(itemTopic.feedcontent === itemTopic.rightanswer){
rightAnswer ++
score += itemTopic.score
itemTopic.teacherRating = itemTopic.score
}
}
})
const allScore = allTopic.reduce((acc, cur) => {
return acc + cur.score;
},0)
rightAnswer > 0?item.scoingRate = (score/allScore * 100).toFixed(0):item.scoingRate = ''
}else{
item.scoingRate = ''
item.getScore = 0
}
//获得总分
const point = allTopic.reduce((acc, cur) => {
if(cur.rating !== 0){
return acc + cur.teacherRating;
}
},0)
// item.chapter = this.courseObj.evalid
item.point = point || 0
item.rating = allTopic[0].rating
})
overviewData.value = [...response.rows]
}
})
}
//#endregion
const onBeforeClose = () =>{
console.log('非正常关闭dialog?esc、dialog外部区域')
closeDialog()
}
const closeDialog = () => {
classWorkAnalysis.open = false
emit('cle-click')
}
watch(classWorkAnalysis, (newVal, oldVal) => {
if(newVal.view != 'quizStats'){
console.log('关闭zdg: 定时执行')
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
}
})
onUnmounted(() => {
clearInterval(classWorkActiveData.timerId) // 关闭定时器 逐题讲评的
})
defineExpose({
openDialog,
})
</script>
<style scoped lang="scss">
/*:deep(.reserv-date-pick) {
width: 140px;
}
:deep(.reserv-time-pick) {
width: 240px;
}*/
.clwk_dialog {
.clwk_dialog_view {
display: flex;
flex-direction: row;
justify-content: flex-start;
overflow: hidden;
}
.view_table {
flex: 0 0 auto;
height: 100%;
overflow: hidden;
}
.view_teachrting {
flex: 1;
height: 100%;
/*overflow-y: auto; */
overflow: hidden;
}
}
.clwk_dialog {
display: flex;
justify-content: center;
overflow: hidden;
}
.clwk_dialog .el-dialog {
margin: 0 auto !important;
height: 85%!important;
overflow: hidden;
}
.clwk_dialog .el-dialog__header {
/* position: absolute;
top: 0;
left: 0; */
width: 100%!important;
}
.clwk_dialog .el-dialog__body {
position: absolute;
left: 0;
top: 15px;
bottom: 1px;
right:0;
padding:5px;
z-index:1;
display: flex;
flex-direction: column;
overflow: hidden;
/* overflow:hidden;
overflow-y: auto; */
}
.clwk_dialog .el-dialog__footer{
position: absolute;
bottom: 10px;
right: 10px;
}
.clwk_dialog .classwork-score{
overflow-y: auto;
}
</style>
<style scoped>
.clwk_dialog {
display: flex;
justify-content: center;
overflow: hidden;
}
.clwk_dialog .el-dialog {
margin: 0 auto !important;
height: 85%!important;
overflow: hidden;
}
.clwk_dialog .el-dialog__header {
/* position: absolute;
top: 0;
left: 0; */
width: 100%!important;
}
.clwk_dialog .el-dialog__body {
position: absolute;
left: 0;
top: 15px;
bottom: 1px;
right:0;
padding:5px;
z-index:1;
display: flex;
flex-direction: column;
overflow: hidden;
/* overflow:hidden;
overflow-y: auto; */
}
.clwk_dialog .el-dialog__footer{
position: absolute;
bottom: 10px;
right: 10px;
}
.clwk_dialog .classwork-score{
overflow-y: auto;
}
</style>
<style src="@/assets/styles/JYStyle.css"></style>

336
src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
View File

@ -89,8 +89,8 @@
</el-col> </el-col>
</el-row> </el-row>
<!-- 习题表格 --> <!-- 习题表格 -->
<div class="middle" > <div class="infinite-list-wrapper" >
<el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;"> <!-- <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
<el-table-column type="index" width="60" /> <el-table-column type="index" width="60" />
<el-table-column align="left" > <el-table-column align="left" >
<template #header> <template #header>
@ -114,7 +114,48 @@
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button> <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table> -->
<ul
v-infinite-scroll="pageLoad"
class="infinite-list"
infinite-scroll-immediate="false"
infinite-scroll-distance='1'
infinite-scroll-delay="1000"
:infinite-scroll-disabled="pageDisabled"
>
<li v-for="(item,index) in workResource.entpCourseWorkList" :key="item" class="infinite-list-item">
<div align="left" style="width: 100%;" >
<!-- <template #header>
<div style="display: flex">
<div style="align-items: center;">题目内容</div>
</div>
</template> -->
<div @click="showExamAnalyseDrawer(item)">
<div>
<span style="width: 20px;">{{ index +1 }}. </span>
<span style="overflow: hidden; text-overflow: ellipsis" v-html="item.titleFormat"></span>
</div>
<div style="overflow: hidden; text-overflow: ellipsis; font-size: 0.9em; margin-top: 6px;" v-html="item.workdescFormat"></div>
<el-col :span="24" style="display: flex">
<div style="font-size: 1em; color: silver; padding-top: 5px">{{ item.entpname }} {{ item.editusername }}</div>
<div style="margin-left: 30px; font-size: 1em; color: silver; padding-top: 5px">{{ item.worktag }}</div>
</el-col>
</div>
</div>
<div align="right" style="width: 72px;">
<el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', item.id)">添加</el-button>
</div>
</li>
</ul>
<p class="infinite-list-loading" v-if="pageParams.loading">加载中...</p>
<p class="infinite-list-noMove" v-if="pageNoMore">无更多试题...</p>
<div v-if="workResource.entpCourseWorkList.length == 0 && !pageParams.loading">
<el-empty
description="未找到相关试题"
style="width: 100%; height: 200px; margin-top: 20px;"
></el-empty>
</div>
</div> </div>
<!-- 分页 这里不用--> <!-- 分页 这里不用-->
<!-- <div style="height: 55px;"> <!-- <div style="height: 55px;">
@ -231,14 +272,14 @@
</template> </template>
<script setup> <script setup>
import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance } from 'vue' import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance, computed } from 'vue'
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import { cloneDeep } from 'lodash' import { cloneDeep } from 'lodash'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork' import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
import { addClassworkReturnId } from '@/api/teaching/classwork' import { addClassworkReturnId } from '@/api/teaching/classwork'
import { updateClasswork, listEvaluationclue,readFile, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask' import { updateClasswork, listEvaluationclue, listClassworkeval,delClassworkeval,addClassworkeval,updateClassworkeval } from '@/api/classTask'
import { listEvaluation } from '@/api/subject' import { listEvaluation } from '@/api/subject'
import { listEntpcoursefile } from '@/api/education/entpcoursefile' import { listEntpcoursefile } from '@/api/education/entpcoursefile'
import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint"; import { listKnowledgePoint } from "@/api/knowledge/knowledgePoint";
@ -250,7 +291,9 @@ import FileUpload from "@/components/FileUpload/index.vue";
import whiteboard from '@/components/whiteboard/whiteboard.vue' import whiteboard from '@/components/whiteboard/whiteboard.vue'
import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue' import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue' import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
import {throttle,debounce } from '@/utils/comm'
import { useToolState } from '@/store/modules/tool' import { useToolState } from '@/store/modules/tool'
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const userStore = useUserStore().user const userStore = useUserStore().user
@ -364,6 +407,24 @@ const boardLoading = ref(false);
//常规作业---------- //常规作业----------
const fileLoading = ref(false); // 常规作业loading const fileLoading = ref(false); // 常规作业loading
// 下拉滚动参数
const BASE_LIMIT_COUT = 50; // 总加载额外试题数
const pageNoMore = computed( () => {
if (pageParams.value.total < 1) {
return false;
}
let count = BASE_LIMIT_COUT >= pageParams.value.total ? pageParams.value.total : pageParams.value.originCount+BASE_LIMIT_COUT;
return workResource.entpCourseWorkList.length >= count;
});
const pageDisabled = computed(() => pageParams.value.loading || pageNoMore.value);
const pageParams = ref({
loading: false, // 是否正在加载中
originCount: 0, // 初始条目数量
isFirst: true, // 是否是第一次加载
total: 0,
})
/*** /***
* 作业类型切换 * 作业类型切换
*/ */
@ -381,9 +442,33 @@ const changeFormType = (val) => {
const handleQueryParamFromEntpCourseWork = (queryType) => { const handleQueryParamFromEntpCourseWork = (queryType) => {
// 确保更改了搜索参数后从第一页开始查询 // 确保更改了搜索参数后从第一页开始查询
// this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了 // this.paginationParams = {pageNum: 1,pageSize: 10}; 分页这里展示弃用了
// 清空作业列表
initPageParams();
handleQueryFromEntpCourseWork(queryType); handleQueryFromEntpCourseWork(queryType);
}; };
let obj = {};
function Apis(key) {
obj[key] = [];
return function(task) {
return new Promise((resolve, reject) => {
obj[key].push(task);
Promise.all([...obj[key]]).then(res => {
const i = obj[key].findIndex(item => {
return item == task;
});
resolve(obj[key][i]);
//arr.splice(i, 1);
})
})
}
}
const client = new Apis('/paht');
/** /**
* @desc: 1、习题训练 - 新查询试题 * @desc: 1、习题训练 - 新查询试题
* @return: {*} * @return: {*}
@ -392,70 +477,87 @@ const handleQueryParamFromEntpCourseWork = (queryType) => {
* 1 - 按条件查询 * 1 - 按条件查询
* 2 - 按关键词查询 * 2 - 按关键词查询
*/ */
const handleQueryFromEntpCourseWork= (queryType) => { const t = function(name, time) {
//queryForm.pageNum = this.paginationParams.pageNum; return new Promise(resolve => {
//queryForm.pageSize = this.paginationParams.pageSize; const queryForm = {
// 分页参数
currentPage: paginationParams.pageNum,
pageSize: paginationParams.pageSize,
// 课程相关参数
eid: props.bookobj.levelSecondId,
sectionName: props.bookobj.coursetitle,
edusubject: userStore.edusubject,
edustage: userStore.edustage,
//
// 题类
worktype: entpCourseWorkQueryParams.worktype.label,
workTypeId: entpCourseWorkQueryParams.worktype.value,
// 题源
workgroup: entpCourseWorkQueryParams.workgroup,
// 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点
thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
const queryForm = { }
// 课程相关参数 const entpcourseworkres = listEntpcourseworkNew(queryForm);
eid: props.bookobj.levelSecondId,
sectionName: props.bookobj.coursetitle,
edusubject: userStore.edusubject,
edustage: userStore.edustage,
//
// 题类
worktype: entpCourseWorkQueryParams.worktype.label,
workTypeId: entpCourseWorkQueryParams.worktype.value,
// 题源
workgroup: entpCourseWorkQueryParams.workgroup,
// 年份
yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
// 知识点
thirdId: entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
// 关键字
keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
resolve(entpcourseworkres);
})
} }
const handleQueryFromEntpCourseWork= async (queryType) => {
// 分页参数
// pageNum: paginationParams.pageNum, pageParams.value.loading = true;
// pageSize: paginationParams.pageSize,
// 初中政治特殊处理( warn: 需确认是否修改 ) // 初中政治特殊处理( warn: 需确认是否修改 )
// if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') { // if (this.courseObj.edusubject=='政治' && this.courseObj.edustage=='初中') {
// // [初中+政治]需改为[初中+道德与法治] // // [初中+政治]需改为[初中+道德与法治]
// queryForm.edusubject = '道德与法治'; // queryForm.edusubject = '道德与法治';
// } // }
listEntpcourseworkNew(queryForm).then(entpcourseworkres => { client(t('任务1', 1500)).then(res => {
// if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') { console.log("请求返回",res);
// // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】 if(paginationParams.pageNum == 1){
// const allowedWorkTypes = ['单选题', '填空题', '多选题', '判断题', '复合题'];
// workResource.entpCourseWorkList = entpcourseworkres.rows.filter(item => {
// return !allowedWorkTypes.includes(item.worktype);
// });
// } else {
// workResource.entpCourseWorkList = entpcourseworkres.rows;
// }
if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
workResource.entpCourseWorkList = entpcourseworkres.data;
workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
workResource.entpCourseWorkList.forEach(item=> {
if (item.worktype == '选择题') {
item.worktype = '单选题'
}
})
//格式化试题信息
processList(workResource.entpCourseWorkList);
}else{
workResource.entpCourseWorkList = []; workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0 workResource.entpCourseWorkTotal = 0;
// 初始化下拉滚动条参数
// pageParams.value.loading = false;
// pageParams.value.isFirst = true;
// pageParams.value.originCount = 0;
} }
}) const data = res.data || [];
if(data && data.length>0){
// workResource.entpCourseWorkList = entpcourseworkres.data;
// workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
data.forEach(item=> {
if (item.worktype == '选择题') {
item.worktype = '单选题'
}
})
// 格式化试题信息
processList(data);
workResource.entpCourseWorkList.push(...data);
// 初次加载时更新当前试题数量
if (pageParams.value.isFirst) {
pageParams.value.isFirst = false;
pageParams.value.originCount = workResource.entpCourseWorkList.length;
pageParams.value.total = parseInt(res.msg);
}
}
pageParams.value.loading = false;
});
//const entpcourseworkres = await listEntpcourseworkNew(queryForm);
// const data = entpcourseworkres.data;
} }
// 教学资源，从课标分析、教材分析里来 // 教学资源，从课标分析、教材分析里来
@ -876,25 +978,85 @@ const showExamAnalyseDrawer = (row) => {
} }
const pageLoad = async() => {
console.log("加载中...")
paginationParams.pageNum ++ ,
//paginationParams.pageSize = 2,
await handleQueryFromEntpCourseWork(0);
}
const initPageParams = () => {
// 初始化作业习题列表
workResource.entpCourseWorkList = [];
workResource.entpCourseWorkTotal = 0
// 初始化下拉滚动条参数
pageParams.value.loading = false;
pageParams.value.isFirst = true;
pageParams.value.originCount = 0;
pageParams.value.total = 0;
// 初始化分页参数
paginationParams.pageNum = 1;
paginationParams.pageSize = 10;
}
onMounted(async() => {
// 获取当前学科下的试题题型
const name = userStore.edustage + userStore.edusubject;
const jyCT = await JYApiListCT(proxy, name);
if (jyCT.length == 0) {
ElMessage.error('获取题型失败!');
return;
}
entpCourseWorkTypeList.value = jyCT;
// 获取当前学科下的试题年份
entpCourseWorkYearList.value = JYApiListOriginYear();
entpCourseWorkGroupList.value = await JYApiListSO(proxy, name);
onMounted(() => {
}) })
// const refreshData = () => {
// console.log("刷新数据")
// // 初始化滚动加载参数
// initPageParams();
// // 习题资源
// handleQueryFromEntpCourseWork(0);
// // 框架梳理
// getQueryFromEvaluationclue();
// // 知识点
// getEntpCourseWorkPointList();
// }
// // 结合防抖和节流
// const debounceQueryData = debounce(throttle(refreshData, 1000), 1000);
// 防抖
const debounceQueryData = debounce(() => {
console.log("防抖 加载数据中...")
// 初始化滚动加载参数
initPageParams();
// 习题资源
handleQueryFromEntpCourseWork(0);
// 框架梳理
getQueryFromEvaluationclue();
// 知识点
getEntpCourseWorkPointList();
}, 1000);
watch(() => props.propsformobj.uniquekey, (newVal) => { watch(() => props.propsformobj.uniquekey, (newVal) => {
console.log(props.propsformobj,'propsformobj') console.log(props.propsformobj,'propsformobj')
if(props.propsformobj.uniquekey){ if(props.propsformobj.uniquekey){
classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称 classWorkForm.uniquekey = props.propsformobj.uniquekey?cloneDeep(props.propsformobj.uniquekey):''; // 作业唯一标识 作业名称
} }
}) })
watch(() => props.bookobj.levelSecondId, (newVal) => { watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
console.log(props.bookobj,'课程选择') console.log(props.bookobj,'课程选择')
// 习题资源 debounceQueryData();
handleQueryFromEntpCourseWork(0);
// 框架梳理
getQueryFromEvaluationclue();
// 知识点
getEntpCourseWorkPointList();
}) })
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -982,7 +1144,47 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
box-sizing: border-box; box-sizing: border-box;
background-color: rgb(231, 231, 231) background-color: rgb(231, 231, 231)
} }
.infinite-list-wrapper{
height: 100%;
text-align: center;
overflow: auto;
.infinite-list {
padding: 0;
margin: 0;
list-style: none;
.infinite-list-item {
display: flex;
align-items: center;
//justify-content: center;
//height: 50px;
//background: var(--el-color-primary-light-9);
padding: 10px;
border-top: 1px solid #eee;
//color: var(--el-color-primary);
}
.infinite-list-item:hover {
background-color: #F3F5F8;
}
.infinite-list-item + .list-item {
margin-top: 10px;
}
}
.infinite-list-loading{
padding: 10px 0;
border-top: 1px solid #eee;
color: red;
}
.infinite-list-noMove{
padding: 10px 0;
border-top: 1px solid #eee;
color: #999;
}
}
} }
</style> </style>
<style src="@/assets/styles/JYStyle.css"></style> <style src="@/assets/styles/JYStyle.css"></style>

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

@ -677,9 +677,7 @@ const handleClassOverviewOpen = (type) =>{
} }
} }
}) })
const allTeacherRating = allTopic.reduce((acc, cur) => { const allTeacherRating = allTopic.reduce((acc, cur) => acc + cur.teacherRating, 0)
return acc + cur.teacherRating;
},0)
rightAnswer > 0?item.scoingRate = (score/allTeacherRating * 100).toFixed(0):item.scoingRate = '' rightAnswer > 0?item.scoingRate = (score/allTeacherRating * 100).toFixed(0):item.scoingRate = ''
item.getScore = score item.getScore = score

20
src/renderer/src/views/desktop/container/work-trend.vue
View File

@ -14,14 +14,15 @@
<div class="class-left flex"> <div class="class-left flex">
<div class="class-name flex"> <div class="class-name flex">
<span class="name">{{ item.uniquekey }}</span> <span class="name">{{ item.uniquekey }}</span>
<el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{ <!-- <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag> getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已批改' : '待批改' }}</el-tag> -->
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag> <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">待批改</el-tag>
<el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
</div> </div>
<div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div> <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
</div> </div>
<div class="class-right"> <div class="class-right">
<div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdatacount }}</div> <div><span class="num">{{ item.workdataresultcount }}</span> / {{ item.workdataresultsum }}</div>
<div>已交</div> <div>已交</div>
</div> </div>
</li> </li>
@ -52,9 +53,10 @@ const getHomework = async () => {
const { edustage, edusubject } = user const { edustage, edusubject } = user
try { try {
const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 }) const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
// 只展示进行中的 // 只展示待批改的
homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断 //homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
// homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算进行中 弃用 // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate) //大于今天的才算待批改 弃用
homeworkList.value = rows || [];
homeworkList.value.forEach((item) => { homeworkList.value.forEach((item) => {
// 处理任务类型的UI // 处理任务类型的UI
if (item.worktype == '学习目标定位') { if (item.worktype == '学习目标定位') {
@ -72,7 +74,6 @@ const getHomework = async () => {
item.workclass = '' item.workclass = ''
} }
item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
// 如果是习题训练任务，则检查一共有多少道 // 如果是习题训练任务，则检查一共有多少道
if (item.entpcourseworklist != '') { if (item.entpcourseworklist != '') {
item.entpcourseworklistarray = JSON.parse( item.entpcourseworklistarray = JSON.parse(
@ -102,7 +103,8 @@ const onClickItem = (item) => {
} }
const tagType = (time) => { const tagType = (time) => {
return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning' return 'warning';
//return getCurrentTime('YYYY-MM-DD HH:mm') > time ? 'info' : 'warning'
} }

7
src/renderer/src/views/fullScreenPdf/index.vue
View File

@ -18,9 +18,10 @@ const loadPdfAnimation = (path) => {
},2000) },2000)
} }
onMounted(() => { onMounted(() => {
console.log('路由参数====',route); const pdfUrl1 = localStorage.getItem('PDF-TOOL-PATH')
const { pdfUrl } = route.query const pdfUrl2 = localStorage.getItem('PDF-LOCAL-PATH')
const bookpath = !!pdfUrl ? pdfUrl : localStorage.getItem('PDF-LOCAL-PATH') console.log('tool-pdf 地址: ',pdfUrl1, pdfUrl2)
const bookpath = pdfUrl1 || pdfUrl2
// const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + bookpath // const filepath = import.meta.env.VITE_APP_RES_FILE_PATH + bookpath
// const isDev = process.env.NODE_ENV == 'development' // const isDev = process.env.NODE_ENV == 'development'
// if (isDev) // if (isDev)

59
src/renderer/src/views/prepare/components/treeLog.vue Normal file
View File

@ -0,0 +1,59 @@
<template>
<div style="padding: 10px;">
<el-dialog
v-model="dialogVisible"
width="30%"
append-to-body
>
<div style="display: flex;justify-content: center;">
<ChooseTextbook @node-click="nodeClick" />
</div>
<template #footer>
<div class="dialog-footer">
<el-button @click="dialogVisible = false">取消</el-button>
<el-button type="primary" @click.stop="save">确定</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, defineExpose } from 'vue'
import ChooseTextbook from '@/components/choose-textbook/index.vue'
const dialogVisible = ref(false)
const getNodeInfo = ref([])
const openDialog = () => {
dialogVisible.value = true
}
const getFullObj = (node) => {
const obj = []
const recursive = (currentNode) => {
// 这里添加节点参数
if (currentNode.parentNode) {
obj.unshift(Object.assign({curentId: currentNode.id,title:currentNode.itemtitle}, currentNode.parentNode))
recursive(currentNode.parentNode)
} else {
obj.unshift({id: currentNode.id,title:currentNode.itemtitle})
}
}
recursive(node)
return obj
}
const nodeClick = (data) => {
getNodeInfo.value = getFullObj(data.node)
console.log(getNodeInfo.value, 'getNodeInfo.value')
}
const save = () => {
dialogVisible.value = false
}
defineExpose({
openDialog
})
</script>

15
src/renderer/src/views/prepare/index.vue
View File

@ -2,6 +2,7 @@
<div v-loading="isLoading" class="page-resource flex"> <div v-loading="isLoading" class="page-resource flex">
<ChooseTextbook @node-click="nodeClick" /> <ChooseTextbook @node-click="nodeClick" />
<div class="page-center-wrap"> <div class="page-center-wrap">
<el-button @click="openChapter" type="primary">打开章节</el-button>
<el-tabs v-model="activeAptTab" style="height: 100%;"> <el-tabs v-model="activeAptTab" style="height: 100%;">
<el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj"> <el-tab-pane label="教学课件" name="教学课件" class="prepare-center-jxkj">
<div class="prepare-center-header"> <div class="prepare-center-header">
@ -140,6 +141,8 @@
<!-- 上课配置 --> <!-- 上课配置 -->
<class-start ref="calssRef" @close="closeChange"/> <class-start ref="calssRef" @close="closeChange"/>
<PptDialog @add-success="addAiPPT" :currentNode="currentNode" :uploadData="uploadData" v-model="pptDialog"/> <PptDialog @add-success="addAiPPT" :currentNode="currentNode" :uploadData="uploadData" v-model="pptDialog"/>
<!-- 章节弹窗 -->
<TreeLog ref="treelogRef"/>
<!-- <button @click="test">test</button> --> <!-- <button @click="test">test</button> -->
</template> </template>
<script setup> <script setup>
@ -178,6 +181,7 @@ import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from './container/class-start.vue' // 预备上课 import classStart from './container/class-start.vue' // 预备上课
import MsgEnum from '@/plugins/imChat/msgEnum' // im 消息枚举 import MsgEnum from '@/plugins/imChat/msgEnum' // im 消息枚举
import Chat from '@/utils/chat' // im 登录初始化 import Chat from '@/utils/chat' // im 登录初始化
import TreeLog from './components/treeLog.vue'
if (!Chat.imChat) Chat.init() if (!Chat.imChat) Chat.init()
const toolStore = useToolState() const toolStore = useToolState()
@ -235,7 +239,9 @@ export default {
isOpenHomework: false, isOpenHomework: false,
// 当前上课课程 // 当前上课课程
activeClass: null, activeClass: null,
pptDialog: false pptDialog: false,
// 打开章节的弹窗
treelogRef:null
} }
}, },
computed: { computed: {
@ -630,6 +636,8 @@ export default {
}) })
}, },
async nodeClick(data) { async nodeClick(data) {
console.log(data,'data');
if (this.currentNode.id === data.node.id) return if (this.currentNode.id === data.node.id) return
this.curBookImg = data.textBook.curBookImg this.curBookImg = data.textBook.curBookImg
this.curBookPath = data.textBook.curBookPath this.curBookPath = data.textBook.curBookPath
@ -788,6 +796,11 @@ export default {
'&reservId=' + '&reservId=' +
id id
}) })
},
// 打开章节
openChapter(){
// 打开弹窗
this.$refs.treelogRef.openDialog()
} }
} }
} }

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

@ -36,7 +36,7 @@
<el-scrollbar height="300px"> <el-scrollbar height="300px">
<div class="item-content-item" v-for="item in cData"> <div class="item-content-item" v-for="item in cData">
<el-tag effect="dark">{{ item.tag }}</el-tag> <el-tag effect="dark">{{ item.tag }}</el-tag>
<span>{{ curNode.bookName }}</span> <span>{{ item.name }}</span>
<el-button :color="item.color||'#349d44'" size="small" @click="openFile(item)">打开</el-button> <el-button :color="item.color||'#349d44'" size="small" @click="openFile(item)">打开</el-button>
</div> </div>
</el-scrollbar> </el-scrollbar>
@ -55,7 +55,7 @@ import { computed, defineProps, ref, reactive, watchEffect, onMounted} from 'vue
import { sessionStore } from '@/utils/store' import { sessionStore } from '@/utils/store'
import homework from './homework.vue'; import homework from './homework.vue';
import { ElMessage } from 'element-plus'; import { ElMessage } from 'element-plus';
import { toRoter } from '@/utils/tool' // 相关工具 import { toRoter, createWindow } from '@/utils/tool' // 相关工具
// 功能说明：侧边-工具栏 // 功能说明：侧边-工具栏
const colors = ['#409EFF','#00f389', '#ff7f00', '#ffff00', '#00baff', '#13b189', '#F56C6C'] const colors = ['#409EFF','#00f389', '#ff7f00', '#ffff00', '#00baff', '#13b189', '#F56C6C']
@ -112,9 +112,9 @@ const getStyle = (style,index) => {
// 获取内容数据 // 获取内容数据
const getContent = o => { const getContent = o => {
loading.value = true loading.value = true
const { bookName } = curNode const { roottitle, edustage, edusubject } = curNode
const textbook = { type: 'book', tag: '教材', name: bookName } const textbook = { type: 'book', tag: '教材', name: roottitle }
const course = { type: 'course', tag: '课标', name: bookName } const course = { type: 'course', tag: '课标', name: `${edustage}-${edusubject}-课标` }
cData.value = [textbook, course] cData.value = [textbook, course]
loading.value = false loading.value = false
} }
@ -145,8 +145,14 @@ const openFile = item => {
if (item.type == 'book') path = (textBook.curBookPath||'').replace('.txt', '.pdf') if (item.type == 'book') path = (textBook.curBookPath||'').replace('.txt', '.pdf')
else path = textBook.curBookPath.replace(/([^-]*)$/, '课标.pdf') else path = textBook.curBookPath.replace(/([^-]*)$/, '课标.pdf')
const url = pdfBasePath + encodeURIComponent(`${fileBasePath}${path}`) const url = pdfBasePath + encodeURIComponent(`${fileBasePath}${path}`)
console.log(url)
localStorage.setItem('PDF-TOOL-PATH', url)
// 打开新窗口 // 打开新窗口
toRoter(`${process.env['ELECTRON_RENDERER_URL']}/#/fullscreenpdf?pdfUrl=${url}`) // toRoter(`${process.env['ELECTRON_RENDERER_URL']}/#/fullscreenpdf`)
console.log('pdf_old:' + localStorage.getItem('PDF-LOCAL-PATH'))
console.log('pdf_new:' + localStorage.getItem('PDF-TOOL-PATH'))
// emit('change', { prop: 'bookOpen' })
createWindow('open-win', {url: '/fullscreenpdf'})
} }
} }
// 回调: 关闭事件 // 回调: 关闭事件

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

@ -43,6 +43,15 @@ export const createHomework = ({ uniquekey, evalid, data, entpcourseid }) => {
let classWorkList = [] let classWorkList = []
// 将标签中的双引号增加转义
let escapeHtmlQuotes = (str) => {
// 后端已replace双引号, 故前端不用在处理
const regex1 = /\\+/g; // 匹配多个反斜杠
let result = str.replace(regex1, '\\');
result = str.replace(/(?<!\\)\n/g, '<br />'); //替换\n而不替换\\n 为 \\n
return result;
}
/** /**
* 获取班级作业 * 获取班级作业
*/ */
@ -52,8 +61,8 @@ export const getClassWorkList = async (id) => {
/** /**
* 2024-10-17 由于 后面截止时间加了 时分，特加判断 * 2024-10-17 由于 后面截止时间加了 时分，特加判断
* 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断， * 1、待批改、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
* 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。 * 2、已批改、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
*/ */
let list = response.rows let list = response.rows
@ -61,7 +70,6 @@ export const getClassWorkList = async (id) => {
for (var i = 0; i < list.length; i++) { for (var i = 0; i < list.length; i++) {
// 初始化部分新增字段值 // 初始化部分新增字段值
list[i].workdatalist = [] list[i].workdatalist = []
list[i].workdatacount = 0 // 人数
list[i].workdatalistVisible = false list[i].workdatalistVisible = false
list[i].workdatafeedbackcount = 0 // 已交人数 list[i].workdatafeedbackcount = 0 // 已交人数
list[i].feedtimelength = 0 list[i].feedtimelength = 0
@ -91,19 +99,10 @@ export const getClassWorkList = async (id) => {
} else { } else {
list[i].entpcourseworklistarray = [] 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 的 // 显示分配人数(workdataresultsum)>0 的
if (list && list.length > 0) { if (list && list.length > 0) {
classWorkList = list && list.filter((item) => item.workdatacount > 0) classWorkList = list && list.filter((item) => item.workdataresultsum > 0)
//TODO： 这里没分页，貌似这个 total 不重要，后续看 //TODO： 这里没分页，貌似这个 total 不重要，后续看
} else { } else {
classWorkList = [] classWorkList = []
@ -171,18 +170,18 @@ export const getStudentClassWorkData = async () => {
} }
} }
} }
// 当前这个学习任务，共推送给了几个学生，workdatacount // 当前这个学习任务，共推送给了几个学生，workdataresultsum
if (res.rows[i].classworkid == classWorkList[t].id) { if (res.rows[i].classworkid == classWorkList[t].id) {
classWorkList[t].workdatalist.push(res.rows[i]) classWorkList[t].workdatalist.push(res.rows[i])
} }
} }
// 计算完成进度 workdatacount人数要大于0 // 计算完成进度 workdataresultsum 人数要大于0
if ( if (
classWorkList[t].workdataresultcount > 0 && classWorkList[t].workdataresultcount > 0 &&
classWorkList[t].workdatacount > 0 classWorkList[t].workdataresultsum > 0
) { ) {
classWorkList[t].finishpercent = parseInt( classWorkList[t].finishpercent = parseInt(
(classWorkList[t].workdataresultcount / classWorkList[t].workdatacount) * 100 (classWorkList[t].workdataresultcount / classWorkList[t].workdataresultsum) * 100
) )
} else { } else {
classWorkList[t].finishpercent = 0 classWorkList[t].finishpercent = 0
@ -211,7 +210,7 @@ export const getStudentClassWorkData = async () => {
var dd = var dd =
(classWorkList[t].rightAnswerCount / (classWorkList[t].rightAnswerCount /
(classWorkList[t].entpcourseworklistarray.length * (classWorkList[t].entpcourseworklistarray.length *
classWorkList[t].workdatacount)) * classWorkList[t].workdataresultsum)) *
100 100
classWorkList[t].scoingRate = dd.toFixed(0) + '%' classWorkList[t].scoingRate = dd.toFixed(0) + '%'
} else { } else {

10
src/renderer/src/views/tool/sphere.vue
View File

@ -207,6 +207,16 @@ const sideMouse = e => {
const sideChange = async o => { const sideChange = async o => {
// console.log(o) // console.log(o)
switch(o.prop) { switch(o.prop) {
case 'bookOpen':
if(isOpenBook.value) {
isOpenBook.value = false
ElMessage.info('已经打开课本了哦')
}else {
// createWindow('fullScreen-PDF',{url: '/fullscreenpdf'})
toRoter(`${process.env['ELECTRON_RENDERER_URL']}/#/fullscreenpdf`)
isOpenBook.value = true
}
break
case 'book': case 'book':
isMask.value = !isMask.value isMask.value = !isMask.value
break break