fix:工序和格式统计修正（未完成）

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 = [],
+			let xAxisData = [],data2 = [],data1 = [],data0 = [];
-				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() {