From 35db1f026e28d82c3943d3a886bb368efe614700 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 20 三月 2025 16:46:52 +0800
Subject: [PATCH] 修改大屏按钮颜色

---
 UI-Project/src/views/Caching/cachingbefore.vue |   50 +++++++++++++++++++++++++++++++-------------------
 1 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 25ab9fc..51a7ec1 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -45,6 +45,7 @@
 function parseAndSetTime() {
   const backendTime = new Date(globalDate);
   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)];
@@ -55,27 +56,28 @@
   parseAndSetTime();
 });
 // 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
 const handlehistorical = (row) => {
   blindb.value = true;
-  historical()
+  iframeUrl.value = `${window.location.origin}/#/Caching/cachingbeforehistory`;
 };
 // 鍘嗗彶浠诲姟
-const historical = async () => {
-  try { 
-  let startTime = window.localStorage.getItem('startTime')
-  var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+1 + "&startTime=" + startTime + "&endTime=" + globalDate + "&glassId=" + '' + "&taskState=" + '' + "&taskType=" + '';
-      const response = await request.get(url) 
-      if (response.code == 200) {
-        ElMessage.success(response.message);
-        tableDatad.value = response.data;
-      } else {
-        ElMessage.error(response.message);
-    }
-}
-catch (error) {
-    console.error(error);
-  }
-}
+// const historical = async () => {
+//   try { 
+//   let startTime = window.localStorage.getItem('startTime')
+//   var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+1 + "&startTime=" + startTime + "&endTime=" + globalDate + "&glassId=" + '' + "&taskState=" + '' + "&taskType=" + '';
+//       const response = await request.get(url) 
+//       if (response.code == 200) {
+//         ElMessage.success(response.message);
+//         tableDatad.value = response.data;
+//       } else {
+//         ElMessage.error(response.message);
+//     }
+// }
+// catch (error) {
+//     console.error(error);
+//   }
+// }
 const sethistorical = async () => {
   try { 
     const params = {
@@ -445,7 +447,17 @@
 </div>
 </div>
 <!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="10vh" width="71%">
+     <iframe 
+     :src="iframeUrl" 
+     marginwidth="2000px"
+     marginheight="2000px"
+     width="100%" 
+     height="750px" 
+     frameborder="0"
+     ></iframe>
+  </el-dialog>
+<!-- <el-dialog v-model="blindb" top="10vh" width="90%">
   <div style="display: flex;">
     <el-input v-model="glassId" style="margin-left: 10px;margin-bottom: 10px;width: 270px;" :placeholder="$t('searchOrder.inglassID')" />
             <el-select 
@@ -518,7 +530,7 @@
         <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
       </div>
     </template>
-  </el-dialog>
+  </el-dialog> -->
 </template>
 <style scoped>
 #dt { display:block; float:left;line-height: 20px;margin-left: 100px;}

--
Gitblit v1.8.0