From 75b98831417be414bc43e1832479d05d20cf6ac3 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 13 三月 2025 16:44:06 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Caching/cachingunhistory.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 7374591..7231a9b 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.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", {
@@ -140,16 +140,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);
@@ -167,17 +165,18 @@
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);
}
@@ -269,7 +268,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
--
Gitblit v1.8.0