~zhoushihao/YiWuProject.git

			@@ -19,11 +19,10 @@
			const dialoglea = ref(false)
			const tableDatax = ref([])
			const upstatus = ref(t('basicData.machineaa'));
			const cuttingMachineStatusColor = ref('#911005'); // 用于动态设置i标签的背景色
			const cuttingMachineStatusColor = ref('#911005');
			const tableDataa = ref<any[]>([]);
			const tableDatab = ref<any[]>([]);
			const tableData = ref([])
			// const tableData = reactive([]);
			const titleSelectJson = ref({
			engineerId: [],
			})
			@@ -63,14 +62,11 @@
			ElMessage.error(response.message);
			}
			} catch (error) {
			// 处理请求失败的情况
			// ElMessage.error('获取表格数据失败，请重试');
			}
			};
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/uploadGlass`;
			const handleMessage = (data: any) => {
			// tableDataa.value = data.list[0].slice(0, 2);
			tableDataa.value = data.list[0].slice(2, 4);
			};
			onBeforeUnmount(() => {
			@@ -100,7 +96,6 @@
			const response = await request.post('/loadGlass/up-patten-usage/selectUpPattenUsage', {
			stationCell: 6,
			engineerId: selectedProjectNo.value,
			// filmRemove: filmRemove.value,
			filmRemove: parseInt(filmRemove.value, 10),
			})
			window.localStorage.setItem('engineeringId', selectedProjectNo.value)
			@@ -127,9 +122,6 @@
			if (markingMachineStatus.value === 'green' && cuttingMachineStatus.value === 'green') {
			try {
			const response = await request.post('/loadGlass/engineering/engineering/pause', {
			// const response = await request.post('/loadGlass/engineering/engineering/changeTask', {
			// stationCell: 6,
			// filmRemove: filmRemove,
			engineerId: engineeringId,
			state: 1,
			})
			@@ -143,7 +135,6 @@
			console.error(error);
			}
			} else if (markingMachineStatus.value === '#911005' \|\| cuttingMachineStatus.value === '#911005') {
			// 提示用户打标机未就绪
			ElMessage.warning(t('basicData.pausea'));
			}
			}
			@@ -181,7 +172,6 @@
			console.log(engineeringId);
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/pause', {
			// stationCell: 6,
			engineerId: engineeringId,
			state: 0,
			})
			@@ -211,7 +201,6 @@
			}
			const response = await request.post("/loadGlass/up-patten-usage/setUpPattenRequest", {
			state: selectValuesa[0],
			// state: stateList,
			stationCell: 6
			})
			if (response.code === 200) {
			@@ -248,10 +237,9 @@
			blinda.value = true;
			};
			const toggleEnableState = async (row: any) => {
			// 检查 id 是否为空
			if (!row.id) {
			ElMessage.error(t('basicData.updatanull'));
			return; // 如果 id 为空，则不执行后续操作
			return;
			}
			const newState = row.state === 100 ? 0 : 100;
			try {
			@@ -329,7 +317,7 @@
			<el-card style="flex: 1;margin-left: 10px;margin-top: 15px;" v-loading="loading">
			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
			<el-table
			height="350"
			height="400"
			ref="table"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			:data="tableData"
			@@ -341,7 +329,6 @@
			<el-table-column prop="filmsId" :label="$t('Mounting.loadinglinea')" align="center"/>
			<el-table-column :label="$t('Mounting.projectnumber')" align="center">
			<template #default="{ row }">
			<!-- 这里总是显示 1 -->
			<span>{{ 1 }}</span>
			</template>
			</el-table-column>
			@@ -361,7 +348,6 @@
			</template>
			</el-table-column>
			<el-table-column prop="filmsId" :label="$t('Mounting.createtime')" align="center"/>
			<!-- <el-table-column prop="filmRemove" :label="$t('Mounting.removalmethodp')" align="center"/> -->
			<el-table-column
			align="center"
			:label="$t('Mounting.removalmethodp')"
			@@ -383,8 +369,7 @@
			<img src="../../assets/shangpianji.png" alt=""
			style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
			<el-table :data="tableDataa" border style="width: 75%;margin-top: 10%;margin-left: 8%;"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			>
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
			<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60"/>
			<el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80"/>
			<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80"/>
			@@ -393,20 +378,6 @@
			</el-table>
			</div>
			</div>
			<!-- <div style="width: 48%;float: right;">
			<div style="display: flex;">
			<img src="../../assets/shangpianji.png" alt="" style="max-width: 25%;max-height: 25%;margin-left: 10%;margin-top: 5%;">
			<el-table :data="tableDatab" border style="width: 75%;margin-top: 10%;margin-left: 2%;"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			>
			<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="60" />
			<el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="80" />
			<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="80" />
			<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80" />
			<el-table-column prop="number" align="center" :label="$t('basicData.quantity')" min-width="80" />
			</el-table>
			</div>
			</div> -->
			</div>
			<el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
			<template #footer>
			@@ -425,14 +396,8 @@
			<el-table-column prop="line" fixed align="center" :label="$t('searchOrder.line')"/>
			<el-table-column prop="workProcesses" fixed align="center" :label="$t('searchOrder.process')"/>
			<el-table-column prop="teamsGroupsName" align="center" :label="$t('searchOrder.team')">
			<!-- <template #default="{ row }">
			<el-input v-model="row.teamsGroupsName" autocomplete="off" min-width="150"/>
			</template> -->
			</el-table-column>
			<el-table-column prop="deviceName" align="center" :label="$t('searchOrder.basic')">
			<!-- <template #default="{ row }">
			<el-input v-model="row.deviceName" autocomplete="off" min-width="150"/>
			</template> -->
			</el-table-column>
			</el-table>
			<template #footer>
			@@ -516,7 +481,6 @@
			</el-dialog>
			</div>
			</template>

			<style scoped>
			.flex-container {
			display: flex;
			@@ -529,9 +493,6 @@
			.flex-container .el-form-item:last-child {
			margin-left: 20px; /* 为第二个表单项添加左侧边距 */
			}



			#dt { display:block; float:left;line-height: 20px;margin-left: 100px;}
			#dta { display:block; float:left;line-height: 20px;margin-left: 80%;}
			#dialog-footer{