test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.3' into master

This commit is contained in:
Captain.B 2020-10-10 14:41:50 +08:00
parent 06418c23cb 3e3a43d113
commit 432d13fb1d
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
frontend/src/business/components/track/home/components/ReviewList.vue
View File

@ -45,29 +45,13 @@
<el-table-column
:label="$t('test_track.review.result_distribution')">
<template v-slot:default="scope">
<el-tooltip :content="getResultTip(scope.row.total,scope.row.reviewed,scope.row.pass)"
placement="top" :enterable="false" class="item" effect="dark">
<yan-progress :total="scope.row.total" :done="scope.row.reviewed" :modify="scope.row.pass" :tip="tip"/>
</el-tooltip>
</template>
</el-table-column>
<!-- <el-table-column-->
<!-- prop="projectName"-->
<!-- :label="$t('test_track.review.done')"-->
<!-- show-overflow-tooltip>-->
<!-- <template v-slot:default="scope">-->
<!-- {{scope.row.reviewed}}/{{scope.row.total}}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="projectName"-->
<!-- :label="$t('test_track.home.review_progress')"-->
<!-- min-width="100"-->
<!-- show-overflow-tooltip>-->
<!-- <template v-slot:default="scope">-->
<!-- <el-progress :percentage="scope.row.testRate"></el-progress>-->
<!-- </template>-->
<!-- </el-table-column>-->
<el-table-column
prop="projectName"
:label="$t('test_track.plan.plan_project')"
@ -95,9 +79,9 @@ export default {
tableData: [],
showMyCreator: false,
tip: [
{text: "总共X个", fillStyle: '#D3D3D3'},
{text: "评审了X个", fillStyle: '#F08080'},
{text: "通过X个", fillStyle: '#90EE90'}
{text: "X", fillStyle: '#D3D3D3'},
{text: "X", fillStyle: '#ee4545'},
{text: "X", fillStyle: '#4dcf4d'}
]
}
},
@ -131,6 +115,9 @@ export default {
} else {
this.initTableData("reviewer");
}
},
getResultTip(total, reviewed, pass) {
return '通过: ' + pass + '; ' + '未通过: ' + (reviewed - pass) + '; ' + '未评审: ' + (total - reviewed);
}
}
}