Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
apaas-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gzga-jzapi
apaas-ui
Commits
791451cd
Commit
791451cd
authored
Jul 28, 2020
by
张俊
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
https://cloud.wodcloud.com/git/apaas/apaas-v3-ui
into dev
parents
950baf62
ea35f905
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
76 additions
and
43 deletions
+76
-43
src/components/allot-info-confirm.vue
src/components/allot-info-confirm.vue
+1
-1
src/components/shop-cloud/shop-cloud.vue
src/components/shop-cloud/shop-cloud.vue
+75
-42
No files found.
src/components/allot-info-confirm.vue
View file @
791451cd
...
...
@@ -184,7 +184,7 @@ export default {
this
.
hideDialog
();
}
else
{
this
.
$message
({
message
:
"
分配失败
"
,
message
:
data
.
errMsg
||
"
分配失败
"
,
type
:
"
warning
"
,
});
}
...
...
src/components/shop-cloud/shop-cloud.vue
View file @
791451cd
...
...
@@ -222,7 +222,7 @@
:max=
"10"
placeholder=
"请选择内存最高使用量"
></el-input-number>
<div
class=
"input_right"
>
核
</div>
<div
class=
"input_right"
>
GB
</div>
</el-form-item>
</el-col>
<el-col
:span=
"11"
>
...
...
@@ -238,7 +238,7 @@
:max=
"10"
placeholder=
"请选择内存默认使用量"
></el-input-number>
<div
class=
"input_right"
>
核
</div>
<div
class=
"input_right"
>
GB
</div>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
...
...
@@ -1197,8 +1197,40 @@ export default {
}
);
}
}
,
checkNamespace
(
namespace
,
cb
)
{
this
.
$http
.
get
(
"
/apaas/service/v3/resource/apply/checkNs
"
,
{
params
:
{
namespace
}
,
}
)
.
then
(({
data
}
)
=>
{
if
(
data
.
success
===
1
)
{
if
(
data
.
data
===
1
)
{
typeof
cb
===
"
function
"
&&
cb
();
}
else
if
(
data
.
data
===
-
1
)
{
this
.
$message
({
message
:
`命名空间名称已存在`
,
type
:
"
error
"
,
}
);
}
else
if
(
data
.
data
===
-
1
)
{
this
.
$message
({
message
:
`命名空间名称验证失败`
,
type
:
"
error
"
,
}
);
}
}
}
)
.
catch
((
error
)
=>
{
console
.
log
(
error
);
this
.
$message
({
message
:
`命名空间名称验证失败`
,
type
:
"
error
"
,
}
);
}
);
}
,
determineSubmit
()
{
if
(
this
.
activeName
==
0
)
{
this
.
checkNamespace
(
this
.
formNew
.
namespace
,
()
=>
{
let
query
=
{
resource_info
:
{
namespace
:
this
.
formNew
.
namespace
,
...
...
@@ -1243,6 +1275,7 @@ export default {
}
);
}
}
);
}
);
}
else
{
let
query
=
{
resource_id
:
this
.
workSpaceId
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment