Skip to content

A
apaas-ui
Commit 08c07dd1 authored by 刘殿昕's avatar 刘殿昕
Browse files
Options

Merge branch 'dev'

parents 4898c433 2e08064a
Hide whitespace changes
Inline Side-by-side
Showing with 418 additions and 91 deletions
src/components/shop-cloud/shop-cloud-new.vue
View file @ 08c07dd1
...@@ -1030,7 +1030,7 @@ export default { ...@@ -1030,7 +1030,7 @@ export default {
let sumCM = 0; let sumCM = 0;
let sumDisk = 0; let sumDisk = 0;
let a_deductions = 0; let a_deductions = 0;
let arrJifei = JSON.parse(JSON.stringify(this.jifeiList1)); let arrJifei = JSON.parse(JSON.stringify(this.jifeiList));
if (this.activeName == "0") { if (this.activeName == "0") {
a_deductions = this.deductions; a_deductions = this.deductions;
if (this.cpu_memory && this.cpu_memory.length != 0) { if (this.cpu_memory && this.cpu_memory.length != 0) {
...@@ -1101,77 +1101,255 @@ export default { ...@@ -1101,77 +1101,255 @@ export default {
this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0 this.formNew.appDuration >= 1 ? this.formNew.appDuration : 0
}个月`; }个月`;
} else if (this.activeName == "1") { } else if (this.activeName == "1") {
let nochangeCM = false,
nochangeRQ = false;
let diffDay = helper.getTwoTimesDiff(this.paramsOld.cloud_end_time);
a_deductions = this.deductions; a_deductions = this.deductions;
if (this.cpu_memory && this.cpu_memory.length != 0) { if (
if (this.formOld.cpu == "8") { (this.formOld.cpu == "" && this.formOld.memory == "") ||
if (this.formOld.memory == "16") { (this.formOld.cpu == this.paramsOld.cpu &&
let priceObj = this.cpu_memory.find((item) => { this.formOld.memory == this.paramsOld.memory) ||
return item.cpu == 8 && item.memory == 16; (this.formOld.cpu == "" &&
}); this.formOld.memory == this.paramsOld.memory) ||
this.eci_single_money = Number(priceObj.price); (this.formOld.cpu == this.paramsOld.cpu && this.formOld.memory == "")
sumCM += Number(priceObj.price); ) {
} else if (this.formOld.memory == "32") { console.log("noCMchange");
let priceObj = this.cpu_memory.find((item) => { // 没变
return item.cpu == 8 && item.memory == 32; nochangeCM = true;
}); if (this.formOld.appDuration != 0) {
this.eci_single_money = Number(priceObj.price); // 续期
sumCM += Number(priceObj.price); let cpu0 = this.paramsOld.cpu;
} let memory0 = this.paramsOld.memory;
} else if (this.formOld.cpu == "16") { let priceObj = this.cpu_memory.find((item) => {
if (this.formOld.memory == "32") { return item.cpu == cpu0 && item.memory == memory0;
let priceObj = this.cpu_memory.find((item) => { });
return item.cpu == 16 && item.memory == 32; this.eci_single_money = Number(priceObj.price);
}); sumCM += Number(priceObj.price);
this.eci_single_money = Number(priceObj.price); sumCM = sumCM * this.formOld.appDuration;
sumCM += Number(priceObj.price); } else {
} else if (this.formOld.memory == "64") { // 不续期
let priceObj = this.cpu_memory.find((item) => { sumCM = 0;
return item.cpu == 16 && item.memory == 64;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
}
} }
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`;
} else if (
this.formOld.cpu != "" &&
this.formOld.memory != "" &&
(this.formOld.cpu < this.paramsOld.cpu ||
this.formOld.memory < this.paramsOld.memory)
) {
console.log("-CM");
// 减配置
if (this.formOld.appDuration != 0) {
// 续期
let cpu0 = this.formOld.cpu;
let memory0 = this.formOld.memory;
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == cpu0 && item.memory == memory0;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
sumCM =
(sumCM * (Number(this.formOld.appDuration) * 30 + diffDay)) / 30;
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`;
} else {
// 不续期
sumCM = 0;
}
} else {
// 加配置
console.log("+CM");
if (this.cpu_memory && this.cpu_memory.length != 0) {
console.log(this.formOld.cpu, this.formOld.memory);
let cpu0 = this.formOld.cpu || this.paramsOld.cpu;
let memory0 = this.formOld.memory || this.paramsOld.memory;
let priceObj = this.cpu_memory.find((item) => {
return item.cpu == cpu0 && item.memory == memory0;
});
this.eci_single_money = Number(priceObj.price);
sumCM += Number(priceObj.price);
}
sumCM =
(sumCM * (Number(this.formOld.appDuration) * 30 + diffDay)) / 30;
arrJifei[0].num = `${
this.formOld.cpu && this.formOld.cpu > 0
? this.formOld.cpu
: this.paramsOld.cpu
}核+${
this.formOld.memory && this.formOld.memory > 0
? this.formOld.memory
: this.paramsOld.memory
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup && this.formOld.containerGroup > 0
? this.formOld.containerGroup
: this.paramsOld.containers
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`;
} }
sumCM = sumCM * Number(this.formOld.appDuration); let nowHasCap = this.dataDiskList.reduce(
(sum, e) => sum + e.disk_cap,
0
);
if ( if (
this.formOld.dataDisk >= 0 && this.formOld.dataDisk >= 0 &&
this.formOld.perDataDisk >= 0 && this.formOld.perDataDisk >= 0 &&
this.formOld.appDuration >= 0 this.formOld.appDuration >= 0
) { ) {
// 加D，续期
if (this.hard_disk && this.hard_disk.length != 0) { if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price); this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += sumDisk += Number(
Number(this.formOld.dataDisk) * (
Number(this.formOld.perDataDisk) * ((Number(this.formOld.dataDisk) *
Number(this.formOld.appDuration) * Number(this.formOld.perDataDisk) +
Number(this.hard_disk[0].price); nowHasCap) *
Number(Number(this.formOld.appDuration) * 30 + diffDay) *
Number(this.hard_disk[0].price)) /
30
).toFixed(2)
);
} }
arrJifei[2] = { arrJifei[2] = {
name: "数据盘", name: "数据盘",
num: `${this.formOld.dataDisk}个数据盘，每个数据盘${this.formOld.perDataDisk}GB`, num: `增加${this.formOld.dataDisk}个数据盘，每个数据盘${
time: `${this.formOld.appDuration}个月`, this.formOld.perDataDisk
}GB${
nowHasCap == 0 ? "" : ",原有数据盘共计剩余" + nowHasCap + "GB"
}`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`,
sum: `${sumDisk}金币`, sum: `${sumDisk}金币`,
}; };
} else { } else {
arrJifei.splice(2); // 不加D，续期
if (this.formOld.appDuration != 0) {
if (delCap != 0) {
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number(
(
nowHasCap *
Number(this.formOld.appDuration) *
Number(this.hard_disk[0].price)
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `原有数据盘共计剩余${nowHasCap}GB`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月续期+剩余"
: ""
}${diffDay}天`,
sum: `${sumDisk}金币`,
};
} else {
// not Del
if (this.hard_disk && this.hard_disk.length != 0) {
this.disk_single_money = Number(this.hard_disk[0].price);
sumDisk += Number(
(
nowHasCap *
Number(this.formOld.appDuration) *
Number(this.hard_disk[0].price)
).toFixed(2)
);
}
arrJifei[2] = {
name: "数据盘",
num: `原有数据盘共计${nowHasCap}GB`,
time: `${
this.formOld.appDuration >= 1
? this.formOld.appDuration + "个月"
: ""
}`,
sum: `${sumDisk}金币`,
};
}
} else {
// 不加D，不续期
sumDisk = 0;
arrJifei.splice(2);
}
}
if (
!this.formOld.containerGroup ||
this.formOld.containerGroup == "" ||
this.formOld.containerGroup == this.paramsOld.containers
) {
nochangeRQ = true;
}
if (nochangeRQ && this.formOld.appDuration == 0) {
arrJifei.splice(1, 1);
}
if (nochangeCM && this.formOld.appDuration == 0) {
arrJifei.splice(0, 1);
} }
arrJifei[0].num = `${this.formOld.cpu >= 1 ? this.formOld.cpu : 0}核+${
this.formOld.memory >= 1 ? this.formOld.memory : 0
}G`;
arrJifei[0].time = `${
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
}个月`;
arrJifei[0].sum = `${sumCM}金币`;
arrJifei[1].num = `${
this.formOld.containerGroup >= 1 ? this.formOld.containerGroup : 0
}个`;
arrJifei[1].time = `${
this.formOld.appDuration >= 1 ? this.formOld.appDuration : 0
}个月`;
} }
this.jifeiList1 = arrJifei; this.jifeiList1 = arrJifei;
// console.log(sumCM, sumDisk) console.log(sumCM, sumDisk);
this.amounts_payable = Number( this.amounts_payable = Number(
(Number(sumCM) + Number(sumDisk)).toFixed(2) (Number(sumCM) + Number(sumDisk)).toFixed(2)
); );
...@@ -1330,7 +1508,10 @@ export default { ...@@ -1330,7 +1508,10 @@ export default {
{ value: "8", label: "8" }, { value: "8", label: "8" },
{ value: "16", label: "16" }, { value: "16", label: "16" },
], ],
optionsRAM: [], optionsRAM: [
{ value: "16", label: "16" },
{ value: "32", label: "32" },
],
options_store_type: [ options_store_type: [
{ value: "nfs-client", label: "nfs-client" }, { value: "nfs-client", label: "nfs-client" },
{ value: "rook-ceph-block", label: "rook-ceph-block" }, { value: "rook-ceph-block", label: "rook-ceph-block" },
...@@ -1380,27 +1561,27 @@ export default { ...@@ -1380,27 +1561,27 @@ export default {
workplacedesc: [ workplacedesc: [
{ required: true, message: "请输入描述信息", trigger: "blur" }, { required: true, message: "请输入描述信息", trigger: "blur" },
], ],
cpu: [ // cpu: [
{ required: true, message: "请选择CPU使用量", trigger: "change" }, // { required: true, message: "请选择CPU使用量", trigger: "change" },
], // ],
memory: [ // memory: [
{ required: true, message: "请选择内存使用量", trigger: "change" }, // { required: true, message: "请选择内存使用量", trigger: "change" },
], // ],
containerGroup: [ // containerGroup: [
{ required: true, message: "请输入容器组规格", trigger: "blur" }, // { required: true, message: "请输入容器组规格", trigger: "blur" },
], // ],
perCPUs: [ // perCPUs: [
{ required: true, message: "请输入CPU最大使用量", trigger: "blur" }, // { required: true, message: "请输入CPU最大使用量", trigger: "blur" },
], // ],
perCPU: [ // perCPU: [
{ required: true, message: "请输入CPU默认使用量", trigger: "blur" }, // { required: true, message: "请输入CPU默认使用量", trigger: "blur" },
], // ],
perRAMs: [ // perRAMs: [
{ required: true, message: "请输入内存最大使用量", trigger: "blur" }, // { required: true, message: "请输入内存最大使用量", trigger: "blur" },
], // ],
perRAM: [ // perRAM: [
{ required: true, message: "请输入内存默认使用量", trigger: "blur" }, // { required: true, message: "请输入内存默认使用量", trigger: "blur" },
], // ],
}, },
dialogVisible: false, dialogVisible: false,
diaForm: {}, diaForm: {},
...@@ -1484,6 +1665,11 @@ export default { ...@@ -1484,6 +1665,11 @@ export default {
}, },
}, },
], ],
jifeiList: [
{ name: "CPU+内存", num: "0核+0G", time: "0个月", sum: "0金币" },
{ name: "容器组", num: "0个", time: "0个月", sum: "-" },
// { name: "数据盘", num: "0个数据盘，每个数据盘0GB", time: "0个月", sum: "2000金币" },
],
jifeiList1: [ jifeiList1: [
{ name: "CPU+内存", num: "0核+0G", time: "0个月", sum: "0金币" }, { name: "CPU+内存", num: "0核+0G", time: "0个月", sum: "0金币" },
{ name: "容器组", num: "0个", time: "0个月", sum: "-" }, { name: "容器组", num: "0个", time: "0个月", sum: "-" },
...@@ -1553,6 +1739,17 @@ export default { ...@@ -1553,6 +1739,17 @@ export default {
this.dataDiskList.forEach((item, index) => { this.dataDiskList.forEach((item, index) => {
item.name = `磁盘${index + 1}`; item.name = `磁盘${index + 1}`;
}); });
if (this.paramsOld.cpu == "16") {
this.optionsRAM = [
{ value: "32", label: "32" },
{ value: "64", label: "64" },
];
} else {
this.optionsRAM = [
{ value: "16", label: "16" },
{ value: "32", label: "32" },
];
}
this.form.link_man = paramsOld.apply_connect_username; this.form.link_man = paramsOld.apply_connect_username;
this.form.phone = paramsOld.apply_connect_mobile; this.form.phone = paramsOld.apply_connect_mobile;
this.formShow = true; this.formShow = true;
...@@ -1634,6 +1831,17 @@ export default { ...@@ -1634,6 +1831,17 @@ export default {
sum: "0金币", sum: "0金币",
}, },
]; ];
if (this.paramsOld.cpu == "16") {
this.optionsRAM = [
{ value: "32", label: "32" },
{ value: "64", label: "64" },
];
} else {
this.optionsRAM = [
{ value: "16", label: "16" },
{ value: "32", label: "32" },
];
}
} else { } else {
this.formShow = false; this.formShow = false;
} }
...@@ -1654,9 +1862,72 @@ export default { ...@@ -1654,9 +1862,72 @@ export default {
} else if (this.activeName == 1) { } else if (this.activeName == 1) {
this.$refs["formOld"].validate((valid) => { this.$refs["formOld"].validate((valid) => {
if (valid) { if (valid) {
formParams = this.formOld; // console.log(
this.dialogVisible = true; // this.formOld.cpu,
this.diaForm = Object.assign(formParams, this.form); // this.formOld.memory,
// this.formOld.containerGroup,
// this.formOld.dataDisk,
// this.formOld.perDataDisk,
// this.formOld.appDuration
// );
if (
(this.formOld.cpu &&
this.formOld.cpu != "" &&
this.formOld.cpu != this.paramsOld.cpu) ||
(this.formOld.memory &&
this.formOld.memory != "" &&
this.formOld.memory != this.paramsOld.memory) ||
(this.formOld.containerGroup &&
this.formOld.containerGroup != 0 &&
this.formOld.containerGroup != this.paramsOld.containers) ||
(this.formOld.dataDisk && this.formOld.dataDisk != 0) ||
(this.formOld.perDataDisk && this.formOld.perDataDisk != 0) ||
(this.formOld.appDuration && this.formOld.appDuration != 0) ||
(this.formOld.perCPUs &&
this.formOld.perCPUs != 0 &&
this.formOld.perCPUs != this.paramsOld.one_cpu_max) ||
(this.formOld.perCPU &&
this.formOld.perCPU != 0 &&
this.formOld.perCPU != this.paramsOld.one_cpu_min) ||
(this.formOld.perRAMs &&
this.formOld.perRAMs != 0 &&
this.formOld.perRAMs != this.paramsOld.one_memory_max) ||
(this.formOld.perRAM &&
this.formOld.perRAM != 0 &&
this.formOld.perRAM != this.paramsOld.one_memory_min)
) {
formParams = JSON.parse(JSON.stringify(this.formOld));
console.log(formParams);
this.dialogVisible = true;
this.diaForm = Object.assign(formParams, this.form);
if (!this.diaForm.cpu) {
this.diaForm.cpu = this.paramsOld.cpu;
}
if (!this.diaForm.memory) {
this.diaForm.memory = this.paramsOld.memory;
}
if (!this.diaForm.containerGroup) {
this.diaForm.containerGroup = this.paramsOld.containers;
}
if (!this.diaForm.perCPUs) {
this.diaForm.perCPUs = this.paramsOld.one_cpu_max;
}
if (!this.diaForm.perCPU) {
this.diaForm.perCPU = this.paramsOld.one_cpu_min;
}
if (!this.diaForm.perRAMs) {
this.diaForm.perRAMs = this.paramsOld.one_memory_max;
}
if (!this.diaForm.perRAM) {
this.diaForm.perRAM = this.paramsOld.one_memory_min;
}
// console.log(this.diaForm)
} else {
this.$message({
message: `请调整工作区域后再提交`,
type: "error",
});
}
} else { } else {
console.log("error submit!!"); console.log("error submit!!");
return false; return false;
...@@ -1746,17 +2017,53 @@ export default { ...@@ -1746,17 +2017,53 @@ export default {
resource_id: this.workSpaceId, resource_id: this.workSpaceId,
resource_apply: { resource_apply: {
apply_file: this.formOld.apply_file, apply_file: this.formOld.apply_file,
cpu: Number(this.formOld.cpu), cpu: Number(
this.formOld.cpu &&
this.formOld.cpu != "" &&
this.formOld.cpu != 0
? this.formOld.cpu
: this.paramsOld.cpu
),
duration: this.formOld.appDuration, duration: this.formOld.appDuration,
duration_unit: Number(this.formOld.durType), duration_unit: Number(this.formOld.durType),
apply_connect_username: this.form.link_man, apply_connect_username: this.form.link_man,
apply_connect_mobile: this.form.phone, apply_connect_mobile: this.form.phone,
memory: Number(this.formOld.memory), memory: Number(
containers: this.formOld.containerGroup, this.formOld.memory &&
one_cpu_min: this.formOld.perCPU ? this.formOld.perCPU : 0, this.formOld.memory != "" &&
one_cpu_max: this.formOld.perCPUs ? this.formOld.perCPUs : 0, this.formOld.memory != 0
one_memory_min: this.formOld.perRAM ? this.formOld.perRAM : 0, ? this.formOld.memory
one_memory_max: this.formOld.perRAMs ? this.formOld.perRAMs : 0, : this.paramsOld.memory
),
containers:
this.formOld.containerGroup != "" &&
this.formOld.containerGroup != 0
? this.formOld.containerGroup
: this.paramsOld.containers,
one_cpu_min:
this.formOld.perCPU &&
this.formOld.perCPU != "" &&
this.formOld.perCPU != 0
? this.formOld.perCPU
: this.paramsOld.one_cpu_min,
one_cpu_max:
this.formOld.perCPUs &&
this.formOld.perCPUs != "" &&
this.formOld.perCPUs != 0
? this.formOld.perCPUs
: this.paramsOld.one_cpu_max,
one_memory_min:
this.formOld.perRAM &&
this.formOld.perRAM != "" &&
this.formOld.perRAM != 0
? this.formOld.perRAM
: this.paramsOld.one_memory_min,
one_memory_max:
this.formOld.perRAMs &&
this.formOld.perRAMs != "" &&
this.formOld.perRAMs != 0
? this.formOld.perRAMs
: this.paramsOld.one_memory_max,
}, },
disks: [ disks: [
{ {
...@@ -1834,15 +2141,15 @@ export default { ...@@ -1834,15 +2141,15 @@ export default {
changeCPU(val) { changeCPU(val) {
this.formOld.memory = ""; this.formOld.memory = "";
this.formNew.memory = ""; this.formNew.memory = "";
if (val == "8") { if (val == "16") {
this.optionsRAM = [ this.optionsRAM = [
{ value: "16", label: "16" },
{ value: "32", label: "32" }, { value: "32", label: "32" },
{ value: "64", label: "64" },
]; ];
} else if (val == "16") { } else {
this.optionsRAM = [ this.optionsRAM = [
{ value: "16", label: "16" },
{ value: "32", label: "32" }, { value: "32", label: "32" },
{ value: "64", label: "64" },
]; ];
} }
}, },
......
src/components/shopping-cart/shopping-cart-cell.vue
View file @ 08c07dd1
...@@ -339,12 +339,12 @@ export default { ...@@ -339,12 +339,12 @@ export default {
}, },
changeSubscription(val) { changeSubscription(val) {
this.changeCellItem(); this.changeCellItem();
this.updateShoppingCart();
}, },
changeNum(val) { changeNum(val) {
this.changeCellItem(); this.changeCellItem();
}, },
changeCellItem() { changeCellItem() {
this.updateShoppingCart();
this.$emit("changeCellMsg", { this.$emit("changeCellMsg", {
index: this.cellIndex, index: this.cellIndex,
data: this.cellItems, data: this.cellItems,
......
src/pages/workbench/yygl/app_detail.vue
View file @ 08c07dd1
...@@ -999,7 +999,7 @@ export default { ...@@ -999,7 +999,7 @@ export default {
} }
if (val.yydetail == "申请上架" || val.yydetail == "申请上架d") { if (val.yydetail == "申请上架" || val.yydetail == "申请上架d") {
this.tipsOptions.message = this.tipsOptions.message =
"申请下架应用需要向组织管理员发送通知，组织管理员通过上架请求后该应用将在应用商店上架。"; "申请上架应用需要向组织管理员发送通知，组织管理员通过上架请求后该应用将在应用商店上架。";
this.tipsOptions.btnSubmitText = "确认"; this.tipsOptions.btnSubmitText = "确认";
} }
this.tipsOptions.confirmSubmit = () => { this.tipsOptions.confirmSubmit = () => {
......
src/services/helper.js
View file @ 08c07dd1
...@@ -97,4 +97,24 @@ module.exports.getQueryString = function (name, url) { ...@@ -97,4 +97,24 @@ module.exports.getQueryString = function (name, url) {
} }
} }
return theRequest[name]; return theRequest[name];
}
module.exports.getTwoTimesDiff = function (time) {//di作为一个变量传进来
//如果时间格式是正确的，那下面这一步转化时间格式就可以不用了
var dateEnd = new Date(time);//使用new Date
var dateBegin = new Date();//获取当前时间
var dateDiff = dateEnd.getTime() - dateBegin.getTime();//时间差的毫秒数
var dayDiff = Math.floor(dateDiff / (24 * 3600 * 1000));//计算出相差天数
// var leave1=dateDiff%(24*3600*1000) //计算天数后剩余的毫秒数
// var hours=Math.floor(leave1/(3600*1000))//计算出小时数
// //计算相差分钟数
// var leave2=leave1%(3600*1000) //计算小时数后剩余的毫秒数
// var minutes=Math.floor(leave2/(60*1000))//计算相差分钟数
// //计算相差秒数
// var leave3=leave2%(60*1000) //计算分钟数后剩余的毫秒数
// var seconds=Math.round(leave3/1000)
// console.log(" 相差 "+dayDiff+"天 "+hours+"小时 "+minutes+" 分钟"+seconds+" 秒")
// console.log(dateDiff+"时间差的毫秒数",dayDiff+"计算出相差天数",leave1+"计算天数后剩余的毫秒数"
// ,hours+"计算出小时数",minutes+"计算相差分钟数",seconds+"计算相差秒数");
return dayDiff;
} }
\ No newline at end of file
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