From 2050221876b0c68472b5c4a0a60f0e4d982caf2e Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 9 Apr 2025 13:28:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=B7=A5=E5=BA=8F=E5=92=8C=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E7=BB=9F=E8=AE=A1=E4=BF=AE=E6=AD=A3=EF=BC=88=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/ppass_num.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/views/statistics/ppass_num.vue b/src/views/statistics/ppass_num.vue
index 920eb975..bb1a084f 100644
--- a/src/views/statistics/ppass_num.vue
+++ b/src/views/statistics/ppass_num.vue
@@ -75,12 +75,12 @@
 							</el-table-column>
 							<el-table-column label="完成进度" prop="完成进度">
 								<template #default="scope">
-									{{ Math.round(scope.row.完成进度 * 100) }}%
+									{{(scope.row.完成进度).toFixed(2)}} + "%"
 								</template>
 							</el-table-column>
 							<el-table-column label="合格率" prop="合格率">
 								<template #default="scope">
-									{{ Math.round(scope.row.合格率 * 100) }}%
+									{{(scope.row.合格率).toFixed(2)}} + "%"
 								</template>
 							</el-table-column>
 						</el-table>
@@ -150,6 +150,18 @@ export default {
 						},
 						barWidth: "15px",
 					},
+					{
+						name: "G05",
+						data: [0, 0, 0, 0, 0, 0, 0, 0],
+						type: "bar",
+						label: {
+							show: true,
+							position: "top",
+							formatter: "{c}",
+							color: "rgb(64,158,255)",
+						},
+						barWidth: "15px",
+					},
 				],
 			},
 			processData: [],
@@ -201,9 +213,7 @@ export default {
 					",EXTRACT ( MONTH FROM mlog.handle_date )";
 				obj.query.order_bys_date = ", 月";
 			}
-			let xAxisData = [],
-				data1 = [],
-				data0 = [];
+			let xAxisData = [],data2 = [],data1 = [],data0 = [];
 			that.$API.bi.dataset.exec.req("lineWeek", obj).then((res) => {
 				let data = res.data2.ds0;
 				that.tableData = data;
@@ -214,7 +224,9 @@ export default {
 					}
 					console.log("xAxisData:", xAxisData);
 					let index = xAxisData.indexOf(item.工段);
-					if (item.物料名.indexOf("棒") > -1) {
+					if (item.物料名.indexOf("G05") > -1) {
+					    data2[index] = item.合格数;
+					}else if (item.物料名.indexOf("棒") > -1) {
 						data0[index] = item.合格数;
 					} else {
 						data1[index] = item.合格数;
@@ -224,6 +236,7 @@ export default {
 				that.option.xAxis.data = that.xAxisData;
 				that.option.series[0].data = data0;
 				that.option.series[1].data = data1;
+				that.option.series[2].data = data2;
 			});
 		},
 		handleQuery() {