Merge remote-tracking branch 'origin/develop' into develop

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>
             );
           },
@@ -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=>{

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 => {

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">