diff --git a/src/components/allot-info-confirm.vue b/src/components/allot-info-confirm.vue
index d40c6ed4d3d8dbc3150dd7b152543c0527c7c1b6..c0e0e138ca725123c305dfbcaf7758956c00893a 100644
--- a/src/components/allot-info-confirm.vue
+++ b/src/components/allot-info-confirm.vue
@@ -184,7 +184,7 @@ export default {
this.hideDialog();
} else {
this.$message({
- message: "分配失败",
+ message: data.errMsg || "分配失败",
type: "warning",
});
}
diff --git a/src/components/shop-cloud/shop-cloud.vue b/src/components/shop-cloud/shop-cloud.vue
index 3775e2db00fb4f068dd10a54ce58edccaa03e02b..e762f77a0f2e9f01df677f30cad008e9663b6bf5 100644
--- a/src/components/shop-cloud/shop-cloud.vue
+++ b/src/components/shop-cloud/shop-cloud.vue
@@ -222,7 +222,7 @@
:max="10"
placeholder="请选择内存最高使用量"
>
-
核
+ GB
@@ -238,7 +238,7 @@
:max="10"
placeholder="请选择内存默认使用量"
>
- 核
+ GB
@@ -1197,51 +1197,84 @@ 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) {
- let query = {
- resource_info: {
- namespace: this.formNew.namespace,
- workplace: this.formNew.workplace,
- workplacedesc: this.formNew.workplacedesc,
- },
- resource_apply: {
- apply_file: this.formNew.apply_file,
- cpu: Number(this.formNew.cpu),
- duration: this.formNew.appDuration,
- duration_unit: Number(this.formNew.durType),
- apply_connect_username: this.form.link_man,
- apply_connect_mobile: this.form.phone,
- memory: Number(this.formNew.memory),
- containers: this.formNew.containerGroup,
- disk_num: this.formNew.dataDisk,
- disk_cap: this.formNew.perDataDisk,
- one_cpu_min: this.formNew.perCPU,
- one_cpu_max: this.formNew.perCPUs,
- one_memory_min: this.formNew.perRAM,
- one_memory_max: this.formNew.perRAMs,
- },
- disks: [
- {
+ this.checkNamespace(this.formNew.namespace, () => {
+ let query = {
+ resource_info: {
+ namespace: this.formNew.namespace,
+ workplace: this.formNew.workplace,
+ workplacedesc: this.formNew.workplacedesc,
+ },
+ resource_apply: {
+ apply_file: this.formNew.apply_file,
+ cpu: Number(this.formNew.cpu),
+ duration: this.formNew.appDuration,
+ duration_unit: Number(this.formNew.durType),
+ apply_connect_username: this.form.link_man,
+ apply_connect_mobile: this.form.phone,
+ memory: Number(this.formNew.memory),
+ containers: this.formNew.containerGroup,
disk_num: this.formNew.dataDisk,
disk_cap: this.formNew.perDataDisk,
- store_type: this.formNew.store_type,
+ one_cpu_min: this.formNew.perCPU,
+ one_cpu_max: this.formNew.perCPUs,
+ one_memory_min: this.formNew.perRAM,
+ one_memory_max: this.formNew.perRAMs,
},
- ],
- };
- this.$api.serviceShop.applicationCloud(query).then((response) => {
- if (response.data.success == 1) {
- this.$message({
- message: "申请成功",
- type: "success",
- });
- this.$router.push("/services_shop");
- } else {
- this.$message({
- message: `申请失败,${response.data.errMsg}`,
- type: "error",
- });
- }
+ disks: [
+ {
+ disk_num: this.formNew.dataDisk,
+ disk_cap: this.formNew.perDataDisk,
+ store_type: this.formNew.store_type,
+ },
+ ],
+ };
+ this.$api.serviceShop.applicationCloud(query).then((response) => {
+ if (response.data.success == 1) {
+ this.$message({
+ message: "申请成功",
+ type: "success",
+ });
+ this.$router.push("/services_shop");
+ } else {
+ this.$message({
+ message: `申请失败,${response.data.errMsg}`,
+ type: "error",
+ });
+ }
+ });
});
} else {
let query = {