From 5f47ef62c6397023beb6703236e810053b0d6118 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 3 Jul 2026 14:58:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:20260702=E5=85=89=E5=AD=90=E7=A7=91?=
 =?UTF-8?q?=E6=8A=80=E5=BC=80=E5=8F=91=E6=B5=8B=E6=96=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_photon.vue    | 27 ++++++++++++++++---------
 src/views/home/widgets/index_photon.vue |  4 ++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue
index 11aa755a..28274167 100644
--- a/src/views/bigScreen/index_photon.vue
+++ b/src/views/bigScreen/index_photon.vue
@@ -132,7 +132,7 @@
 						id="dashbordProcess"
 					>
 						<span class="percentage-value" style="font-size: 16px"
-							>{{ dialogData.percentage }}%</span
+							>{{ dialogData.percentage }}</span
 						>
 					</el-progress>
 					<span>完成进度</span>
@@ -216,7 +216,7 @@
 						id="dashbordProcess"
 					>
 						<span class="percentage-value" style="font-size: 16px"
-							>{{ currentData.percentage }}%</span
+							>{{ currentData.percentage }}</span
 						>
 					</el-progress>
 					<p style="text-align: center">完成进度</p>
@@ -444,23 +444,23 @@ export default {
 			yesterday: "",
 			dept6Obj: {
 				deptName: "光学精密加工车间",
-				percentage: 100,
+				percentage: "100%",
 				count_bang: 0,
 				count_guan: 0,
 			},
 			dept7Obj: {
 				deptName: "光纤预制棒生产车间",
-				percentage: 100,
+				percentage: "100%",
 				count_bang: 0,
 			},
 			dept8Obj: {
 				deptName: "玻璃配合料制备车间",
-				percentage: 100,
+				percentage: "100%",
 				count: 0,
 			},
 			dept10Obj: {
 				deptName: "光纤预制管生产车间",
-				percentage: 100,
+				percentage: "100%",
 				count_guan: 0,
 			},
 			isUnmounted: false,
@@ -994,12 +994,19 @@ export default {
 			that.$API.bi.dataset.exec.req("materialCount", obj).then((res) => {
 				let data = [];
 				let list = res.data2.ds0;
+				let names = [];
 				if (list.length > 0) {
 						list.forEach((item) => {
-							let arr = [];
-							arr[0] = item.material_name ;
-							arr[1] = item.count;
-							data.push(arr);
+							let indexes = names.indexOf(item.material_name);
+							if(indexes === -1){
+								names.push(item.material_name);
+								let arr = [];
+								arr[0] = item.material_name ;
+								arr[1] = item.count;
+								data.push(arr);
+							}else{
+								data[indexes][1] = data[indexes][1] + item.count;
+							}
 						});
 					}
 					that.taskBoard.data = data;
diff --git a/src/views/home/widgets/index_photon.vue b/src/views/home/widgets/index_photon.vue
index e247081f..a4135c95 100644
--- a/src/views/home/widgets/index_photon.vue
+++ b/src/views/home/widgets/index_photon.vue
@@ -183,7 +183,7 @@
 									></el-table-column>
 									<el-table-column
 										prop="dept_name"
-										label="完成车间"
+										label="所在车间"
 									></el-table-column>
 									<el-table-column
 										prop="count"
@@ -351,7 +351,7 @@
 									</el-table-column>
 									<el-table-column
 										prop="dept_name"
-										label="完成车间"
+										label="所在车间"
 									/>
 									<el-table-column
 										prop="count"