From 271759c04323f38f7b4870a81c8dc8e4877eb66f Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 20 一月 2026 17:00:14 +0800
Subject: [PATCH] 1.递交
---
src/views/gantt/index.vue | 170 ++++++++++++++++++++++++++++----------------------------
1 files changed, 85 insertions(+), 85 deletions(-)
diff --git a/src/views/gantt/index.vue b/src/views/gantt/index.vue
index f7f98a3..6685486 100644
--- a/src/views/gantt/index.vue
+++ b/src/views/gantt/index.vue
@@ -34,6 +34,13 @@
娓呯┖澶嶉�夋閫夋嫨
</el-button>
+ <el-button size="mini" type="primary" @click="prepareArrange('device')">
+ 鎸夎澶囦紭鍏堥鎺�
+ </el-button>
+ <el-button size="mini" type="primary" @click="prepareArrange('time')">
+ 鎸夋椂闂翠紭鍏堥鎺�
+ </el-button>
+
</div>
<div id="gantt_here" style="width:100%; height:calc(90vh - 50px);" />
@@ -57,6 +64,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 +85,9 @@
allTasks: [], // 瀛樺偍鎵�鏈変换鍔℃暟鎹�
paginatedTasks: [], // 褰撳墠椤电殑浠诲姟鏁版嵁
- fivePeriodsTimeName: ['OneStartDate', 'TwoStartDate', 'ThreeStartDate', 'FourStartDate', 'FiveStartDate']// 浜斾釜鏃堕棿娈电殑閿悕
+ fivePeriodsTimeName: ['OneStartDate', 'TwoStartDate', 'ThreeStartDate', 'FourStartDate', 'FiveStartDate'], // 浜斾釜鏃堕棿娈电殑閿悕
+ needArrangeNumber: 5000, // 鍋囪闇�瑕佹帓浜ф暟閲�5000
+ priorityMethod: 'device'// device 璁惧 time 鏃堕棿
}
},
mounted() {
@@ -232,62 +242,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
@@ -312,7 +266,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 +476,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 +488,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,10 +497,11 @@
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,
@@ -573,25 +513,29 @@
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]),
+ 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
})
}
}
@@ -827,6 +771,8 @@
this.totalTasks = this.allTasks.length
this.updatePaginatedTasks()
this.renderGanttChart()
+
+ this.prepareArrange()
},
// 鏇存柊鍒嗛〉鍚庣殑浠诲姟鏁版嵁
@@ -834,6 +780,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)))
},
// 鎷嗗垎鏃堕棿瀛楃涓插苟鍒嗗埆璁＄畻鍒嗛挓鍊�
@@ -911,6 +858,7 @@
// 椤靛ぇ灏忔敼鍙�
handleSizeChange(newSize) {
+ console.log('鎵ц2')
this.pageSize = newSize
this.currentPage = 1 // 閲嶇疆鍒扮涓�椤�
this.updatePaginatedTasks()
@@ -920,6 +868,7 @@
// 褰撳墠椤垫敼鍙�
handleCurrentChange(newPage) {
+ console.log('鎵ц1')
// 璁＄畻鏈�澶ч〉鏁帮紝闃叉瓒呭嚭鑼冨洿
const maxPage = Math.ceil(this.totalTasks / this.pageSize)
if (newPage > maxPage) {
@@ -982,6 +931,57 @@
// 鏄剧ず鎻愮ず淇℃伅
this.$notify.success('宸叉竻绌烘墍鏈夐�夋嫨')
+ },
+ // 棰勬帓
+ prepareArrange(type) {
+ // 浼樺厛鏂瑰紡 time device
+ if (type === 'time') {
+ this.allTasks.sort((a, b) => a.start_date - b.start_date)
+ }
+ if (type === 'device') {
+ console.log(JSON.parse(JSON.stringify(this.allTasks)), '9999')
+ this.allTasks.sort((a, b) => Number(a.partCode.replace(/\D/g, '')) - Number(b.partCode.replace(/\D/g, '')))
+ }
+
+ // console.log(JSON.parse(JSON.stringify(this.allTasks)), '9999')
+ const newArr = []
+ 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({
+ id: nanoid(),
+ type: 'task2',
+ text: '浠诲姟鍚嶇О棰勭暀',
+ partName: item.AdvaDevicName,
+ partCode: item.AdvaDevicNumber,
+ start_date: handleDatetime2(item.start_date),
+ // duration: item.duration,
+ duration: duration,
+ checked: false,
+ progress: 0,
+ parent: item.parent,
+ saleOrder: 'SO-2026-01001',
+ producedCount: count <= item.producedCount ? count : item.producedCount
+ })
+ }
+ }
+ })
+
+ // for (let i = 0; i < this.allTasks.length; i++) {
+ //
+ // }
+
+ this.allTasks = [...this.allTasks, ...newArr]
+ // console.log(JSON.parse(JSON.stringify(this.allTasks)), '9999')
+
+ this.totalTasks = this.allTasks.length
+ this.updatePaginatedTasks()
+ this.renderGanttChart()
}
}
--
Gitblit v1.9.3