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

This commit is contained in:
wenyann 2020-06-05 16:03:18 +08:00
commit d42f399a49
4 changed files with 24 additions and 24 deletions

View File

@ -3,12 +3,8 @@
<template v-slot:header> <template v-slot:header>
<span class="title">{{$t('api_report.title')}}</span> <span class="title">{{$t('api_report.title')}}</span>
</template> </template>
<el-table :data="tableData" class="table-content"> <el-table :data="tableData" class="table-content" @row-click="link">
<el-table-column :label="$t('commons.name')" width="150" show-overflow-tooltip> <el-table-column prop="name" :label="$t('commons.name')" width="150" 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 width="250" :label="$t('commons.create_time')"> <el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span> <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@ -65,4 +61,8 @@
<style scoped> <style scoped>
.el-table {
cursor:pointer;
}
</style> </style>

View File

@ -3,12 +3,8 @@
<template v-slot:header> <template v-slot:header>
<span class="title">{{$t('commons.test')}}</span> <span class="title">{{$t('commons.test')}}</span>
</template> </template>
<el-table :data="tableData" class="table-content"> <el-table :data="tableData" class="table-content" @row-click="link">
<el-table-column :label="$t('commons.name')" width="150" show-overflow-tooltip> <el-table-column prop="name" :label="$t('commons.name')" width="150" 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 prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/> <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')"> <el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
@ -66,4 +62,8 @@
<style scoped> <style scoped>
.el-table {
cursor:pointer;
}
</style> </style>

View File

@ -3,12 +3,8 @@
<template v-slot:header> <template v-slot:header>
<span class="title">{{$t('api_report.title')}}</span> <span class="title">{{$t('api_report.title')}}</span>
</template> </template>
<el-table :data="tableData" class="table-content"> <el-table :data="tableData" class="table-content" @row-click="link">
<el-table-column :label="$t('commons.name')" width="150" show-overflow-tooltip> <el-table-column prop="name" :label="$t('commons.name')" width="150" 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 width="250" :label="$t('commons.create_time')"> <el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
<span>{{ scope.row.createTime | timestampFormatDate }}</span> <span>{{ scope.row.createTime | timestampFormatDate }}</span>
@ -63,4 +59,8 @@
<style scoped> <style scoped>
.el-table {
cursor:pointer;
}
</style> </style>

View File

@ -3,12 +3,8 @@
<template v-slot:header> <template v-slot:header>
<span class="title">{{$t('commons.test')}}</span> <span class="title">{{$t('commons.test')}}</span>
</template> </template>
<el-table :data="tableData" class="table-content"> <el-table :data="tableData" class="table-content" @row-click="link">
<el-table-column :label="$t('commons.name')" width="150" show-overflow-tooltip> <el-table-column prop="name" :label="$t('commons.name')" width="150" 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 prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/> <el-table-column prop="projectName" :label="$t('load_test.project_name')" width="150" show-overflow-tooltip/>
<el-table-column width="250" :label="$t('commons.create_time')"> <el-table-column width="250" :label="$t('commons.create_time')">
<template v-slot:default="scope"> <template v-slot:default="scope">
@ -64,4 +60,8 @@
<style scoped> <style scoped>
.el-table {
cursor:pointer;
}
</style> </style>