From ca7d480e79cc828feafea0005fd92821ca6ed338 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 31 三月 2025 09:30:24 +0800
Subject: [PATCH] 大屏历史任务按钮修改为每次打开重新加载进行查询 修复生产统计工序顺序问题
---
UI-Project/src/views/Slicecage/slicecagehistory.vue | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/UI-Project/src/views/Slicecage/slicecagehistory.vue b/UI-Project/src/views/Slicecage/slicecagehistory.vue
index 7676f59..c4d10cc 100644
--- a/UI-Project/src/views/Slicecage/slicecagehistory.vue
+++ b/UI-Project/src/views/Slicecage/slicecagehistory.vue
@@ -3,7 +3,7 @@
<div style="display: flex;width: 1770px;">
<el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('searchOrder.inglassID')" />
<el-input v-model="startSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputa" :placeholder="$t('film.originateslot')" />
- <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('film.endslot')" />
+ <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('film.endoriginateslot')" />
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
style="width: 200px;margin-left: 10px;">
<el-option :label="$t('searchOrder.begin')" value="0"></el-option>
@@ -60,7 +60,7 @@
<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="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
- <el-table-column prop="targetSlot" align="center" :label="$t('film.endslot')" min-width="80" />
+ <el-table-column prop="targetSlot" align="center" :label="$t('film.endoriginateslot')" min-width="80" />
<el-table-column
align="center"
:label="$t('film.taskstatus')"
@@ -149,17 +149,13 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- // tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const Daily = async () => {
@@ -186,12 +182,10 @@
}
}
catch (error) {
- console.error(error);
}
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
Dailya(currentPage2.value);
@@ -242,17 +236,13 @@
formattedCreateTime: formatTimestamp(record.createTime),
formattedUpdateTime: formatTimestamp(record.updateTime),
}));
- // tableDatax.value = response.data.records;
tableDatax.value = formattedData;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
const Dailya = async (page) => {
@@ -304,7 +294,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handleClick = async () => {
@@ -365,7 +354,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailyhistorical = async () => {
@@ -415,7 +403,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handleInputa = (value: string) => {
@@ -451,8 +438,6 @@
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)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
--
Gitblit v1.8.0