From cf226ddae76ece6716e6158e1bdfa56f1f2550ff Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Fri, 6 Feb 2026 10:22:52 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E6=9C=BA=E5=85=B7=E5=8D=A0=E6=AF=94?=
 =?UTF-8?q?=20=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/WEB-INF/views/index/indexHome.jsp | 40 ++++++++++++++++----
 WebContent/static/js/index/indexHome.js      |  6 ++-
 2 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/WebContent/WEB-INF/views/index/indexHome.jsp b/WebContent/WEB-INF/views/index/indexHome.jsp
index 0f906d6..41281f9 100644
--- a/WebContent/WEB-INF/views/index/indexHome.jsp
+++ b/WebContent/WEB-INF/views/index/indexHome.jsp
@@ -810,12 +810,12 @@
 					<div class="overview-card">
 						<div class="section-title">入库占比&nbsp; &nbsp;&nbsp;  / &nbsp;&nbsp;&nbsp;机具类别</div>
 						<div class="chart-grid">
-							<div id="storageChart1" class="chart-item" onclick="showEquipmentTypes()"></div>
-							<div id="storageChart2" class="chart-item" onclick="showEquipmentTypes()"></div>
-							<div id="storageChart3" class="chart-item" onclick="showEquipmentTypes()"></div>
-							<div id="storageChart4" class="chart-item" onclick="showEquipmentTypes()"></div>
-							<div id="storageChart5" class="chart-item" onclick="showEquipmentTypes()"></div>
-							<div id="storageChart6" class="chart-item" onclick="showEquipmentTypes()"></div>
+							<div id="storageChart1" class="chart-item" onclick="showEquipmentTypes1('入库占比','1')"></div>
+							<div id="storageChart2" class="chart-item" onclick="showEquipmentTypes1('入库占比','2')"></div>
+							<div id="storageChart3" class="chart-item" onclick="showEquipmentTypes1('入库占比','3')"></div>
+							<div id="storageChart4" class="chart-item" onclick="showEquipmentTypes1('入库占比','4')"></div>
+							<div id="storageChart5" class="chart-item" onclick="showEquipmentTypes2('机具占比','5')"></div>
+							<div id="storageChart6" class="chart-item" onclick="showEquipmentTypes2('编码占比','6')"></div>
 						</div>
 					</div>
 				</div>
@@ -931,7 +931,7 @@
 	function showEquipmentTypes() {
 		layer.open({
 			type: 2,
-			title: '机具类别明细',
+			title: '入库占比',
 			area: ['1500px', '700px'],
 			content: '${bonuspath}/backstage/indexHome/dataOverview/equipment/index',
 			btn: ['关闭'], // 添加关闭按钮
@@ -941,6 +941,32 @@
 		});
 	}
 
+	function showEquipmentTypes1(name,type) {
+		layer.open({
+			type: 2,
+			title: ''+name,
+			area: ['1500px', '700px'],
+			content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentProportion/index?type='+type,
+			btn: ['关闭'], // 添加关闭按钮
+			yes: function(index, layero) {
+				layer.close(index); // 关闭当前弹窗
+			}
+		});
+	}
+
+	function showEquipmentTypes2(name,type) {
+		layer.open({
+			type: 2,
+			title: ''+name,
+			area: ['1500px', '700px'],
+			content: '${bonuspath}/backstage/indexHome/dataOverview/equipmentType/index?type='+type,
+			btn: ['关闭'], // 添加关闭按钮
+			yes: function(index, layero) {
+				layer.close(index); // 关闭当前弹窗
+			}
+		});
+	}
+
 	function showProjectDetail() {
 		layer.open({
 			type: 2,
diff --git a/WebContent/static/js/index/indexHome.js b/WebContent/static/js/index/indexHome.js
index 5143c0a..b140bf5 100644
--- a/WebContent/static/js/index/indexHome.js
+++ b/WebContent/static/js/index/indexHome.js
@@ -1230,6 +1230,7 @@ $(function() {
 				{ key: 'repairStorage', index: 2, title: '修试后入库', color: '#36cfc9' },
 				{ key: 'inventoryStorage', index: 3, title: '盘点入库', color: '#73d13d' },
 				{ key: 'returnStorage', index: 4, title: '退料入库', color: '#ffc53d' },
+				// { key: 'repairStorage', index: 4, title: '退料入库', color: '#ffc53d' },
 				{ key: 'equipmentCount', index: 5, title: '机具数量', color: '#ff7a45' },
 				{ key: 'deviceCount', index: 6, title: '编码数量', color: '#722ed1' }
 			];
@@ -1241,7 +1242,10 @@ $(function() {
 					continue;
 				}
 
-				const chartData = data[config.key] || { value: 0, total: 100 };
+				let chartData = data[config.key] || { value: 0, total: 100 };
+				if(config.key=='returnStorage'){
+					chartData=data['repairStorage'] || { value: 0, total: 100 };
+				}
 				const option = createCircleChartOption(chartData, config.title, config.color);
 				
 				try {