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 | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/UI-Project/src/views/StockBasicData/stockhistory.vue b/UI-Project/src/views/StockBasicData/stockhistory.vue
index 7374591..38fe996 100644
--- a/UI-Project/src/views/StockBasicData/stockhistory.vue
+++ b/UI-Project/src/views/StockBasicData/stockhistory.vue
@@ -99,7 +99,7 @@
const taskState = ref('');
const taskType = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
-const historical = async (page) => {
+const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
@@ -115,7 +115,6 @@
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);
@@ -126,10 +125,9 @@
}
}
const handlePageChange2 = (newPage) => {
- currentPage2.value = newPage;
- console.log(currentPage2.value);
- window.localStorage.setItem('pagenumber', currentPage2.value)
- historicala(currentPage2.value);
+currentPage2.value = newPage;
+window.localStorage.setItem('pagenumber', currentPage2.value)
+historicala(currentPage2.value);
};
const historicala = async (page) => {
try {
@@ -140,16 +138,14 @@
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);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -164,20 +160,20 @@
try {
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- console.log(page);
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
deviceId: 2,
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
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);
tableDatax.value = response.data.records;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -202,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))
}
@@ -269,7 +264,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
--
Gitblit v1.8.0