From ed22e6a3749bc13522a8c14789e767e5f597eae2 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Fri, 22 Mar 2024 13:58:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=B2=97=E5=8A=A0=E5=B7=A5=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E6=A3=80=E9=AA=8C=E6=97=A5=E6=9C=9F=E6=9B=B4=E6=AD=A3?=
 =?UTF-8?q?&=E6=B7=BB=E5=8A=A0=E7=8E=AF=E5=BD=A2=E5=9B=BElabel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/ppass_num.vue      | 6 ++----
 src/views/statistics/product_check2.vue | 7 +++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/statistics/ppass_num.vue b/src/views/statistics/ppass_num.vue
index 3d3754fc..72488017 100644
--- a/src/views/statistics/ppass_num.vue
+++ b/src/views/statistics/ppass_num.vue
@@ -132,7 +132,8 @@ export default {
 				query: {
 					start_date: this.start_date, end_date: this.end_date, dept_name: "6车间",
 					select_cols_material: "", group_bys_material: "", order_bys_material: "",
-					select_cols_mgroup: ", mgroup.name AS 工段", group_bys_mgroup: ", mgroup.name"
+					is_count_utask:-1,select_cols_mgroup: ", mgroup.name AS 工段",
+					group_bys_mgroup: ", mgroup.name"
 				},
 				raise_exception: true
 			};
@@ -158,12 +159,9 @@ export default {
 					}
 				})
 				that.xAxisData = xAxisData;
-				console.log('data0:', data0);
-				console.log('data1:', data1);
 				that.option.xAxis.data = that.xAxisData;
 				that.option.series[0].data = data0;
 				that.option.series[1].data = data1;
-				console.log('that.option:', that.option);
 			})
 		},
 		handleQuery() {
diff --git a/src/views/statistics/product_check2.vue b/src/views/statistics/product_check2.vue
index a1facad4..3d57f81b 100644
--- a/src/views/statistics/product_check2.vue
+++ b/src/views/statistics/product_check2.vue
@@ -57,7 +57,7 @@
 							<el-table-column label="日期" prop="date">
 								<template #default="scope">
 									<span>{{ scope.row.年 }}</span>
-									<span v-if="scope.row.月">-{{ scope.row.年 }}</span>
+									<span v-if="scope.row.月">-{{ scope.row.月 }}</span>
 								</template>
 							</el-table-column>
 							<el-table-column label="规格" prop="规格">
@@ -112,7 +112,10 @@
 							type: 'pie',
 							radius: ['40%', '60%'],
 							center: ['50%', '60%'],
-							label: false,
+							label: {
+								show: true,
+								formatter: '{b} : {c}',
+							},
 							data: [
 								{value: 1048, name: '合格数'},
 								{value: 735, name: '不合格一'},