diff --git a/.env.local b/.env.local index 9bd18842..71123634 100644 --- a/.env.local +++ b/.env.local @@ -8,8 +8,9 @@ VITE_DEV=true # 线上环境 # VITE_BASE_URL='https://besure.ngsk.tech:7001' # 本地联调 -# VITE_BASE_URL='http://192.168.5.107:48081' -VITE_BASE_URL='http://localhost:48081' +VITE_BASE_URL='http://192.168.5.167:48081' +# VITE_BASE_URL='http://192.168.5.164:48081' +# VITE_BASE_URL='http://192.168.5.5:48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持 S3 服务 diff --git a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue index 6d43b3d5..87f80a79 100644 --- a/src/views/mes/tasksummary/components/TaskScheduleDialog.vue +++ b/src/views/mes/tasksummary/components/TaskScheduleDialog.vue @@ -159,40 +159,11 @@ - - - - - 计划信息 - - {{ activePreviewDevice.deviceName }} - {{ activePreviewDevice.deviceId }} - {{ activePreviewDevice.ratedCapacity ?? '-' }} - {{ activePreviewDevice.plans?.length ?? 0 }} - - - 计划明细 - - - 任务明细ID:{{ plan.taskDetailId ?? '-' }} - 计划数量:{{ plan.planNumber ?? '-' }} - 交货日期:{{ plan.deliveryDateStr ?? '-' }} - 开始:{{ plan.planStartTimeStr || '-' }} - 结束:{{ plan.planEndTimeStr || '-' }} - 最晚开工:{{ plan.latestStartTimeStr || '-' }} - - - - - - 保存 - 关闭 - - + @@ -200,12 +171,9 @@ - - diff --git a/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue new file mode 100644 index 00000000..ac2c40ae --- /dev/null +++ b/src/views/mes/tasksummary/components/TaskSchedulePreviewDialog.vue @@ -0,0 +1,491 @@ + + + + + + 计划信息 + + {{ activePreviewDevice.deviceName }} + {{ activePreviewDevice.deviceId }} + {{ activePreviewDevice.ratedCapacity ?? '-' }} + {{ activePreviewDevice.plans?.length ?? 0 }} + + + 计划明细 + + + 任务明细ID:{{ plan.taskDetailId ?? '-' }} + 计划数量:{{ plan.planNumber ?? '-' }} + 交货日期:{{ plan.deliveryDateStr ?? '-' }} + 开始:{{ plan.planStartTimeStr || '-' }} + 结束:{{ plan.planEndTimeStr || '-' }} + 最晚开工:{{ plan.latestStartTimeStr || '-' }} + + + + + + 保存 + 关闭 + + + + + + +