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 | 257 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 175 insertions(+), 82 deletions(-)
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 31ee432..69a3227 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"
@@ -21,34 +22,42 @@
<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="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">
- <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>
<el-table-column
align="center"
:label="$t('film.enabletype')"
- min-width="80"
+ min-width="50"
prop="taskType"
>
<template #default="scope">
- <el-tag :type="getStatusTypea(scope.row.taskType)">
- {{ getStatusTexta(scope.row.taskType) }}
+ <el-tag :type="getStatusType1(scope.row.taskType)">
+ {{ getStatusText1(scope.row.taskType) }}
</el-tag>
</template>
</el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('reportmanage.starttime')" min-width="100" />
- <el-table-column prop="updateTime" 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 :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>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -99,48 +108,124 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
+const successfull = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.psuccessfullyprocessed'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/glassStorage/rawGlassStorageTask/taskSuccess?taskId="+ row.id;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
+// 浠诲姟澶辫触澶勭悊
+const handleptask = async(row) => {
+ try {
+ const confirmResult = await ElMessageBox.confirm(
+ t('searchOrder.ptaskfailure'),
+ t('workOrder.prompt'),
+ {
+ confirmButtonText: t('workOrder.yes'),
+ cancelButtonText: t('workOrder.cancel'),
+ type: 'warning',
+ }
+ );
+ if (confirmResult === 'confirm') {
+ var url="/glassStorage/rawGlassStorageTask/taskError?taskId="+ row.id;
+ const response = await request.post(url)
+ if (response.code === 200) {
+ ElMessage.success(response.message);
+ } else {
+ ElMessage.error(response.msg);
+ }
+ }
+ } catch (error) {
+ }
+};
const handlePageChange2 = (newPage) => {
currentPage2.value = newPage;
- console.log(currentPage2.value);
window.localStorage.setItem('pagenumber', currentPage2.value)
historicala(currentPage2.value);
};
const historicala = async (page) => {
try {
- let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
+ let celllist=[]
+ let stateList=[]
+ let pstartSlot= ''
+ let ptargetSlot=''
+ if(selectValuesa[0]!=null&&selectValuesa[0]!='undefined'){
+ if(selectValuesa[0]!=""){
+ celllist=[selectValuesa[0]];
+ }
+ }
+ if(selectValuesa[1]!=null&&selectValuesa[1]!='undefined'){
+ if(selectValuesa[1]!=""){
+ stateList=[selectValuesa[1]];
+ }
+ }
+ if(startSlot.value != ""){
+ pstartSlot = startSlot.value
+ }else{
+ pstartSlot = '0'
+ }
+ if(targetSlot.value != ""){
+ ptargetSlot = targetSlot.value
+ }else{
+ ptargetSlot = '0'
+ }
+ let page = window.localStorage.getItem('pagenumber')
const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
pageNo: page,
pageSize: 20,
- taskState: [],
- taskType: [],
- beginDate: startTime,
- endDate: getglobalDate
+ taskState: celllist,
+ taskType: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
// 鍘嗗彶鏌ヨ鐐瑰嚮
@@ -161,8 +246,6 @@
stateList=[selectValuesa[1]];
}
}
- console.log(startSlot.value);
-
if(startSlot.value != ""){
pstartSlot = startSlot.value
}else{
@@ -175,22 +258,29 @@
}
let page = window.localStorage.getItem('pagenumber')
const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
taskState: celllist,
taskType: stateList,
- beginDate: startTime,
- endDate: getglobalDate
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
+ currentPage2.value = 1;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
}
catch (error) {
- console.error(error);
}
}
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
@@ -209,54 +299,57 @@
function parseAndSetTime() {
const backendTime = new Date(getglobalDate);
const oneWeekAgo = new Date(backendTime.getTime() - 7 * 24 * 60 * 60 * 1000); // 鍑忓幓7澶�
- console.log(formatTimestamp(oneWeekAgo));
- console.log(oneWeekAgo);
+ oneWeekAgo.setHours(0, 0, 0, 0);
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