From f8d4f5e58cdcade758423c7a3337fea00dc97ada Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 22 一月 2026 16:42:08 +0800
Subject: [PATCH] 1.递交
---
src/views/gantt/index.vue | 535 +++++++++++++++++++++++++---------------------------------
1 files changed, 232 insertions(+), 303 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index 2cca563..5b252df 100644
--- a/src/views/gantt/index.vue
+++ b/src/views/gantt/index.vue
@@ -36,6 +36,7 @@
value-format="yyyy-MM-dd"
type="daterange"
:clearable="false"
+ :picker-options="pickerOptions"
range-separator="鑷�"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -75,7 +76,7 @@
</template>
<script>
-import { gantt } from '@/components/dhtmlxGantt'
+import { gantt } from '@/components/dhtmlxGantt' // 鐩墠dhtmlxgantt鐗堟湰8.0.x
import '@/components/dhtmlxGantt/codebase/dhtmlxgantt.css'
import { handleDateReduceOneDay, handleDatetime, handleDatetime2 } from '@/utils/global'
import { nanoid } from 'nanoid'
@@ -90,7 +91,7 @@
{ code: '360min', name: '360min' }
],
scaleValue: '240min',
- ganttDateRange: ['2026-01-20', '2026-01-25'],
+ ganttDateRange: ['2026-01-22', '2026-01-25'], // '2026-01-20', '2026-01-25'
selectedIds: [],
// 鍒嗛〉鐩稿叧鏁版嵁
currentPage: 1,
@@ -106,24 +107,28 @@
priorityMethodArr: [
{ code: 'device', name: '璁惧浼樺厛' },
{ code: 'time', name: '鏃堕棿浼樺厛' }
- ]
+ ],
+ pickerOptions: {
+ // disabledDate(time) {
+ // return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
+ // }
+ }
}
},
mounted() {
- // 鍏堟敼鍙樻棩鏈熻寖鍥撮厤缃�
- this.ganttDateRangeChange(this.ganttDateRange)
-
// 鍒濆鍖栫敇鐗瑰浘閰嶇疆
this.initGantt()
+ // 鏀瑰彉鏃ユ湡鑼冨洿閰嶇疆
+ this.ganttDateRangeChange(this.ganttDateRange)
+
// 鐒跺悗鍔犺浇浠诲姟鏁版嵁锛堜細鑷姩娓叉煋褰撳墠椤碉級
- this.loadTasks()
+ // this.loadTasks()
},
methods: {
initGantt() {
gantt.plugins({
-
critical_path: true,
drag_timeline: true,
grouping: true,
@@ -145,37 +150,9 @@
gantt.config.row_height = 32 // 琛岄珮
gantt.config.bar_height = 20 // bar楂�
-
gantt.config.xml_date = '%Y-%m-%d %H:%i' // gantt鐨勬棩鏈熸牸寮�
-
gantt.config.drag_progress = false // 绂佹閫氳繃鎷栧姩杩涘害鏉℃敼鍙樹换鍔¤繘搴�
-
gantt.config.readonly = true // 鍙妯″紡
-
- /* 鈫撯啌鈫� Group configuration 鈫撯啌鈫� */
- gantt.serverList('task_priority', [
- { key: 1, label: '楂�' },
- { key: 2, label: '涓瓑' },
- { key: 3, label: '浣�' }
- ])
-
- gantt.serverList('task_status', [
- { key: 1, label: 'Planning' },
- { key: 2, label: 'Not started' },
- { key: 3, label: 'In Progress' },
- { key: 4, label: 'Complete' }
- ])
-
- function byId(list, id) {
- for (let i = 0; i < list.length; i++) {
- if (list[i].key == id) {
- return list[i].label || ''
- }
- }
- return ''
- }
-
- /* 鈫戔啈鈫� Group configuration 鈫戔啈鈫� */
// 鍒诲害鍊兼敼鍙�
this.changeTimeScale()
@@ -260,18 +237,11 @@
]
/* 鈫戔啈鈫� Grid Columns configuration 鈫戔啈鈫� */
- // 姹夊寲绐楀彛
-
- // gantt.config.order_branch = true
- // gantt.config.open_tree_initially = true
-
gantt.config.show_errors = false // 鍙戠敓寮傚父鏃讹紝涓嶅厑璁稿脊鍑鸿鍛婂埌 UI 鐣岄潰
-
gantt.config.grid_elastic_columns = true
// 鑷畾涔夋诞鍔ㄦ鐨勬樉绀哄唴瀹� tooltip娴姩妗嗘樉绀虹殑End Date琚拷鍔�1鐨勯棶棰樹慨澶嶏紙搴旇鏄剧ず鏁版嵁搴撶殑鍘熷鍊硷級
gantt.templates.tooltip_text = function(start, end, task) {
- // console.log(JSON.parse(JSON.stringify(task)))
// return '<b>浠诲姟:</b> ' + task.text + '<br/><b>寮�濮嬫椂闂�:</b> ' + `${gantt.date.date_to_str('%Y-%m-%d')(start)}` + '<br/><b>缁撴潫鏃堕棿:</b> ' + handleDateReduceOneDay(end)
// return '<b>浠诲姟:</b> ' + task.text + '<br/><b>寮�濮嬫椂闂�:</b> ' + handleDatetime2(start) + '<br/><b>缁撴潫鏃堕棿:</b> ' + handleDateReduceOneDay(end) + '<br/><b>杩涘害:</b> ' + task.progress * 100 + '%'
return '<b>浠诲姟:</b> ' + task.text +
@@ -293,7 +263,7 @@
// return task.producedCount
}
if (task.type === 'task3') {
- return `<div class="task3Css">`
+ return `<div class="task3Css">${task.producedCount}</div>`
}
return ''
}
@@ -335,11 +305,13 @@
// 鍒濆鍖栧畬鎴愬悗鍚屾涓�娆￠�変腑鐘舵��
this.syncSelected()
+
+ // this.loadTasks()
},
// 鍔犺浇浠诲姟鏁版嵁
loadTasks() {
- // 鎺ュ彛鑾峰彇鍒扮殑鏁版嵁
+ // 鎺ュ彛鑾峰彇鍒扮殑鏁版嵁 //杩欐槸寰呮帓鏁版嵁
const rows = [
{
'wo_code': null,
@@ -511,19 +483,136 @@
}
]
+ // 杩欐槸宸叉帓鏁版嵁
+ const Cont = [
+ {
+ 'wo_code': 'MO-2023-06-0007_1',
+ 'eqp_code': 'JG010',
+ 'time_start': '2026-01-21 13:51:55',
+ 'time_end': '2026-01-21 18:00:00',
+ 'status': 'S',
+ 'alloc_qty': 298.00,
+ 'part_code': '302',
+ 'part_name': '8504鍏夋満',
+ 'uom_name': '鍙�'
+ },
+ {
+ 'wo_code': 'MO-2023-06-0007_1',
+ 'eqp_code': 'JG010',
+ 'time_start': '2026-01-22 08:00:00',
+ 'time_end': '2026-01-22 11:30:00',
+ 'status': 'S',
+ 'alloc_qty': 252.00,
+ 'part_code': '302',
+ 'part_name': '8504鍏夋満',
+ 'uom_name': '鍙�'
+ },
+ {
+ 'wo_code': 'MO-2023-06-0007_1',
+ 'eqp_code': 'JG010',
+ 'time_start': '2026-01-22 13:00:00',
+ 'time_end': '2026-01-22 18:00:00',
+ 'status': 'S',
+ 'alloc_qty': 360,
+ 'part_code': '302',
+ 'part_name': '8504鍏夋満',
+ 'uom_name': '鍙�'
+ },
+ {
+ 'wo_code': 'MO-2023-06-0007_1',
+ 'eqp_code': 'JG010',
+ 'time_start': '2026-01-23 08:00:00',
+ 'time_end': '2026-01-23 11:30:00',
+ 'status': 'S',
+ 'alloc_qty': 252.00,
+ 'part_code': '302',
+ 'part_name': '8504鍏夋満',
+ 'uom_name': '鍙�'
+ },
+ {
+ 'wo_code': 'MO-2023-06-0007_1',
+ 'eqp_code': 'JG010',
+ 'time_start': '2026-01-23 13:00:00',
+ 'time_end': '2026-01-23 15:00:00',
+ 'status': 'S',
+ 'alloc_qty': 144.00,
+ 'part_code': '302',
+ 'part_name': '8504鍏夋満',
+ 'uom_name': '鍙�'
+ }
+ // {
+ // 'wo_code': 'MO-2023-06-0007_1',
+ // 'eqp_code': 'JG010',
+ // 'time_start': '2026-01-24 08:00:00',
+ // 'time_end': '2026-01-24 11:30:00',
+ // 'status': 'S',
+ // 'alloc_qty': 252.00,
+ // 'part_code': '302',
+ // 'part_name': '8504鍏夋満',
+ // 'uom_name': '鍙�'
+ // },
+ // {
+ // 'wo_code': 'MO-2023-06-0007_1',
+ // 'eqp_code': 'JG010',
+ // 'time_start': '2026-01-24 13:00:00',
+ // 'time_end': '2026-01-24 18:00:00',
+ // 'status': 'S',
+ // 'alloc_qty': 360.00,
+ // 'part_code': '302',
+ // 'part_name': '8504鍏夋満',
+ // 'uom_name': '鍙�'
+ // },
+ // {
+ // 'wo_code': 'MO-2023-06-0007_1',
+ // 'eqp_code': 'JG010',
+ // 'time_start': '2026-01-25 08:00:00',
+ // 'time_end': '2026-01-25 11:30:00',
+ // 'status': 'S',
+ // 'alloc_qty': 252.00,
+ // 'part_code': '302',
+ // 'part_name': '8504鍏夋満',
+ // 'uom_name': '鍙�'
+ // },
+ // {
+ // 'wo_code': 'MO-2023-06-0007_1',
+ // 'eqp_code': 'JG010',
+ // 'time_start': '2026-01-25 13:00:00',
+ // 'time_end': '2026-01-25 18:00:00',
+ // 'status': 'S',
+ // 'alloc_qty': 360.00,
+ // 'part_code': '302',
+ // 'part_name': '8504鍏夋満',
+ // 'uom_name': '鍙�'
+ // }
+ ]
+
const newArr = []
// 杩欎竴姝ョ殑鎿嶄綔涓昏鏄鍋氫骇鑳借儗鏅殑鏄剧ず
rows.forEach((item, index) => {
// 鏁版嵁鎺ュ彛杩斿洖鐨勬椂闂磋寖鍥磋鍦ㄦ棩鏈熼�夋嫨鑼冨洿涔嬪唴
if (new Date(item.YearDate).getTime() >= new Date(this.ganttDateRange[0]).getTime() && new Date(item.YearDate).getTime() <= new Date(this.ganttDateRange[1]).getTime()) {
- // console.log(JSON.stringify(item))
item.children.forEach((it, ind) => {
- // console.log(JSON.stringify(it))
// 杩欓噷搴旇瑕佺敓鎴愪竴涓互璁惧缁村害涓哄熀纭�鐨勬暟缁� 涓嶉噸涓嶆紡
if (!newArr.map(i => i.partCode).includes(it.AdvaDevicNumber)) {
- console.log(' it.AdvaDevicNumber,', it.AdvaDevicNumber)
newArr.push({
id: it.AdvaDevicNumber,
+ type: 'project',
+ text: '鎴戞槸鐖剁骇',
+ partName: it.AdvaDevicName,
+ partCode: it.AdvaDevicNumber,
+ start_date: handleDatetime2(item.YearDate + ' ' + it.OneStartDate.split('~')[0]), // 杩欎釜鏄棤鏁堢殑锛屽彧鏄负浜嗛鎺抪repareArrange鏂规硶閲岄潰涓嶆姤閿�
+ end_date: handleDatetime2(item.YearDate + ' ' + it.OneStartDate.split('~')[1]), // 杩欎釜鏄棤鏁堢殑锛屽彧鏄负浜嗛鎺抪repareArrange鏂规硶閲岄潰涓嶆姤閿�
+ // duration: this.calculateTimeRangeInMinutes(it.OneStartDate),
+ checked: false,
+ progress: 0.6,
+ parent: 0,
+ saleOrder: 'SO-2026-01001',
+ open: true
+ })
+ console.log(it.AdvaDevicNumber + ind.toString(), 999)
+ newArr.push({
+ id: it.AdvaDevicNumber + ind.toString(),
+ // id: it.AdvaDevicNumber,
type: 'project',
text: '浠诲姟鍚嶇О棰勭暀',
partName: it.AdvaDevicName,
@@ -534,7 +623,8 @@
render: 'split', // 鐢ㄤ簬鍦ㄤ竴涓伐浣滄椂闂存鍐呮樉绀轰笉涓嬶紝闇�瑕佽繘琛屽垎鍓叉樉绀�
checked: false,
progress: 0,
- parent: 0,
+ parent: it.AdvaDevicNumber,
+ // parent: it.AdvaDevicNumber,
saleOrder: 'SO-2026-01001'
})
}
@@ -543,6 +633,7 @@
for (let i = 0; i < 5; i++) { // 杩欐寰幆鏄负浜嗘樉绀轰骇鑳�
if (it[this.fivePeriodsTimeName[i]]) {
const duration = this.calculateTimeRangeInMinutes(it[this.fivePeriodsTimeName[i]]) // 宸ユ湡 鍗曚綅 鍒嗛挓
+ console.log(it.AdvaDevicNumber + ind.toString(), 123)
newArr.push({
// id: index.toString() + ind.toString() + i.toString(),
id: nanoid(),
@@ -551,11 +642,14 @@
partName: it.AdvaDevicName,
partCode: it.AdvaDevicNumber,
start_date: handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0]),
+ // start_date: new Date(handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0])).getTime() < new Date().getTime() ? handleDatetime2(new Date()) : handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0]),
+ // end_date: new Date(handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[1])).getTime() < new Date().getTime() ? handleDatetime2(new Date()) : handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[1]),
end_date: handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[1]),
duration,
checked: false,
progress: 0,
- parent: it.AdvaDevicNumber,
+ parent: it.AdvaDevicNumber + ind.toString(),
+ // parent: it.AdvaDevicNumber,
saleOrder: 'SO-2026-01001',
// 瑕佸湪姣忎竴涓椂闂存鍐呯畻鍑鸿兘鐢熶骇澶氬皯涓� 宸ユ湡锛堝垎閽燂級涔樹互60 闄や互鐢熶骇鑺傛媿 * 绋煎姩鐜�
producedCount: (duration * 60 / it.AdvaDevicRhythm) * (it.AdvaDevicCropMob / 100),
@@ -568,236 +662,64 @@
}
})
- // 浣跨敤鍘熸湁鐨勭ず渚嬫暟鎹綔涓哄熀纭�
- this.allTasks = newArr
-
- const dataBack = [
- {
- 'id': 1,
- 'text': '宸ュ崟:MO-2025-05-001',
- saleOrder: 'SO-2025-05001',
- 'calendar_id': 'customCalendar1',
- partName: '璺戞鏈�',
- partCode: 'Run01',
- description: '鎺掍骇鏁伴噺:500 鎶ュ伐鏁伴噺:100 杩涘害:20%',
- 'type': 'project',
- 'start_date': '2025-04-02 00:00',
- // 'duration': 5,
- 'progress': 0.2,
- 'parent': 0,
- 'checked': false
- // render: 'split'
- },
- {
- 'id': 2,
- 'text': '宸ュ簭:鍒囧壊',
- saleOrder: 'SO-2025-05001',
- 'calendar_id': 'customCalendar1',
- partName: '璺戞鏈�',
- partCode: 'Run01',
- description: '鎺掍骇鏁伴噺:500 鎶ュ伐鏁伴噺:100 杩涘害:20%',
- 'type': 'project',
- 'start_date': '2025-04-02 00:00',
- 'duration': 2,
- 'progress': 0.2,
- 'parent': '1',
- checked: false
- },
- {
- 'id': 3,
- 'text': '璁惧:閲戝伐杞﹂棿1鍙疯澶�',
- saleOrder: 'SO-2025-05001',
- 'calendar_id': 'customCalendar1',
- partName: '璺戞鏈�',
- partCode: 'Run01',
- description: '鎺掍骇鏁伴噺:500 鎶ュ伐鏁伴噺:100 杩涘害:20%',
- 'type': 'task',
- 'start_date': '2025-04-07 00:00',
- 'parent': '2',
- 'duration': 4,
- 'progress': 0,
- checked: false
- },
- {
- 'id': 4,
- 'text': '璁惧:閲戝伐杞﹂棿2鍙疯澶�',
- saleOrder: 'SO-2025-05001',
- 'calendar_id': 'customCalendar1',
- partName: '璺戞鏈�',
- partCode: 'Run01',
- description: '鎺掍骇鏁伴噺:500 鎶ュ伐鏁伴噺:100 杩涘害:20%',
- 'type': 'task',
- 'start_date': '2025-04-15 00:00',
- 'parent': '2',
- 'duration': 3,
- 'progress': 0,
- checked: false
- },
- {
- 'id': 5,
- 'text': '宸ュ崟:MO-2025-05-002',
- saleOrder: 'SO-2025-05002',
- 'calendar_id': 'customCalendar1',
- partName: '璧版鏈�',
- partCode: 'W01',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:500 杩涘害:50%',
- 'type': 'project',
- 'start_date': '2025-04-02 00:00',
- // 'duration': 5,
- 'progress': 0.5,
- 'parent': 0,
- 'checked': false
- // render: 'split'
- },
- {
- 'id': 6,
- 'text': '宸ュ簭:鍒囧壊',
- saleOrder: 'SO-2025-05002',
- 'calendar_id': 'customCalendar1',
- partName: '璧版鏈�',
- partCode: 'W01',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:500 杩涘害:50%',
- 'type': 'project',
- 'start_date': '2025-04-02 00:00',
- 'duration': 5,
- 'progress': 0.5,
- 'parent': '5',
- checked: false
- },
- {
- 'id': 7,
- 'text': '璁惧:閲戝伐杞﹂棿3鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- 'calendar_id': 'customCalendar1',
- partCode: 'W01',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:500 杩涘害:50%',
- 'type': 'task',
- 'start_date': '2025-04-07 06:23',
- 'parent': '6',
- 'duration': 3,
- 'progress': 0,
- checked: false
- },
- {
- 'id': 8,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task',
- render: 'split', // 鐢ㄤ簬鍦ㄤ竴涓伐浣滄椂闂存鍐呮樉绀轰笉涓嬶紝闇�瑕佽繘琛屽垎鍓叉樉绀�
- 'start_date': '2025-04-12 00:00',
- 'parent': '6',
- 'duration': 4,
- 'progress': 0,
- checked: false
- },
-
- {
- 'id': 11,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task',
-
- 'start_date': '2025-04-14 00:00',
- 'parent': '8',
- 'duration': 3,
- 'progress': 0,
- checked: false
- },
-
- {
- 'id': 12,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task',
- 'start_date': '2025-04-18 00:00',
- 'parent': '8',
- 'duration': 1,
- 'progress': 0,
- checked: false
- },
-
- {
- 'id': 13,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task',
- 'start_date': '2025-04-10 02:50',
- 'parent': '8',
- 'duration': 2,
- 'progress': 0,
- checked: false
- },
- {
- 'id': 10,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task3',
- 'start_date': '2025-04-10 06:24',
- 'parent': '8',
- 'duration': 1,
- 'progress': 0,
- checked: false
- },
- {
- 'id': 14,
- 'text': '璁惧:閲戝伐杞﹂棿4鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:600 杩涘害:60%',
- 'type': 'task2',
-
- 'start_date': '2025-04-11 06:24',
- 'parent': '8',
- 'duration': 1,
- 'progress': 0,
- checked: false
- },
-
- {
- 'id': 9,
- 'text': '璁惧:閲戝伐杞﹂棿5鍙疯澶�',
- saleOrder: 'SO-2025-05002',
- partName: '璧版鏈�',
- partCode: 'W01',
- 'calendar_id': 'customCalendar1',
- description: '鎺掍骇鏁伴噺:1000 鎶ュ伐鏁伴噺:400 杩涘害:40%',
- 'type': 'task',
- 'start_date': '2025-04-10 00:00',
- 'parent': '6',
- 'duration': 3,
- 'progress': 0,
- checked: false
+ // 杩欎竴姝ョ殑鎿嶄綔鏄仛宸叉帓鐨勬樉绀�
+ const scheduledDevices = [...new Set(Cont.map(i => i.eqp_code))]// 杩欐槸宸叉帓鐨勮澶囩紪鐮�
+ Cont.forEach(item => {
+ if (scheduledDevices.includes(item.eqp_code)) {
+ newArr.push({
+ id: nanoid(),
+ type: 'task3',
+ text: '浠诲姟鍚嶇О棰勭暀',
+ partName: item.part_name,
+ partCode: item.part_code,
+ start_date: item.time_start,
+ end_date: item.time_end,
+ // duration: this.calculateTimeRangeInMinutes(it.OneStartDate),
+ duration: this.calculateTimeRangeInMinutes(item.time_start.split(' ')[1] + '~' + item.time_end.split(' ')[1]),
+ checked: false,
+ progress: 0,
+ parent: item.eqp_code + '0',
+ saleOrder: 'SO-2026-01001',
+ producedCount: item.alloc_qty
+ })
}
- ]
+ })
- // this.totalTasks = this.allTasks.length
- // this.updatePaginatedTasks()
- // this.renderGanttChart()
+ // task 浠ｈ〃鐨勬槸浜ц兘 task2 浠ｈ〃鐨勬槸鍙互鎺掍骇鐨勫�� task3 浠ｈ〃鐨勬槸宸叉帓浜х殑鍊�
+ // task2 鐨勫�煎緱浠� task鍑忓幓task3鐨勬椂闂� 浠ｈ〃鍙帓浜ф椂闂�
+ // 鑻ュ悓涓�鐖惰妭鐐圭殑鍊肩浉鍚屾椂,褰搕ask鐨勫紑濮嬫椂闂村拰缁撴潫鏃堕棿涓巘ask3鐩哥瓑鏃�,浠ｈ〃姝ゆ涓嶈兘鍐嶆帓浜�
+ // 褰搕ask鐨勫紑濮嬫椂闂寸瓑浜巘ask3鐨勫紑濮嬫椂闂�,浣唗ask鐨勭粨鏉熸椂闂村ぇ浜巘ask3鐨勭粨鏉熸椂闂存椂锛岃繖鏃跺�欙紝鍙帓浜ф椂闂翠负锛歵ask3鐨勭粨鏉熸椂闂村埌task鐨勭粨鏉熸椂闂�
+ const task = newArr.filter(item => item.type === 'task')
+ const task3 = newArr.filter(item => item.type === 'task3')
+ task.forEach(item => { // 鎬讳骇鑳�
+ task3.forEach(it => { // 宸叉帓鏁版嵁
+ if (item.parent === it.parent) { // 璇存槑鏄湪鍚屼竴涓澶囦笅
+ // 褰撲袱涓椂闂寸浉绛夋椂璇存槑鑲畾涓嶈兘鎺掍骇浜�
+ if (new Date(item.start_date).getTime() === new Date(it.start_date).getTime() && new Date(item.end_date).getTime() === new Date(it.end_date).getTime()) {
+ item.schedulingPossible = false
+ }
- this.prepareArrange()
+ if (new Date(item.start_date).getTime() === new Date(it.start_date).getTime() && new Date(item.end_date).getTime() > new Date(it.end_date).getTime()) {
+ item.start_date2 = it.end_date
+ }
+
+ // 涓嶇煡閬撹涓嶈娉ㄩ噴鎺� 寰呴獙璇�
+ // if (new Date(item.start_date).getTime() < new Date().getTime() && item.producedCount !== it.producedCount) {
+ // item.start_date2 = handleDatetime2(new Date())
+ // }
+ }
+ })
+ })
+
+ // 浣跨敤鍘熸湁鐨勭ず渚嬫暟鎹綔涓哄熀纭�
+ this.allTasks = newArr.filter(i => i.schedulingPossible !== false)
+ // this.allTasks = newArr
+
+ this.totalTasks = this.allTasks.length
+ this.updatePaginatedTasks()
+ this.renderGanttChart()
+
+ // this.prepareArrange()
},
// 鏇存柊鍒嗛〉鍚庣殑浠诲姟鏁版嵁
@@ -914,7 +836,10 @@
this.priorityMethodChange()// 娓呯┖宸叉帓鍊�
gantt.config.start_date = new Date(val[0] + ' 00:00')
gantt.config.end_date = new Date(val[1] + ' 24:00')
- gantt.render()
+
+ this.loadTasks()
+
+ // gantt.render()
},
// 浠庣敇鐗瑰浘涓悓姝ラ�変腑鐨� id 鍒� Vue data
syncSelected() {
@@ -922,7 +847,6 @@
gantt.eachTask((task) => {
const globalTask = this.allTasks.find(t => t.id === task.id)
if (globalTask) {
- // console.log(globalTask, 'globalTask')
globalTask.checked = task.checked
}
})
@@ -961,16 +885,20 @@
},
// 棰勬帓
prepareArrange() {
+ this.priorityMethodChange()
+
+ this.loadTasks()
+
// 浼樺厛鏂瑰紡 time device
if (this.priorityMethod === 'time') {
this.allTasks.sort((a, b) => a.start_date - b.start_date)
}
if (this.priorityMethod === 'device') {
- this.allTasks.sort((a, b) => Number(a.partCode.replace(/\D/g, '')) - Number(b.partCode.replace(/\D/g, '')))
- // this.allTasks.sort((a, b) => Number(b.partCode.replace(/\D/g, '')) - Number(a.partCode.replace(/\D/g, '')))
- // this.allTasks.sort((a, b) => a.producedCount - b.producedCount)
+ this.allTasks.sort((a, b) => parseFloat(a.AdvaDevicCropMob) - parseFloat(b.AdvaDevicCropMob))
}
+ // 鍦ㄨ繖涓惊鐜噷闈㈣繕寰楄�冭檻涓�涓偣锛屽湪宸叉帓鐨勬暟鎹笂涓嶈兘鍐嶆帓浜�
+ // 鐩稿綋浜庡湪task 鍜宼ask3涓� 瑕佸湪task閲岄潰鍓旈櫎鎺塼ask3鐨勬椂闂存
const newArr = []
// this.canArrangeNumber = 0
let needArrangeNumber = this.needArrangeNumber
@@ -979,12 +907,19 @@
if (item.type === 'task' &&
new Date(item.start_date).getTime() >= new Date(this.ganttDateRange[0] + ' 00:00:00').getTime() &&
new Date(item.end_date).getTime() >= new Date().getTime()) { // 杩欓噷鐨勫垽鏂潯浠惰繕寰楀姞涓棩鏈熷垽鏂� 缁撴潫鏃堕棿瑕佸ぇ浜庣洰鍓嶆椂闂�
- console.log(JSON.parse(JSON.stringify(item)))
-
let ratio = 1 // 榛樿绯绘暟 1
- if (new Date(item.start_date).getTime() < new Date().getTime() && new Date(item.end_date).getTime() >= new Date().getTime()) {
- const d = this.calculateTimeRangeInMinutes(handleDatetime2(new Date()).split(' ')[1] + '~' + handleDatetime2(item.end_date).split(' ')[1])
- ratio = d / item.duration
+
+ if (item.start_date2) {
+ const d = this.calculateTimeRangeInMinutes(item.start_date2.split(' ')[1] + '~' + handleDatetime2(item.end_date).split(' ')[1])
+ ratio = Math.round((d / item.duration) * 100) / 100
+ }
+
+ if (
+ new Date(item.start_date).getTime() < new Date().getTime() &&
+ new Date(item.end_date).getTime() >= new Date().getTime()
+ ) {
+ const d = this.calculateTimeRangeInMinutes(handleDatetime2(new Date()).split(' ')[1] + '~' + handleDatetime2(item.end_date).split(' ')[1])
+ ratio = Math.round((d / item.duration) * 100) / 100
}
// 杩欎釜鍦版柟鐨刢ount鍊� 寰楀彉鏇� item.producedCount 寰椾箻浠ヤ釜绯绘暟 榛樿绯绘暟 1
@@ -993,13 +928,10 @@
if (count > 0 && (needArrangeNumber > 0 || Math.abs(needArrangeNumber) < item.producedCount * ratio)) { // 涓�瀹氭槸澶т簬闆朵笖灏忎簬鏁存潯鐨勭敓浜у�肩殑
// duration 鍗曚綅 鍒嗛挓
- let duration = (count / (item.AdvaDevicCropMob / 100)) * item.AdvaDevicRhythm / 60
- if (count < item.producedCount && new Date().getTime() <= new Date(item.start_date)) {
- console.log('鎵ц1111')
- duration = duration * (count / item.producedCount)
- // item.end_date = '2026-01-24 11:00:00'
- }
- // console.log(duration, 'duration')
+ const duration = (count / (item.AdvaDevicCropMob / 100)) * item.AdvaDevicRhythm / 60
+ // if (count < item.producedCount && new Date().getTime() <= new Date(item.start_date).getTime()) {
+ // duration = duration * (count / item.producedCount) //濂藉儚娉ㄩ噴鎺夊氨瀵逛簡 寰呴獙璇�
+ // }
const obj = {
id: nanoid(),
@@ -1007,7 +939,7 @@
text: '浠诲姟鍚嶇О111',
partName: item.partName,
partCode: item.partCode,
- start_date: new Date(item.start_date).getTime() < new Date().getTime() ? handleDatetime2(new Date()) : handleDatetime2(item.start_date),
+ start_date: new Date(item.start_date).getTime() < new Date().getTime() ? handleDatetime2(new Date()) : (item.start_date2 ? item.start_date2 : handleDatetime2(item.start_date)),
// end_date: handleDatetime2(item.end_date),
// end_date: item.end_date,
duration, // 浠ｈ〃鐨勬槸杩涘害鏉�
@@ -1015,26 +947,24 @@
progress: 0,
parent: item.parent,
saleOrder: item.saleOrder,
- producedCount: count <= item.producedCount ? count.toFixed(0) : item.producedCount
+ producedCount: count <= item.producedCount ? Math.round(count) : item.producedCount
+ // producedCount: count <= item.producedCount ? count : item.producedCount
}
this.canArrangeNumber += parseFloat(obj.producedCount)
- console.log(this.canArrangeNumber)
-
- // 杩欎釜鍦版柟寰楀姞涓�昏緫锛屽緱鏍规嵁涓栭棿鏃ユ湡杩涜push 涓嬪崍鐮旂┒涓�涓�
+ if (Math.abs(this.canArrangeNumber - this.needArrangeNumber) === 1) {
+ obj.producedCount = obj.producedCount + (this.needArrangeNumber - this.canArrangeNumber)
+ }
newArr.push({ ...obj })
}
}
})
- console.log(JSON.parse(JSON.stringify(newArr)), 'newArr')
-
// for (let i = 0; i < this.allTasks.length; i++) {
//
// }
this.allTasks = [...this.allTasks, ...newArr]
- // console.log(JSON.parse(JSON.stringify(this.allTasks)), '77')
console.log(JSON.parse(JSON.stringify(this.allTasks)), '888')
@@ -1050,7 +980,6 @@
this.updatePaginatedTasks()
this.renderGanttChart()
}
-
}
}
--
Gitblit v1.9.3