diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts
index 31940a2..0dae967 100644
--- a/src/router/routes/modules/stuzy/stuzy.ts
+++ b/src/router/routes/modules/stuzy/stuzy.ts
@@ -86,6 +86,14 @@ const stuzy: AppRouteModule = {
title: '作业互评',
},
},
+ {
+ path: 'zyhpDetail',
+ name: 'zyhpDetail',
+ component: () => import('/@/views/zy/zyInfoStudentHp/ZyInfoStudentHpMyhpfsDetailList.vue'),
+ meta: {
+ title: '作业互评结果',
+ },
+ },
]
}
diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 35c85c8..696914f 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -30,18 +30,19 @@
{{ item.title }}
- 开始时间:{{ dayjs(item.startTime).format('YYYY.MM.DD HH:mm') }}
- 结束时间:{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}
+ 作业时间:{{ dayjs(item.startTime).format('YYYY.MM.DD HH:mm') }} ~ {{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}
+ 互评时间:{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }} ~ {{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}未设置互评
- 评分:{{ item.stuscore ? item.stuscore : '未评' }}分
+ 作业评分:{{ item.zzdf ? item.zzdf : item.stuscore ? item.stuscore : '未评' }}分
+ 互评分数:{{ item.xshpfs ? item.xshpfs : '未评' }}分
- 网络查重:{{ getCctype(item, '1') }}
- 作业查重:{{ getCctype(item, '2') }}
+ 维普资源库查重:{{ getCctype(item, '1') }}
+ 本次作业查重:{{ getCctype(item, '2') }}
- Aigc查重:{{ getCctype(item, '3') }}
- 校内查重:{{ getCctype(item, '4') }}
+ 学校作业库查重:{{ getCctype(item, '4') }}
+ Aigc查重:{{ getCctype(item, '3') }}
详情
@@ -131,6 +132,11 @@ const wrapperCol = reactive({
sm: { span: 16 },
});
+function handleHpfs(record){
+ var href = '/stuzy/zyhpDetail';
+ router.push({ path: href, query: { rwbh, xqxn, type, teano, zyStuId: record.stuId, mainId: record.id } });
+}
+
function handleOpenCcjg(record, type) {
var text = "0";
if (type == '0') {
@@ -178,7 +184,7 @@ function handleSfkshp(record) {
var xshpkssj = new Date(record.xshpkssj);
var xshpjssj = new Date(record.xshpjssj);
var nowTime = new Date();
- if (sfkshp == '1' && nowTime.getTime() >= xshpkssj.getTime() && nowTime.getTime() <= xshpjssj.getTime()) {
+ if (record.stuFilePath && sfkshp == '1' && nowTime.getTime() >= xshpkssj.getTime() && nowTime.getTime() <= xshpjssj.getTime()) {
return true;
}
return false;
diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue
index b8e4da6..4d2e125 100644
--- a/src/views/zy/zyInfo/ZyInfoV2List.vue
+++ b/src/views/zy/zyInfo/ZyInfoV2List.vue
@@ -961,6 +961,17 @@ async function submitForm() {
}
}
+ if(xshpkssj && startTime){
+ var endTimestamp = Date.parse(xshpkssj);
+ var startTimestamp = Date.parse(startTime);
+ if (endTimestamp < startTimestamp) {
+ createMessage.warning('互评开始间不能小于作业发布时间!');
+ confirmLoading.value = false;
+ return;
+ }
+
+ }
+
await saveOrUpdate(model, isUpdate.value)
.then((res) => {
if (res.success) {
diff --git a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHp.data.ts b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHp.data.ts
index ab31f0c..37b05a2 100644
--- a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHp.data.ts
+++ b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHp.data.ts
@@ -31,7 +31,8 @@ export const columnsZyhp: BasicColumn[] = [
{
title: '学生姓名',
align: "center",
- dataIndex: 'studentName'
+ dataIndex: 'studentName',
+ slots: { customRender: 'stuNameSlot' },
},
{
title: '作业预览',
@@ -50,7 +51,8 @@ export const columnsZyhpYhp: BasicColumn[] = [
{
title: '学生姓名',
align: "center",
- dataIndex: 'studentName'
+ dataIndex: 'studentName',
+ slots: { customRender: 'stuNameSlot' },
},
{
title: '作业预览',
diff --git a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue
index 8e7b266..83c2ad2 100644
--- a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue
+++ b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue
@@ -1,7 +1,8 @@
+