From e875c70fea51ffafd689fd0d5f8b51bd3df40de0 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 07 一月 2025 15:26:13 +0800
Subject: [PATCH] 中空模块新增空闲状态，中空配方新增字段，掰片模块调整文字样式
---
UI-Project/src/views/Caching/cachingun.vue | 167 ++++++++++++++++++++++---------------------------------
1 files changed, 67 insertions(+), 100 deletions(-)
diff --git a/UI-Project/src/views/Caching/cachingun.vue b/UI-Project/src/views/Caching/cachingun.vue
index 5385f53..5cbcf1b 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,
@@ -210,40 +234,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 +260,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');
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -336,7 +324,7 @@
<template #default="props">
<el-table
:header-cell-style="{ background: '#F2F3F5', color: '#1D2129' }"
- :data="props.row.details" style="width: 100%;height: 200px;">
+ :data="props.row.details" style="width: 100%;height: 100px;">
<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" />
@@ -359,35 +347,10 @@
<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 +363,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 +438,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 +454,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