From ba77dbbe9a52f84ccd4ca47f47f6263d250f51dc Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 21 一月 2026 11:42:06 +0800
Subject: [PATCH] 1.递交
---
src/views/gantt/index.vue | 135 +++++++++++++++++++++++++++++++++-----------
1 files changed, 101 insertions(+), 34 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index 6685486..2cca563 100644
--- a/src/views/gantt/index.vue
+++ b/src/views/gantt/index.vue
@@ -15,6 +15,20 @@
:value="item.code"
/>
</el-select>
+ <el-select
+ v-model="priorityMethod"
+ size="mini"
+ style="margin-left: 10px;"
+ placeholder="璇烽�夋嫨"
+ @change="priorityMethodChange"
+ >
+ <el-option
+ v-for="item in priorityMethodArr"
+ :key="item.code"
+ :label="item.name"
+ :value="item.code"
+ />
+ </el-select>
<el-date-picker
v-model="ganttDateRange"
style="margin-left: 10px;"
@@ -34,11 +48,11 @@
娓呯┖澶嶉�夋閫夋嫨
</el-button>
- <el-button size="mini" type="primary" @click="prepareArrange('device')">
- 鎸夎澶囦紭鍏堥鎺�
+ <el-button size="mini" type="primary" @click="prepareArrange">
+ 棰勬帓
</el-button>
- <el-button size="mini" type="primary" @click="prepareArrange('time')">
- 鎸夋椂闂翠紭鍏堥鎺�
+ <el-button size="mini" disabled>
+ 棰勬帓杩涘害锛歿{ canArrangeNumber }}/{{ needArrangeNumber }}
</el-button>
</div>
@@ -87,7 +101,12 @@
fivePeriodsTimeName: ['OneStartDate', 'TwoStartDate', 'ThreeStartDate', 'FourStartDate', 'FiveStartDate'], // 浜斾釜鏃堕棿娈电殑閿悕
needArrangeNumber: 5000, // 鍋囪闇�瑕佹帓浜ф暟閲�5000
- priorityMethod: 'device'// device 璁惧 time 鏃堕棿
+ canArrangeNumber: 0, // 鑳芥帓鏁伴噺榛樿涓� 0
+ priorityMethod: 'device', // device 璁惧 time 鏃堕棿
+ priorityMethodArr: [
+ { code: 'device', name: '璁惧浼樺厛' },
+ { code: 'time', name: '鏃堕棿浼樺厛' }
+ ]
}
},
mounted() {
@@ -255,7 +274,11 @@
// 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 + '<br/><b>寮�濮嬫椂闂�:</b> ' + handleDatetime2(start) + '<br/><b>缁撴潫鏃堕棿:</b> ' + handleDatetime2(end) + '<br/><b>杩涘害:</b> ' + task.progress * 100 + '%'
+ return '<b>浠诲姟:</b> ' + task.text +
+ '<br/><b>' + `${task.type === 'task' ? '浜ц兘' : '鐢熶骇鏁伴噺'}` + ' :</b> ' + task.producedCount +
+ '<br/><b>杩涘害:</b> ' + task.progress * 100 + '%' +
+ '<br/><b>寮�濮嬫椂闂�:</b> ' + handleDatetime2(start) +
+ '<br/><b>缁撴潫鏃堕棿:</b> ' + handleDatetime2(end)
}
gantt.templates.task_text = function(start, end, task) {
@@ -505,7 +528,8 @@
text: '浠诲姟鍚嶇О棰勭暀',
partName: it.AdvaDevicName,
partCode: it.AdvaDevicNumber,
- // start_date: item.YearDate + ' ' + it.OneStartDate.split('~')[0],
+ 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),
render: 'split', // 鐢ㄤ簬鍦ㄤ竴涓伐浣滄椂闂存鍐呮樉绀轰笉涓嬶紝闇�瑕佽繘琛屽垎鍓叉樉绀�
checked: false,
@@ -527,6 +551,7 @@
partName: it.AdvaDevicName,
partCode: it.AdvaDevicNumber,
start_date: handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0]),
+ end_date: handleDatetime2(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[1]),
duration,
checked: false,
progress: 0,
@@ -768,9 +793,9 @@
}
]
- this.totalTasks = this.allTasks.length
- this.updatePaginatedTasks()
- this.renderGanttChart()
+ // this.totalTasks = this.allTasks.length
+ // this.updatePaginatedTasks()
+ // this.renderGanttChart()
this.prepareArrange()
},
@@ -841,7 +866,8 @@
gantt.config.end_date = new Date(this.ganttDateRange[1] + ' 24:00')
gantt.config.scales = scaleConfig
if (boolean) {
- gantt.render()// gantt閲嶇粯
+ // gantt.render()// gantt閲嶇粯
+ this.renderGanttChart()
}
},
@@ -885,6 +911,7 @@
},
// 鐢樼壒鍥炬棩鏈熸敼鍙�
ganttDateRangeChange(val) {
+ this.priorityMethodChange()// 娓呯┖宸叉帓鍊�
gantt.config.start_date = new Date(val[0] + ' 00:00')
gantt.config.end_date = new Date(val[1] + ' 24:00')
gantt.render()
@@ -933,52 +960,92 @@
this.$notify.success('宸叉竻绌烘墍鏈夐�夋嫨')
},
// 棰勬帓
- prepareArrange(type) {
+ prepareArrange() {
// 浼樺厛鏂瑰紡 time device
- if (type === 'time') {
+ if (this.priorityMethod === 'time') {
this.allTasks.sort((a, b) => a.start_date - b.start_date)
}
- if (type === 'device') {
- console.log(JSON.parse(JSON.stringify(this.allTasks)), '9999')
+ 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)
}
- // console.log(JSON.parse(JSON.stringify(this.allTasks)), '9999')
const newArr = []
+ // this.canArrangeNumber = 0
+ let needArrangeNumber = this.needArrangeNumber
this.allTasks.forEach(item => {
- if (item.type === 'task') {
- // console.log(JSON.parse(JSON.stringify(item)))
- const count = this.needArrangeNumber > 0 && this.needArrangeNumber <= item.producedCount ? this.needArrangeNumber : item.producedCount
- this.needArrangeNumber = this.needArrangeNumber - item.producedCount // 鍓╀綑寰呮帓鍊�
- if (count > 0 && (this.needArrangeNumber > 0 || Math.abs(this.needArrangeNumber) < item.producedCount)) { // 涓�瀹氭槸澶т簬闆朵笖灏忎簬鏁存潯鐨勭敓浜у�肩殑
- // duration 鏈�鍚庝竴鏉＄殑鏁版嵁搴旇鏄�氳繃璁＄畻寰楀嚭鏃堕棿闀垮害鐨�
- const duration = (count / (item.AdvaDevicCropMob / 100)) * item.AdvaDevicRhythm / 60
- newArr.push({
+ // if (item.type === 'task') { // 杩欓噷鐨勫垽鏂潯浠惰繕寰楀姞涓棩鏈熷垽鏂�
+ 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
+ }
+
+ // 杩欎釜鍦版柟鐨刢ount鍊� 寰楀彉鏇� item.producedCount 寰椾箻浠ヤ釜绯绘暟 榛樿绯绘暟 1
+ const count = needArrangeNumber > 0 && needArrangeNumber <= item.producedCount * ratio ? needArrangeNumber : item.producedCount * ratio
+ needArrangeNumber = needArrangeNumber - item.producedCount * ratio // 鍓╀綑寰呮帓鍊�
+
+ 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 obj = {
id: nanoid(),
type: 'task2',
- text: '浠诲姟鍚嶇О棰勭暀',
- partName: item.AdvaDevicName,
- partCode: item.AdvaDevicNumber,
- start_date: handleDatetime2(item.start_date),
- // duration: item.duration,
- duration: duration,
+ 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),
+ // end_date: handleDatetime2(item.end_date),
+ // end_date: item.end_date,
+ duration, // 浠ｈ〃鐨勬槸杩涘害鏉�
checked: false,
progress: 0,
parent: item.parent,
- saleOrder: 'SO-2026-01001',
- producedCount: count <= item.producedCount ? count : item.producedCount
- })
+ saleOrder: item.saleOrder,
+ producedCount: count <= item.producedCount ? count.toFixed(0) : item.producedCount
+ }
+ this.canArrangeNumber += parseFloat(obj.producedCount)
+ console.log(this.canArrangeNumber)
+
+ // 杩欎釜鍦版柟寰楀姞涓�昏緫锛屽緱鏍规嵁涓栭棿鏃ユ湡杩涜push 涓嬪崍鐮旂┒涓�涓�
+
+ 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)), '9999')
+ // console.log(JSON.parse(JSON.stringify(this.allTasks)), '77')
+ console.log(JSON.parse(JSON.stringify(this.allTasks)), '888')
+
+ this.totalTasks = this.allTasks.length
+ this.updatePaginatedTasks()
+ this.renderGanttChart()
+ },
+ // 娓呯┖宸叉帓鍊�
+ priorityMethodChange() {
+ this.canArrangeNumber = 0
+ this.allTasks = this.allTasks.filter(i => i.type !== 'task2')
this.totalTasks = this.allTasks.length
this.updatePaginatedTasks()
this.renderGanttChart()
--
Gitblit v1.9.3