Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
86034d4e
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
86034d4e
编写于
5月 18, 2020
作者:
Q
q4speed
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
上级
a4dfcf3f
6262c9c2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
12 addition
and
7 deletion
+12
-7
frontend/src/business/components/common/head/HeaderUser.vue
frontend/src/business/components/common/head/HeaderUser.vue
+1
-2
frontend/src/business/components/performance/home/PerformanceTestHome.vue
...iness/components/performance/home/PerformanceTestHome.vue
+1
-1
frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
...components/performance/home/PerformanceTestRecentList.vue
+1
-1
frontend/src/business/components/performance/test/PerformanceTestStatus.vue
...ess/components/performance/test/PerformanceTestStatus.vue
+9
-3
未找到文件。
frontend/src/business/components/common/head/HeaderUser.vue
浏览文件 @
86034d4e
...
...
@@ -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
;
...
...
frontend/src/business/components/performance/home/PerformanceTestHome.vue
浏览文件 @
86034d4e
...
...
@@ -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>
...
...
frontend/src/business/components/performance/home/PerformanceTestRecentList.vue
浏览文件 @
86034d4e
...
...
@@ -51,7 +51,7 @@
},
link
(
row
)
{
this
.
$router
.
push
({
path
:
'
/performance/test/edit
?id=
'
+
row
.
id
,
path
:
'
/performance/test/edit
/
'
+
row
.
id
,
})
}
},
...
...
frontend/src/business/components/performance/test/PerformanceTestStatus.vue
浏览文件 @
86034d4e
<
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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录