From bbbe207791b13ad5781ec6fcffff23ec5d9f999e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 13 三月 2025 14:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/GlassStorage/rawhistory.vue | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 60 insertions(+), 53 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 31ee432..0a71dcf 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -3,16 +3,17 @@
<div style="display: flex;width: 1770px;">
<el-select v-model="selectValuesa[0]" filterable :placeholder="$t('searchOrder.taskstatus')" clearable
style="width: 200px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.begin')" value="1"></el-option>
- <el-option :label="$t('searchOrder.finish')" value="2"></el-option>
- <el-option :label="$t('order.dilapidation')" value="3"></el-option>
- <el-option :label="$t('searchOrder.uncar')" value="4"></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]" filterable :placeholder="$t('film.enabletype')" clearable
style="width: 200px;margin-left: 10px;">
- <el-option :label="$t('searchOrder.inkage')" value="1"></el-option>
- <el-option :label="$t('searchOrder.outfilm')" value="2"></el-option>
- <el-option :label="$t('film.dispatch')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancetask')" value="1"></el-option>
+ <el-option :label="$t('sorter.outputtasks')" value="2"></el-option>
+ <el-option :label="$t('sorter.schedulingtasks')" value="3"></el-option>
+ <el-option :label="$t('sorter.advancerequests')" value="4"></el-option>
+ <el-option :label="$t('sorter.releaserequest')" value="5"></el-option>
</el-select>
<el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�" :start-placeholder="$t('reportmanage.starttime')"
style="margin-left: 15px;" value-format = "YYYY-MM-DD hh:mm:ss"
@@ -23,6 +24,8 @@
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
<el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="80" />
<el-table-column prop="endSlot" align="center" :label="$t('film.endslot')" min-width="80" />
+ <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="80" />
+ <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="80" />
<el-table-column
align="center"
:label="$t('film.taskstatus')"
@@ -30,8 +33,8 @@
prop="taskState"
>
<template #default="scope">
- <el-tag :type="getStatusTypeb(scope.row.taskState)">
- {{ getStatusTextb(scope.row.taskState) }}
+ <el-tag :type="getStatusType2(scope.row.taskState)">
+ {{ getStatusText2(scope.row.taskState) }}
</el-tag>
</template>
</el-table-column>
@@ -42,8 +45,8 @@
prop="taskType"
>
<template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
+ <el-tag :type="getStatusText1(scope.row.taskType)">
+ {{ getStatusType1(scope.row.taskType) }}
</el-tag>
</template>
</el-table-column>
@@ -214,49 +217,53 @@
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
-function getStatusTypeb(state: number) {
- switch (state) {
- case 0:
- return 'primary';
- case 2:
- return 'success';
- case 3:
- return 'danger';
- case 4:
- return 'warning';
- }
-}
-function getStatusTextb(state: number) {
- switch (state) {
- case 0:
- return t('searchOrder.begin');
- case 2:
- return t('searchOrder.finish');
- case 3:
- return t('order.dilapidation');
- case 4:
- return t('searchOrder.uncar');
- }
-}
-function getStatusTypea(ishorizontal: number) {
- switch (ishorizontal) {
- case 1:
- return 'primary';
- case 2:
- return 'success';
- case 3:
- return 'warning';
- }
+function getStatusType1(taskType) {
+switch (taskType) {
+ case 1:
+ return 'info';
+ case 2:
+ return 'warning';
+ case 3:
+ return 'success';
+ case 4:
+ return 'danger';
+ case 5:
+ return 'primary';
}
-function getStatusTexta(ishorizontal: number) {
- switch (ishorizontal) {
- case 1:
- return t('searchOrder.inkage');
- case 2:
- return t('searchOrder.outfilm');
- case 3:
- return t('film.dispatch');
- }
+}
+function getStatusText1(taskType) {
+switch (taskType) {
+ case 1:
+ return t('sorter.advancetask');//杩涚墖浠诲姟
+ case 2:
+ return t('sorter.outputtasks');//鍑虹墖浠诲姟
+ case 3:
+ return t('sorter.schedulingtasks');//璋冨害浠诲姟
+ case 4:
+ return t('sorter.advancerequests');//杩涚墖璇锋眰
+ case 5:
+ return t('sorter.releaserequest');//鍑虹墖璇锋眰
+}
+}
+function getStatusType2(taskState) {
+switch (taskState) {
+ case 0:
+ return 'info';
+ case 2:
+ return 'warning';
+ case 1:
+ return 'success';
+}
+}
+function getStatusText2(taskState) {
+switch (taskState) {
+ case 0:
+ return t('film.built');//鏂板缓
+ case 2:
+ return t('film.fail');//澶辫触
+ case 1:
+ return t('film.finish');//瀹屾垚
+}
}
onMounted(() => {
parseAndSetTime();
--
Gitblit v1.8.0