From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Caching/cachingun.vue | 214 ++++++++++++++++++++++++-----------------------------
1 files changed, 96 insertions(+), 118 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index aa7ef4d..adf7426 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -2,6 +2,7 @@
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'
@@ -36,9 +37,12 @@
// id: rect.id * 10,
// }));
};
-// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
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')];
});
// 鍘嗗彶浠诲姟
const handlehistorical = (row) => {
@@ -65,13 +69,12 @@
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 || '',
+ taskState: taskState.value,
taskType: taskType.value || ''
};
-
// 鏋勫缓鏌ヨ瀛楃涓�
const queryString = new URLSearchParams(params).toString();
const url = `/cacheGlass/edgStorageDeviceTaskHistory?${queryString}`;
@@ -104,7 +107,7 @@
glassId: row.glassId,
state: 8,
line: 2,
- workingProcedure: '2',
+ workingProcedure: '鐞嗙墖绗�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -133,7 +136,7 @@
glassId: row.glassId,
state: 9,
line: 2,
- workingProcedure: '2',
+ workingProcedure: '鐞嗙墖绗�',
})
if (response.code === 200) {
ElMessage.success(response.message);
@@ -143,6 +146,31 @@
}
} catch (error) {
console.error('鍙戠敓閿欒:', error);
+ }
+};
+// 浠诲姟閲嶇疆
+const handleptask = async() => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.partasks'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/cacheGlass/edgStorageDeviceTask/resetTask?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);
}
};
// 鍒犻櫎
@@ -158,9 +186,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 {
@@ -189,7 +215,7 @@
const optionsa = [
{
value: 0,
- label: t('searchOrder.empty'),
+ label: t('hellow.starttask'),
},
{
value: 1,
@@ -210,40 +236,24 @@
label: t('sorter.straighttasks'),
}
]
-function getStatusTypea(taskRunning) {
- switch (taskRunning) {
- case 0:
- return 'info';
+function getStatusTypea(taskType) {
+ switch (taskType) {
case 1:
- return 'success';
+ return 'info';
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');
+function getStatusTexta(taskType) {
+ switch (taskType) {
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) {
@@ -252,34 +262,14 @@
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');
+ return t('hellow.starttask');
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');
+ return t('searchOrder.endtask');
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -291,8 +281,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) {
@@ -308,12 +297,21 @@
<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>
+ <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>
+ <div style="margin-left: 155px;">{{ $t('hellow.flowCardId') }}</div>
+ <div style="margin-left: 152px;">{{ $t('searchOrder.glassID') }}</div>
+ <div style="margin-left: 165px;">{{ $t('searchOrder.width') }}</div>
+ <div style="margin-left: 185px;">{{ $t('searchOrder.height') }}</div>
+ <div style="margin-left: 172px;">{{ $t('searchOrder.thickness') }}</div>
+ <div style="margin-left: 145px;">{{ $t('hellow.operate') }}</div>
+ </div>
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table
ref="table"
style="margin-top: 20px; height: 360px;"
:data="tableDataa"
- :row-class-name="rowClassName"
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
row-key="id"
>
@@ -336,14 +334,14 @@
<template #default="props">
<el-table
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
- :data="props.row.details" style="width: 100%;height: 200px;">
- <el-table-column prop="engineerId" align="center" :label="$t('searchOrder.projectnumber')" min-width="80" />
- <el-table-column prop="flowCardId" align="center" :label="$t('hellow.flowCardId')" min-width="80" />
- <el-table-column prop="glassId" align="center" :label="$t('searchOrder.glassID')" min-width="80" />
- <el-table-column prop="width" align="center" :label="$t('searchOrder.width')" min-width="80" />
- <el-table-column prop="height" align="center" :label="$t('searchOrder.height')" min-width="80" />
- <el-table-column prop="thickness" align="center" :label="$t('searchOrder.thickness')" min-width="80" />
- <el-table-column fixed="right" :label="$t('hellow.operate')" align="center" width="150">
+ :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" />
+ <el-table-column prop="width" align="center" min-width="80" />
+ <el-table-column prop="height" align="center" min-width="80" />
+ <el-table-column prop="thickness" align="center" min-width="80" />
+ <el-table-column fixed="right" align="center" width="150">
<template #default="scope">
<el-button size="mini" type="text" plain @click="handletake(scope.row)">{{ $t('searchOrder.breakage') }}</el-button>
<el-button size="mini" type="text" plain @click="handleBindRack(scope.row)">{{ $t('searchOrder.takeout')}} </el-button>
@@ -355,39 +353,15 @@
</el-table-column>
</el-table>
</div>
+ </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="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
+ <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="getStatusTypea(scope.row.taskRunning)">
- {{ getStatusTexta(scope.row.taskRunning) }}
- </el-tag>
- </template>
- </el-table-column>
<el-table-column
align="center"
:label="$t('film.taskstatus')"
@@ -400,8 +374,25 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('film.enabletype')"
+ min-width="80"
+ prop="taskType"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.taskType)">
+ {{ getStatusTexta(scope.row.taskType) }}
+ </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-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>
@@ -458,35 +449,10 @@
}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
+ <el-table-column prop="glassIdIn" align="center" :label="$t('searchOrder.intoglassid')" min-width="80" />
<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="getStatusTypea(scope.row.taskRunning)">
- {{ getStatusTexta(scope.row.taskRunning) }}
- </el-tag>
- </template>
- </el-table-column>
<el-table-column
align="center"
:label="$t('film.taskstatus')"
@@ -499,6 +465,18 @@
</el-tag>
</template>
</el-table-column>
+ <el-table-column
+ align="center"
+ :label="$t('film.enabletype')"
+ min-width="80"
+ prop="taskType"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypea(scope.row.taskType)">
+ {{ getStatusTexta(scope.row.taskType) }}
+ </el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="createTime" align="center" :label="$t('film.createtime')" min-width="120" />
<el-table-column prop="updateTime" align="center" :label="$t('sorter.updateTime')" min-width="120" />
</el-table>
--
Gitblit v1.8.0