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 | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index df9ebe5..5b252df 100644
--- a/src/views/gantt/index.vue
+++ b/src/views/gantt/index.vue
@@ -76,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'
@@ -109,9 +109,9 @@
{ code: 'time', name: '鏃堕棿浼樺厛' }
],
pickerOptions: {
- disabledDate(time) {
- return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
- }
+ // disabledDate(time) {
+ // return time.getTime() <= Date.now() - 24 * 60 * 60 * 1000
+ // }
}
}
},
@@ -594,9 +594,25 @@
item.children.forEach((it, ind) => {
// 杩欓噷搴旇瑕佺敓鎴愪竴涓互璁惧缁村害涓哄熀纭�鐨勬暟缁� 涓嶉噸涓嶆紡
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,
@@ -607,7 +623,8 @@
render: 'split', // 鐢ㄤ簬鍦ㄤ竴涓伐浣滄椂闂存鍐呮樉绀轰笉涓嬶紝闇�瑕佽繘琛屽垎鍓叉樉绀�
checked: false,
progress: 0,
- parent: 0,
+ parent: it.AdvaDevicNumber,
+ // parent: it.AdvaDevicNumber,
saleOrder: 'SO-2026-01001'
})
}
@@ -616,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(),
@@ -630,7 +648,8 @@
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),
@@ -659,7 +678,7 @@
duration: this.calculateTimeRangeInMinutes(item.time_start.split(' ')[1] + '~' + item.time_end.split(' ')[1]),
checked: false,
progress: 0,
- parent: item.eqp_code,
+ parent: item.eqp_code + '0',
saleOrder: 'SO-2026-01001',
producedCount: item.alloc_qty
})
--
Gitblit v1.9.3