From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingbefore.vue | 247 ++++++++++++++++++++++++++++++++----------------
1 files changed, 164 insertions(+), 83 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingbefore.vue b/UI-Project/src/views/Caching/cachingbefore.vue
index f97f343..19d921e 100644
--- a/UI-Project/src/views/Caching/cachingbefore.vue
+++ b/UI-Project/src/views/Caching/cachingbefore.vue
@@ -8,77 +8,115 @@
import {useI18n} from 'vue-i18n'
const {t} = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
-const tableData = ref([])
-const slot = ref('')
+const tableDataa = ref([])
+const tableDatab = ref([])
const adjustedRects = ref([]);
-onMounted(async () => {
- try {
- const response = await request.post('/cacheGlass/edgStorageCage/selectEdgStorageCage');
- if (response.code === 200) {
- const rawRects = response.data;
- tableData.value = response.data
- adjustedRects.value = rawRects.map(rect => ({
- ...rect,
- width: rect.width * 0.5 ,
- id: rect.id * 10,
- }));
- } else {
- ElMessage.warning(res.msg)
- }
- } catch (error) {
- // console.error('Error fetching rects :', error);
- }
-});
-const toggleEnableState = async (row) => {
- const newState = row.enable_state === 1 ? 0 : 1;
- const response = await request.post('/cacheGlass/edgStorageCage/updateEdgStorageCage', { id: row.id, enableState: newState });
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.message);
- }
- row.enable_state = newState;
-};
-const open = async(row) => {
- try {
- const confirmResult = await ElMessageBox.confirm(
- t('sorter.information'),
- t('sorter.prompt'),
- {
- confirmButtonText: t('sorter.yes'),
- cancelButtonText: t('sorter.cancel'),
- type: 'warning',
- }
- );
- if (confirmResult === 'confirm') {
- var url="/cacheGlass/edgStorageCage/edgStorageCageGlass?edgStorageCageId="+row.id;
- const response = await request.post(url, {
- glassId:row.glass_id
- })
- if (response.code === 200) {
- ElMessage.success(response.message);
- } else {
- ElMessage.error(response.msg);
- }
- }
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
- }
-};
let socket = null;
-const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlass`;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/cacheGlassOne`;
const handleMessage = (data) => {
- tableData.value = data.EdgStorageCageinfos[0]
- adjustedRects.value = data.EdgStorageCageinfos[0].map(rect => ({
- ...rect,
- width: rect.width * 0.5 ,
- id: rect.id * 10,
- }));
+ const cageInfo = data.taskMessage[0];
+ if (cageInfo && cageInfo.createTime) {
+ cageInfo.formattedCreateTime = formatTimestamp(cageInfo.createTime);
+ }
+ if (cageInfo && cageInfo.updateTime) {
+ cageInfo.formattedupdateTime = formatTimestamp(cageInfo.updateTime);
+ }
+ tableDataa.value = data.EdgStorageCageinfos[0]
+ tableDatab.value = data.taskMessage
+ // adjustedRects.value = data.EdgStorageCageinfos[0].map(rect => ({
+ // ...rect,
+ // width: rect.width * 0.5 ,
+ // id: rect.id * 10,
+ // }));
};
// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
onMounted(() => {
socket = initializeWebSocket(socketUrl, handleMessage);
});
+function getStatusTypea(taskRunning) {
+ switch (taskRunning) {
+ case 0:
+ return 'info';
+ case 1:
+ return 'success';
+ case 2:
+ return 'success';
+ case 3:
+ return 'success';
+ case 4:
+ return 'success';
+ case 5:
+ return 'danger';
+ case 6:
+ return 'info';
+ }
+}
+function getStatusTexta(taskRunning) {
+ switch (taskRunning) {
+ case 0:
+ return t('sorter.emptymissions');
+ case 1:
+ return t('sorter.advancetask');
+ case 2:
+ return t('sorter.outputtasks');
+ case 3:
+ return t('sorter.straighttasks');
+ case 4:
+ return t('searchOrder.infilm');
+ case 5:
+ return t('sorter.endingtask');
+ case 6:
+ return t('sorter.another');
+ }
+}
+function getStatusTypeb(taskState) {
+ switch (taskState) {
+ case 0:
+ return 'info';
+ case 1:
+ return 'success';
+ case 2:
+ return 'success';
+ case 3:
+ return 'success';
+ case 4:
+ return 'success';
+ case 5:
+ return 'danger';
+ case 6:
+ return 'info';
+ }
+}
+function getStatusTextb(taskState) {
+ switch (taskState) {
+ case 0:
+ return t('sorter.emptymissions');
+ case 1:
+ return t('sorter.advancetask');
+ case 2:
+ return t('sorter.outputtasks');
+ case 3:
+ return t('sorter.straighttasks');
+ case 4:
+ return t('searchOrder.infilm');
+ case 5:
+ return t('sorter.endingtask');
+ case 6:
+ return t('sorter.another');
+ }
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ 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}`;
+}
onUnmounted(() => {
if (socket) {
closeWebSocket(socket);
@@ -93,41 +131,84 @@
<div style="height: 500px;">
<el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
- <el-table height="340" ref="table"
+ <el-table height="300" ref="table"
@selection-change="handleSelectionChange"
- :data="tableData" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ :data="tableDataa" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="id" align="center" :label="$t('sorter.id')" min-width="80" />
+ <el-table-column prop="deviceId" align="center" :label="$t('searchOrder.tid')" min-width="80" />
<el-table-column prop="slot" align="center" :label="$t('sorter.gridnumber')" min-width="80" />
- <el-table-column prop="glass_id" align="center" :label="$t('sorter.glassnumber')" min-width="80" />
- <el-table-column prop="width" align="center" :label="$t('sorter.width')" min-width="120" />
- <el-table-column prop="height" align="center" :label="$t('sorter.height')" min-width="120" />
<el-table-column
align="center"
:label="$t('sorter.startstatus')"
min-width="80"
- prop="enable_state"
+ prop="enableState"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.enableState === 1 ? 'success' : 'warning'"
+ >
+ {{ scope.row.enableState === 1 ? $t('sorter.start') : $t('sorter.disable') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remainWidth" align="center" :label="$t('sorter.remainWidth')" min-width="80" />
+ </el-table>
+ </div>
+ <div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;margin-top: 15px;">
+ <el-table height="90" ref="table"
+ @selection-change="handleSelectionChange"
+ :data="tableDatab" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassIdOut" align="center" :label="$t('searchOrder.outputglassID')" min-width="80" />
+ <el-table-column prop="currentCell" align="center" :label="$t('sorter.layernow')" min-width="80" />
+ <el-table-column prop="startCell" align="center" :label="$t('processCard.layer')" min-width="120" />
+ <el-table-column
+ align="center"
+ :label="$t('sorter.place')"
+ min-width="80"
+ prop="inPlace"
+ >
+ <template #default="scope">
+ <el-tag
+ :type="scope.row.inPlace === 1 ? 'success' : 'warning'"
+ >
+ {{ scope.row.inPlace === 1 ? $t('sorter.inPlace') : $t('sorter.ninPlace') }}
+ </el-tag>
+ </template>
+ </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('sorter.taskRunning')"
+ min-width="80"
+ prop="taskRunning"
>
<template #default="scope">
- <el-tag
- :type="scope.row.enable_state === 1 ? 'success' : 'danger'"
- @click="toggleEnableState(scope.row)"
- >
- {{ scope.row.enable_state === 1 ? $t('sorter.start') : $t('sorter.disable') }}
- </el-tag>
- </template>
+ <el-tag :type="getStatusTypea(scope.row.taskRunning)">
+ {{ getStatusTexta(scope.row.taskRunning) }}
+ </el-tag>
+ </template>
</el-table-column>
- <el-table-column fixed="right" :label="$t('sorter.operate')" align="center" width="200">
- <template #default="scope">
- <el-button size="mini" type="text" plain @click="open(scope.row)">{{ $t('sorter.deficiencieste') }}</el-button>
- </template>
- </el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('film.taskstatus')"
+ min-width="80"
+ prop="taskState"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.taskState)">
+ {{ getStatusTextb(scope.row.taskState) }}
+ </el-tag>
+ </template>
+ </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>
</div>
</el-card>
<div class="awatch">
- <img src="../../assets/woshihuancun.png" alt="" style="width: 70%;height: 90%;margin-left: 200px;margin-top: 20px;position: relative;">
+ <img src="../../assets/woshihuancun.png" alt="" style="width: 50%;height: 70%;margin-left: 30%;margin-top: 20px;position: relative;">
<div style="position: relative; width: 500px;height: 95px;margin-top: -165px;margin-left: 450px;">
<div
- v-for="(rect, index) in adjustedRects"
+ v-for="(rect, index) in adjustedRects"
:key="rect"
:style="{ position: 'absolute',
top: `${rect.id}px`, left: `10px`, width: `${rect.width}px`, height: `5px`,
--
Gitblit v1.8.0