~zhoushihao/YiWuProject.git

			@@ -27,21 +27,23 @@
			const tableDataf = ref([])
			const tableDatae = ref([])
			const carPosition = ref([])
			const tableDatass = ref([])
			const ganghua = ref('')
			const diaodu = ref('')
			const flowCardId = ref('')
			const filmsId = ref('')
			const adjustedRects = ref([]);
			const adjust = ref([]);
			const adjusta = ref([]);
			const adjustedRects = ref([]);
			const adjustedRectsa = ref([]);
			const adjustedRectsb = ref([]);
			const adjustedRectsc = ref([]);
			const adjustedRectsd = ref([]);
			const adjustedRectse = ref([]);
			const adjustedRectsf = ref([]);
			const adjustedRectsg = ref([]);
			const adjustedRectsh = ref([]);
			const subRectsCounts = ref([]);
			const subRectsCountsa = ref([]);
			const subRectsCountsb = ref([]);
			const subRectsCountsc = ref([]);
			const subRectsCountsd = ref([]);
			const currentRow = reactive({}); // 当前行的数据
			const currentPage2 = ref(1)
			const add = ref(false)
			@@ -297,6 +299,11 @@
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/hollowGlassMessage`;
			const handleMessage = (data) => {
			if(data.bigStorageSummary!=null){
			tableDatass.value = data.bigStorageSummary[0]
			}else{
			tableDatass.value = ''
			}
			if (data.inkageEntity != null) {
			inkageEntity.value = data.inkageEntity[0] == true ? 'green' : '#911005';
			}
			@@ -309,14 +316,14 @@
			if (data.outInkageEntity != null) {
			outInkageEntity.value = data.outInkageEntity[0] == true ? 'green' : '#911005';
			}
			if (data.freeTwoReqvestEntity != null) {
			freetwo.value = data.freeTwoReqvestEntity[0] == true ? 'green' : '#911005';
			if (data.freeTwoRequestEntity != null) {
			freetwo.value = data.freeTwoRequestEntity[0] == true ? 'green' : '#911005';
			}
			if (data.outRequestEntity != null) {
			outRequestEntity.value = data.outRequestEntity == 1 ? 'green' : '#911005';
			}
			if (data.free0neReguestEntity != null) {
			freeone.value = data.free0neReguestEntity == 1 ? 'green' : '#911005';
			if (data.freeOneRequestEntity != null) {
			freeone.value = data.freeOneRequestEntity == 1 ? 'green' : '#911005';
			}
			if(data.bigStorageCageDetailsOutTask!=null){
			tableDatac.value = data.bigStorageCageDetailsOutTask[0]
			@@ -365,31 +372,209 @@
			ganghua.value = ''
			}
			if(data.bigStorageCageInfos!=null){
			window.localStorage.setItem('length', data.bigStorageCageInfos[0][1].length)
			let length = window.localStorage.getItem('length')
			adjustedRects.value = data.bigStorageCageInfos[0][1].map(rect => ({
			...rect,
			height: 20/length,
			top: 29/length
			}));
			adjustedRectsa.value = data.bigStorageCageInfos[0][2].map(rect => ({
			...rect,
			height: 20/length,
			top: 29/length
			}));
			adjustedRectsb.value = data.bigStorageCageInfos[0][3].map(rect => ({
			...rect,
			height: 20/length,
			top: 29/length
			}));
			adjustedRectsc.value = data.bigStorageCageInfos[0][4].map(rect => ({
			...rect,
			height: 20/length,
			top: 29/length
			}));
			adjustedRects.value = data.bigStorageCageInfos[0][1].map((rect, index) => ({
			id: index + 1,
			height: 20/55,
			top: 46/55,
			}));
			subRectsCounts.value = data.bigStorageCageInfos[0][1].map(rect => rect.count);
			adjustedRectsa.value = data.bigStorageCageInfos[0][2].map((rect, index) => ({
			id: index + 1,
			height: 20/55,
			top: 46/55,
			}));
			subRectsCountsa.value = data.bigStorageCageInfos[0][2].map(rect => rect.count);
			adjustedRectsb.value = data.bigStorageCageInfos[0][3].map((rect, index) => ({
			id: index + 1,
			height: 20/55,
			top: 46/55,
			}));
			subRectsCountsb.value = data.bigStorageCageInfos[0][3].map(rect => rect.count);
			adjustedRectsc.value = data.bigStorageCageInfos[0][4].map((rect, index) => ({
			id: index + 1,
			height: 20/55,
			top: 46/55,
			}));
			subRectsCountsc.value = data.bigStorageCageInfos[0][4].map(rect => rect.count);
			adjustedRectsd.value = data.bigStorageCageInfos[0][5].map((rect, index) => ({
			id: index + 1,
			height: 20/55,
			top: 46/55,
			}));
			subRectsCountsd.value = data.bigStorageCageInfos[0][5].map(rect => rect.count);
			}else{
			adjustedRects.value = ''
			adjustedRects.value = '',
			adjustedRectsa.value = '',
			adjustedRectsb.value = '',
			adjustedRectsc.value = ''
			adjustedRectsd.value = ''
			}
			};

			// 计算每个大矩形的样式
			const rectStyle = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			// 计算每个小矩形的样式和数量
			const getSubRects = (rectIndex) => {
			const count = subRectsCounts.value[rectIndex];
			const subRects = [];
			for (let i = 0; i < count; i++) {
			subRects.push({});
			}
			return subRects;
			};
			// 计算每个小矩形的样式
			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}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			top: '0px',
			backgroundColor: '#911005',
			left,
			};
			};
			// 计算每个大矩形的样式
			const rectStylea = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			// 计算每个小矩形的样式和数量
			const getSubRectsa = (rectIndex) => {
			const count = subRectsCountsa.value[rectIndex];
			const subRects = [];
			for (let i = 0; i < count; i++) {
			subRects.push({});
			}
			return subRects;
			};
			// 计算每个小矩形的样式
			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}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			top: '0px',
			backgroundColor: '#911005',
			left,
			};
			};
			// 计算每个大矩形的样式
			const rectStyleb = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			// 计算每个小矩形的样式和数量
			const getSubRectsb = (rectIndex) => {
			const count = subRectsCountsb.value[rectIndex];
			const subRects = [];
			for (let i = 0; i < count; i++) {
			subRects.push({});
			}
			return subRects;
			};
			// 计算每个小矩形的样式
			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}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			top: '0px',
			backgroundColor: '#911005',
			left,
			};
			};
			// 计算每个大矩形的样式
			const rectStylec = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			// 计算每个小矩形的样式和数量
			const getSubRectsc = (rectIndex) => {
			const count = subRectsCountsc.value[rectIndex];
			const subRects = [];
			for (let i = 0; i < count; i++) {
			subRects.push({});
			}
			return subRects;
			};
			// 计算每个小矩形的样式
			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}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			top: '0px',
			backgroundColor: '#911005',
			left,
			};
			};
			// 计算每个大矩形的样式
			const rectStyled = (rect, index) => ({
			position: 'absolute',
			width: '170px',
			left: '0px',
			top: `${index*rect.top}px`,
			height: `${rect.height}px`,
			});
			// 计算每个小矩形的样式和数量
			const getSubRectsd = (rectIndex) => {
			const count = subRectsCountsd.value[rectIndex];
			const subRects = [];
			for (let i = 0; i < count; i++) {
			subRects.push({});
			}
			return subRects;
			};
			// 计算每个小矩形的样式
			const subRectStyled = (rectIndex, subIndex) => {
			const width = '18px';
			const marginLeft = '8px';
			const totalWidth = 6 * (parseInt(width) + parseInt(marginLeft));
			const left = `${(subIndex * (parseInt(width) + parseInt(marginLeft))) / totalWidth * 100}%`;
			return {
			position: 'absolute',
			width,
			height: '100%',
			marginLeft,
			top: '0px',
			backgroundColor: '#911005',
			left,
			};
			};
			onMounted(() => {
			socket = initializeWebSocket(socketUrl, handleMessage);
			@@ -414,6 +599,28 @@
			case 102:
			return t('searchOrder.rengongxp');
			}
			}
			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();
			@@ -458,6 +665,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" />
			@@ -466,6 +674,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>
			@@ -484,7 +699,7 @@
			</div>
			<!-- // 父级框 -->
			<div class="img-dlpl" >
			<div class="img-car1" :style="'z-index:999;left:475px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
			<div class="img-car1" :style="'z-index:999;left:305px;top:' + 1700*carPosition[0] + 'px;position:absolute;'">
			<div
			v-for="(rect, index) in adjusta"
			:key="rect.id"
			@@ -498,7 +713,7 @@
			>
			</div>
			</div>
			<div class="img-car4" :style="'z-index:999;left:890px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
			<div class="img-car4" :style="'z-index:999;left:730px;top:' + 600*carPosition[1] + 'px;position:absolute;'">
			<div
			v-for="(rect, index) in adjust"
			:key="rect.id"
			@@ -513,254 +728,66 @@
			</div>
			</div>
			<div style="position: relative;">
			<div v-show="cell1" style="width: 227px;height: 29px;position: relative;top:50px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRects"
			:key="rect"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			<div v-show="cell1" style="width: 170px;height: 46px;position: relative;top:387px;left: 523px;">
			<div v-for="(rect, rectIndex) in adjustedRects" :key="rect.id" :style="rectStyle(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRects(rectIndex)"
			:key="subIndex"
			:style="subRectStyle(rectIndex, subIndex)"
			></div>
			</div>
			</div>
			<div v-show="cell2" style="width: 227px;height: 29px;position: relative;top:51px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsa"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			<div v-show="cell2" style="width: 170px;height: 46px;position: relative;top:389px;left: 523px;">
			<div v-for="(rect, rectIndex) in adjustedRectsa" :key="rect.id" :style="rectStylea(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsa(rectIndex)"
			:key="subIndex"
			:style="subRectStylea(rectIndex, subIndex)"
			></div>
			</div>
			</div>
			<div v-show="cell3" style="width: 227px;height: 29px;position: absolute;top:110px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsb"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			<div v-show="cell3" style="width: 170px;height: 46px;position: relative;top:391px;left: 523px;">
			<div v-for="(rect, rectIndex) in adjustedRectsb" :key="rect.id" :style="rectStyleb(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsb(rectIndex)"
			:key="subIndex"
			:style="subRectStyleb(rectIndex, subIndex)"
			></div>
			</div>
			</div>
			<div v-show="cell4" style="width: 227px;height: 29px;position: absolute;top:140px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsc"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			<div v-show="cell4" style="width: 170px;height: 46px;position: relative;top:392px;left: 523px;">
			<div v-for="(rect, rectIndex) in adjustedRectsc" :key="rect.id" :style="rectStylec(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsc(rectIndex)"
			:key="subIndex"
			:style="subRectStylec(rectIndex, subIndex)"
			></div>
			</div>
			</div>
			<div v-show="cell5" style="width: 227px;height: 29px;position: absolute;top:170px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsd"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			</div>
			</div>
			<div v-show="cell6" style="width: 227px;height: 29px;position: absolute;top:241px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectse"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			</div>
			</div>
			<div v-show="cell7" style="width: 227px;height: 29px;position: absolute;top:271px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsf"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			</div>
			</div>
			<div v-show="cell8" style="width: 227px;height: 29px;position: absolute;top:301px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsg"
			:key="rect.id"
			:style="{
			// display:'flex',
			position: 'absolute',
			width: '227px',
			// backgroundColor: 'red',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			// border:'1px solid black',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			</div>
			</div>
			<div v-show="cell9" style="width: 227px;height: 29px;position: absolute;top:332px;left: 495px;">
			<div
			v-for="(rect, index) in adjustedRectsh"
			:key="rect.id"
			:style="{
			position: 'absolute',
			width: '227px',
			left: '0px',
			top: index*rect.top+`px`,
			height: `${rect.height}px`,
			}"
			>
			<div
			v-for="(rects, index) in rect.hollowBigStorageCageDetails"
			:key="rects"
			:style="{
			float:'left',
			width: '18px',
			height: `${rect.height}px`,
			backgroundColor: '#911005',
			top: '0px',
			marginRight: rects.gap/5000*227+'px'
			}"
			>
			</div>
			<div v-show="cell5" style="width: 170px;height: 46px;position: relative;top:394px;left: 523px;">
			<div v-for="(rect, rectIndex) in adjustedRectsd" :key="rect.id" :style="rectStyled(rect, rectIndex)">
			<div
			v-for="(subRect, subIndex) in getSubRectsd(rectIndex)"
			:key="subIndex"
			:style="subRectStyled(rectIndex, subIndex)"
			></div>
			</div>
			</div>
			</div>
			</div>
			<el-card style="flex: 1;margin-left: 1020px;margin-top: -670px;" v-loading="loading">
			<div style="width: 100%; height: calc(100% - 35px); overflow-y: auto;max-height: 550px;">
			<el-table height="550px" ref="table" border
			:data="tableDatass" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.cardnumber')" min-width="140" />
			<el-table-column prop="sumCount" align="center" :label="$t('searchOrder.totallogarithms')" min-width="120" />
			<el-table-column prop="pairCount" align="center" :label="$t('searchOrder.numberpairs')" min-width="120" />
			<el-table-column prop="sumCountlayer" align="center" :label="$t('hellow.totalnumber')" min-width="120" />
			<el-table-column prop="realCount" align="center" :label="$t('hellow.realpieces')" min-width="120" />
			<el-table-column prop="slotCount" align="center" :label="$t('searchOrder.numberoccupied')" min-width="120" />
			</el-table>
			</div>
			</el-card>
			</div>
			<!-- 添加理片笼信息 -->
			<el-dialog v-model="add" top="10vh" width="70%" :title="$t('searchOrder.addcage')" >
			@@ -925,7 +952,7 @@
			</div>
			</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{
			@@ -1023,9 +1050,9 @@
			background-repeat: no-repeat;
			background-attachment: local;
			min-height: 700px;
			width: 1200px;
			width: 1000px;
			max-width: 100%;
			background-size: 1200px 700px;
			background-size: 1000px 700px;
			overflow: hidden;
			position:relative
			}
			@@ -1071,4 +1098,7 @@
			margin-top: 20px;
			margin-bottom: 10px;
			}
			.row-red-background {
			background-color: #CDAF95 !important;
			}
			</style>