~zhoushihao/YiWuProject.git

			@@ -879,7 +879,7 @@
			const rectStyle = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			right: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			@@ -895,24 +895,24 @@
			// 计算每个小矩形的样式
			const subRectStyle = (rectIndex, subIndex) => {
			const width = '18px';
			const marginLeft = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
			const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
			const marginRight = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
			const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			marginRight,
			top: '0px',
			backgroundColor: '#911005',
			left,
			right,
			};
			};
			// 计算每个大矩形的样式
			const rectStylea = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			right: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			@@ -928,24 +928,24 @@
			// 计算每个小矩形的样式
			const subRectStylea = (rectIndex, subIndex) => {
			const width = '18px';
			const marginLeft = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
			const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
			const marginRight = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
			const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			marginRight,
			top: '0px',
			backgroundColor: '#911005',
			left,
			right,
			};
			};
			// 计算每个大矩形的样式
			const rectStyleb = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			right: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			@@ -961,24 +961,24 @@
			// 计算每个小矩形的样式
			const subRectStyleb = (rectIndex, subIndex) => {
			const width = '18px';
			const marginLeft = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
			const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
			const marginRight = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
			const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			marginRight,
			top: '0px',
			backgroundColor: '#911005',
			left,
			right,
			};
			};
			// 计算每个大矩形的样式
			const rectStylec = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			right: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			@@ -994,17 +994,17 @@
			// 计算每个小矩形的样式
			const subRectStylec = (rectIndex, subIndex) => {
			const width = '18px';
			const marginLeft = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
			const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
			const marginRight = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginRight));
			const right = `${(subIndex * (parseInt(width) + parseInt(marginRight))) / totalWidth * 100}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			marginRight,
			top: '0px',
			backgroundColor: '#911005',
			left,
			right,
			};
			};
			onMounted(() => {
			@@ -1065,6 +1065,28 @@
			return t('searchOrder.waiting');
			}
			}
			function getcasOnea(isSame) {
			switch (isSame) {
			case 1:
			return 'danger';
			case 0:
			return 'info';
			}
			}
			function getStatuscasOnea(isSame) {
			switch (isSame) {
			case 1:
			return t('searchOrder.same');
			case 0:
			return t('searchOrder.notsame');
			}
			}
			function tableRowClassName({ row }) {
			if (row.isSame === 1) {
			return 'row-red-background'; // 设置红色背景
			}
			return '';
			}
			onBeforeUnmount(() => {
			closeWebSocket();
			});
			@@ -1112,6 +1134,7 @@
			<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
			<el-table height="300px" ref="table"
			@selection-change="handleSelectionChange"
			:row-class-name="tableRowClassName"
			:data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.intoglassid')" min-width="140" />
			<el-table-column prop="startSlot" align="center" :label="$t('searchOrder.startposition')" min-width="120" />
			@@ -1120,6 +1143,13 @@
			<template #default="scope">
			<el-tag type="success" >{{ scope.row.taskState==0? $t('searchOrder.filmenter') : $t('searchOrder.infilm') }}</el-tag>
			</template>
			</el-table-column>
			<el-table-column prop="isSame" align="center" :label="$t('searchOrder.whethersame')" min-width="120">
			<template #default="scope">
			<el-tag :type="getcasOnea(scope.row.isSame)">
			{{ getStatuscasOnea(scope.row.isSame) }}
			</el-tag>
			</template>
			</el-table-column>
			</el-table>
			</el-card>
			@@ -1138,7 +1168,7 @@
			</div>
			<!-- // 父级框 -->
			<div class="img-dlpl" >
			<div class="img-car1" :style="'z-index:999;left:375px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
			<div class="img-car1" :style="'z-index:999;left:290px;top:' + 350*carPosition[0] + 'px;position:absolute;'">
			<div
			v-for="(rect, index) in adjusta"
			:key="rect.id"
			@@ -1152,7 +1182,7 @@
			>
			</div>
			</div>
			<div class="img-car4" :style="'z-index:999;left:770px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
			<div class="img-car4" :style="'z-index:999;left:735px;top:' + 350*carPosition[1] + 'px;position:absolute;'">
			<div
			v-for="(rect, index) in adjust"
			:key="rect.id"
			@@ -1167,7 +1197,7 @@
			</div>
			</div>
			<div style="position: relative;">
			<div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 585px;">
			<div v-show="cell1" style="width: 170px;height: 53px;position: relative;top:63px;left: 525px;">
			<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRects(rectIndex)"
			@@ -1176,7 +1206,7 @@
			></div>
			</div>
			</div>
			<div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 585px;">
			<div v-show="cell2" style="width: 170px;height: 53px;position: relative;top:67px;left: 525px;">
			<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
			@@ -1185,7 +1215,7 @@
			></div>
			</div>
			</div>
			<div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 585px;">
			<div v-show="cell3" style="width: 170px;height: 53px;position: relative;top:72px;left: 525px;">
			<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
			@@ -1194,7 +1224,7 @@
			></div>
			</div>
			</div>
			<div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 585px;">
			<div v-show="cell4" style="width: 170px;height: 53px;position: relative;top:77px;left: 525px;">
			<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
			@@ -1680,7 +1710,7 @@
			:printGlassId="printGlassId" style=""/>
			</el-dialog>
			</template>
			<style scoped>
			<style>
			#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
			#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
			#dialog-footer{
			@@ -1826,4 +1856,7 @@
			margin-top: 20px;
			margin-bottom: 10px;
			}
			.row-red-background {
			background-color: #CDAF95 !important;
			}
			</style>