~zhoushihao/YiWuProject.git

			@@ -4,7 +4,6 @@
			import request from "@/utils/request"
			import {host, WebSocketHost} from '@/utils/constants'
			import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';

			const adjustedRects = ref([]);
			const currentGlassId = ref(null);
			const currenttemperingFeedSequence = ref(null);
			@@ -13,16 +12,13 @@
			const dialogFormVisible = ref(true)
			const dialogFormVisiblea = ref(false)
			const blind = ref(false)

			const getTableRow = (row,type) =>{
			switch (type) {
			case 'edit' :{
			//alert('我接收到子组件传送的编辑信息')
			router.push({path: '/main/returns/createReturns', query: { ReturnID: 'TH24010101' }})
			break
			}
			case 'delete':{
			alert('我接收到子组件传送的删除信息')
			break
			}
			}
			@@ -33,10 +29,8 @@
			if (data.overGlass && data.overGlass.length > 0) {
			// 提取新的矩形ID
			const newGlassIds = new Set(data.overGlass[0].map(rect => rect.glassId));

			// 过滤出已存在的矩形
			const existingRects = adjustedRects.value.filter(rect => newGlassIds.has(rect.glassId));

			// 计算新的矩形
			const newRects = data.overGlass[0].map(rect => {
			const scaleFactor = 1390/5190;
			@@ -68,7 +62,6 @@
			heighta: rect.height,
			}
			});

			// 合并新旧矩形，并保留 isActive 状态
			adjustedRects.value = existingRects.map(oldRect => {
			const newRect = newRects.find(r => r.glassId === oldRect.glassId);
			@@ -114,7 +107,6 @@
			canSelectProject.value = true;
			}
			}

			const handleDialogClose = () => {
			adjustedRects.value.forEach(rect => {
			rect.isActive = false;
			@@ -126,7 +118,6 @@
			try {
			const response = await request.post('/temperingGlass/temperingGlassInfo/updateTemperingState', {
			glassId: currentGlassId.value,
			// temperingFeedSequence: currenttemperingFeedSequence.value,
			line: 4001,
			status: 8,
			workingProcedure: '钢化',
			@@ -136,12 +127,10 @@
			blind.value = false;
			updateRectColors();
			} else {
			// 请求失败，显示错误消息
			ElMessage.error(response.message);
			}
			}
			catch (error) {
			// 处理错误
			console.error(error);
			}
			}
			@@ -158,14 +147,12 @@
			closeWebSocket();
			});
			</script>

			<template>
			<div style="height: 500px;">
			<div style="margin-top: 10px;">
			<div>
			<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;margin-right: 10px;height: 800px;"
			v-loading="loading">
			<!-- <el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading"> -->
			<div v-if="adjustedRects.length > 0">
			<div style="text-align: center;">炉号：{{ adjustedRects[0].engineerId }}-{{
			adjustedRects[0].temperingLayoutId
			@@ -194,15 +181,13 @@
			</el-card>
			</div>
			<el-dialog v-model="blind" top="30vh" width="15%" style="text-align: center;" @close="handleDialogClose">
			<el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage"
			style="width: 140px;margin-left: 10px;">
			<el-button :disabled="!canSelectProject" type="warning" plain :icon="Delete" @click="handleDamage" style="width: 140px;margin-left: 10px;">
			{{ $t('order.dilapidation') }}
			</el-button>
			</el-dialog>
			</div>
			</div>
			</template>

			<style scoped>
			#boxa{
			border: 1px solid rgb(119, 116, 116);
			@@ -215,14 +200,13 @@
			}
			.rect {
			border: 1px solid black; /* 设置矩形的边框 */
			background-color: lightblue; /* 设置矩形的背景色 */
			background-color: lightblue;
			}
			.centered-text {
			/* 设置文字居中样式 */
			/* display: flex; */
			justify-content: center;
			align-items: center;
			height: 100%; /* 确保div占据整个矩形的高度 */
			height: 100%;
			font-size: small;
			}
			</style>