From 23f026fbfd81066b1f2e9662bbeff31965dda4d6 Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期一, 20 十月 2025 17:00:16 +0800
Subject: [PATCH] 仓储页面推送数据过滤查询
---
UI-Project/src/views/GlassStorage/rawfilmstorage2.vue | 58 +++++++++++++++++++++++++++++++++-------------------------
1 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage2.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage2.vue
index 4c40694..ad4e8b5 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage2.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage2.vue
@@ -83,6 +83,8 @@
const slot = ref('');
const leftingStation = ref('');
const loadingline = ref('');
+const rawTableData = ref([]);
+
let webSocket: WebSocket | null = null;
const globalDate = inject('globalDate');
const value = ref('')
@@ -131,6 +133,7 @@
}
return task;
});
+ rawTableData.value = formattedTasks;
tableDataa.value = formattedTasks;
if (data.rawStationDetailsList != null) {
tableDatab.value = data.rawStationDetailsList[0]
@@ -314,6 +317,7 @@
}
return task;
});
+ rawTableData.value = formattedTasks;
tableDataa.value = formattedTasks;
}
// 鏇存柊tableDatab鏁版嵁锛岀‘淇濋〉闈㈣兘鍙婃椂鏄剧ず浠诲姟
@@ -444,33 +448,36 @@
}
};
// 鏌ヨ鏁版嵁
-const selectReportData = async () => {
- let celllist = []
- let stateList = []
- if (selectValuesa[0] != null && selectValuesa[0] != 'undefined') {
- if (selectValuesa[0] != "") {
- celllist = [selectValuesa[0]];
- }
+const selectReportData = () => {
+ // 澶勭悊鏌ヨ鏉′欢
+ const [taskStateVal, taskTypeVal] = selectValuesa;
+ const beginDate = timeRange.value?.[0] || '';
+ const endDate = timeRange.value?.[1] || '';
+
+ let filteredData = [...rawTableData.value];
+
+ if (beginDate) {
+ const beginTime = new Date(beginDate).getTime();
+ filteredData = filteredData.filter(item => new Date(item.createTime).getTime() >= beginTime);
}
- if (selectValuesa[1] != null && selectValuesa[1] != 'undefined') {
- if (selectValuesa[1] != "") {
- stateList = [selectValuesa[1]];
- }
+ if (endDate) {
+ const endTime = new Date(endDate).getTime();
+ filteredData = filteredData.filter(item => new Date(item.createTime).getTime() <= endTime);
}
- const response = await request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest", {
- beginDate: (timeRange.value && timeRange.value[0]) || '',
- endDate: (timeRange.value && timeRange.value[1]) || '',
- taskState: celllist,
- taskType: stateList
- })
- if (response.code === 200) {
- // tableDataa.value = response.data;
- ElMessage.success(response.message);
+
+ if (taskStateVal != null && taskStateVal !== 'undefined' && taskStateVal !== '') {
+ filteredData = filteredData.filter(item => item.taskState.toString() === taskStateVal);
}
- else {
- ElMessage.error(response.message);
+
+ if (taskTypeVal != null && taskTypeVal !== 'undefined' && taskTypeVal !== '') {
+ filteredData = filteredData.filter(item => item.taskType.toString() === taskTypeVal);
}
+
+ tableDataa.value = filteredData;
+
+ ElMessage.success(`鏌ヨ鎴愬姛锛屽叡 ${filteredData.length} 鏉℃暟鎹甡);
};
+
// 鏄惁绂佺敤
const toggleEnableState = async (row: any) => {
if (!row.deviceId) {
@@ -689,11 +696,12 @@
:end-placeholder="$t('film.endtime')" :default-time="defaultTime" />
<el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px; width: 200px;">
<el-option :label="$t('film.built')" value="0"></el-option>
- <el-option :label="$t('film.finish')" value="1"></el-option>
- <el-option :label="$t('film.fail')" value="2"></el-option>
+ <el-option :label="$t('film.execution')" value="1"></el-option>
+ <el-option :label="$t('film.finish')" value="2"></el-option>
+ <el-option :label="$t('film.fail')" value="3"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px; width: 200px;">
- <el-option :label="$t('sorter.advancetask')" value="1"></el-option>
+ <el-option :label="$t('sorter.warehouseReturntasks')" value="1"></el-option>
<el-option :label="$t('sorter.outputtasks')" value="2"></el-option>
<el-option :label="$t('sorter.schedulingtasks')" value="3"></el-option>
<el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
--
Gitblit v1.8.0