From a1bf701b728e79151bc34ffc8cbe479ab9ca53e4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 三月 2025 16:25:38 +0800
Subject: [PATCH] 单独钢化页面新增序号显示，钢化前大理片笼部分样式及接口
---
UI-Project/src/views/Caching/cachingun.vue | 68 +++++++++++++++++++++++++---------
1 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 5b17c8e..ead7ee8 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -2,10 +2,13 @@
import {onBeforeUnmount, onMounted, onUnmounted, ref, reactive} from "vue";
import {useRouter} from "vue-router"
import {host, WebSocketHost} from '@/utils/constants'
+import dayjs from 'dayjs';
import request from "@/utils/request"
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([])
@@ -36,9 +39,19 @@
// id: rect.id * 10,
// }));
};
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
-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澶�
+ console.log(formatTimestamp(oneWeekAgo));
+ console.log(oneWeekAgo);
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+ onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
+ parseAndSetTime();
});
// 鍘嗗彶浠诲姟
const handlehistorical = (row) => {
@@ -48,7 +61,8 @@
// 鍘嗗彶浠诲姟
const historical = async () => {
try {
- var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+2 + "&startTime=" + '' + "&endTime=" + '' + "&glassId=" + '' + "&taskState=" + '' + "&taskType=" + '';
+ let startTime = window.localStorage.getItem('startTime')
+ var url="/cacheGlass/edgStorageDeviceTaskHistory?deviceId="+2 + "&startTime=" + startTime + "&endTime=" + globalDate + "&glassId=" + '' + "&taskState=" + '' + "&taskType=" + '';
const response = await request.get(url)
if (response.code == 200) {
ElMessage.success(response.message);
@@ -65,8 +79,8 @@
try {
const params = {
deviceId: 2,
- startTime: timeRange.value[0] || '',
- endTime: timeRange.value[1] || '',
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
glassId: glassId.value || '',
taskState: taskState.value,
taskType: taskType.value || ''
@@ -157,7 +171,7 @@
}
);
if (confirmResult === 'confirm') {
- var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 1;
+ var url="/cacheGlass/edgStorageDeviceTask/resetTask?deviceId="+ 2;
const response = await request.post(url)
if (response.code === 200) {
ElMessage.success(response.message);
@@ -169,6 +183,31 @@
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="+ 2;
+ 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 {
@@ -182,9 +221,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 {
@@ -279,8 +316,7 @@
const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
- // 鍙樉绀哄勾鏈堟棩锛屽鏋滈渶瑕佹樉绀烘椂闂达紝鍒欐嫾鎺� hours + ':' + minutes + ':' + seconds
- return `${year}-${month}-${day}`;
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}
onUnmounted(() => {
if (socket) {
@@ -296,6 +332,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>
@@ -311,7 +349,6 @@
ref="table"
style="margin-top: 20px; height: 360px;"
:data="tableDataa"
- :row-class-name="rowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="id"
>
@@ -334,7 +371,7 @@
<template #default="props">
<el-table
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
- :data="props.row.details" style="width: 100%;height: 100px;">
+ :data="props.row.details" style="width: 100%;height: 70px;">
<el-table-column prop="engineerId" align="center" min-width="80" />
<el-table-column prop="flowCardId" align="center" min-width="80" />
<el-table-column prop="glassId" align="center" min-width="80" />
@@ -388,11 +425,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>
--
Gitblit v1.8.0