From c5fd2ee402c7ad76d278a85523bf7eea21ab1ad5 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 12 Jun 2025 13:48:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=89=E8=8A=AF=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=BA=A7=E9=87=8F=E5=B1=95=E7=A4=BA=E4=BA=8C?=
 =?UTF-8?q?=E6=AC=A1=E8=B6=85=E6=B4=97=E6=95=B0=E9=87=8F=EF=BC=8C=E7=B2=BE?=
 =?UTF-8?q?=E9=9B=95=E6=94=B9=E4=B8=BA=E5=80=92=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_gx.vue | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue
index b8d5040e..b5ef4570 100644
--- a/src/views/bigScreen/index_gx.vue
+++ b/src/views/bigScreen/index_gx.vue
@@ -170,7 +170,7 @@
 					</div>
 				</div>				
 				<div class="flexItem3">
-					<div class="flexItem3_title">精雕</div>
+					<div class="flexItem3_title">倒角</div>
 					<div class="flexItem3Body">
 						<dv-scroll-board 
 							:config="configData2" 
@@ -245,7 +245,7 @@ const baseOption={
 	},
 	grid:{
 		top: '20%',
-		bottom: '10%',
+		bottom: 0,
 	},
 	xAxis:{
 		type: 'category',
@@ -265,21 +265,22 @@ const baseOption={
 	yAxis:[
 		{
 			type: 'value',
-			name: '数量',
+			// name: '数量',
 			axisLine: {
 				lineStyle: {
 					color: '#fff',
 				}
 			},
 			axisLabel: {
-				fontSize: 10,
+				fontSize: 8,
 				color: '#fff',
+				top: 10,
 			},
 			
 		},
 		{
 			type: "value",
-			name: "合格率",
+			// name: "合格率",
 			position: "right",
 			alignTicks: true,
 			offset: 0,
@@ -299,7 +300,7 @@ const baseOption={
 		itemWidth: 12,
 		itemHeight: 12,
 		left: 'center',
-		bottom: '0.5%',
+		top: '0.5%',
 		textStyle: {
 			color: '#fff',
 			fontSize: 10,
@@ -694,7 +695,7 @@ export default {
 			let month = that.currentMonth>9?that.currentMonth:'0'+that.currentMonth;
 			let day = that.currentDay>9?that.currentDay:'0'+that.currentDay;
 			let current_date = that.currentYear+'-'+month+'-'+day;
-			let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'三次超洗'}};
+			let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'二次超洗'}};
 			that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => {
 				if(res0.data2.ds0&&res0.data2.ds0.length>0){
 					that.count_day = res0.data2.ds0[0].生产数;
@@ -708,7 +709,7 @@ export default {
 			let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一
 			let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日
 			let objWeek = {query:{
-				start_date:first,end_date:last,mgroup_name:'三次超洗',
+				start_date:first,end_date:last,mgroup_name:'二次超洗',
 				group_bys_date:',月,周',order_bys_date:',月,周',
 				select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周'
 			}};
@@ -720,7 +721,7 @@ export default {
 			let start_month = that.currentYear+'-'+month+'-01';
 			let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate();
 			let objMonth = {query:{
-				start_date:start_month,end_date:end_month,mgroup_name:'三次超洗',
+				start_date:start_month,end_date:end_month,mgroup_name:'二次超洗',
 				group_bys_date:',月',order_bys_date:',月',
 				select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月'
 			}};
@@ -884,7 +885,7 @@ export default {
 					}else if(data[i].name=='减薄A'){
 						that.getProcessDatas(data[i].name,1);
 						that.getProcessCount(data[i].name,1);
-					}else if(data[i].name=='精雕'){
+					}else if(data[i].name=='倒角'){
 						that.getProcessDatas(data[i].name,2);
 						that.getProcessCount(data[i].name,2);
 					}else if(data[i].name=='成品抛'){
@@ -913,12 +914,12 @@ export default {
 			// let current_date = that.currentYear+'-'+month+'-'+day;
 			// let obj = {query:{current_date:current_date,mgroup_name:name}};
 			// that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => {
+			let keys = 'configData'+index;
+			that[keys] = that.deepCopy(configData);
+			that[keys].data = [];
 			that.$API.wpm.ana.batchwork.req({mgroup_name:name}).then((res) => {
 				if(res.length>0){
 					//根据工段名称分组
-					let keys = 'configData'+index;
-					that[keys] = that.deepCopy(configData);
-					that[keys].data = [];
 					res.forEach((item) => {
 						let arr = [];
 						arr[0] = item.batch;