From 09d9824fbcdb76501e5eb37ee79a073d8fdd9eda Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:12:02 +0800
Subject: [PATCH] 推送当天时间改为接口调用
---
UI-Project/src/views/GlassStorage/rawhistory.vue | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index d2eedb8..69a3227 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -22,14 +22,14 @@
<el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{$t('reportmanage.inquire')}}</el-button>
</div>
<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 prop="startSlot" align="center" :label="$t('film.originateslot')" min-width="50" />
+ <el-table-column prop="endSlot" align="center" :label="$t('film.endoriginateslot')" min-width="50" />
+ <el-table-column prop="shelf" align="center" :label="$t('film.resetnumber')" min-width="50" />
+ <el-table-column prop="patternQuantity" align="center" :label="$t('film.thickremainquant')" min-width="50" />
<el-table-column
align="center"
:label="$t('film.taskstatus')"
- min-width="80"
+ min-width="50"
prop="taskState"
>
<template #default="scope">
@@ -41,7 +41,7 @@
<el-table-column
align="center"
:label="$t('film.enabletype')"
- min-width="80"
+ min-width="50"
prop="taskType"
>
<template #default="scope">
@@ -50,12 +50,12 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
- <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.starttime')" min-width="50" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="50" />
<el-table-column fixed="right" :label="$t('film.operate')" align="center">
<template #default="scope">
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
- <el-button size="mini" :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="successfull(scope.row)">{{ $t('searchOrder.successfullyprocessed') }}</el-button>
+ <el-button :disabled="(scope.row.taskState !== 0)" type="text" plain @click="handleptask(scope.row)">{{ $t('searchOrder.taskfailure') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -121,7 +121,6 @@
}
}
catch (error) {
- console.error(error);
}
}
const successfull = async(row) => {
@@ -144,8 +143,7 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
// 浠诲姟澶辫触澶勭悊
@@ -169,13 +167,11 @@
ElMessage.error(response.msg);
}
}
- } catch (error) {
- console.error('鍙戠敓閿欒:', error);
+ } catch (error) {
}
};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
@@ -196,8 +192,6 @@
stateList=[selectValuesa[1]];
}
}
- console.log(startSlot.value);
-
if(startSlot.value != ""){
pstartSlot = startSlot.value
}else{
@@ -232,7 +226,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -288,7 +281,6 @@
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -308,8 +300,6 @@
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
oneWeekAgo.setHours(0, 0, 0, 0);
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
}
--
Gitblit v1.8.0