~admin/HangZhouMes.git

			@@ -152,13 +152,15 @@
			adjustedRects2.value = []
			}
			// 进炉中左
			if (data.intoGlass && data.intoGlass.length > 0) {
			const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
			const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
			const newRects = data.intoGlass[0].map(rect => {
			const scaleFactor = 810.89/5087;
			const scaleFactorY = 430/2800;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			if (data.intoGlass && data.intoGlass.length > 0) {
			console.log(data.intoGlass);

			const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
			const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
			const newRects = data.intoGlass[0].map(rect => {
			const scaleFactor = 810.89/5087;
			const scaleFactorY = 430/2800;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;
			let newX = rect.yCoordinate;
			if (rect.width < rect.height) {
			widtha = rect.height;
			@@ -199,7 +201,7 @@
			return oldRect; // 如果旧矩形在新数据中不存在，但保留在newGlassIds中，则保留原样
			}).concat(newRects.filter(r => !existingRects.some(o => o.glassId === r.glassId)));
			}
			else if (data.overGlass == null) {
			else {
			adjustedRects1.value = []
			}
			if (data.waitingGlass && data.waitingGlass.length > 0) {
			@@ -785,7 +787,7 @@
			<el-button id="searchButton" type="info" @click="dialogFormVisiblec = true;dialogFormVisibleb = false;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.print') }}</el-button>
			<div v-if="dialogFormVisible" >
			<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 600px;" v-loading="loading">
			<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
			<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
			<div v-if="adjustedRects1.length > 0">
			<!-- <div style="text-align: center;">炉号：{{ engineerIdDisplay }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->
			<div style="text-align: center;"> 炉号：{{ adjustedRects1[0].engineerId }}-{{ adjustedRects1[0].temperingLayoutId }} </div>
			@@ -812,7 +814,7 @@
			</el-scrollbar>
			</div>
			</div>
			<div style="width: 49%;float: right;background-color: #f4f4f5;height: 430px;">
			<div style="width: 50%;float: left;background-color: #f4f4f5;height: 430px;">
			<div v-if="adjustedRects2.length > 0">
			<div style="text-align: center;"> 炉号：{{ adjustedRects2[0].engineerId }}-{{ adjustedRects2[0].temperingLayoutId }} </div>
			<!-- <div style="text-align: center;">炉号：{{ engineerIdDisplay2 }}-{{ adjustedRects[0].temperingLayoutId }}</div> -->