From 4788208a9da7fb26800cd7d552b0cafe350feea6 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 31 三月 2025 13:46:11 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Caching/cachingunhistory.vue | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 0b222b1..0f6606b 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -38,14 +38,14 @@
<el-col :span="4">
<div id="dt" style="font-size: 15px;">
<el-form-item :label="$t('hellow.countOutTwo')" style="width: 14vw">
- {{ countOutTwo }}
+ {{ countOutOne }}
</el-form-item>
</div>
</el-col>
<el-col :span="5">
<div id="dta" style="font-size: 15px;">
<el-form-item :label="$t('hellow.totalAreaOutTwo')" style="width: 14vw">
- {{ totalAreaOutTwo }}
+ {{ totalAreaOutOne }}
</el-form-item>
</div>
</el-col>
@@ -117,8 +117,8 @@
const tableDatax = ref([])
const currentPage2 = ref(1)
const totalRecords = ref(0)
-const countOutTwo = ref(0)
-const totalAreaOutTwo = ref(0)
+const countOutOne = ref(0)
+const totalAreaOutOne = ref(0)
const glassId = ref('');
const startSlot = ref('');
const targetSlot = ref('');
@@ -141,14 +141,12 @@
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);
}
}
catch (error) {
- console.error(error);
}
}
const Daily = async () => {
@@ -172,12 +170,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);
@@ -205,7 +201,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailya = async (page) => {
@@ -230,7 +225,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const handleClick = async () => {
@@ -242,7 +236,6 @@
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: 1,
@@ -263,7 +256,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const Dailyhistorical = async () => {
@@ -288,7 +280,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -308,8 +299,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