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

This commit is contained in:
yuping
2023-02-28 01:09:49 +08:00
3 changed files with 10 additions and 10 deletions

View File

@@ -190,7 +190,7 @@ export default {
title: "工号", title: "工号",
dataIndex: "studentCode", dataIndex: "studentCode",
key: "studentCode", key: "studentCode",
width: 60, width: 120,
align: "center", align: "center",
className: "h head", className: "h head",
customRender: (text) => { customRender: (text) => {
@@ -305,7 +305,7 @@ export default {
align: "center", align: "center",
ellipsis: true, ellipsis: true,
className: "h", className: "h",
customRender: ({record:{finishStatus}}) => ({1:'进行中',0:'未开始',9:'已完成'}[finishStatus] || '未开始'), customRender: ({record:{status}}) => ({1:'进行中',0:'未开始',9:'已完成'}[status] || '未开始'),
}, },
{ {
title: "操作", title: "操作",
@@ -318,14 +318,14 @@ export default {
customRender: (text) => { customRender: (text) => {
return ( return (
<div class="racona"> <div class="racona">
<a {text.record.status == '0' ? "查看答卷" :
onClick={()=>{ <a onClick={()=>{
state.studentKid = text.record.studentKid; state.studentKid = text.record.studentKid;
state.datasource = text.record; state.datasource = text.record;
state.CAvisible = true; state.CAvisible = true;
}}> }}> 查看答卷 </a>
查看答卷 }
</a>
</div> </div>
); );
}, },
@@ -398,7 +398,7 @@ export default {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
chapterId: props.datasource.chapterId, chapterId: props.datasource.chapterId,
type: 2, type: 1,
taskId: props.datasource.courseId, taskId: props.datasource.courseId,
targetId: props.datasource.projectId targetId: props.datasource.projectId
}).then(res=>{ }).then(res=>{

View File

@@ -399,7 +399,7 @@ export default {
pageNo: state.currentPage, pageNo: state.currentPage,
pageSize: state.pageSize, pageSize: state.pageSize,
chapterId: props.datasource.chapterId, chapterId: props.datasource.chapterId,
type: 1, type: 2,
taskId: props.datasource.courseId, taskId: props.datasource.courseId,
targetId: props.datasource.routerId targetId: props.datasource.routerId
}).then(res => { }).then(res => {

View File

@@ -13,7 +13,7 @@
<div class="delete" @click="handleDel">删除</div> <div class="delete" @click="handleDel">删除</div>
</div> </div>
<div class="name uploadContent"> <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> <div class="addimg">+添加图片</div>
</a-upload> </a-upload>
<div v-show="formData.optionPictureAddress" class="picture" style="position: relative"> <div v-show="formData.optionPictureAddress" class="picture" style="position: relative">