From 61a86d766a82e490d2aea6b87237223e375bd18d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 24 Jul 2024 13:48:58 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mtm/process.vue  | 11 +++++++++--
 src/views/wpm_gx/chart.vue | 38 +++++++++++++++++++++-----------------
 src/views/wpm_gx/print.vue | 26 ++++++++++++++++++--------
 3 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/views/mtm/process.vue b/src/views/mtm/process.vue
index 5cf5abb3..951ce04b 100644
--- a/src/views/mtm/process.vue
+++ b/src/views/mtm/process.vue
@@ -46,11 +46,11 @@
 					prop="cate"
 					min-width="150"
 				></el-table-column>
-				<el-table-column
+				<!-- <el-table-column
 					label="车间"
 					prop="belong_dept_name"
 					min-width="60"
-				></el-table-column>
+				></el-table-column> -->
 				<el-table-column label="交接到工段" min-width="60">
 					<template #default="scope">
 						<el-icon v-if="scope.row.into_wm_mgroup" color="green">
@@ -58,6 +58,13 @@
 						</el-icon>
 					</template>
 				</el-table-column>
+				<el-table-column label="不合格品是否入库" min-width="60">
+					<template #default="scope">
+						<el-icon v-if="scope.row.store_notok" color="green">
+							<CircleCheckFilled />
+						</el-icon>
+					</template>
+				</el-table-column>
 				<el-table-column
 					label="操作"
 					fixed="right"
diff --git a/src/views/wpm_gx/chart.vue b/src/views/wpm_gx/chart.vue
index 96a74621..bab41f95 100644
--- a/src/views/wpm_gx/chart.vue
+++ b/src/views/wpm_gx/chart.vue
@@ -50,31 +50,31 @@ export default {
 			[14, 39, 14, "替代燃料碳减排", 2025],
 			[6, 32, 6, "清洁能源电力碳减排", 2025],
 			[8, 32.2, 8, "能效提升技术碳减排", 2025],
-			[4, 36.5, 4, "CCUS碳减排", 2025],
+			[3, 36.5, 4, "CCUS碳减排", 2025],
 
 			[33, 34.05, 33, "低碳水泥碳减排", 2030],
-			[26, 39, 26, "替代燃料碳减排", 2030],
+			[16, 39, 26, "替代燃料碳减排", 2030],
 			[10, 32, 10, "清洁能源电力碳减排", 2030],
 			[18, 32.2, 18, "能效提升技术碳减排", 2030],
-			[9, 36.57, 9, "CCUS碳减排", 2030],
+			[7, 36.57, 9, "CCUS碳减排", 2030],
 
-			[78, 34.05, 78, "低碳水泥碳减排", 2040],
+			[118, 34.05, 78, "低碳水泥碳减排", 2040],
 			[68, 39, 68, "替代燃料碳减排", 2040],
 			[17, 32, 17, "清洁能源电力碳减排", 2040],
 			[18, 32.2, 18, "能效提升技术碳减排", 2040],
-			[19, 36.57, 19, "CCUS碳减排", 2040],
+			[14, 36.57, 19, "CCUS碳减排", 2040],
 
-			[118, 34.05, 118, "低碳水泥碳减排", 2050],
+			[157, 34.05, 118, "低碳水泥碳减排", 2050],
 			[111, 39, 111, "替代燃料碳减排", 2050],
 			[23, 32, 23, "清洁能源电力碳减排", 2050],
 			[16, 32.2, 16, "能效提升技术碳减排", 2050],
-			[57, 36.57, 57, "CCUS碳减排", 2050],
+			[41, 36.57, 57, "CCUS碳减排", 2050],
 
-			[118, 34.05, 118, "低碳水泥碳减排", 2060],
-			[117, 39, 117, "替代燃料碳减排", 2060],
+			[196, 34.05, 118, "低碳水泥碳减排", 2060],
+			[177, 39, 117, "替代燃料碳减排", 2060],
 			[26, 32, 26, "清洁能源电力碳减排", 2060],
 			[16, 32.2, 16, "能效提升技术碳减排", 2060],
-			[254, 36.57, 254, "CCUS碳减排", 2060],
+			[184, 36.57, 254, "CCUS碳减排", 2060],
 		];
 		let startYear = years[startIndex];
 		option = {
@@ -183,11 +183,11 @@ export default {
 		let _rawData = [
 			["Income", "Country", "Year"],
 			[575, "水泥碳排放", 2021],
-			[558, "水泥碳排放", 2025],
-			[520, "水泥碳排放", 2030],
-			[420, "水泥碳排放", 2040],
-			[296, "水泥碳排放", 2050],
-			[31, "水泥碳排放", 2060],
+			[559, "水泥碳排放", 2025],
+			[523, "水泥碳排放", 2030],
+			[386, "水泥碳排放", 2040],
+			[273, "水泥碳排放", 2050],
+			[23, "水泥碳排放", 2060],
 		];
 		var chartDoms = document.getElementById("mains");
 		var myCharts = echarts.init(chartDoms);
@@ -215,10 +215,14 @@ export default {
 					return params.value[1] + ": " + params.value[0];
 				},
 			},
+			lineStyle: {
+				width: 5,
+			},
 			emphasis: {
 				focus: "series",
 			},
-			color: "green",
+			// color: "#43fb43",//绿色
+			color: "#000000",
 			encode: {
 				x: "Year",
 				y: "Income",
@@ -240,7 +244,7 @@ export default {
 			xAxis: {
 				type: "category",
 				nameLocation: "middle",
-				show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
+				// show: false, // 不显示坐标轴线、坐标轴刻度线和坐标轴上的文字
 				axisTick: {
 					show: false, // 不显示坐标轴刻度线
 				},
diff --git a/src/views/wpm_gx/print.vue b/src/views/wpm_gx/print.vue
index a07d0b7f..62634aec 100644
--- a/src/views/wpm_gx/print.vue
+++ b/src/views/wpm_gx/print.vue
@@ -24,9 +24,12 @@ import html2canvas from "html2canvas";
 export default {
 	data() {
 		return {
-			name: "切片",
-			batch: "2023-01-01",
+			material_name: "玻璃片",
+			batch: "20240723_001",
 			count: "1000",
+			date: "2023-01-01",
+			sender: "切片-石小静",
+			resave: "活化-白海军",
 			visible: false,
 		};
 	},
@@ -85,16 +88,23 @@ export default {
 				"SIZE 70 mm,90 mm",
 				"GAP 2 mm,0 mm",
 				"CLS",
-				"WINTEXT 100,100,36,0,0,0,Simhei,光芯——交接单",
-				'BARCODE 100,200,"128",108,0,0,2,4,"' + this.batch + '"',
-				"WINTEXT 100,380,36,0,0,0,Simhei,物料：" + this.name,
-				"WINTEXT 100,460,36,0,0,0,Simhei,批次：" + this.batch,
-				"WINTEXT 100,540,36,0,0,0,Simhei,数量：" + this.count,
+				"WINTEXT 100,80,36,0,0,0,Simhei,光芯科技——交接单",
+				'BARCODE 100,140,"128",108,0,0,2,4,"' + this.batch + '"',
+				"WINTEXT 100,280,36,0,0,0,Simhei,物料：" + this.material_name,
+				"WINTEXT 100,340,36,0,0,0,Simhei,批次：" + this.batch,
+				"WINTEXT 100,400,36,0,0,0,Simhei,数量：" + this.count,
+				"WINTEXT 100,460,36,0,0,0,Simhei,日期：" + this.date,
+				"WINTEXT 100,520,36,0,0,0,Simhei,送料：" + this.sender,
+				"WINTEXT 100,580,36,0,0,0,Simhei,收料：" + this.resave,
 				"PRINT 1",
 			];
+			// 送料：工段-姓名
+			// 收料：工段-姓名
 			let obj = {};
-			obj.print_commands = str;
+			obj.printer_commands = str;
+			obj.printer_name = "GP-3150TNS";
 			http.post("http://localhost:8080/prints/", obj)
+				// http.post("http://192.168.1.242:8080/prints/", obj)
 				.then((response) => {
 					console.log("postRes", response);
 				})