diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue
index 0d79afb..78d251e 100644
--- a/src/views/zy/zyInfo/StudentZyInfoList.vue
+++ b/src/views/zy/zyInfo/StudentZyInfoList.vue
@@ -43,15 +43,15 @@
开始时间:{{dayjs(item.startTime).format('YYYY.MM.DD HH:mm')}}
结束时间:{{dayjs(item.endTime).format('YYYY.MM.DD HH:mm')}}
- 评分:{{item.score?item.score:'未评'}}分
+ 评分:{{item.stuscore?item.stuscore:'未评'}}分
- 网络查重:{{getCctype(item,"1")}}
- 作业查重:{{getCctype(item,"2")}}
+ 网络查重:{{getCctype(item,"1")}}
+ 作业查重:{{getCctype(item,"2")}}
- Aigc查重:{{getCctype(item,"3")}}
- 校内查重:{{getCctype(item,"4")}}
+ Aigc查重:{{getCctype(item,"3")}}
+ 校内查重:{{getCctype(item,"4")}}
详情
@@ -133,40 +133,48 @@ const baseApiUrl = globSetting.domainUrl;
if(record.wwcc=='1'){
if(record.wwxsl){
text = record.wwxsl+"%";
- }else if(!record.filePath){
- text = "-";
- }else{
+ }else if(record.wwsftg&&record.wwsftg.indexOf("失败")!=-1){
+ text = "失败";
+ }else if(record.stuFilePath){
text = "检测中";
+ }else{
+ text = "-";
}
}
}else if(type=='2'){
if(record.nwcc=='1'){
if(record.nwxsl){
text = record.nwxsl+"%";
- }else if(!record.filePath){
- text = "-";
- }else{
+ }else if(record.nwsftg&&record.nwsftg.indexOf("失败")!=-1){
+ text = "失败";
+ }else if(record.stuFilePath){
text = "检测中";
+ }else{
+ text = "-";
}
}
}else if(type=='3'){
if(record.aigccc=='1'){
if(record.aigcxsl){
text = record.aigcxsl+"%";
- }else if(!record.filePath){
- text = "-";
- }else{
+ }else if(record.aigcsftg&&record.aigcsftg.indexOf("失败")!=-1){
+ text = "失败";
+ }else if(record.stuFilePath){
text = "检测中";
+ }else{
+ text = "-";
}
}
}else if(type=='4'){
if(record.xncc=='1'){
if(record.xnxsl){
text = record.xnxsl+"%";
- }else if(!record.filePath){
- text = "-";
- }else{
+ }else if(record.xnsftg&&record.xnsftg.indexOf("失败")!=-1){
+ text = "失败";
+ }else if(record.stuFilePath){
text = "检测中";
+ }else{
+ text = "-";
}
}
}
@@ -183,7 +191,7 @@ const baseApiUrl = globSetting.domainUrl;
}
}
function callText(record){
- if(record.score){
+ if(record.stuscore){
return "已完成";
}else if(record.stuFilePath){
return "待评分";
diff --git a/src/views/zy/zyInfo/components/ZyInfoEditForm.vue b/src/views/zy/zyInfo/components/ZyInfoEditForm.vue
index 7eed947..39c91e8 100644
--- a/src/views/zy/zyInfo/components/ZyInfoEditForm.vue
+++ b/src/views/zy/zyInfo/components/ZyInfoEditForm.vue
@@ -192,6 +192,7 @@
* 编辑
*/
function edit(record) {
+ console.log(`🚀 ~ edit ~ record:`, record)
nextTick(() => {
resetFields();
//赋值
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
index 869d23f..def7791 100644
--- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
+++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue
@@ -70,6 +70,7 @@
{{record.wwxsl}}%
{{record.wwxsl}}%
+ {{text}}
检测中
未提交
@@ -86,6 +87,7 @@
{{record.nwxsl}}%
{{record.nwxsl}}%
+ {{text}}
检测中
未提交
@@ -102,6 +104,7 @@
{{record.aigcxsl}}%
{{record.aigcxsl}}%
+ {{text}}
检测中
未提交
@@ -118,6 +121,7 @@
{{record.xnxsl}}%
{{record.xnxsl}}%
+ {{text}}
检测中
未提交
@@ -263,6 +267,11 @@
})
}
+ function handleNoScoreFabu(record: Recordable){
+ defHttp.post({url:'/zyInfoStudent/zyInfoStudent/editFabu',params:{id:record.id,scoreFabu:'0'}}).then(res =>{
+ handleSuccess()
+ })
+ }
/**
* 详情
*/
@@ -321,12 +330,16 @@
if(record.filePath){
if(record.scoreFabu=='1'){
var list = [
+ {
+ label: '撤回发布',
+ onClick: handleNoScoreFabu.bind(null, record),
+ },
{
label: '设置样本',
onClick: handleSzyb.bind(null, record),
},
{
- label: '作业',
+ label: '下载',
onClick: handleDown.bind(null, record.filePath),
},
{
@@ -350,7 +363,7 @@
onClick: handleScoreFabu.bind(null, record),
},
{
- label: '作业',
+ label: '下载',
onClick: handleDown.bind(null, record.filePath),
},
{
diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
index 60439b9..c730202 100644
--- a/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
+++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentForm.vue
@@ -3,9 +3,10 @@
- 作业名称:{{zyInfo.title}}
- 作业要求:{{zyInfo.content?zyInfo.content:'无'}}
- 上传时间:{{zyInfo.startTime}} ~ {{zyInfo.endTime}}
+ 作业名称:{{zyInfo.title}}
+ 作业要求:{{zyInfo.content?zyInfo.content:'无'}}
+ 上传时间:{{zyInfo.startTime}} ~ {{zyInfo.endTime}}
+ 检测方式:是否网络查重-{{zyInfo.wwcc=='1'?'是':'否'}} , 是否课程内查重-{{zyInfo.nwcc=='1'?'是':'否'}} , Aigc是否查重-{{zyInfo.nwcc=='1'?'是':'否'}} , 是否校内查重-{{zyInfo.xncc=='1'?'是':'否'}}