~zhoushihao/YiWuProject.git

			@@ -144,6 +144,31 @@
			console.error('发生错误:', error);
			}
			};
			// 任务重置
			const handleptask = async() => {
			try {
			const confirmResult = await ElMessageBox.confirm(
			t('searchOrder.partasks'),
			t('workOrder.prompt'),
			{
			confirmButtonText: t('workOrder.yes'),
			cancelButtonText: t('workOrder.cancel'),
			type: 'warning',
			}
			);
			if (confirmResult === 'confirm') {
			var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 1;
			const response = await request.post(url)
			if (response.code === 200) {
			ElMessage.success(response.message);
			} else {
			ElMessage.error(response.msg);
			}
			}
			} catch (error) {
			console.error('发生错误:', error);
			}
			};
			// 删除
			const handledelete = async(row) => {
			try {
			@@ -271,6 +296,16 @@
			<div style="height: 500px;">
			<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
			<el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button>
			<div style="position: relative; width: 100%; height: 100%;"> <!-- 添加相对定位 -->
			<div style="position: absolute; margin-top: 28px; left: 430px; display: flex; z-index: 10;"> <!-- 添加绝对定位 -->
			<div>{{ $t('searchOrder.projectnumber') }}</div>
			<div style="margin-left: 155px;">{{ $t('hellow.flowCardId') }}</div>
			<div style="margin-left: 152px;">{{ $t('searchOrder.glassID') }}</div>
			<div style="margin-left: 165px;">{{ $t('searchOrder.width') }}</div>
			<div style="margin-left: 185px;">{{ $t('searchOrder.height') }}</div>
			<div style="margin-left: 172px;">{{ $t('searchOrder.thickness') }}</div>
			<div style="margin-left: 145px;">{{ $t('hellow.operate') }}</div>
			</div>
			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
			<el-table
			ref="table"
			@@ -299,14 +334,14 @@
			<template #default="props">
			<el-table
			:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
			:data="props.row.details" style="width: 100%;height: 200px;">
			<el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" />
			<el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" />
			<el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
			<el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
			<el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
			<el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
			<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150">
			:data="props.row.details" style="width: 100%;height: 100px;">
			<el-table-column prop="engineerId" align="center" min-width="80" />
			<el-table-column prop="flowCardId" align="center" min-width="80" />
			<el-table-column prop="glassId" align="center" min-width="80" />
			<el-table-column prop="width" align="center" min-width="80" />
			<el-table-column prop="height" align="center" min-width="80" />
			<el-table-column prop="thickness" align="center" min-width="80" />
			<el-table-column fixed="right" align="center" width="150">
			<template #default="scope">
			<el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
			<el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
			@@ -317,6 +352,7 @@
			</template>
			</el-table-column>
			</el-table>
			</div>
			</div>
			<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;margin-top: 15px;">
			<el-table height="90" ref="table"
			@@ -352,6 +388,11 @@
			</el-table-column>
			<el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="120" />
			<el-table-column prop="formattedupdateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
			<el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150">
			<template #default="scope">
			<el-button size="mini" type="text" plain @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
			</template>
			</el-table-column>
			</el-table>
			</div>
			</el-card>