From 0902cf8c42d7ec8fbe87cbb6839cbfd94b9ae65d Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Mon, 20 Apr 2026 10:46:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=B8=AD=E6=A3=80=E4=B8=80=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E7=BB=9F=E8=AE=A1=E6=B7=BB=E5=8A=A0=E5=BC=80=E5=8F=B0?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/bxerp/jiejingdept.vue      | 4 +---
 src/views/statistics/bxerp/zhongjian1Total.vue | 8 +++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/bigScreen/bxerp/jiejingdept.vue b/src/views/bigScreen/bxerp/jiejingdept.vue
index 07e440c7..4e2d227b 100644
--- a/src/views/bigScreen/bxerp/jiejingdept.vue
+++ b/src/views/bigScreen/bxerp/jiejingdept.vue
@@ -1206,7 +1206,5 @@ export default {
 	color: #ff9d3e;
 	font-size: 1.4vh;
 }
-.yuanjianIcon{
-	background-image: url("/public/img/bx/dxq2.png");
-}
+
 </style>
diff --git a/src/views/statistics/bxerp/zhongjian1Total.vue b/src/views/statistics/bxerp/zhongjian1Total.vue
index 086adb24..5b1d2082 100644
--- a/src/views/statistics/bxerp/zhongjian1Total.vue
+++ b/src/views/statistics/bxerp/zhongjian1Total.vue
@@ -295,7 +295,13 @@
 						</template>
 					</el-table-column>
 				</el-table-column>
-				<el-table-column label="备注" align="center" class-name="colorheader6">
+				<el-table-column label="开台人" align="center" class-name="colorheader6">
+					<template #default="scope">
+						<span v-if="scope.row.data.喷码_一体刀_操作人">{{scope.row.data.喷码_一体刀_操作人}}</span>
+						<span v-if="scope.row.data.喷码_磨床开台_操作人">{{scope.row.data.喷码_磨床开台_操作人}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="备注" align="center" class-name="colorheader7">
 					<template #default="scope">
 						<span>{{ scope.row.data.中检一_缺陷_备注 }}</span>
 					</template>