From c2437613fdb41f8b187130ffc78f6afafb2d64c3 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 19 三月 2025 13:31:21 +0800
Subject: [PATCH] 所有默认开始时间更为00:00:00
---
UI-Project/src/views/Caching/cachingbefore.vue | 106 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 32 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index 3a69e5c..f69fdee 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -7,6 +7,8 @@
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
import {ElMessage, ElMessageBox} from 'element-plus'
import {useI18n} from 'vue-i18n'
+import { inject } from 'vue';
+const globalDate = inject('globalDate');
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
const tableDataa = ref([])
@@ -38,34 +40,44 @@
// id: rect.id * 10,
// }));
};
-onMounted(() => {
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+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)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+ onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
- const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
- const startTime = endTime.subtract(1, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
- // 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
- timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ parseAndSetTime();
});
// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
const handlehistorical = (row) => {
blindb.value = true;
- historical()
+ iframeUrl.value = `${window.location.origin}/#/Caching/cachingbeforehistory`;
};
// 鍘嗗彶浠诲姟
-const historical = async () => {
- try {
- var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+1 + "&startTime=" + '' + "&endTime=" + '' + "&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 = {
@@ -173,7 +185,32 @@
} catch (error) {
console.error('鍙戠敓閿欒:', error);
}
-};
+};
+// 浠诲姟鎴愬姛澶勭悊
+const successfull = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.psuccessfullyprocessed'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/cacheGlass/edgStorageDeviceTask/taskSuccess?deviceId="+ 1;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ console.error('鍙戠敓閿欒:', error);
+ }
+};
// 鍒犻櫎
const handledelete = async(row) => {
try {
@@ -187,9 +224,7 @@
}
);
if (confirmResult === 'confirm') {
- const response = await request.post("/cacheGlass/edgStorageCageDetails/removeEdgDetails",{
- glassId: row.glassId
- })
+ const response = await request.post("/cacheGlass/edgStorageCageDetails/removeEdgDetails?glassId="+encodeURIComponent(row.glassId))
if (response.code === 200) {
ElMessage.success(response.message);
} else {
@@ -300,6 +335,8 @@
<div style="height: 500px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 10px;" v-loading="loading">
<el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handlehistorical" type="primary">{{ $t('searchOrder.historicaltasks') }}</el-button>
+ <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="handleptask()" type="warning">{{ $t('searchOrder.partask') }}</el-button>
+ <el-button style="margin-bottom: 15px;margin-left: 20px;" @click="successfull()" type="success">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
<div style="position: relative; width: 100%; height: 100%;"> <!-- 娣诲姞鐩稿瀹氫綅 -->
<div style="position: absolute; margin-top: 28px; left: 430px; display: flex; z-index: 10;"> <!-- 娣诲姞缁濆瀹氫綅 -->
<div>{{ $t('searchOrder.projectnumber') }}</div>
@@ -391,11 +428,6 @@
</el-table-column>
<el-table-column prop="formattedCreateTime" align="center" :label="$t('film.createtime')" min-width="120" />
<el-table-column prop="formattedupdateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
- <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150">
- <template #default="scope">
- <el-button size="mini" type="text" plain @click="handleptask()">{{ $t('searchOrder.partask') }}</el-button>
- </template>
- </el-table-column>
</el-table>
</div>
</el-card>
@@ -415,7 +447,17 @@
</div>
</div>
<!-- 鍘嗗彶浠诲姟 -->
-<el-dialog v-model="blindb" top="10vh" width="90%">
+<el-dialog v-model="blindb" top="10vh" width="95%">
+ <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
@@ -488,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