Merge branch 'develop' of http://gitlab.dongwu-inc.com:10080/BOE/fe-stu into manage-release

This commit is contained in:
yuping
2022-12-26 22:08:07 +08:00
3 changed files with 3 additions and 3 deletions

View File

@@ -83,7 +83,7 @@
</div> </div>
<div class="goclass" @click="toFinish(value, i.stageName, i.stageId)"> <div class="goclass" @click="toFinish(value, i.stageName, i.stageId)">
{{ {{
value.status === 100 value.status === 1
? "已完成" ? "已完成"
: types.path[value.type] : types.path[value.type]
? types.toName[value.type] ? types.toName[value.type]

View File

@@ -80,7 +80,7 @@
: scope.row.taskStatus === 2 : scope.row.taskStatus === 2
? completed ? completed
: scope.row.taskStatus === 0 : scope.row.taskStatus === 0
? nostarted ? ongoing
: null : null
" style="width: 99px; height: 99px"/> " style="width: 99px; height: 99px"/>
</el-table-column> </el-table-column>

View File

@@ -91,7 +91,7 @@
<div class="goclass" :style="{ <div class="goclass" :style="{
background: `${types.path[value.type] ? '#2478ff' : '#999'}`, background: `${types.path[value.type] ? '#2478ff' : '#999'}`,
}" @click="toFinish(value)"> }" @click="toFinish(value)">
{{ value.currentRatio === 100 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }} {{ value.status === 1 ? "已完成" : types.path[value.type] ? types.toName[value.type] : "未开放" }}
</div> </div>
<!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">--> <!-- <div :style="{ display: value.status === 1 ? 'block' : 'none' }">-->
<!-- <div--> <!-- <div-->