Commit 791451cd authored by 张俊's avatar 张俊

Merge branch 'dev' of https://cloud.wodcloud.com/git/apaas/apaas-v3-ui into dev

parents 950baf62 ea35f905
......@@ -184,7 +184,7 @@ export default {
this.hideDialog();
} else {
this.$message({
message: "分配失败",
message: data.errMsg || "分配失败",
type: "warning",
});
}
......
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment