From 4147e932437a41dcec48a9f5fbafab5da240f30e Mon Sep 17 00:00:00 2001
From: zhangdi <15053473693@163.com>
Date: Fri, 26 Dec 2025 20:23:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9C=8B=E6=9D=BF=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../schedulingDashboard/index.vue             | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue
index 049b1bc..6f5e5aa 100644
--- a/src/views/productionSchedulingPlan/schedulingDashboard/index.vue
+++ b/src/views/productionSchedulingPlan/schedulingDashboard/index.vue
@@ -152,9 +152,9 @@
       </div>
 
       <!-- 甘特图主体 -->
-      <div class="gantt-wrapper" :style="{ height: ganttWrapperHeight }">
+      <div class="gantt-wrapper" >
         <!-- 左侧信息列表 - 展示车间订单号等信息 -->
-        <div class="info-list">
+        <div class="info-list" :style="{ height: ganttWrapperHeightLeft }">
           <div class="info-item-title">
             <div class="info-title-cell info-title-num">序号</div>
             <div class="info-title-cell">订单信息</div>
@@ -193,7 +193,7 @@
         </div>
 
         <!-- 右侧时间轴 @wheel.prevent="handleWheel"-->
-        <div class="timeline-container" ref="timelineContainer">
+        <div class="timeline-container" ref="timelineContainer" :style="{ height: ganttWrapperHeight }">
           <!-- 图表X轴区域 -->
           <div class="chart-axis">
             <!-- 日期行 -->
@@ -348,8 +348,8 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          
-          layout="total, prev, pager, next, jumper"
+          :page-sizes="[10, 20, 50]"
+          layout="total, prev, pager, next, jumper,sizes"
           :total="totalOrders"
         ></el-pagination>
       </div>
@@ -476,7 +476,7 @@ export default {
 
       // 样式相关
       baseRowHeight: 50,
-      baseRowChartHeight: 51,
+      baseRowChartHeight: 50,
       rowHeights: {},
       selectTeamOptions: [],
       selectEquipOptions: [],
@@ -666,6 +666,16 @@ export default {
       // 根据时间范围动态调整时间轴宽度
       return Math.max(100, this.totalHours * (100 / 24)); // 每24小时为100%宽度，最小为100%
     },
+    // 右侧动态计算甘特图容器高度
+    ganttWrapperHeightLeft() {
+      if (this.$route.path == '/productionSchedulingPlan/schedulingDashboard/index') {
+        // 根据实际页面元素计算可用高度
+        return `calc(100vh - 250px - 120px)`; // 调整数值以适应您的页面布局
+      } else {
+        // 根据实际页面元素计算可用高度
+        return `calc(100vh - 250px)`; // 调整数值以适应您的页面布局
+      }
+    },
     // 动态计算甘特图容器高度
     ganttWrapperHeight() {
       if (this.$route.path == '/productionSchedulingPlan/schedulingDashboard/index') {
@@ -1057,7 +1067,7 @@ export default {
 
     // 左侧行高计算
     getRowHeight(device) {
-      return this.baseRowHeight;
+      return this.baseRowHeight-1;
     },
     // 右侧行高计算
     getRowChartHeight(device) {
@@ -1384,6 +1394,7 @@ export default {
   flex-direction: column;
   overflow-y: auto; /* 允许垂直滚动 */
   overflow-x: auto; /* 允许水平滚动 */
+  
 }
 
 /* 图表X轴区域样式 */