From ba7dfefd608d2c295f7d58d12ad1ab3802ccf666 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 09:18:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 49 +++++++++++++++++++++++++++----------------------
1 files changed, 27 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index dff40a7..f3c75a8 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -4,6 +4,7 @@
import {ElMessage, ElMessageBox} from 'element-plus'
import {useI18n} from 'vue-i18n'
import {host, WebSocketHost} from '@/utils/constants'
+import dayjs from 'dayjs';
import request from "@/utils/request"
import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
const router = useRouter()
@@ -16,7 +17,7 @@
const dialogFormVisiblec = ref(false)
const dialogFormVisiblee = ref(false)
const Edit = ref(false)
-const timeRange = ref(["2022-01-01 00:00:00", "2025-01-01 00:00:00"])
+const timeRange = ref([])
const selectValuesa = reactive([]);
const patternWidth = ref('');
const patternHeight = ref('');
@@ -42,9 +43,11 @@
taskType: '',
taskState: '',
});
-request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest",{
- beginDate: "2022-01-01 00:00:00",
- endDate: "2025-01-01 00:00:00",
+ let startTime = window.localStorage.getItem('startTime')
+ let endTime = window.localStorage.getItem('endTime')
+ request.post("/glassStorage/rawGlassStorageTask/setRawGlassTaskRequest",{
+ beginDate: startTime,
+ endDate: endTime,
}).then((response) => {
if (response.code == 200) {
tableDataa.value = response.data
@@ -54,15 +57,18 @@
}
});
-onMounted(() => {
- socket = initializeWebSocket(socketUrl, handleMessage);
+ onMounted(() => {
+ socket = initializeWebSocket(socketUrl, handleMessage);
+ const endTime = dayjs().startOf('minute'); // 褰撳墠鏃堕棿锛岀簿纭埌鍒嗛挓
+ const startTime = endTime.subtract(7, 'day').startOf('minute'); // 褰撳墠鏃堕棿鐨勫墠涓�澶╋紝绮剧‘鍒板垎閽�
+ // 璁剧疆鏃堕棿鑼冨洿涓� [寮�濮嬫椂闂�, 缁撴潫鏃堕棿]
+ timeRange.value = [startTime.format('YYYY-MM-DD HH:mm:ss'), endTime.format('YYYY-MM-DD HH:mm:ss')];
+ window.localStorage.setItem('startTime', startTime.format('YYYY-MM-DD HH:mm:ss'))
+ window.localStorage.setItem('endTime', endTime.format('YYYY-MM-DD HH:mm:ss'))
});
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/glassStorage/api/talk/rawGlass`;
const handleMessage = (data) => {
- // if(data.tasks !=null){
- // tableDataa.value = data.tasks[0]
- // }
const formattedTasks = data.tasks[0].map(task => {
if (task && task.createTime) {
return { ...task, createTime: formatTimestamp(task.createTime) };
@@ -72,7 +78,6 @@
tableDataa.value = formattedTasks;
if(data.rawStationDetailsList !=null){
tableDatab.value = data.rawStationDetailsList[0]
- console.log(tableDatab.value);
}
};
const handleEdit = (row) => {
@@ -319,21 +324,21 @@
}
function getStatusType2(taskState) {
switch (taskState) {
- case 1:
+ case 0:
return 'info';
case 2:
return 'warning';
- case 3:
+ case 1:
return 'success';
}
}
function getStatusText2(taskState) {
switch (taskState) {
- case 1:
+ case 0:
return t('film.built');//鏂板缓
case 2:
- return t('film.execution');//鎵ц涓�
- case 3:
+ return t('film.fail');//澶辫触
+ case 1:
return t('film.finish');//瀹屾垚
}
}
@@ -364,9 +369,9 @@
:end-placeholder="$t('film.endtime')"
:default-time="defaultTime" />
<el-select v-model="selectValuesa[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px;" >
- <el-option :label="$t('film.built')" value="1"></el-option>
- <el-option :label="$t('film.execution')" value="2"></el-option>
- <el-option :label="$t('film.finish')" value="3"></el-option>
+ <el-option :label="$t('film.built')" value="0"></el-option>
+ <el-option :label="$t('film.finish')" value="1"></el-option>
+ <el-option :label="$t('film.fail')" value="2"></el-option>
</el-select>
<el-select v-model="selectValuesa[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
<el-option :label="$t('film.stocke')" value="1"></el-option>
@@ -411,7 +416,7 @@
</div>
</el-card>
<div class="img-dlpl">
- <div class="img-car1" :style="'z-index:999;top:20px;left:' + 330 + 'px;position:absolute;'">
+ <div class="img-car1" :style="'z-index:999;top:250px;left:' + 20 + 'px;position:absolute;'">
</div>
</div>
<el-dialog v-model="dialogFormVisiblea" top="5vh" width="85%" >
@@ -655,10 +660,10 @@
position: absolute;
background-repeat: no-repeat;
background-attachment: local;
- min-height: 200px;
- width: 200px;
+ min-height: 150px;
+ width: 70px;
max-width: 100%;
- background-size: 200px 70px;
+ background-size: 70px 150px;
overflow: hidden;
position:relative
}
--
Gitblit v1.8.0