Commit dca59da1 authored by 刘殿昕's avatar 刘殿昕

fixed

parent 5785c2f0
...@@ -578,8 +578,8 @@ ...@@ -578,8 +578,8 @@
<el-input-number <el-input-number
v-model="formOld.appDuration" v-model="formOld.appDuration"
controls-position="right" controls-position="right"
:min="1" :min="0"
:max="1000" :max="10000"
></el-input-number> ></el-input-number>
<div class="input_right"></div> <div class="input_right"></div>
</el-form-item> </el-form-item>
...@@ -1361,7 +1361,7 @@ export default { ...@@ -1361,7 +1361,7 @@ export default {
perCPU: undefined, perCPU: undefined,
perRAMs: undefined, perRAMs: undefined,
perRAM: undefined, perRAM: undefined,
appDuration: 1, appDuration: 0,
durType: 1, durType: 1,
apply_file: "", apply_file: "",
apply_file_name: "", apply_file_name: "",
...@@ -1530,23 +1530,23 @@ export default { ...@@ -1530,23 +1530,23 @@ export default {
this.formOld.namespace = paramsOld.namespace; this.formOld.namespace = paramsOld.namespace;
this.formOld.workplace = paramsOld.workplace; this.formOld.workplace = paramsOld.workplace;
this.formOld.workplacedesc = paramsOld.workplacedesc; this.formOld.workplacedesc = paramsOld.workplacedesc;
this.formOld.cpu = paramsOld.cpu; // this.formOld.cpu = paramsOld.cpu;
this.formOld.memory = paramsOld.memory; // this.formOld.memory = paramsOld.memory;
this.formOld.containerGroup = paramsOld.containers; // this.formOld.containerGroup = paramsOld.containers;
this.specArr[0].val = paramsOld.cpu; this.specArr[0].val = paramsOld.cpu;
this.specArr[1].val = paramsOld.memory; this.specArr[1].val = paramsOld.memory;
this.specArr[2].val = paramsOld.containers; this.specArr[2].val = paramsOld.containers;
this.formOld.dataDisk = ""; // this.formOld.dataDisk = "";
this.formOld.perDataDisk = ""; // this.formOld.perDataDisk = "";
this.formOld.perCPUs = paramsOld.one_cpu_max; // this.formOld.perCPUs = paramsOld.one_cpu_max;
this.formOld.perCPU = paramsOld.one_cpu_min; // this.formOld.perCPU = paramsOld.one_cpu_min;
this.formOld.perRAMs = paramsOld.one_memory_max; // this.formOld.perRAMs = paramsOld.one_memory_max;
this.formOld.perRAM = paramsOld.one_memory_min; // this.formOld.perRAM = paramsOld.one_memory_min;
this.rqzArr[0].max = paramsOld.one_cpu_max; this.rqzArr[0].max = paramsOld.one_cpu_max;
this.rqzArr[0].default = paramsOld.one_cpu_min; this.rqzArr[0].default = paramsOld.one_cpu_min;
this.rqzArr[1].max = paramsOld.one_memory_max; this.rqzArr[1].max = paramsOld.one_memory_max;
this.rqzArr[1].default = paramsOld.one_memory_min; this.rqzArr[1].default = paramsOld.one_memory_min;
this.formOld.store_type = paramsOld.store_type; // this.formOld.store_type = paramsOld.store_type;
this.dataDiskList = paramsOld.disk_list || []; this.dataDiskList = paramsOld.disk_list || [];
this.dataDiskList.forEach((item, index) => { this.dataDiskList.forEach((item, index) => {
item.name = `磁盘${index + 1}`; item.name = `磁盘${index + 1}`;
...@@ -1588,23 +1588,23 @@ export default { ...@@ -1588,23 +1588,23 @@ export default {
this.formOld.namespace = paramsOld.namespace; this.formOld.namespace = paramsOld.namespace;
this.formOld.workplace = paramsOld.workplace; this.formOld.workplace = paramsOld.workplace;
this.formOld.workplacedesc = paramsOld.workplacedesc; this.formOld.workplacedesc = paramsOld.workplacedesc;
this.formOld.cpu = paramsOld.cpu; // this.formOld.cpu = paramsOld.cpu;
this.formOld.memory = paramsOld.memory; // this.formOld.memory = paramsOld.memory;
this.formOld.containerGroup = paramsOld.containers; // this.formOld.containerGroup = paramsOld.containers;
this.specArr[0].val = paramsOld.cpu; this.specArr[0].val = paramsOld.cpu;
this.specArr[1].val = paramsOld.memory; this.specArr[1].val = paramsOld.memory;
this.specArr[2].val = paramsOld.containers; this.specArr[2].val = paramsOld.containers;
this.formOld.dataDisk = ""; // this.formOld.dataDisk = "";
this.formOld.perDataDisk = ""; // this.formOld.perDataDisk = "";
this.formOld.perCPUs = paramsOld.one_cpu_max; // this.formOld.perCPUs = paramsOld.one_cpu_max;
this.formOld.perCPU = paramsOld.one_cpu_min; // this.formOld.perCPU = paramsOld.one_cpu_min;
this.formOld.perRAMs = paramsOld.one_memory_max; // this.formOld.perRAMs = paramsOld.one_memory_max;
this.formOld.perRAM = paramsOld.one_memory_min; // this.formOld.perRAM = paramsOld.one_memory_min;
this.rqzArr[0].max = paramsOld.one_cpu_max; this.rqzArr[0].max = paramsOld.one_cpu_max;
this.rqzArr[0].default = paramsOld.one_cpu_min; this.rqzArr[0].default = paramsOld.one_cpu_min;
this.rqzArr[1].max = paramsOld.one_memory_max; this.rqzArr[1].max = paramsOld.one_memory_max;
this.rqzArr[1].default = paramsOld.one_memory_min; this.rqzArr[1].default = paramsOld.one_memory_min;
this.formOld.store_type = paramsOld.store_type; // this.formOld.store_type = paramsOld.store_type;
this.dataDiskList = paramsOld.disk_list || []; this.dataDiskList = paramsOld.disk_list || [];
this.dataDiskList.forEach((item, index) => { this.dataDiskList.forEach((item, index) => {
item.name = `磁盘${index + 1}`; item.name = `磁盘${index + 1}`;
......
...@@ -369,10 +369,12 @@ export default { ...@@ -369,10 +369,12 @@ export default {
}); });
}, },
updateShoppingCart() { updateShoppingCart() {
let spec_id = this.specificationPop && this.specificationPop.id ? this.specificationPop.id : this.cellItems.spec_id;
console.log(spec_id)
let query = { let query = {
id: this.cellItems.id, id: this.cellItems.id,
duration: this.cellItems.duration, duration: this.cellItems.duration,
spec_id: this.specificationPop.id, spec_id: spec_id,
duration_method: this.cellItems.duration_method, duration_method: this.cellItems.duration_method,
is_subscribe: Number(this.cellItems.is_subscribe), is_subscribe: Number(this.cellItems.is_subscribe),
}; };
......
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