Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
dcef65f7
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,发现更多精彩内容 >>
提交
dcef65f7
编写于
4月 24, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改消息提示
上级
0bf42358
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
27 addition
and
108 deletion
+27
-108
frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
...ts/performance/test/components/PerformanceBasicConfig.vue
+1
-4
frontend/src/business/components/project/MsProject.vue
frontend/src/business/components/project/MsProject.vue
+1
-4
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
...omponents/settings/organization/OrganizationWorkspace.vue
+3
-12
frontend/src/business/components/settings/personal/PersonSetting.vue
...c/business/components/settings/personal/PersonSetting.vue
+1
-4
frontend/src/business/components/settings/system/Organization.vue
.../src/business/components/settings/system/Organization.vue
+7
-28
frontend/src/business/components/settings/system/SystemWorkspace.vue
...c/business/components/settings/system/SystemWorkspace.vue
+4
-16
frontend/src/business/components/settings/system/TestResourcePool.vue
.../business/components/settings/system/TestResourcePool.vue
+6
-24
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
...usiness/components/settings/workspace/WorkspaceMember.vue
+4
-16
未找到文件。
frontend/src/business/components/performance/test/components/PerformanceBasicConfig.vue
浏览文件 @
dcef65f7
...
...
@@ -193,10 +193,7 @@
oldJmxNum
=
this
.
fileList
.
filter
(
f
=>
f
.
name
.
toLowerCase
().
endsWith
(
"
.jmx
"
)).
length
;
}
if
(
newJmxNum
+
oldJmxNum
!==
1
)
{
this
.
$message
({
message
:
this
.
$t
(
'
load_test.jmx_is_null
'
),
type
:
'
error
'
});
this
.
$error
(
this
.
$t
(
'
load_test.jmx_is_null
'
));
return
false
;
}
return
true
;
...
...
frontend/src/business/components/project/MsProject.vue
浏览文件 @
dcef65f7
...
...
@@ -107,10 +107,7 @@
create
()
{
let
workspaceId
=
this
.
currentUser
.
lastWorkspaceId
;
if
(
!
workspaceId
)
{
this
.
$message
({
type
:
'
warning
'
,
message
:
this
.
$t
(
'
project.please_choose_workspace
'
)
})
this
.
$warning
(
this
.
$t
(
'
project.please_choose_workspace
'
));
return
false
;
}
this
.
title
=
this
.
$t
(
'
project.create
'
);
...
...
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
浏览文件 @
dcef65f7
...
...
@@ -345,17 +345,11 @@
type
:
'
warning
'
}).
then
(()
=>
{
this
.
result
=
this
.
$get
(
'
/user/ws/member/delete/
'
+
this
.
currentWorkspaceRow
.
id
+
'
/
'
+
row
.
id
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
));
this
.
cellClick
(
this
.
currentWorkspaceRow
);
});
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
updateOrgMember
()
{
...
...
@@ -368,10 +362,7 @@
workspaceId
:
this
.
currentWorkspaceRow
.
id
}
this
.
result
=
this
.
$post
(
"
/workspace/member/update
"
,
param
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
));
this
.
updateMemberVisible
=
false
;
this
.
cellClick
(
this
.
currentWorkspaceRow
);
});
...
...
frontend/src/business/components/settings/personal/PersonSetting.vue
浏览文件 @
dcef65f7
...
...
@@ -113,10 +113,7 @@
this
.
$refs
[
updateUserForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
result
=
this
.
$post
(
this
.
updatePath
,
this
.
form
,
response
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
));
localStorage
.
setItem
(
TokenKey
,
JSON
.
stringify
(
response
.
data
));
this
.
updateVisible
=
false
;
this
.
initTableData
();
...
...
frontend/src/business/components/settings/system/Organization.vue
浏览文件 @
dcef65f7
...
...
@@ -319,17 +319,11 @@
type
:
'
warning
'
}).
then
(()
=>
{
this
.
result
=
this
.
$get
(
this
.
deletePath
+
row
.
id
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
));
this
.
initTableData
()
});
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
delMember
(
row
)
{
...
...
@@ -339,27 +333,18 @@
type
:
'
warning
'
}).
then
(()
=>
{
this
.
result
=
this
.
$get
(
'
/user/special/org/member/delete/
'
+
this
.
currentRow
.
id
+
'
/
'
+
row
.
id
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
))
this
.
cellClick
(
this
.
currentRow
);
});
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
createOrganization
(
createOrganizationForm
)
{
this
.
$refs
[
createOrganizationForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
result
=
this
.
$post
(
this
.
createPath
,
this
.
form
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.save_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.save_success
'
));
this
.
initTableData
();
this
.
createVisible
=
false
;
});
...
...
@@ -372,10 +357,7 @@
this
.
$refs
[
udpateOrganizationForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
result
=
this
.
$post
(
this
.
updatePath
,
this
.
form
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
))
this
.
updateVisible
=
false
;
this
.
initTableData
();
});
...
...
@@ -442,10 +424,7 @@
organizationId
:
this
.
currentRow
.
id
}
this
.
result
=
this
.
$post
(
"
/organization/member/update
"
,
param
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
))
this
.
updateMemberVisible
=
false
;
this
.
cellClick
(
this
.
currentRow
);
});
...
...
frontend/src/business/components/settings/system/SystemWorkspace.vue
浏览文件 @
dcef65f7
...
...
@@ -296,10 +296,7 @@
this
.
$refs
[
updateForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
result
=
this
.
$post
(
"
/workspace/special/update
"
,
this
.
form
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
));
this
.
updateVisible
=
false
;
this
.
list
();
});
...
...
@@ -388,17 +385,11 @@
type
:
'
warning
'
}).
then
(()
=>
{
this
.
result
=
this
.
$get
(
'
/user/special/ws/member/delete/
'
+
this
.
currentWorkspaceRow
.
id
+
'
/
'
+
row
.
id
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
));
this
.
cellClick
(
this
.
currentWorkspaceRow
);
});
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
updateOrgMember
()
{
...
...
@@ -411,10 +402,7 @@
workspaceId
:
this
.
currentWorkspaceRow
.
id
}
this
.
result
=
this
.
$post
(
"
/workspace/member/update
"
,
param
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
));
this
.
updateMemberVisible
=
false
;
this
.
cellClick
(
this
.
currentWorkspaceRow
);
});
...
...
frontend/src/business/components/settings/system/TestResourcePool.vue
浏览文件 @
dcef65f7
...
...
@@ -280,10 +280,7 @@
if
(
this
.
infoList
.
length
>
1
)
{
this
.
infoList
.
splice
(
index
,
1
)
}
else
{
this
.
$message
({
type
:
'
warning
'
,
message
:
this
.
$t
(
'
test_resource_pool.cannot_remove_all_node
'
)
});
this
.
$warning
(
this
.
$t
(
'
test_resource_pool.cannot_remove_all_node
'
))
}
},
validateResourceInfo
()
{
...
...
@@ -341,15 +338,9 @@
this
.
result
=
this
.
$get
(
`/testresourcepool/delete/
${
row
.
id
}
`
).
then
(()
=>
{
this
.
initTableData
();
});
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
));
}).
catch
(()
=>
{
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
createTestResourcePool
(
createTestResourcePoolForm
)
{
...
...
@@ -370,10 +361,7 @@
this
.
initTableData
());
});
}
else
{
this
.
$message
({
type
:
'
warning
'
,
message
:
vri
.
msg
});
this
.
$warning
(
vri
.
msg
);
return
false
;
}
...
...
@@ -413,10 +401,7 @@
self
.
loading
=
false
);
});
}
else
{
this
.
$message
({
type
:
'
warning
'
,
message
:
vri
.
msg
});
this
.
$warning
(
vri
.
msg
);
return
false
;
}
}
else
{
...
...
@@ -429,10 +414,7 @@
},
changeSwitch
(
row
)
{
this
.
result
=
this
.
$post
(
'
/testresourcepool/update
'
,
row
).
then
(()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
test_resource_pool.status_change_success
'
)
});
this
.
$success
(
this
.
$t
(
'
test_resource_pool.status_change_success
'
));
})
}
}
...
...
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
浏览文件 @
dcef65f7
...
...
@@ -185,16 +185,10 @@
this
.
initTableData
();
this
.
loading
=
false
;
});
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.delete_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.delete_success
'
));
}).
catch
(()
=>
{
this
.
loading
=
false
;
this
.
$message
({
type
:
'
info
'
,
message
:
this
.
$t
(
'
commons.delete_cancel
'
)
});
this
.
$info
(
this
.
$t
(
'
commons.delete_cancel
'
));
});
},
edit
(
row
)
{
...
...
@@ -217,10 +211,7 @@
workspaceId
:
this
.
currentUser
().
lastWorkspaceId
}
this
.
result
=
this
.
$post
(
"
/workspace/member/update
"
,
param
,
()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
});
this
.
$success
(
this
.
$t
(
'
commons.modify_success
'
));
this
.
updateVisible
=
false
;
this
.
initTableData
();
});
...
...
@@ -233,10 +224,7 @@
};
let
wsId
=
this
.
currentUser
().
lastWorkspaceId
;
if
(
typeof
wsId
==
"
undefined
"
||
wsId
==
null
||
wsId
==
""
)
{
this
.
$message
({
message
:
'
请先选择工作空间!
'
,
type
:
'
warning
'
});
this
.
$warning
(
"
请先选择工作空间!
"
);
return
false
;
}
this
.
$post
(
'
/user/org/member/list/all
'
,
param
,
response
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录