YiWuProject.git

			@@ -71,10 +71,10 @@
			}
			};
			let socket = null;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlass`;
			const socketUrl = `ws://${WebSocketHost}:${host}/api/loadGlass/api/talk/loadGlassTwo`;
			const handleMessage = (data: any) => {
			if (data.stationTwo!=null) {
			const processedData = [...data.stationTwo[0]];
			if (data.stationList.length != 0) {
			const processedData = [...data.stationList[0]];
			if (processedData.length > 0) {
			processedData[0] = { ...processedData[0], workstationId: 1 };
			}
			@@ -85,19 +85,18 @@
			}else {
			tableDataa.value = []
			}
			if (data.LoadTwoervice != null) {
			cuttingMachineStatusColor.value = data.LoadTwoervice[0] == 1 ? 'green' : '#911005';
			if (data.inkageState != null) {
			cuttingMachineStatusColor.value = data.inkageState[0] === 1 ? 'green' : '#911005';
			}
			if(data.loadTask2!=null){
			// tableData.splice(0, tableData.length, ...data.loadTask2[0]);
			tableData.value = data.loadTask2[0]
			if (data.upPattenUsages.length != 0) {
			tableData.value = data.upPattenUsages[0]
			window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
			canSelectProjecta.value = false;
			canSelectProjectb.value = false;
			canSelectProjectc.value = true;
			}
			else {
			tableData.value = '';
			tableData.value = [];
			canSelectProjecta.value = true;
			canSelectProjectb.value = true;
			canSelectProjectc.value = false;
			@@ -130,7 +129,6 @@
			};
			// 架子复位
			const handleptask = async (workstationId: number) => {
			console.log(workstationId);
			try {
			const confirmResult = await ElMessageBox.confirm(
			t('basicData.prackreset'),
			@@ -255,7 +253,6 @@
			try {
			let filmRemove = window.localStorage.getItem('filmRemove')
			let engineeringId = window.localStorage.getItem('engineeringIda')
			console.log(engineeringId);
			if (engineeringId !== '') {
			const response = await request.post('/loadGlass/engineering/engineering/pause', {
			stationCell: 6,
			@@ -456,7 +453,7 @@
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}"
			:data="tableData"
			>
			<el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="100" align="center"/>
			<el-table-column prop="engineeringId" :label="$t('Mounting.project')" width="120" align="center"/>
			<el-table-column prop="width" :label="$t('Mounting.width')" width="200" align="center"/>
			<el-table-column prop="height" :label="$t('Mounting.height')" align="center"/>
			<el-table-column prop="thickness" :label="$t('Mounting.thickness')" align="center"/>
			@@ -480,22 +477,22 @@
			</el-table>
			</div>
			</el-card>
			<div style="display: flex;">
			<div style="width: 49%;float: left;margin-left: 300px;">
			<div style="display: flex;margin-left:5%">
			<div style="width: 55%;float: left;margin-left: 300px;">
			<div style="display: flex;">
			<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="margin-top: 10%;margin-left: 8%;" width="500"
			style="max-width: 20%;max-height: 25%;margin-left: 10%;margin-top: 3%;">
			<el-table :data="tableDataa" border style="margin-top: 10%;margin-left: 8%;" width="700"
			:header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}" >
			<el-table-column prop="workstationId" align="center" :label="$t('basicData.station')" min-width="50"/>
			<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="workstationId" align="center" :label="$t('basicData.station')" min-width="65"/>
			<el-table-column prop="patternWidth" align="center" :label="$t('basicData.width')" min-width="75"/>
			<el-table-column prop="patternHeight" align="center" :label="$t('basicData.height')" min-width="75"/>
			<el-table-column prop="filmsId" align="center" :label="$t('basicData.coatingtypes')" min-width="80"/>
			<el-table-column prop="remainQuantity" align="center" :label="$t('basicData.quantity')" min-width="80"/>
			<el-table-column prop="patternThickness" align="center" :label="$t('basicData.thickness')" min-width="60"/>
			<el-table-column fixed="right" :label="$t('film.operate')" align="center">
			<el-table-column fixed="right" :label="$t('film.operate')" align="center" width="100">
			<template #default="scope">
			<el-button size="mini" :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
			<el-button :disabled="(!scope.row.patternThickness)" type="text" plain @click="handleptask(scope.row.workstationId)">{{ $t('basicData.rackreset') }}</el-button>
			</template>
			</el-table-column>
			</el-table>
			@@ -503,13 +500,13 @@
			</div>
			</div>
			<!-- 历史任务 -->
			<el-dialog v-model="blindbd" top="10vh" width="71%">
			<el-dialog v-model="blindbd" top="5vh" width="95%" @close="iframeUrl=''">
			<iframe
			:src="iframeUrl"
			marginwidth="2000px"
			marginheight="2000px"
			width="100%"
			height="700px"
			height="750px"
			frameborder="0"
			></iframe>
			</el-dialog>
			@@ -537,8 +534,8 @@
			<el-table-column prop="flowCardId" align="center" :label="$t('searchOrder.processcards')"/>
			<el-table-column fixed="right" :label="$t('productStock.operate')" align="center" width="200">
			<template #default="scope">
			<el-button size="mini" type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
			<el-button size="mini" type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
			<el-button type="text" plain @click="opena(scope.row)">{{ $t('order.dilapidation') }}</el-button>
			<el-button type="text" plain @click="openb(scope.row)">{{ $t('order.takeaway') }}</el-button>
			</template>
			</el-table-column>
			</el-table>