提交 86034d4e 编写于 作者: Q q4speed

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

......@@ -13,7 +13,6 @@
</template>
<script>
import {TokenKey} from '../../../../common/js/constants';
import {getCurrentUser} from "../../../../common/js/utils";
export default {
......@@ -32,7 +31,7 @@
break;
case "logout":
this.$get("/signout", function () {
localStorage.removeItem(TokenKey);
localStorage.clear();
window.location.href = "/login";
});
break;
......
......@@ -9,7 +9,7 @@
<ms-performance-test-recent-list/>
</el-col>
</el-row>
<el-row>
<el-row :gutter="20">
<el-col :span="12">
<ms-test-heatmap :values="values"/>
</el-col>
......
......@@ -51,7 +51,7 @@
},
link(row) {
this.$router.push({
path: '/performance/test/edit?id=' + row.id,
path: '/performance/test/edit/' + row.id,
})
}
},
......
<template>
<div>
<el-tag size="mini" type="primary" v-if="row.status === 'Starting'">
<el-tag size="mini" type="info" v-if="row.status === 'Saved'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="primary" v-else-if="row.status === 'Starting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="success" v-else-if="row.status === 'Running'">
......@@ -9,6 +12,9 @@
<el-tag size="mini" type="warning" v-else-if="row.status === 'Reporting'">
{{ row.status }}
</el-tag>
<el-tag size="mini" type="info" v-else-if="row.status === 'Completed'">
{{ row.status }}
</el-tag>
<el-tooltip placement="top" v-else-if="row.status === 'Error'" effect="light">
<template v-slot:content>
<div>{{row.description}}</div>
......@@ -17,9 +23,9 @@
{{ row.status }}
</el-tag>
</el-tooltip>
<el-tag size="mini" type="info">
<span v-else>
{{ row.status }}
</el-tag>
</span>
</div>
</template>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册