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 | 249 +++++++++++++++++++++++++++++++------------------
1 files changed, 158 insertions(+), 91 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index f7f98a3..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;"
@@ -32,6 +46,13 @@
</el-button>
<el-button size="mini" @click="handleClearSelection">
娓呯┖澶嶉�夋閫夋嫨
+ </el-button>
+
+ <el-button size="mini" type="primary" @click="prepareArrange">
+ 棰勬帓
+ </el-button>
+ <el-button size="mini" disabled>
+ 棰勬帓杩涘害锛歿{ canArrangeNumber }}/{{ needArrangeNumber }}
</el-button>
</div>
@@ -57,6 +78,7 @@
import { gantt } from '@/components/dhtmlxGantt'
import '@/components/dhtmlxGantt/codebase/dhtmlxgantt.css'
import { handleDateReduceOneDay, handleDatetime, handleDatetime2 } from '@/utils/global'
+import { nanoid } from 'nanoid'
export default {
data() {
@@ -77,7 +99,14 @@
allTasks: [], // 瀛樺偍鎵�鏈変换鍔℃暟鎹�
paginatedTasks: [], // 褰撳墠椤电殑浠诲姟鏁版嵁
- fivePeriodsTimeName: ['OneStartDate', 'TwoStartDate', 'ThreeStartDate', 'FourStartDate', 'FiveStartDate']// 浜斾釜鏃堕棿娈电殑閿悕
+ fivePeriodsTimeName: ['OneStartDate', 'TwoStartDate', 'ThreeStartDate', 'FourStartDate', 'FiveStartDate'], // 浜斾釜鏃堕棿娈电殑閿悕
+ needArrangeNumber: 5000, // 鍋囪闇�瑕佹帓浜ф暟閲�5000
+ canArrangeNumber: 0, // 鑳芥帓鏁伴噺榛樿涓� 0
+ priorityMethod: 'device', // device 璁惧 time 鏃堕棿
+ priorityMethodArr: [
+ { code: 'device', name: '璁惧浼樺厛' },
+ { code: 'time', name: '鏃堕棿浼樺厛' }
+ ]
}
},
mounted() {
@@ -232,62 +261,6 @@
/* 鈫戔啈鈫� Grid Columns configuration 鈫戔啈鈫� */
// 姹夊寲绐楀彛
- gantt.locale.labels = {
- dhx_cal_today_button: '浠婂ぉ',
- day_tab: '鏃�',
- week_tab: '鍛�',
- month_tab: '鏈�',
- new_event: '鏂板缓鏃ョ▼',
- icon_save: '淇濆瓨',
- icon_cancel: '鍏抽棴',
- icon_details: '璇︾粏',
- icon_edit: '缂栬緫',
- icon_delete: '鍒犻櫎',
- confirm_closing: '璇风‘璁ゆ槸鍚︽挙閿�淇敼!', // Your changes will be lost, are your sure?
- confirm_deleting: '鏄惁鍒犻櫎璁″垝?',
- section_description: '鎻忚堪:',
- section_resources: '鑷畾涔夐�夋嫨:',
- section_calendar: '鑷畾涔夐�夋嫨2:',
- section_time: '鏃堕棿鑼冨洿:',
- section_type: '绫诲瀷:',
- section_text: '璁″垝鍚嶇О:',
- section_test: '娴嬭瘯:',
- section_projectClass: '椤圭洰绫诲瀷:',
- taskProjectType_0: '椤圭洰浠诲姟',
- taskProjectType_1: '鏅�氫换鍔�',
- section_head: '璐熻矗浜�:',
- section_priority: '浼樺厛绾�:',
- taskProgress: '浠诲姟鐘舵��',
- taskProgress_0: '鏈紑濮�',
- taskProgress_1: '杩涜涓�',
- taskProgress_2: '宸插畬鎴�',
- taskProgress_3: '宸插欢鏈�',
- taskProgress_4: '鎼佺疆涓�',
- section_template: 'Details',
- /* grid columns */
- column_text: '璁″垝鍚嶇О',
- column_start_date: '寮�濮嬫椂闂�',
- column_duration: '鎸佺画鏃堕棿',
- column_add: '',
- column_priority: '闅惧害',
- /* link confirmation */
- link: '鍏宠仈',
- confirm_link_deleting: '灏嗚鍒犻櫎',
- message_ok: '纭畾',
- message_cancel: '鍙栨秷',
- link_start: ' (寮�濮�)',
- link_end: ' (缁撴潫)',
-
- type_task: '浠诲姟',
- type_project: '椤圭洰',
- type_milestone: '閲岀▼纰�',
- minutes: '鍒嗛挓',
- hours: '灏忔椂',
- days: '澶�',
- weeks: '鍛�',
- months: '鏈�',
- years: '骞�'
- }
// gantt.config.order_branch = true
// gantt.config.open_tree_initially = true
@@ -301,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) {
@@ -312,7 +289,8 @@
// return task.progress * 100 + '%'
if (task.type === 'task2') {
- return `<div class="task2Css">`
+ return `<div class="task2Css">${task.producedCount}</div>`
+ // return task.producedCount
}
if (task.type === 'task3') {
return `<div class="task3Css">`
@@ -521,8 +499,8 @@
{
'AdvaDevicNumber': 'SB001',
'AdvaDevicName': '璁惧001',
- 'AdvaDevicCropMob': '30',
- 'AdvaDevicRhythm': '5.0',
+ 'AdvaDevicCropMob': '30', // 绋煎姩鐜� 闇�瑕侀櫎100
+ 'AdvaDevicRhythm': '5.0', // 鐢熶骇鑺傛媿
'OneStartDate': '08:00~11:30',
'TwoStartDate': '13:00~18:00',
'ThreeStartDate': '',
@@ -533,22 +511,6 @@
}
]
- // {
- // '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
- // },
-
const newArr = []
// 杩欎竴姝ョ殑鎿嶄綔涓昏鏄鍋氫骇鑳借儗鏅殑鏄剧ず
rows.forEach((item, index) => {
@@ -558,14 +520,16 @@
item.children.forEach((it, ind) => {
// console.log(JSON.stringify(it))
// 杩欓噷搴旇瑕佺敓鎴愪竴涓互璁惧缁村害涓哄熀纭�鐨勬暟缁� 涓嶉噸涓嶆紡
- if (!this.allTasks.map(i => i.partCode).includes(it.AdvaDevicNumber)) {
+ if (!newArr.map(i => i.partCode).includes(it.AdvaDevicNumber)) {
+ console.log(' it.AdvaDevicNumber,', it.AdvaDevicNumber)
newArr.push({
id: it.AdvaDevicNumber,
- type: 'task',
+ type: 'project',
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,
@@ -573,25 +537,30 @@
parent: 0,
saleOrder: 'SO-2026-01001'
})
- // console.log(this.allTasks, 'allTasks')
}
// 鍥犱负鏄簲涓椂闂存锛屾墍鏈夎鏈変釜寰幆娆℃暟涓�5鐨勫惊鐜�
- for (let i = 0; i < 5; i++) {
- // console.log(item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0])
+ for (let i = 0; i < 5; i++) { // 杩欐寰幆鏄负浜嗘樉绀轰骇鑳�
if (it[this.fivePeriodsTimeName[i]]) {
+ const duration = this.calculateTimeRangeInMinutes(it[this.fivePeriodsTimeName[i]]) // 宸ユ湡 鍗曚綅 鍒嗛挓
newArr.push({
- id: index.toString() + ind.toString() + i.toString(),
+ // id: index.toString() + ind.toString() + i.toString(),
+ id: nanoid(),
type: 'task',
text: '浠诲姟鍚嶇О棰勭暀',
partName: it.AdvaDevicName,
partCode: it.AdvaDevicNumber,
- start_date: item.YearDate + ' ' + it[this.fivePeriodsTimeName[i]].split('~')[0],
- duration: this.calculateTimeRangeInMinutes(it[this.fivePeriodsTimeName[i]]),
+ 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,
parent: it.AdvaDevicNumber,
- saleOrder: 'SO-2026-01001'
+ saleOrder: 'SO-2026-01001',
+ // 瑕佸湪姣忎竴涓椂闂存鍐呯畻鍑鸿兘鐢熶骇澶氬皯涓� 宸ユ湡锛堝垎閽燂級涔樹互60 闄や互鐢熶骇鑺傛媿 * 绋煎姩鐜�
+ producedCount: (duration * 60 / it.AdvaDevicRhythm) * (it.AdvaDevicCropMob / 100),
+ AdvaDevicRhythm: it.AdvaDevicRhythm, // 鐢熶骇鑺傛媿
+ AdvaDevicCropMob: it.AdvaDevicCropMob // 绋煎姩鐜� 闇�瑕侀櫎100
})
}
}
@@ -824,9 +793,11 @@
}
]
- this.totalTasks = this.allTasks.length
- this.updatePaginatedTasks()
- this.renderGanttChart()
+ // this.totalTasks = this.allTasks.length
+ // this.updatePaginatedTasks()
+ // this.renderGanttChart()
+
+ this.prepareArrange()
},
// 鏇存柊鍒嗛〉鍚庣殑浠诲姟鏁版嵁
@@ -834,6 +805,7 @@
const startIndex = (this.currentPage - 1) * this.pageSize
const endIndex = Math.min(startIndex + this.pageSize, this.allTasks.length)
this.paginatedTasks = this.allTasks.slice(startIndex, endIndex)
+ // this.paginatedTasks = JSON.parse(JSON.stringify(this.allTasks.slice(startIndex, endIndex)))
},
// 鎷嗗垎鏃堕棿瀛楃涓插苟鍒嗗埆璁＄畻鍒嗛挓鍊�
@@ -894,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()
}
},
@@ -911,6 +884,7 @@
// 椤靛ぇ灏忔敼鍙�
handleSizeChange(newSize) {
+ console.log('鎵ц2')
this.pageSize = newSize
this.currentPage = 1 // 閲嶇疆鍒扮涓�椤�
this.updatePaginatedTasks()
@@ -920,6 +894,7 @@
// 褰撳墠椤垫敼鍙�
handleCurrentChange(newPage) {
+ console.log('鎵ц1')
// 璁＄畻鏈�澶ч〉鏁帮紝闃叉瓒呭嚭鑼冨洿
const maxPage = Math.ceil(this.totalTasks / this.pageSize)
if (newPage > maxPage) {
@@ -936,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()
@@ -982,6 +958,97 @@
// 鏄剧ず鎻愮ず淇℃伅
this.$notify.success('宸叉竻绌烘墍鏈夐�夋嫨')
+ },
+ // 棰勬帓
+ prepareArrange() {
+ // 浼樺厛鏂瑰紡 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)
+ }
+
+ const newArr = []
+ // this.canArrangeNumber = 0
+ let needArrangeNumber = this.needArrangeNumber
+ this.allTasks.forEach(item => {
+ // 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: '浠诲姟鍚嶇О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: 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)), '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