| | |
| | | :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;" |
| | |
| | | </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> |
| | |
| | | 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() { |
| | |
| | | { 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, |
| | |
| | | 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() { |
| | |
| | | |
| | | initGantt() { |
| | | gantt.plugins({ |
| | | |
| | | critical_path: true, |
| | | drag_timeline: true, |
| | | grouping: true, |
| | |
| | | |
| | | 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() |
| | |
| | | ] |
| | | /* ↑↑↑ 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 |
| | | |
| | | gantt.config.show_errors = false // 发生异常时,不允许弹出警告到 UI 界面 |
| | | |
| | | gantt.config.grid_elastic_columns = true |
| | | |
| | | // 自定义浮动框的显示内容 tooltip浮动框显示的End Date被追加1的问题修复(应该显示数据库的原始值) |
| | |
| | | // 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) { |
| | |
| | | // 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">` |
| | |
| | | { |
| | | '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': '', |
| | |
| | | } |
| | | ] |
| | | |
| | | // { |
| | | // '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) => { |
| | |
| | | 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]), // 这个是无效的,只是为了预排prepareArrange方法里面不报错 |
| | | end_date: handleDatetime2(item.YearDate + ' ' + it.OneStartDate.split('~')[1]), // 这个是无效的,只是为了预排prepareArrange方法里面不报错 |
| | | // duration: this.calculateTimeRangeInMinutes(it.OneStartDate), |
| | | render: 'split', // 用于在一个工作时间段内显示不下,需要进行分割显示 |
| | | checked: false, |
| | |
| | | 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 |
| | | }) |
| | | } |
| | | } |
| | |
| | | // 使用原有的示例数据作为基础 |
| | | 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 |
| | | }, |
| | | |
| | | { |
| | | '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() |
| | | }, |
| | | |
| | | // 更新分页后的任务数据 |
| | |
| | | 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))) |
| | | }, |
| | | |
| | | // 拆分时间字符串并分别计算分钟值 |
| | |
| | | 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() |
| | | } |
| | | }, |
| | | |
| | |
| | | |
| | | // 页大小改变 |
| | | handleSizeChange(newSize) { |
| | | console.log('执行2') |
| | | this.pageSize = newSize |
| | | this.currentPage = 1 // 重置到第一页 |
| | | this.updatePaginatedTasks() |
| | |
| | | |
| | | // 当前页改变 |
| | | handleCurrentChange(newPage) { |
| | | console.log('执行1') |
| | | // 计算最大页数,防止超出范围 |
| | | const maxPage = Math.ceil(this.totalTasks / this.pageSize) |
| | | if (newPage > maxPage) { |
| | |
| | | }, |
| | | // 甘特图日期改变 |
| | | 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() |
| | |
| | | |
| | | // 显示提示信息 |
| | | this.$notify.success('已清空所有选择') |
| | | }, |
| | | // 预排 |
| | | prepareArrange() { |
| | | this.priorityMethodChange() |
| | | |
| | | this.loadTasks() |
| | | |
| | | // 优先方式 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 = Math.round((d / item.duration) * 100) / 100 |
| | | console.log(ratio, 'ratio') |
| | | } |
| | | |
| | | // 这个地方的count值 得变更 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 ? 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 下午研究一下 |
| | | |
| | | 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() |
| | | } |
| | | |
| | | } |