From 19fe80d1c273cb8a281a1ac8bd3fa9e0d40a9def Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Thu, 11 Jul 2024 22:10:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B90711=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue |  6 +--
 src/views/zy/zyGonggao/TeacherYulanList.vue   |  4 +-
 src/views/zy/zyInfo/StudentZyInfoList.vue     | 44 +++++++++++--------
 .../zy/zyInfo/components/ZyInfoEditForm.vue   |  1 +
 .../zy/zyInfoStudent/ZyInfoStudentList.vue    | 17 ++++++-
 .../components/ZyInfoStudentForm.vue          |  7 +--
 6 files changed, 51 insertions(+), 28 deletions(-)

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 @@
                     <a-select-option value="1">1</a-select-option>
                   </a-select>
                   <span  v-if="item.wjSfqh=='0'" @click="handleQiehuan(item,'1')" style="color:#9e9e9e;">自定义分数</span>
-                  <a-input  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input>
+                  <a-input-number  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input-number>
                   <span  v-if="item.wjSfqh=='1'" @click="handleQiehuan(item,'0')" style="color:#9e9e9e;">返回</span>
                 </a-tooltip >
                 <a-tooltip placement="topRight" title="删除此题"><Icon icon="ant-design:delete-outlined" style="cursor: pointer;font-size: 20px;margin: 10px" @click="handleDelTigan(item,index)" /></a-tooltip >
@@ -78,7 +78,7 @@
                     <a-select-option value="1">1</a-select-option>
                   </a-select>
                   <span  v-if="item.wjSfqh=='0'" @click="handleQiehuan(item,'1')" style="color:#9e9e9e;">自定义分数</span>
-                  <a-input  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input>
+                  <a-input-number  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input-number>
                   <span  v-if="item.wjSfqh=='1'" @click="handleQiehuan(item,'0')" style="color:#9e9e9e;">返回</span>
                 </a-tooltip >
                 <a-tooltip placement="topRight" title="删除此题"><Icon icon="ant-design:delete-outlined" style="cursor: pointer;font-size: 20px;margin: 10px" @click="handleDelTigan(item,index)" /></a-tooltip >
@@ -118,7 +118,7 @@
                     <a-select-option value="1">1</a-select-option>
                   </a-select>
                   <span  v-if="item.wjSfqh=='0'" @click="handleQiehuan(item,'1')" style="color:#9e9e9e;">自定义分数</span>
-                  <a-input  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input>
+                  <a-input-number  v-model:value="item.wjScore" style="width:120px;" v-if="item.wjSfqh=='1'"></a-input-number>
                   <span  v-if="item.wjSfqh=='1'" @click="handleQiehuan(item,'0')" style="color:#9e9e9e;">返回</span>
                 </a-tooltip >
                 <a-tooltip placement="topRight" title="删除此题"><Icon icon="ant-design:delete-outlined" style="cursor: pointer;font-size: 20px;margin: 10px" @click="handleDelTigan(item,index)" /></a-tooltip >
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 @@
                 <span style="font-size: 16px;color: #515151 ;font-weight: bold; ">{{item.title}}</span>
                 <span v-if="item.ggStatus==0" style="margin-left:15px;"><a-tag color="blue">草稿</a-tag></span>
               </a-col>
-              <a-col :span="item.ggStatus==0||item.ggStatus==2?10:24" style="text-align: right;color:#9e9e9e;">
-                   尚未发布，学生端页面看不到这条通知 
+              <a-col v-if="item.ggStatus==2" :span="item.ggStatus==0||item.ggStatus==2?10:24" style="text-align: right;color:#9e9e9e;">
+                   尚未发布，学生端页面看不到这条通知
               </a-col>
             </a-row>
             <a-row style="padding:10px;">
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 @@
             <a-col :span="24" class="zyCon">开始时间：{{dayjs(item.startTime).format('YYYY.MM.DD HH:mm')}}</a-col>
             <a-col :span="24" class="zyCon">结束时间：{{dayjs(item.endTime).format('YYYY.MM.DD HH:mm')}}</a-col>
             <a-col :span="24" class="zyCon">
-              <div style="float:left" >评分：{{item.score?item.score:'未评'}}分</div>
+              <div style="float:left" >评分：{{item.stuscore?item.stuscore:'未评'}}分</div>
             </a-col>
             <a-col :span="24" class="zyCon">
-              <div style="float:left;">网络查重:{{getCctype(item,"1")}}</div>
-              <div style="float:right" >作业查重:{{getCctype(item,"2")}}</div>
+              <div style="float:left;" :title="item.wwsftg">网络查重:{{getCctype(item,"1")}}</div>
+              <div style="float:right" :title="item.nwsftg">作业查重:{{getCctype(item,"2")}}</div>
             </a-col>
             <a-col :span="24" class="zyCon">
-              <div style="float:left;">Aigc查重:{{getCctype(item,"3")}}</div>
-              <div style="float:right" >校内查重:{{getCctype(item,"4")}}</div>
+              <div style="float:left;" :title="item.aigcsftg">Aigc查重:{{getCctype(item,"3")}}</div>
+              <div style="float:right" :title="item.xnsftg">校内查重:{{getCctype(item,"4")}}</div>
             </a-col>
             <a-col :span="24" style="text-align:center;margin-top:20px;">
               <a-button type="primary" @click="handleDetail(item)" style="margin-left:5px;background:rgb(28, 132, 198);">详情</a-button>
@@ -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 @@
           <template v-else>
             <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
             <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.wwpaperviewurl)">{{record.wwxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
             <span v-else>
               <span v-if="record.filePath">检测中</span>
               <span v-else>未提交</span>
@@ -86,6 +87,7 @@
           <template v-else>
             <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
             <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.zypaperviewurl)">{{record.nwxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
             <span v-else>
               <span v-if="record.filePath">检测中</span>
               <span v-else>未提交</span>
@@ -102,6 +104,7 @@
           <template v-else>
             <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
             <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.aigcpaperviewurl)">{{record.aigcxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
             <span v-else>
               <span v-if="record.filePath">检测中</span>
               <span v-else>未提交</span>
@@ -118,6 +121,7 @@
           <template v-else>
             <span v-if="text=='通过'" style="color: green;padding: 5px 15px;cursor:pointer" title="通过(点击可查看对比结果)" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
             <span v-else-if="text=='未通过'" style="color: red;padding: 5px 15px;cursor:pointer" title="未通过(点击可查看对比结果)" @click="handleYulan(record.xxpaperviewurl)">{{record.xnxsl}}%</span>
+            <span v-else-if="text&&text.indexOf('失败')>-1" style="color: red;padding: 5px 15px;cursor:pointer" :title="text">{{text}}</span>
             <span v-else>
               <span v-if="record.filePath">检测中</span>
               <span v-else>未提交</span>
@@ -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 @@
     <a-form ref="formRef" class="antd-modal-form" :labelCol="labelCol" :wrapperCol="wrapperCol">
       <a-row>
         <a-col :span="24" style=";padding:  30px 0 0 75px;">
-            <div>作业名称：{{zyInfo.title}}</div>
-            <div>作业要求：{{zyInfo.content?zyInfo.content:'无'}}</div>
-            <div>上传时间：{{zyInfo.startTime}} ~ {{zyInfo.endTime}}</div>
+            <div style="line-height:40px;">作业名称：{{zyInfo.title}}</div>
+            <div style="line-height:40px;">作业要求：{{zyInfo.content?zyInfo.content:'无'}}</div>
+            <div style="line-height:40px;">上传时间：{{zyInfo.startTime}} ~ {{zyInfo.endTime}}</div>
+            <div style="line-height:40px;">检测方式：是否网络查重-{{zyInfo.wwcc=='1'?'是':'否'}} ， 是否课程内查重-{{zyInfo.nwcc=='1'?'是':'否'}} ， Aigc是否查重-{{zyInfo.nwcc=='1'?'是':'否'}} ， 是否校内查重-{{zyInfo.xncc=='1'?'是':'否'}} </div>
             <div v-if="zyInfo.filePath">附件：
             <a-button type="primary" style="margin-left: 10px" @click="downLoad(zyInfo.filePath)">下载</a-button></div>
         </a-col>