diff --git a/src/locales/en.ts b/src/locales/en.ts index df5b373f..1cd31433 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -3502,6 +3502,7 @@ export default { detailBaogongRecordTabLabel: 'Report Records', tableCodeColumn: 'Plan Code', + tableTaskCodeColumn: 'Task Code', tableProductColumn: 'Product', tableDeviceNameColumn: 'Device Name', tableFeedingPipelineColumn: 'Production Line', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 128b8dfc..4464d4d0 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -3347,6 +3347,7 @@ export default { detailBaogongRecordTabLabel: '报工记录', tableCodeColumn: '计划编码', + tableTaskCodeColumn: '任务编码', tableProductColumn: '产品', tableDeviceNameColumn: '设备名称', tableFeedingPipelineColumn: '生产线', diff --git a/src/views/mes/components/ScheduleGanttPanel.vue b/src/views/mes/components/ScheduleGanttPanel.vue new file mode 100644 index 00000000..79cc0e64 --- /dev/null +++ b/src/views/mes/components/ScheduleGanttPanel.vue @@ -0,0 +1,853 @@ + + + + + diff --git a/src/views/mes/ganttChart/index.vue b/src/views/mes/ganttChart/index.vue index 8cead246..b7ec6500 100644 --- a/src/views/mes/ganttChart/index.vue +++ b/src/views/mes/ganttChart/index.vue @@ -18,59 +18,46 @@ + -
-
-
-
设备信息
- - {{ activeDevice.deviceName || '-' }} - {{ activeDevice.deviceCode || '-' }} - {{ activeDevice.plans?.length ?? 0 }} - - -
计划明细
-
-
-
计划ID:{{ plan.planId ?? '-' }}
-
产品:{{ plan.productName ?? '-' }}
-
计划数量:{{ plan.planNumber ?? '-' }}
-
开始:{{ plan.planStartTimeStr || '-' }}
-
结束:{{ plan.planEndTimeStr || '-' }}
-
最晚开工:{{ plan.latestStartTimeStr || '-' }}
-
-
-
+
+
- - diff --git a/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue index 1b2bfcfd..fc6e0dee 100644 --- a/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue +++ b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue @@ -1,74 +1,17 @@ - -