From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/StockBasicData/stockhistory.vue | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockhistory.vue b/UI-Project/src/views/StockBasicData/stockhistory.vue
index 2885ba6..38fe996 100644
--- a/UI-Project/src/views/StockBasicData/stockhistory.vue
+++ b/UI-Project/src/views/StockBasicData/stockhistory.vue
@@ -126,7 +126,6 @@
}
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
-console.log(newPage);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -139,10 +138,10 @@
pageNo: page,
pageSize: 20,
glassId: glassId.value,
- taskState: '',
- taskType: '',
- startTime: startTime,
- endTime: getglobalDate
+ taskState: taskState.value,
+ taskType: taskType.value,
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -168,8 +167,8 @@
glassId: glassId.value,
taskState: taskState.value,
taskType: taskType.value,
- startTime: (timeRange.value && timeRange.value[0]) || '',
- endTime: (timeRange.value && timeRange.value[1]) || '',
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
@@ -199,8 +198,7 @@
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
--
Gitblit v1.8.0