From 9510a8604d8bf66d72945fbc48df039f36df6c63 Mon Sep 17 00:00:00 2001
From: wyx <you@example.com>
Date: Mon, 27 Feb 2023 23:47:31 +0800
Subject: [PATCH 1/3] =?UTF-8?q?style:=E9=9A=90=E8=97=8F=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=8A=95=E7=A5=A8=E4=B8=8A=E4=BC=A0=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BE=E7=89=87=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/vote/VoteQuestionItem.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/vote/VoteQuestionItem.vue b/src/components/vote/VoteQuestionItem.vue
index 9f36cd2e..767e6988 100644
--- a/src/components/vote/VoteQuestionItem.vue
+++ b/src/components/vote/VoteQuestionItem.vue
@@ -13,7 +13,7 @@
       <div class="delete" @click="handleDel">删除</div>
     </div>
     <div class="name uploadContent">
-      <a-upload v-show="!formData.imgVal" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
+      <a-upload v-show="!formData.optionPictureAddress" class="in uploadBtn" :show-upload-list="false" :before-upload="beforeUpload">
         <div class="addimg">+添加图片</div>
       </a-upload>
       <div v-show="formData.optionPictureAddress" class="picture" style="position: relative">

From 9b472e8a6e5a59cbedea6b9e058cc7000beb7f22 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Tue, 28 Feb 2023 00:27:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E5=A4=96=E9=83=A8=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86;=E6=9C=AA=E5=AE=8C=E6=88=90=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E7=9A=84=E5=AD=A6=E5=91=98=E3=80=90=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=AD=94=E5=8D=B7=E3=80=91=E6=8C=89=E9=92=AE=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=20=20=20=20=20=E5=B7=A5=E5=8F=B7=E5=AD=97=E6=AE=B5=E5=AE=BD?=
 =?UTF-8?q?=E5=BA=A6=E5=8A=A0=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../drawers/project/ProjectExamManage.vue          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index 1abdba36..e13aa8cc 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -190,7 +190,7 @@ export default {
           title: "工号",
           dataIndex: "studentCode",
           key: "studentCode",
-          width: 60,
+          width: 120,
           align: "center",
           className: "h head",
           customRender: (text) => {
@@ -305,7 +305,7 @@ export default {
           align: "center",
           ellipsis: true,
           className: "h",
-          customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'),
+          customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'),
         },
         {
           title: "操作",
@@ -318,14 +318,14 @@ export default {
           customRender: (text) => {
             return (
               <div class="racona">
-                <a 
-                  onClick={()=>{
+                {text.record.status == '0' ? "查看答卷" : 
+                <a onClick={()=>{
                     state.studentKid = text.record.studentKid;
                     state.datasource = text.record;
                     state.CAvisible = true;
-                  }}> 
-                  查看答卷
-                </a>
+                  }}>  查看答卷 </a>
+                }
+                
               </div>
             );
           },

From 1a0ddbc6601ccc7d29c7785cb145e15b7e7e552a Mon Sep 17 00:00:00 2001
From: quhongwei <1632078442@qq.com>
Date: Tue, 28 Feb 2023 00:44:33 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E8=AF=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86type=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/project/ProjectExamManage.vue      | 2 +-
 src/components/drawers/router/RouterExaminationManage.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue
index e13aa8cc..68a7ea51 100644
--- a/src/components/drawers/project/ProjectExamManage.vue
+++ b/src/components/drawers/project/ProjectExamManage.vue
@@ -398,7 +398,7 @@ export default {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         chapterId: props.datasource.chapterId,
-        type: 2,
+        type: 1,
         taskId: props.datasource.courseId,
         targetId: props.datasource.projectId
       }).then(res=>{
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue
index a06f8702..33fb498c 100644
--- a/src/components/drawers/router/RouterExaminationManage.vue
+++ b/src/components/drawers/router/RouterExaminationManage.vue
@@ -399,7 +399,7 @@ export default {
         pageNo: state.currentPage,
         pageSize: state.pageSize,
         chapterId: props.datasource.chapterId,
-        type: 1,
+        type: 2,
         taskId: props.datasource.courseId,
         targetId: props.datasource.routerId
       }).then(res => {