From 4fbd0c98d22c2ce6eabfcb507c13c6c9ce77492d Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 21 一月 2026 14:22:55 +0800
Subject: [PATCH] 1.递交
---
src/views/gantt/index.vue | 282 +++-----------------------------------------------------
1 files changed, 17 insertions(+), 265 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index 2cca563..e3d09a1 100644
--- a/src/views/gantt/index.vue
+++ b/src/views/gantt/index.vue
@@ -90,7 +90,7 @@
{ code: '360min', name: '360min' }
],
scaleValue: '240min',
- ganttDateRange: ['2026-01-20', '2026-01-25'],
+ ganttDateRange: ['2026-01-21', '2026-01-22'], // '2026-01-20', '2026-01-25'
selectedIds: [],
// 鍒嗛〉鐩稿叧鏁版嵁
currentPage: 1,
@@ -123,7 +123,6 @@
initGantt() {
gantt.plugins({
-
critical_path: true,
drag_timeline: true,
grouping: true,
@@ -145,37 +144,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,13 +231,7 @@
]
/* 鈫戔啈鈫� 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鐨勯棶棰樹慨澶嶏紙搴旇鏄剧ず鏁版嵁搴撶殑鍘熷鍊硷級
@@ -571,233 +536,11 @@
// 浣跨敤鍘熸湁鐨勭ず渚嬫暟鎹綔涓哄熀纭�
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
- },
+ this.totalTasks = this.allTasks.length
+ this.updatePaginatedTasks()
+ this.renderGanttChart()
- {
- '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
- }
- ]
-
- // this.totalTasks = this.allTasks.length
- // this.updatePaginatedTasks()
- // this.renderGanttChart()
-
- this.prepareArrange()
+ // this.prepareArrange()
},
// 鏇存柊鍒嗛〉鍚庣殑浠诲姟鏁版嵁
@@ -961,6 +704,10 @@
},
// 棰勬帓
prepareArrange() {
+ this.priorityMethodChange()
+
+ this.loadTasks()
+
// 浼樺厛鏂瑰紡 time device
if (this.priorityMethod === 'time') {
this.allTasks.sort((a, b) => a.start_date - b.start_date)
@@ -984,7 +731,8 @@
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
+ ratio = Math.round((d / item.duration) * 100) / 100
+ console.log(ratio, 'ratio')
}
// 杩欎釜鍦版柟鐨刢ount鍊� 寰楀彉鏇� item.producedCount 寰椾箻浠ヤ釜绯绘暟 榛樿绯绘暟 1
@@ -995,7 +743,7 @@
// 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')
+ // console.log('鎵ц1111')
duration = duration * (count / item.producedCount)
// item.end_date = '2026-01-24 11:00:00'
}
@@ -1015,10 +763,14 @@
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)
+ if (Math.abs(this.canArrangeNumber - this.needArrangeNumber) === 1) {
+ obj.producedCount = obj.producedCount + (this.needArrangeNumber - this.canArrangeNumber)
+ }
// 杩欎釜鍦版柟寰楀姞涓�昏緫锛屽緱鏍规嵁涓栭棿鏃ユ湡杩涜push 涓嬪崍鐮旂┒涓�涓�
--
Gitblit v1.9.3