From adb74c51618faf025fe1d46bf6b22db895c2608f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期日, 12 二月 2023 11:16:14 +0800
Subject: [PATCH] 1.提交
---
src/views/scgl/zdpc.vue | 53 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/src/views/scgl/zdpc.vue b/src/views/scgl/zdpc.vue
index d4ce167..3ca1b8e 100644
--- a/src/views/scgl/zdpc.vue
+++ b/src/views/scgl/zdpc.vue
@@ -959,7 +959,7 @@
// 鎹㈠瀷鏃堕棿
MinutesTest(time) {
const t = new Date(time)
- // console.log(t.getMinutes(), 800)
+ // console.log(typeof parseFloat(this.formBottom.times), 'typeof')
t.setMinutes(t.getMinutes() + this.formBottom.times * 1)
const now =
t.getFullYear() +
@@ -973,7 +973,6 @@
t.getMinutes().toString().padStart(2, '0') +
':' +
t.getSeconds().toString().padStart(2, '0')
- // console.log('now', now)
return now
},
// 鎻掑叆浜ц兘鏃堕棿娈�
@@ -1166,6 +1165,7 @@
let all_num = this.formBottom.meter
let flag1 = 0
const mod = this.schedulingData[0].mod
+ console.log(this.schedulingData, 998)
// let nowTime = this.schedulingData[0].AdvaDevicRhythm*all_num
// console.log(this.schedulingData, 31)
// console.log(JSON.stringify(this.schedulingData), 31)
@@ -1176,10 +1176,16 @@
let capacity_arr = [] // 瑕佹帓绋嬬殑鏁扮粍
this.schedulingData[i].gtArray.sort((a, b) => new Date(a.end).getTime() - new Date(b.end).getTime())
+ console.log(this.schedulingData)
- end_arr = this.schedulingData[i].gtArray.filter(item => item.type === 'h_schedule')
- nend_arr = this.schedulingData[i].gtArray.filter(item => item.type === 'capacity')
+ end_arr = this.schedulingData[i].gtArray.filter(item => item.type === 'h_schedule') // 宸叉帓绋嬫暟缁�
+ nend_arr = this.schedulingData[i].gtArray.filter(item => item.type === 'capacity') // 瀹归噺
+
+ // end_arr.sort((a, b) => new Date(b.end).getTime() - new Date(a.end).getTime())
+
console.log(end_arr, nend_arr, 770)
+ console.log(JSON.stringify(end_arr), 771)
+ console.log(JSON.stringify(nend_arr), 772)
if (end_arr && end_arr.length > 0) {
capacity_arr = nend_arr.map(item => {
@@ -1189,8 +1195,11 @@
new Date(item.end).getTime() >= new Date(it.end).getTime()
})
+ console.log(schedule, '鐜嬭�佸悏')
if (schedule && schedule.length > 0) {
- item.start = this.MinutesTest(schedule[0]['end'])
+ console.log('鏈夎繘鏉ュ悧')
+ console.log(schedule[schedule.length - 1]['end'])
+ item.start = this.MinutesTest(schedule[schedule.length - 1]['end'])
}
const schedule1 = end_arr.filter(schedule => {
@@ -1214,6 +1223,7 @@
if (end_arr != '') {
(id_obj.id = end_arr[0].id), (id_obj.start_time = end_arr[0].end)
}
+ console.log(capacity_arr, 997)
for (const w in capacity_arr) {
let end_time = ''
let mistiming = ''
@@ -1231,8 +1241,10 @@
if (
id_obj.start_time !== '' &&
flag1 === 0 &&
- new Date(id_obj.start_time) >= new Date(capacity_arr[w].start)
+ new Date(id_obj.start_time).getTime() >= new Date(capacity_arr[w].start).getTime()
) {
+ console.log('鍔犲瀹�', id_obj.start_time)
+
data.start = this.MinutesTest(id_obj.start_time)
flag1 = 1
} else {
@@ -1336,19 +1348,7 @@
// console.log(nend_arr, 673)
// console.log(JSON.stringify(nend_arr), 673)
- // end_arr = JSON.parse(JSON.stringify(end_arr.sort((a, b) => new Date(b.end) - new Date(a.end))))
-
capacity_arr = JSON.parse(JSON.stringify(nend_arr)) // 瀹归噺
-
- // end_arr.forEach(item => {
- // for (let i = 0; i < capacity_arr.length; i++) {
- // if (new Date(capacity_arr[i].start).getTime() === new Date(item.start).getTime() && item.id === capacity_arr[i].id) {
- // console.log(i, capacity_arr[i], '鍝囧搱鍝�')
- // capacity_arr.splice(i, 1)
- // break
- // }
- // }
- // })
// 鑾峰彇鍙帓绋嬬殑鏃堕棿 浠ヤ究鎺ョ潃寰�鍚庢帓绋� 閬嶅巻缁撴潫瑕佸緱鍒扮殑鏄� 褰撳墠鏃ユ湡鍙帓瀹归噺
end_arr.forEach((item, index) => { // 宸叉帓绋嬬殑鏁扮粍
@@ -1384,25 +1384,29 @@
// console.log(nend_arr, 299)
// debugger
- // 褰撴煇涓閲忓瓨鍦ㄤ笁涓笉鍚岀殑宸ュ崟鏃� 涓嬮潰杩欎釜if閫昏緫瀛樺湪闂
+
+ // 涓嬮潰閫昏緫寰堥噸瑕�
if (schedule_arr && schedule_arr.length > 0) {
const scheduleCan = schedule_arr.map(item => {
const temp = nend_arr.filter(it => {
if (it.id === item.id) {
console.log('鎵ц浜嗭紒', item.id, item.end)
- return (new Date(item.start).getTime() === new Date(it.start).getTime() &&
+ return (new Date(item.start).getTime() >= new Date(it.start).getTime() &&
new Date(item.end).getTime() < new Date(it.end).getTime())
- // ||
+ // ||
// (new Date(item.start).getTime() > new Date(it.start).getTime() &&
// new Date(item.end).getTime() < new Date(it.end).getTime())
}
})[0]
+ // console.log('鏉庣櫧', temp)
+ // console.log('鏉庣櫧', item.end)
temp.start = this.MinutesTest(item.end)
+
return temp
})
const newSchedule = JSON.parse(JSON.stringify(scheduleCan))
-
+ console.log(newSchedule, 'newSchedule')
capacity_arr.forEach(item => {
newSchedule.forEach(it => {
if (item.id === it.id && new Date(item.start).getTime() < new Date(it.start).getTime()) {
@@ -1422,6 +1426,9 @@
if (end_arr != '') {
(id_obj.id = end_arr[0].id), (id_obj.start_time = end_arr[0].end)
}
+ // console.log(capacity_arr, 999)
+ // console.log(JSON.stringify(capacity_arr), 999)
+
for (const w in capacity_arr) {
let end_time
let mistiming
@@ -1444,7 +1451,7 @@
) {
if (data.id === id_obj.id) {
data.start = this.MinutesTest(id_obj.start_time)
- // console.log(data.start, 999)
+
// flag1 =1
} else {
data.start = capacity_arr[w].start
--
Gitblit v1.9.3