From e33068bf181a56eb3bba2e39cb0573cafb06584a Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 25 三月 2025 15:02:39 +0800
Subject: [PATCH] 中空一线、二线websockect接收更改，空闲状态名称更改，新增中空三线页面，中空理片笼新增三线空闲状态
---
UI-Project/src/views/GlassStorage/rawhistory.vue | 184 +++++++++++++++++++++++++++++++++++-----------
1 files changed, 140 insertions(+), 44 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 0a71dcf..386681f 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -22,14 +22,14 @@
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="80" />
- <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="80" />
- <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="80" />
+ <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="50" />
+ <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="50" />
+ <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="50" />
+ <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="50" />
<el-table-column
align="center"
:label="$t('film.taskstatus')"
- min-width="80"
+ min-width="50"
prop="taskState"
>
<template #default="scope">
@@ -41,17 +41,23 @@
<el-table-column
align="center"
:label="$t('film.enabletype')"
- min-width="80"
+ min-width="50"
prop="taskType"
>
<template #default="scope">
- <el-tag :type="getStatusText1(scope.row.taskType)">
- {{ getStatusType1(scope.row.taskType) }}
+ <el-tag :type="getStatusType1(scope.row.taskType)">
+ {{ getStatusText1(scope.row.taskType) }}
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
- <el-table-column prop="updateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="50" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="50" />
+ <el-table-column fixed="right" :label="$t('film.operate')" align="center">
+ <template #default="scope">
+ <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ </template>
+ </el-table-column>
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -102,9 +108,13 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -114,6 +124,55 @@
console.error(error);
}
}
+const successfull = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.psuccessfullyprocessed'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/glassStorage/rawGlassStorageTask/taskSuccess?taskId="+ row.id;
+ 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 handleptask = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.ptaskfailure'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/glassStorage/rawGlassStorageTask/taskError?taskId="+ row.id;
+ 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 handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
console.log(currentPage2.value);
@@ -121,33 +180,6 @@
historicala(currentPage2.value);
};
const historicala = async (page) => {
- try {
- let page = window.localStorage.getItem('pagenumber')
- let startTime = window.localStorage.getItem('startTime')
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
- pageNo: page,
- pageSize: 20,
- taskState: [],
- taskType: [],
- beginDate: startTime,
- endDate: getglobalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
- totalRecords.value = response.data.total/2 || 0
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-// 鍘嗗彶鏌ヨ鐐瑰嚮
-const sethistorical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
let celllist=[]
@@ -177,17 +209,80 @@
ptargetSlot = '0'
}
let page = window.localStorage.getItem('pagenumber')
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
+ const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
pageNo: page,
pageSize: 20,
taskState: celllist,
taskType: stateList,
- beginDate: startTime,
- endDate: getglobalDate
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ totalRecords.value = response.data.total/2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+ }
+}
+// 鍘嗗彶鏌ヨ鐐瑰嚮
+const sethistorical = async () => {
+ try {
+ let startTime = window.localStorage.getItem('startTime')
+ let celllist=[]
+ let stateList=[]
+ let pstartSlot= ''
+ let ptargetSlot=''
+ if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+ }
+ if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
+ if(selectValuesa[1]!=""){
+ stateList=[selectValuesa[1]];
+ }
+ }
+ if(startSlot.value != ""){
+ pstartSlot = startSlot.value
+ }else{
+ pstartSlot = '0'
+ }
+ if(targetSlot.value != ""){
+ ptargetSlot = targetSlot.value
+ }else{
+ ptargetSlot = '0'
+ }
+ let page = window.localStorage.getItem('pagenumber')
+ const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
+ pageNo: 1,
+ pageSize: 20,
+ taskState: celllist,
+ taskType: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ currentPage2.value = 1;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -212,6 +307,7 @@
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
+ oneWeekAgo.setHours(0, 0, 0, 0);
console.log(formatTimestamp(oneWeekAgo));
console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
--
Gitblit v1.8.0