diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue index fdbec32..f59d34b 100644 --- a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue +++ b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue @@ -172,14 +172,14 @@
{{ index + 1 }}
- -
订单号:{{ order.woCode }}
-
- -
零件号:{{ order.partCode }}
+ +
+ {{ order.woCode }}/ + {{ order.partCode }} +
-
+
{{ order.batchNo }} / {{ order.makeQty }} / {{ order.productIdent }} / {{ order.priorityAps }} @@ -385,23 +385,23 @@ {{ tooltipData.makeQty || '-' }}
  • - 计划开始时间: + 计划开始: {{ tooltipData.planStartTime || '-' }}
  • -
  • - 实际开始时间: - {{ tooltipData.factStartTime || '-' }} +
  • + 计划完成: + {{ tooltipData.planEndTime || '-' }}
  • - 计划完成时间: - {{ tooltipData.planEndTime || '-' }} + 实际开始: + {{ tooltipData.factStartTime || '-' }}
  • - 实际完成时间: + 实际完成: {{ tooltipData.factEndTime || '-' }}
  • - 状态: + 工序状态: 未开始 @@ -460,7 +460,7 @@ export default { // 分页参数 currentPage: 1, - pageSize: 10, + pageSize: 8, // 提示框相关 tooltipVisible: false, @@ -597,7 +597,7 @@ export default { dates.push({ date: date, position: Math.max(0, Math.min(100, positionPercent)), - label: `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`, // 显示年/月/日 + label: `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日`, // 显示年/月/日 dayName: this.getDayName(date.getDay()), }); } @@ -1100,6 +1100,7 @@ export default { // 确保百分比在有效范围内 const percent = (startHour / totalDuration) * 100; + console.log('percent',percent) return Math.max(0, Math.min(100, percent)); }, @@ -1117,7 +1118,8 @@ export default { } // 确保宽度在有效范围内 - const width = (duration / totalDuration) * 100; + const width = ((duration / totalDuration) * 100); + return Math.max(0, Math.min(100, width)); }, @@ -1253,7 +1255,7 @@ export default { /* 左侧信息列表样式 */ .info-list { - width: 450px; + width: 330px; background-color: #f8f9fa; flex-shrink: 0; } @@ -1281,6 +1283,13 @@ export default { .info-item-txt i { font-style: normal; } +.info-item-info{ + display: flex; + justify-content: space-between; + align-items: center; + padding-right: 15px; + +} .info-title-cell { flex: 1; @@ -1511,14 +1520,14 @@ export default { border-radius: 5px; display: flex; align-items: center; - padding: 2px 8px; + padding: 2px 2px; box-sizing: border-box; cursor: pointer; overflow: hidden; transition: all 0.2s; white-space: nowrap; border: 1px solid rgba(255, 255, 255, 0.3); - min-width: 20px; + min-width: 5px; z-index: 1; } .task-bar.task-bar-narrow { @@ -1574,7 +1583,7 @@ export default { background-color: white; border: 1px solid #ddd; border-radius: 4px; - padding: 5px; + padding: 20px; box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1); z-index: 1000; font-size: 12px; @@ -1605,9 +1614,10 @@ export default { line-height: 20px; .label { - width: 100px; + width: 60px; color: #666; font-weight: 500; + text-align: right; } .value {