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

Merge branch 'master' of https://github.com/metersphere/metersphere 

# Conflicts:
#	frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
This commit is contained in:
fit2-zhao 2020-10-15 18:23:10 +08:00
parent cbf2b89742
commit 25b40809db
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/business/components/track/review/view/components/TestReviewRelevance.vue
View File

@ -64,7 +64,7 @@
:label="$t('test_track.case.status')" :label="$t('test_track.case.status')"
show-overflow-tooltip> show-overflow-tooltip>
<template v-slot:default="scope"> <template v-slot:default="scope">
<status-table-item :value="scope.row.reviewStatus"/> <review-status :value="scope.row.reviewStatus"/>
</template> </template>
</el-table-column> </el-table-column>
@ -98,7 +98,7 @@
import SwitchProject from "../../../case/components/SwitchProject"; import SwitchProject from "../../../case/components/SwitchProject";
import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components"; import {TEST_CASE_CONFIGS} from "../../../../common/components/search/search-components";
import {_filter} from "../../../../../../common/js/utils"; import {_filter} from "../../../../../../common/js/utils";
import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem"; import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
import elTableInfiniteScroll from 'el-table-infinite-scroll'; import elTableInfiniteScroll from 'el-table-infinite-scroll';
export default { export default {
@ -112,7 +112,8 @@
MsTableAdvSearchBar, MsTableAdvSearchBar,
MsTableHeader, MsTableHeader,
SwitchProject, SwitchProject,
StatusTableItem ReviewStatus
}, },
directives: { directives: {
'el-table-infinite-scroll': elTableInfiniteScroll 'el-table-infinite-scroll': elTableInfiniteScroll