From 60bad2227ba67bb1f8b0ebbaa68e86e8f5651cbb Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Mar 2024 14:48:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E6=88=90=E5=BA=A6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/statistics/ppass_num.vue | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/statistics/ppass_num.vue b/src/views/statistics/ppass_num.vue
index 821386e5..3d3754fc 100644
--- a/src/views/statistics/ppass_num.vue
+++ b/src/views/statistics/ppass_num.vue
@@ -29,12 +29,16 @@
 							<el-table-column type="index" width="50" />
 							<el-table-column label="工段" prop="工段">
 							</el-table-column>
-							<el-table-column label="物料名称" prop="物料名称">
+							<el-table-column label="物料名" prop="物料名">
 							</el-table-column>
-							<el-table-column label="计划数" prop="计划数">
+							<el-table-column label="任务数" prop="任务数">
+							</el-table-column>
+							<el-table-column label="生产数" prop="生产数">
 							</el-table-column>
 							<el-table-column label="合格数" prop="合格数">
 							</el-table-column>
+							<el-table-column label="不合格数" prop="不合格数">
+							</el-table-column>
 							<el-table-column label="完成进度" prop="完成进度">
 							</el-table-column>
 							<el-table-column label="合格率" prop="合格率">
@@ -125,10 +129,20 @@ export default {
 		getData6() {
 			let that = this;
 			let obj = {
-				query: { start_date: this.start_date, end_date: this.end_date, dept_name: "6车间" },
+				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"
+				},
+				raise_exception: true
 			};
+			if (that.queryType == '月') {
+				obj.query.select_cols_date = ",EXTRACT ( MONTH FROM mlog.handle_date ) AS 月"
+				obj.query.group_bys_date = ",EXTRACT ( MONTH FROM mlog.handle_date )"
+				obj.query.order_bys_date = ", 月"
+			}
 			let xAxisData = [], data1 = [], data0 = [];
-			that.$API.bi.dataset.exec.req('mgroupWeek', obj).then((res) => {
+			that.$API.bi.dataset.exec.req('lineWeek', obj).then((res) => {
 				let data = res.data2.ds0;
 				that.tableData = data;
 				data.forEach(item => {
@@ -137,7 +151,7 @@ export default {
 					}
 					console.log('xAxisData:', xAxisData);
 					let index = xAxisData.indexOf(item.工段);
-					if (item.物料名称.indexOf('棒') > -1) {
+					if (item.物料名.indexOf('棒') > -1) {
 						data0[index] = item.合格数;
 					} else {
 						data1[index] = item.合格数;
@@ -183,9 +197,9 @@ export default {
 </script>
 
 <style scoped>
-.tables{
+.tables {
 	position: absolute;
-	top:6px;
+	top: 6px;
 	left: 4px;
 	z-index: 10;
 }