Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
ca66c782
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,发现更多精彩内容 >>
提交
ca66c782
编写于
3月 23, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
上级
ffba30cf
a62eaa55
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
157 addition
and
109 deletion
+157
-109
frontend/src/business/components/project/MsProject.vue
frontend/src/business/components/project/MsProject.vue
+1
-1
frontend/src/business/components/settings/organization/OrganizationMember.vue
...s/components/settings/organization/OrganizationMember.vue
+2
-2
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
...omponents/settings/organization/OrganizationWorkspace.vue
+3
-3
frontend/src/business/components/settings/personal/PersonSetting.vue
...c/business/components/settings/personal/PersonSetting.vue
+1
-1
frontend/src/business/components/settings/system/Organization.vue
.../src/business/components/settings/system/Organization.vue
+4
-4
frontend/src/business/components/settings/system/SystemWorkspace.vue
...c/business/components/settings/system/SystemWorkspace.vue
+4
-4
frontend/src/business/components/settings/system/TestResourcePool.vue
.../business/components/settings/system/TestResourcePool.vue
+138
-90
frontend/src/business/components/settings/system/User.vue
frontend/src/business/components/settings/system/User.vue
+2
-2
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
...usiness/components/settings/workspace/WorkspaceMember.vue
+2
-2
未找到文件。
frontend/src/business/components/project/MsProject.vue
浏览文件 @
ca66c782
...
...
@@ -46,7 +46,7 @@
</el-card>
<el-dialog
:title=
"title"
:visible.sync=
"createVisible"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.name')"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
></el-input>
</el-form-item>
...
...
frontend/src/business/components/settings/organization/OrganizationMember.vue
浏览文件 @
ca66c782
...
...
@@ -51,7 +51,7 @@
</el-card>
<el-dialog
:title=
"$t('member.create')"
:visible.sync=
"createVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.member')"
prop=
"userIds"
>
<el-select
v-model=
"form.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -81,7 +81,7 @@
</el-dialog>
<el-dialog
:title=
"$t('member.modify')"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
浏览文件 @
ca66c782
...
...
@@ -48,7 +48,7 @@
</el-card>
<el-dialog
:title=
"$t('workspace.create')"
:visible.sync=
"createVisible"
width=
"30%"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -114,7 +114,7 @@
<!-- add workspace member dialog -->
<el-dialog
:title=
"$t('member.create')"
:visible.sync=
"addMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"wsMemberRule"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"wsMemberRule"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.member')"
prop=
"userIds"
>
<el-select
v-model=
"memberForm.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -145,7 +145,7 @@
<!-- update workspace member dialog -->
<el-dialog
:title=
"$t('member.modify')"
:visible.sync=
"updateMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form
:model=
"memberForm"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"memberForm.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/personal/PersonSetting.vue
浏览文件 @
ca66c782
...
...
@@ -26,7 +26,7 @@
</el-table>
<el-dialog
:title=
"$t('member.modify_personal_info')"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateUserForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/system/Organization.vue
浏览文件 @
ca66c782
...
...
@@ -101,7 +101,7 @@
<!-- add organization form -->
<el-dialog
:title=
"$t('organization.create')"
:visible.sync=
"createVisible"
width=
"30%"
@
closed=
"closeFunc"
:destroy-on-close=
"true"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"createOrganization"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"createOrganization"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -116,7 +116,7 @@
<!-- update organization form -->
<el-dialog
:title=
"$t('organization.modify')"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateOrganizationForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateOrganizationForm"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -131,7 +131,7 @@
<!-- add organization member form -->
<el-dialog
:title=
"$t('member.create')"
:visible.sync=
"addMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"orgMemberRule"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"orgMemberRule"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.member')"
prop=
"userIds"
>
<el-select
v-model=
"memberForm.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -162,7 +162,7 @@
<!-- update organization member form -->
<el-dialog
:title=
"$t('member.modify')"
:visible.sync=
"updateMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form
:model=
"memberForm"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"memberForm.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/system/SystemWorkspace.vue
浏览文件 @
ca66c782
...
...
@@ -53,7 +53,7 @@
<!-- add workspace dialog -->
<el-dialog
:title=
"$t('workspace.create')"
:visible.sync=
"createVisible"
width=
"30%"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -78,7 +78,7 @@
<!-- update workspace dialog -->
<el-dialog
:title=
"$t('workspace.update')"
:visible.sync=
"updateVisible"
width=
"30%"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"updateForm"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
:rules=
"rules"
ref=
"updateForm"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.name')"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -154,7 +154,7 @@
<!-- add workspace member dialog -->
<el-dialog
:title=
"$t('member.create')"
:visible.sync=
"addMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"wsMemberRule"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"memberForm"
ref=
"form"
:rules=
"wsMemberRule"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
:label=
"$t('commons.member')"
prop=
"userIds"
>
<el-select
v-model=
"memberForm.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -185,7 +185,7 @@
<!-- update workspace member dialog -->
<el-dialog
:title=
"$t('member.modify')"
:visible.sync=
"updateMemberVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"memberForm"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form
:model=
"memberForm"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"memberForm.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/system/TestResourcePool.vue
浏览文件 @
ca66c782
...
...
@@ -70,7 +70,7 @@
</el-card>
<el-dialog
title=
"创建资源池"
:visible.sync=
"createVisible"
width=
"70%"
@
closed=
"closeFunc"
:destroy-on-close=
"true"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"createTestResourcePoolForm"
>
<el-form-item
label=
"名称"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
...
...
@@ -85,46 +85,41 @@
</el-select>
</el-form-item>
<div
v-for=
"(item,index) in infoList "
:key=
"index"
>
<div
class=
"current-row"
v-if=
"form.type === 'K8S'"
>
<div
style=
"width: 35%;float: left"
>
<label
class=
"el-form-item__label"
>
Master URL
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.masterUrl"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"node-line"
v-if=
"form.type === 'K8S'"
>
<div
class=
"k8s-master"
>
<el-col
:span=
"11"
>
</el-col>
<el-form-item
prop=
"masterUrl"
label=
"Master URL"
>
<el-input
v-model=
"item.masterUrl"
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 35%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
Token
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.token"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"k8s-token"
>
<el-form-item
prop=
"token"
label=
"Token"
>
<el-input
v-model=
"item.token"
show-password
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 30%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
最大并发数
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 102px"
>
<input
v-model=
"item.maxConcurrency"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<el-form-item
prop=
"maxConcurrency"
label=
"最大并发数"
>
<el-input-number
v-model=
"item.maxConcurrency"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
</div>
<div
class=
"current-row"
v-if=
"form.type === 'NODE'"
>
<div
style=
"width: 42%;float: left"
>
<label
class=
"el-form-item__label"
>
IP
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.ip"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"node-line"
v-if=
"form.type === 'NODE'"
>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"ip"
label=
"IP"
>
<el-input
v-model=
"item.ip"
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 20%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
port
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.port"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"port"
label=
"Port"
>
<el-input-number
v-model=
"item.port"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
<div
style=
"width: 20%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
最大并发数
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 102px"
>
<input
v-model=
"item.maxConcurrency"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"maxConcurrency"
label=
"最大并发数"
>
<el-input-number
v-model=
"item.maxConcurrency"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
<div
class=
"op"
>
<span
class=
"box"
>
...
...
@@ -149,7 +144,7 @@
</el-dialog>
<el-dialog
title=
"修改资源池"
:visible.sync=
"updateVisible"
width=
"70%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateTestResourcePoolForm"
>
<el-form-item
label=
"名称"
prop=
"name"
>
<el-input
v-model=
"form.name"
autocomplete=
"off"
/>
...
...
@@ -158,52 +153,44 @@
<el-input
v-model=
"form.description"
autocomplete=
"off"
/>
</el-form-item>
<el-form-item
label=
"资源类型"
prop=
"type"
>
<el-select
v-model=
"form.type"
placeholder=
"选择资源类型"
>
<el-select
v-model=
"form.type"
placeholder=
"选择资源类型"
@
change=
"changeResourceType()"
>
<el-option
key=
"K8S"
value=
"K8S"
label=
"Kubernetes"
>
Kubernetes
</el-option>
<el-option
key=
"NODE"
value=
"NODE"
label=
"独立节点"
>
独立节点
</el-option>
</el-select>
</el-form-item>
<div
v-for=
"(item,index) in infoList "
:key=
"index"
>
<div
class=
"current-row"
v-if=
"form.type === 'K8S'"
>
<div
style=
"width: 35%;float: left"
>
<label
class=
"el-form-item__label"
>
Master URL
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.masterUrl"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"node-line"
v-if=
"form.type === 'K8S'"
>
<div
class=
"k8s-master"
>
<el-form-item
prop=
"masterUrl"
label=
"Master URL"
>
<el-input
v-model=
"item.masterUrl"
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 35%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
Token
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.token"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"k8s-token"
>
<el-form-item
prop=
"password"
label=
"Token"
style=
"padding-left: 20px"
>
<el-input
v-model=
"item.token"
show-password
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 30%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
最大并发数
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 102px"
>
<input
v-model=
"item.maxConcurrency"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<el-form-item
prop=
"maxConcurrency"
label=
"最大并发数"
style=
"padding-left: 20px"
>
<el-input-number
v-model=
"item.maxConcurrency"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
</div>
<div
class=
"current-row"
v-if=
"form.type === 'NODE'"
>
<div
style=
"width: 42%;float: left"
>
<label
class=
"el-form-item__label"
>
IP
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.ip"
autocomplete=
"off"
class=
"el-input__inner form-input"
/>
</div>
<div
class=
"node-line"
v-if=
"form.type === 'NODE'"
>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"ip"
label=
"IP"
>
<el-input
v-model=
"item.ip"
autocomplete=
"off"
/>
</el-form-item>
</div>
<div
style=
"width: 20%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
port
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 100px"
>
<input
v-model=
"item.port"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"port"
label=
"Port"
style=
"padding-left: 20px"
>
<el-input-number
v-model=
"item.port"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
<div
style=
"width: 20%;float: left"
>
<label
class=
"el-form-item__label"
style=
"padding-left: 20px"
>
最大并发数
</label>
<div
class=
"el-form-item__content"
style=
"margin-left: 102px"
>
<input
v-model=
"item.maxConcurrency"
autocomplete=
"off"
type=
"number"
class=
"el-input__inner form-input"
/>
</div>
<div
style=
"width: 30%;float: left"
>
<el-form-item
prop=
"maxConcurrency"
label=
"最大并发数"
style=
"padding-left: 20px"
>
<el-input-number
v-model=
"item.maxConcurrency"
:min=
"1"
:max=
"9999"
></el-input-number>
</el-form-item>
</div>
<div
class=
"op"
>
<span
class=
"box"
>
...
...
@@ -264,6 +251,9 @@
],
description
:
[
{
max
:
60
,
message
:
'
最大长度 60 个字符
'
,
trigger
:
'
blur
'
}
],
type
:
[
{
required
:
true
,
message
:
'
请选择资源类型
'
,
trigger
:
'
blur
'
}
]
}
}
...
...
@@ -303,6 +293,28 @@
});
}
},
validateResourceInfo
()
{
if
(
this
.
infoList
.
length
<=
0
)
{
return
{
validate
:
false
,
msg
:
"
资源池不能为空
"
}
}
let
resultValidate
=
{
validate
:
true
,
msg
:
"
请完善数据
"
}
this
.
infoList
.
forEach
(
function
(
info
)
{
for
(
let
key
in
info
)
{
if
(
info
[
key
]
!=
'
0
'
&&
!
info
[
key
])
{
resultValidate
.
validate
=
false
return
false
;
}
}
if
(
!
info
.
maxConcurrency
)
{
resultValidate
.
validate
=
false
return
false
;
}
});
return
resultValidate
;
},
buildPagePath
(
path
)
{
return
path
+
"
/
"
+
this
.
currentPage
+
"
/
"
+
this
.
pageSize
;
},
...
...
@@ -349,16 +361,26 @@
createTestResourcePool
(
createTestResourcePoolForm
)
{
this
.
$refs
[
createTestResourcePoolForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
form
.
info
=
JSON
.
stringify
(
this
.
infoList
);
this
.
$post
(
"
/testresourcepool/add
"
,
this
.
form
)
.
then
(()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
'
添加成功!
'
},
this
.
createVisible
=
false
,
this
.
initTableData
())
let
vri
=
this
.
validateResourceInfo
();
if
(
vri
.
validate
)
{
this
.
form
.
info
=
JSON
.
stringify
(
this
.
infoList
);
this
.
$post
(
"
/testresourcepool/add
"
,
this
.
form
)
.
then
(()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
'
添加成功!
'
},
this
.
createVisible
=
false
,
this
.
initTableData
())
});
}
else
{
this
.
$message
({
type
:
'
warning
'
,
message
:
vri
.
msg
});
return
false
;
}
}
else
{
return
false
;
}
...
...
@@ -367,17 +389,26 @@
updateTestResourcePool
(
updateTestResourcePoolForm
)
{
this
.
$refs
[
updateTestResourcePoolForm
].
validate
(
valide
=>
{
if
(
valide
)
{
this
.
form
.
info
=
JSON
.
stringify
(
this
.
infoList
);
this
.
$post
(
"
/testresourcepool/update
"
,
this
.
form
)
.
then
(()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
},
this
.
updateVisible
=
false
,
this
.
initTableData
(),
self
.
loading
=
false
)
let
vri
=
this
.
validateResourceInfo
();
if
(
vri
.
validate
)
{
this
.
form
.
info
=
JSON
.
stringify
(
this
.
infoList
);
this
.
$post
(
"
/testresourcepool/update
"
,
this
.
form
)
.
then
(()
=>
{
this
.
$message
({
type
:
'
success
'
,
message
:
this
.
$t
(
'
commons.modify_success
'
)
},
this
.
updateVisible
=
false
,
this
.
initTableData
(),
self
.
loading
=
false
)
});
}
else
{
this
.
$message
({
type
:
'
warning
'
,
message
:
vri
.
msg
});
return
false
;
}
}
else
{
return
false
;
}
...
...
@@ -414,12 +445,29 @@
}
.op
{
line-height
:
40px
;
float
:
left
;
width
:
1
6
%
;
width
:
1
0
%
;
}
.box
{
padding-left
:
5px
;
}
.k8s-master
{
width
:
34%
;
float
:
left
}
.k8s-token
{
width
:
36%
;
float
:
left
}
.k8s-token
.el-form-item__label
{
padding-left
:
20px
;
}
.node-line
{
clear
:
both
;
}
</
style
>
frontend/src/business/components/settings/system/User.vue
浏览文件 @
ca66c782
...
...
@@ -65,7 +65,7 @@
</el-card>
<el-dialog
:title=
"$t('user.create')"
:visible.sync=
"createVisible"
width=
"30%"
@
closed=
"closeFunc"
:destroy-on-close=
"true"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"createUserForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"createUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
/>
</el-form-item>
...
...
@@ -85,7 +85,7 @@
</el-dialog>
<el-dialog
:title=
"$t('user.modify')"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateUserForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
:rules=
"rule"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
frontend/src/business/components/settings/workspace/WorkspaceMember.vue
浏览文件 @
ca66c782
...
...
@@ -50,7 +50,7 @@
</el-card>
<el-dialog
title=
"添加成员"
:visible.sync=
"createVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
>
<el-form
:model=
"form"
ref=
"form"
:rules=
"rules"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
>
<el-form-item
label=
"成员"
prop=
"userIds"
>
<el-select
v-model=
"form.userIds"
multiple
:placeholder=
"$t('member.please_choose_member')"
class=
"select-width"
>
<el-option
...
...
@@ -80,7 +80,7 @@
</el-dialog>
<el-dialog
title=
"修改成员"
:visible.sync=
"updateVisible"
width=
"30%"
:destroy-on-close=
"true"
@
close=
"closeFunc"
>
<el-form
:model=
"form"
label-position=
"
lef
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form
:model=
"form"
label-position=
"
righ
t"
label-width=
"100px"
size=
"small"
ref=
"updateUserForm"
>
<el-form-item
label=
"ID"
prop=
"id"
>
<el-input
v-model=
"form.id"
autocomplete=
"off"
:disabled=
"true"
/>
</el-form-item>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录