~zhoushihao/YiWuProject.git

			@@ -13,6 +13,9 @@
			const dialogFormVisible = ref(false)
			const dialogFormVisiblea = ref(true)
			const dialogFormVisibleb = ref(false)
			const dialogFormVisibletemperingTakeGlass = ref(true)

			const temperingTakeGlassInfos=ref([])
			const blind = ref(false)
			const width = ref();
			const height = ref();
			@@ -24,10 +27,14 @@
			const currenttemperingFeedSequence = ref(null);
			const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
			const handleMessage = (data) => {
			if (data.temperingTakeGlassInfos != null) {
			temperingTakeGlassInfos.value = data.temperingTakeGlassInfos[0];
			console.log(temperingTakeGlassInfos.value)
			}
			// 进炉中
			if(data.intoGlass!=null){
			adjustedRects1.value = data.intoGlass[0].map(rect => {
			console.log( adjustedRects1.value);
			const scaleFactor = 794.67/5087;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			let newX = rect.yCoordinate;
			if (rect.width < rect.height) {
			@@ -38,34 +45,21 @@
			heighta = rect.height;
			}
			if (rect.angle === 0) {
			adjustedWidth = widtha * 0.12;
			adjustedWidth = widtha * scaleFactor;
			adjustedHeight = heighta * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			newX = 5087 - (rect.yCoordinate + widtha);
			} else {
			adjustedWidth = heighta * 0.12;
			adjustedWidth = heighta * scaleFactor;
			adjustedHeight = widtha * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			newX = 5087 - (rect.yCoordinate + heighta);
			}
			// if (rect.angle === 0) {
			// adjustedWidth = heighta * 0.12;
			// adjustedHeight = widtha * 0.1;
			// adjustedWidtha = heighta;
			// adjustedHeighta = widtha;
			// newX = 5087 - (rect.xCoordinate + heighta);
			// } else {
			// adjustedWidth = widtha * 0.12;
			// adjustedHeight = heighta * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			// newX = 5087 - (rect.xCoordinate + widtha);
			// }
			}
			return {
			...rect,
			xcoordinate: newX * 0.12,
			xcoordinate: newX * scaleFactor,
			ycoordinate: rect.xCoordinate * 0.1,
			width: adjustedWidth,
			height: adjustedHeight,
			@@ -78,7 +72,7 @@
			}
			if(data.intoGlass2!=null){
			adjustedRects2.value = data.intoGlass2[0].map(rect => {
			console.log( adjustedRects2.value);
			const scaleFactor = 794.67/5087;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			let newX = rect.yCoordinate;
			if (rect.width < rect.height) {
			@@ -89,34 +83,21 @@
			heighta = rect.height;
			}
			if (rect.angle === 0) {
			adjustedWidth = widtha * 0.12;
			adjustedWidth = widtha * scaleFactor;
			adjustedHeight = heighta * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			newX = 5087 - (rect.yCoordinate + widtha);
			} else {
			adjustedWidth = heighta * 0.12;
			adjustedWidth = heighta * scaleFactor;
			adjustedHeight = widtha * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			newX = 5087 - (rect.yCoordinate + heighta);
			}
			// if (rect.angle === 0) {
			// adjustedWidth = heighta * 0.12;
			// adjustedHeight = widtha * 0.1;
			// adjustedWidtha = heighta;
			// adjustedHeighta = widtha;
			// newX = 5087 - (rect.xCoordinate + heighta);
			// } else {
			// adjustedWidth = widtha * 0.12;
			// adjustedHeight = heighta * 0.1;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			// newX = 5087 - (rect.xCoordinate + widtha);
			// }
			}
			return {
			...rect,
			xcoordinate: newX * 0.12,
			xcoordinate: newX * scaleFactor,
			ycoordinate: rect.xCoordinate * 0.1,
			width: adjustedWidth,
			height: adjustedHeight,
			@@ -130,6 +111,7 @@
			// 进炉前
			if(data.waitingGlass!=null){
			adjustedRectsa.value = data.waitingGlass[0].map(rect => {
			const scaleFactor = 1621.78/5190;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			let newX = rect.yCoordinate;
			if (rect.width < rect.height) {
			@@ -140,13 +122,13 @@
			heighta = rect.height;
			}
			if (rect.angle === 0) {
			adjustedWidth = widtha * 0.24;
			adjustedWidth = widtha * scaleFactor;
			adjustedHeight = heighta * 0.16;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			newX = 5190 - (rect.yCoordinate + widtha);
			} else {
			adjustedWidth = heighta * 0.24;
			adjustedWidth = heighta * scaleFactor;
			adjustedHeight = widtha * 0.16;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			@@ -154,7 +136,7 @@
			}
			return {
			...rect,
			x: newX * 0.24,
			x: newX * scaleFactor,
			y: rect.xCoordinate * 0.16,
			width: adjustedWidth,
			height: adjustedHeight,
			@@ -168,7 +150,8 @@
			// 已出炉
			if(data.outGlass!=null){
			adjustedRectsb.value = data.outGlass[0].map(rect => {
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			const scaleFactor = 1621.78/5190;
			let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
			let newX = rect.yCoordinate;
			if (rect.width < rect.height) {
			widtha = rect.height;
			@@ -178,13 +161,13 @@
			heighta = rect.height;
			}
			if (rect.angle === 0) {
			adjustedWidth = widtha * 0.24;
			adjustedWidth = widtha * scaleFactor;
			adjustedHeight = heighta * 0.16;
			// adjustedWidtha = widtha;
			// adjustedHeighta = heighta;
			// newX = 5190 - (rect.yCoordinate + widtha);
			} else {
			adjustedWidth = heighta * 0.24;
			adjustedWidth = heighta * scaleFactor;
			adjustedHeight = widtha * 0.16;
			// adjustedWidtha = heighta;
			// adjustedHeighta = widtha;
			@@ -192,7 +175,7 @@
			}
			return {
			...rect, // 复制原始对象的其他属性
			x: newX * 0.24,
			x: newX * scaleFactor,
			y: rect.xCoordinate * 0.16,
			width: adjustedWidth,
			height: adjustedHeight,
			@@ -284,9 +267,11 @@
			</script>
			<template>
			<div style="margin-top: 10px;">

			<el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisiblea = true;dialogFormVisible = false;dialogFormVisibleb = false;" >{{ $t('processCard.beforefurnace') }}</el-button>
			<el-button style="margin-left: 15px;" id="searchButton" type="primary" @click="dialogFormVisible = true;dialogFormVisiblea = false;dialogFormVisibleb = false;">{{ $t('processCard.intofurnace') }}</el-button>
			<el-button id="searchButton" type="success" @click="dialogFormVisibleb = true;dialogFormVisible = false;dialogFormVisiblea = false">{{ $t('processCard.outfurnace') }}</el-button>
			<el-button id="searchButton" type="success" @click="dialogFormVisibletemperingTakeGlass = true;">拿走详情</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: 49%;float: left;background-color: #f4f4f5;height: 550px;">
			@@ -409,6 +394,18 @@
			</el-button>
			</el-dialog>
			</div>

			<el-dialog v-model="dialogFormVisibletemperingTakeGlass" top="2vh" width="97%"
			:title="$t('人工拿走信息')">
			<el-table height="200px" ref="table" @selection-change="handleSelectionChange" :data="temperingTakeGlassInfos"
			:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
			<el-table-column prop="engineerId" align="center" :label="$t('工程号')" min-width="80"/>
			<el-table-column prop="processId" align="center" :label="$t('流程卡号')" min-width="80"/>
			<el-table-column prop="technologyNumber" align="center" :label="$t('层')" min-width="120"/>
			<el-table-column prop="orderNumber" align="center" :label="$t('订单序号')" min-width="80"/>
			<el-table-column prop="temperingLayoutId" align="center" :label="$t('钢化版图')" min-width="150"/>
			</el-table>
			</el-dialog>
			</template>
			<style scoped>
			#boxa{