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

Merge branch 'dev' of https://github.com/metersphere/server into dev

This commit is contained in:
chenjianxing 2020-06-03 17:37:54 +08:00
parent 9569be7d1f 1ee3dd09b0
commit f83550044f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
frontend/src/business/components/api/test/ApiTestList.vue
View File

@ -7,12 +7,9 @@
:title="$t('commons.test')" :title="$t('commons.test')"
@create="create" :createTip="$t('load_test.create')"/> @create="create" :createTip="$t('load_test.create')"/>
</template> </template>
<el-table :data="tableData" class="table-content" @sort-change="sort" <el-table :data="tableData" class="table-content" @sort-change="sort" @row-click="handleEdit"
@filter-change="filter"> @filter-change="filter">
<el-table-column :label="$t('commons.name')" width="250" show-overflow-tooltip> <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip>
<template v-slot:default="scope">
<el-link type="info" @click="handleEdit(scope.row)">{{ scope.row.name }}</el-link>
</template>
</el-table-column> </el-table-column>
<el-table-column prop="projectName" :label="$t('load_test.project_name')" width="200" show-overflow-tooltip/> <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="200" show-overflow-tooltip/>
<el-table-column prop="userName" :label="$t('api_test.creator')" width="150" show-overflow-tooltip/> <el-table-column prop="userName" :label="$t('api_test.creator')" width="150" show-overflow-tooltip/>
@ -153,9 +150,6 @@
} }
this.search(); this.search();
}, },
/* filter(value, row) {
return row.status === value;
}*/
sort(column) { sort(column) {
_sort(column, this.condition); _sort(column, this.condition);
this.init(); this.init();
@ -176,4 +170,8 @@
.table-content { .table-content {
width: 100%; width: 100%;
} }
.el-table {
cursor: pointer;
}
</style> </style>

8
frontend/src/business/components/performance/test/PerformanceTestPlan.vue
View File

@ -19,15 +19,13 @@
<el-table :data="tableData" class="test-content" <el-table :data="tableData" class="test-content"
@sort-change="sort" @sort-change="sort"
@filter-change="filter" @filter-change="filter"
@row-click="link"
> >
<el-table-column <el-table-column
prop="name" prop="name"
:label="$t('commons.name')" :label="$t('commons.name')"
width="150" width="150"
show-overflow-tooltip> show-overflow-tooltip>
<template v-slot:default="scope">
<el-link type="info" @click="link(scope.row)">{{ scope.row.name }}</el-link>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="projectName" prop="projectName"
@ -228,4 +226,8 @@
margin-right: -9px; margin-right: -9px;
float: right; float: right;
} }
.el-table {
cursor:pointer;
}
</style> </style>