diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 72a9cff..a68c005 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -39,7 +39,7 @@ 1 自定义分数 - + 返回 @@ -78,7 +78,7 @@ 1 自定义分数 - + 返回 @@ -118,7 +118,7 @@ 1 自定义分数 - + 返回 diff --git a/src/views/zy/zyGonggao/TeacherYulanList.vue b/src/views/zy/zyGonggao/TeacherYulanList.vue index 4288447..b9d55ee 100644 --- a/src/views/zy/zyGonggao/TeacherYulanList.vue +++ b/src/views/zy/zyGonggao/TeacherYulanList.vue @@ -27,8 +27,8 @@ {{item.title}} 草稿 - - 尚未发布,学生端页面看不到这条通知 + + 尚未发布,学生端页面看不到这条通知 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 @@