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

This commit is contained in:
q4speed 2020-05-09 16:03:44 +08:00
commit 7854c999c9
1 changed files with 7 additions and 14 deletions

View File

@ -64,13 +64,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" :label="$t('load_test.operating')"> <el-table-column align="center" :label="$t('load_test.operating')">
<template v-slot:default="{row, $index}"> <template v-slot:default="{row, $index}">
<el-button <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
type="danger" @exec="del(row, 'domains', $index)"/>
size="mini"
icon="el-icon-delete"
circle
@click="del(row, 'domains', $index)">
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -142,13 +137,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" :label="$t('load_test.operating')"> <el-table-column align="center" :label="$t('load_test.operating')">
<template v-slot:default="{row, $index}"> <template v-slot:default="{row, $index}">
<el-button <ms-table-operator-button :tip="$t('commons.delete')" icon="el-icon-delete" type="danger"
type="danger" @exec="del(row, 'params', $index)"/>
size="mini"
icon="el-icon-delete"
circle
@click="del(row, 'params', $index)">
</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -187,8 +177,11 @@
</template> </template>
<script> <script>
import MsTableOperatorButton from "../../../common/components/MsTableOperatorButton";
export default { export default {
name: "PerformanceAdvancedConfig", name: "PerformanceAdvancedConfig",
components: {MsTableOperatorButton},
data() { data() {
return { return {
timeout: 100, timeout: 100,