From c429bb4ea4663970c7dc83aecc7f301a87070339 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Tue, 27 Jan 2026 16:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../engineeringSafetyAnalysis.html            |  2 +-
 .../overallEfficiency.html                    | 30 ++++++++++------
 .../dataAnalysisOctober/projectProgress.html  | 25 +++++++++++++-
 .../resourceRateAnalysis.html                 | 34 +++++++++++++++++++
 4 files changed, 79 insertions(+), 12 deletions(-)

diff --git a/pages/dataAnalysisOctober/engineeringSafetyAnalysis.html b/pages/dataAnalysisOctober/engineeringSafetyAnalysis.html
index 591cc09..4f3ad3f 100644
--- a/pages/dataAnalysisOctober/engineeringSafetyAnalysis.html
+++ b/pages/dataAnalysisOctober/engineeringSafetyAnalysis.html
@@ -73,7 +73,7 @@
         <div class="table-module">
             <div class="module-title">
                 <span class="title-indicator"></span>
-                <span class="title-text">质量检测记录</span>
+                <span class="title-text">质量监测记录</span>
                 <span class="info-icon">
                     <img src="../../img/dataAnalysisOctober/common_icon.png" alt=""
                         style="cursor: pointer; width: 20px; height: 20px;margin-right: 10px;margin-top: 5px;">
diff --git a/pages/dataAnalysisOctober/overallEfficiency.html b/pages/dataAnalysisOctober/overallEfficiency.html
index bef38e6..c58a6ff 100644
--- a/pages/dataAnalysisOctober/overallEfficiency.html
+++ b/pages/dataAnalysisOctober/overallEfficiency.html
@@ -457,17 +457,21 @@
     /* 模块2样式 - 各工种任务占比（六边形卡片） */
     .trade-proportion-container {
         width: 100%;
-        height: 80%;
+        height: 100%;
         display: flex;
-        align-items: center;
-        justify-content: space-around;
-        gap: 8px;
         flex-wrap: wrap;
-        /* padding: 10px 0; */
+        align-content: flex-start;
+        gap: 8px;
+        padding: 10px 0;
+        overflow-y: auto;
+        overflow-x: hidden;
+        /* 确保每行最多5个卡片：容器宽度 / 5 - gap */
+        /* 使用calc计算，考虑gap间距 */
     }
 
     .trade-proportion-box {
-        width: 130px;
+        /* 每行5个卡片：宽度 = (100% - 4个gap) / 5，gap为8px，共32px */
+        width: calc((100% - 32px) / 5);
         height: 150px;
         background-image: url("../../img/dataAnalysisOctober/overallEfficiency/box.png");
         background-size: 100% 100%;
@@ -480,6 +484,8 @@
         position: relative;
         padding: 20px 10px;
         box-sizing: border-box;
+        flex-shrink: 0;
+        flex-grow: 0;
     }
 
     .trade-proportion-value {
@@ -708,28 +714,32 @@
     /* 滚动条样式 */
     .module-content::-webkit-scrollbar,
     .table-container::-webkit-scrollbar,
-    .equipment-failure-list::-webkit-scrollbar {
+    .equipment-failure-list::-webkit-scrollbar,
+    .trade-proportion-container::-webkit-scrollbar {
         width: 6px;
         height: 6px;
     }
 
     .module-content::-webkit-scrollbar-track,
     .table-container::-webkit-scrollbar-track,
-    .equipment-failure-list::-webkit-scrollbar-track {
+    .equipment-failure-list::-webkit-scrollbar-track,
+    .trade-proportion-container::-webkit-scrollbar-track {
         background: rgba(13, 34, 37, 0.5);
         border-radius: 3px;
     }
 
     .module-content::-webkit-scrollbar-thumb,
     .table-container::-webkit-scrollbar-thumb,
-    .equipment-failure-list::-webkit-scrollbar-thumb {
+    .equipment-failure-list::-webkit-scrollbar-thumb,
+    .trade-proportion-container::-webkit-scrollbar-thumb {
         background: rgba(6, 189, 221, 0.5);
         border-radius: 3px;
     }
 
     .module-content::-webkit-scrollbar-thumb:hover,
     .table-container::-webkit-scrollbar-thumb:hover,
-    .equipment-failure-list::-webkit-scrollbar-thumb:hover {
+    .equipment-failure-list::-webkit-scrollbar-thumb:hover,
+    .trade-proportion-container::-webkit-scrollbar-thumb:hover {
         background: rgba(6, 189, 221, 0.8);
     }
 
diff --git a/pages/dataAnalysisOctober/projectProgress.html b/pages/dataAnalysisOctober/projectProgress.html
index cbc4289..e7b0a8a 100644
--- a/pages/dataAnalysisOctober/projectProgress.html
+++ b/pages/dataAnalysisOctober/projectProgress.html
@@ -301,9 +301,32 @@
         /* padding: 1%; */
         box-sizing: border-box;
         overflow: hidden;
+        display: flex;
+        flex-direction: column;
+    }
+
+    /* 顶部日期筛选区域（与工程质量分析保持一致） */
+    .top-date-filter {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        padding: 4px 20px;
+        background: rgba(13, 34, 37, 0.8);
+        border-bottom: 1px solid rgba(6, 189, 221, 0.3);
+        flex-shrink: 0;
+    }
+
+    .date-filter-label {
+        font-size: 14px;
+        color: #FFFFFF;
+        font-weight: bold;
+        white-space: nowrap;
     }
 
     .panels-container {
+        flex: 1;
+        height: 0;
+        min-height: 0;
         width: 100%;
         height: 100%;
         display: flex;
@@ -602,7 +625,7 @@
     }
 
     .date-input {
-        width: 200px;
+        width: 240px;
     }
 
     .search-btn {
diff --git a/pages/dataAnalysisOctober/resourceRateAnalysis.html b/pages/dataAnalysisOctober/resourceRateAnalysis.html
index c394b0b..6c844e7 100644
--- a/pages/dataAnalysisOctober/resourceRateAnalysis.html
+++ b/pages/dataAnalysisOctober/resourceRateAnalysis.html
@@ -169,6 +169,20 @@
         width: 60%;
     }
 
+    /* 表格面板的panel-body添加滚动条 */
+    .table-panel .panel-body {
+        flex-direction: column;
+        overflow-y: auto;
+        overflow-x: hidden;
+        min-height: 0;
+        padding: 10px 12px 12px 12px;
+    }
+
+    /* 确保表格在容器内正确显示 */
+    .table-panel .panel-body table {
+        width: 100%;
+    }
+
     .cards-panel {
         width: 40%;
         display: flex;
@@ -545,6 +559,26 @@
         background-color: #207E75 !important;
         color: #FFFFFF !important;
     }
+
+    /* 表格面板滚动条样式 */
+    .table-panel .panel-body::-webkit-scrollbar {
+        width: 6px;
+        height: 6px;
+    }
+
+    .table-panel .panel-body::-webkit-scrollbar-track {
+        background: rgba(13, 34, 37, 0.5);
+        border-radius: 3px;
+    }
+
+    .table-panel .panel-body::-webkit-scrollbar-thumb {
+        background: rgba(6, 189, 221, 0.5);
+        border-radius: 3px;
+    }
+
+    .table-panel .panel-body::-webkit-scrollbar-thumb:hover {
+        background: rgba(6, 189, 221, 0.8);
+    }
 </style>
 
 <body>