From afe62150047b3d808ea02ca127f74bfe3828ec2f Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 11 二月 2025 16:43:27 +0800
Subject: [PATCH] 新增大屏显示模块、路由配置，页面图片及表格样式
---
UI-Project/src/views/Caching/cachingun.vue | 68 ++++++++++++++++++++++++++-------
1 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 62100c6..8b0cd7e 100644
--- a/UI-Project/src/views/Caching/cachingun.vue
+++ b/UI-Project/src/views/Caching/cachingun.vue
@@ -68,10 +68,9 @@
startTime: timeRange.value[0] || '',
endTime: 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}`;
@@ -145,6 +144,31 @@
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);
+ }
+};
// 鍒犻櫎
const handledelete = async(row) => {
try {
@@ -189,7 +213,7 @@
const optionsa = [
{
value: 0,
- label: t('searchOrder.empty'),
+ label: t('hellow.starttask'),
},
{
value: 1,
@@ -241,7 +265,7 @@
function getStatusTextb(taskState) {
switch (taskState) {
case 0:
- return t('searchOrder.empty');
+ return t('hellow.starttask');
case 1:
return t('searchOrder.endtask');
}
@@ -255,8 +279,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) {
@@ -272,12 +295,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"
>
@@ -300,14 +332,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>
@@ -318,6 +350,7 @@
</template>
</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"
@@ -353,6 +386,11 @@
</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