From b794af068ade99e0499dca57bd083aedd6cebd79 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 13 三月 2025 14:51:14 +0800
Subject: [PATCH] 各模块历史任务更新
---
UI-Project/src/views/Returns/upreturns.vue | 5
UI-Project/src/views/GlassStorage/rawhistory.vue | 116 ++++--
UI-Project/src/views/Caching/cachingbeforehistory.vue | 18
UI-Project/src/views/GlassStorage/rawfilmstorage.vue | 115 +-----
UI-Project/src/views/Returns/upreturns2.vue | 20 +
UI-Project/src/views/hollow/hellowslicecagehistory.vue | 117 +++++-
UI-Project/src/router/index.js | 12
UI-Project/src/views/Returns/upreturnhistory.vue | 39 +
UI-Project/src/views/Returns/upreturnhistory2.vue | 290 ++++++++++++++++++
UI-Project/src/views/Caching/cachingunhistory.vue | 21
UI-Project/src/views/Slicecage/slicecagehistory.vue | 140 ++++++--
UI-Project/src/views/StockBasicData/stockhistory.vue | 19
12 files changed, 660 insertions(+), 252 deletions(-)
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 3e4acc2..ad83b19 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -410,6 +410,18 @@
},
]
},
+ {
+ path: '/upreturnhistory2',
+ name: 'upreturnhistory2',
+ component: () => import('../views/Returns/upreturnhistory2.vue'),
+ children: [
+ {
+ path: '/Returns/upreturnhistory2',
+ name: 'upreturnhistory2',
+ component: () => import('../views/Returns/upreturnhistory2.vue')
+ },
+ ]
+ },
]
})
// 瀵艰埅瀹堝崼
diff --git a/UI-Project/src/views/Caching/cachingbeforehistory.vue b/UI-Project/src/views/Caching/cachingbeforehistory.vue
index 9a97bec..8fe05a9 100644
--- a/UI-Project/src/views/Caching/cachingbeforehistory.vue
+++ b/UI-Project/src/views/Caching/cachingbeforehistory.vue
@@ -99,7 +99,7 @@
const taskState = ref('');
const taskType = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
-const historical = async (page) => {
+const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
@@ -115,7 +115,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -140,16 +139,14 @@
pageNo: page,
pageSize: 20,
glassId: glassId.value,
- taskState: '',
- taskType: '',
- startTime: startTime,
- endTime: getglobalDate
+ taskState: taskState.value,
+ taskType: taskType.value,
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -167,7 +164,7 @@
console.log(page);
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
deviceId: 1,
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
glassId: glassId.value,
taskState: taskState.value,
@@ -178,6 +175,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -269,7 +267,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
diff --git a/UI-Project/src/views/Caching/cachingunhistory.vue b/UI-Project/src/views/Caching/cachingunhistory.vue
index 7374591..7231a9b 100644
--- a/UI-Project/src/views/Caching/cachingunhistory.vue
+++ b/UI-Project/src/views/Caching/cachingunhistory.vue
@@ -99,7 +99,7 @@
const taskState = ref('');
const taskType = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
-const historical = async (page) => {
+const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
@@ -140,16 +140,14 @@
pageNo: page,
pageSize: 20,
glassId: glassId.value,
- taskState: '',
- taskType: '',
- startTime: startTime,
- endTime: getglobalDate
+ taskState: taskState.value,
+ taskType: taskType.value,
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -167,17 +165,18 @@
console.log(page);
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
deviceId: 2,
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
glassId: glassId.value,
taskState: taskState.value,
taskType: taskType.value,
- startTime: (timeRange.value && timeRange.value[0]) || '',
- endTime: (timeRange.value && timeRange.value[1]) || '',
+ startTime: (timeRange.value && timeRange.value[0]) || '',
+ endTime: (timeRange.value && timeRange.value[1]) || '',
})
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -269,7 +268,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
diff --git a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
index 04ed981..4e5b56b 100644
--- a/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
+++ b/UI-Project/src/views/GlassStorage/rawfilmstorage.vue
@@ -247,34 +247,6 @@
ElMessage.error(response.message);
}
};
-// 鍘嗗彶浠诲姟鏌ヨ
-const sethistorical = async () => {
- let celllista=[]
- let stateLista=[]
- if(selectValuesb[0]!=null&&selectValuesb[0]!='undefined'){
- if(selectValuesb[0]!=""){
- celllista=[selectValuesb[0]];
- }
- }
- if(selectValuesb[1]!=null&&selectValuesb[1]!='undefined'){
- if(selectValuesb[1]!=""){
- stateLista=[selectValuesb[1]];
- }
- }
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
- beginDate: (timeRangea.value && timeRangea.value[0]) || '',
- endDate: (timeRangea.value && timeRangea.value[1]) || '',
- taskState: celllista,
- taskType: stateLista
- })
- if (response.code === 200) {
- tableDatad.value = response.data;
- ElMessage.success(response.message);
- }
- else {
- ElMessage.error(response.message);
- }
-};
// 鏄惁绂佺敤
const toggleEnableState = async (row: any) => {
if (!row.deviceId) {
@@ -341,9 +313,31 @@
// 鍘嗗彶浠诲姟
const iframeUrl = ref('');
const handlehistorical = (row) => {
+ // historical()
+ // window.localStorage.setItem('pagenumber', 1)
blindb.value = true;
iframeUrl.value = `${window.location.origin}/#/GlassStorage/rawhistory`;
};
+// const historical = async () => {
+// try {
+// let startTime = window.localStorage.getItem('startTime')
+// const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
+// pageNo: 1,
+// pageSize: 20,
+// taskState: [],
+// taskType: [],
+// beginDate: startTime,
+// endDate: globalDate
+// })
+// if (response.code == 200) {
+// window.localStorage.setItem('pagenumber', 1)
+// } else {
+// }
+// }
+// catch (error) {
+// console.error(error);
+// }
+// }
// 浠诲姟鎴愬姛澶勭悊
const successfull = async(row) => {
try {
@@ -570,71 +564,6 @@
frameborder="0"
></iframe>
</el-dialog>
-<!-- <el-dialog v-model="blindb" top="10vh" width="90%">
- <div style="display: flex;">
- <el-date-picker style="margin-left: 10px;" v-model="timeRangea" type="datetimerange"
- format="YYYY/MM/DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
- :start-placeholder="$t('film.starttime')"
- :end-placeholder="$t('film.endtime')"
- :default-time="defaultTime" />
- <el-select v-model="selectValuesb[0]" clearable :placeholder="$t('film.taskstatus')" style="margin-left: 10px;" >
- <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="selectValuesb[1]" clearable :placeholder="$t('film.tasktype')" style="margin-left: 10px;" >
- <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-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: 650px;" :data="tableDatad" :header-cell-style="{background:'#F2F3F5 ',color:'#1D2129'}">
- <el-table-column prop="id" align="center" :label="$t('film.enableid')"/>
- <el-table-column prop="startSlot" align="center" :label="$t('film.originateslot')"/>
- <el-table-column prop="endSlot" align="center" :label="$t('film.endslot')"/>
- <el-table-column prop="patternQuantity" align="center" :label="$t('film.patternquantity')"/>
- <el-table-column
- align="center"
- :label="$t('film.enabletype')"
- prop="taskType"
- >
- <template #default="scope">
- <el-tag :type="getStatusType1(scope.row.taskType)">
- {{ getStatusText1(scope.row.taskType) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column
- align="center"
- :label="$t('film.taskstatus')"
- prop="taskState"
- >
- <template #default="scope">
- <el-tag :type="getStatusType2(scope.row.taskState)">
- {{ getStatusText2(scope.row.taskState) }}
- </el-tag>
- </template>
- </el-table-column>
- <el-table-column prop="createTime" align="center" :label="$t('film.createtime')" />
- <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>
- </template>
- </el-table-column>
- </el-table>
- <template #footer>
- <div id="dialog-footer">
- <el-button @click="blindb = false">{{ $t('large.close') }}</el-button>
- </div>
- </template>
- </el-dialog> -->
<el-dialog v-model="dialogFormVisibleb" top="23vh" width="55%" :title="$t('film.addglass')" >
<div style="margin-left: -50px;margin-top: 10px;margin-bottom: 10px;">
<el-form size="mini" label-width="150px">
diff --git a/UI-Project/src/views/GlassStorage/rawhistory.vue b/UI-Project/src/views/GlassStorage/rawhistory.vue
index 0a71dcf..c6ee98e 100644
--- a/UI-Project/src/views/GlassStorage/rawhistory.vue
+++ b/UI-Project/src/views/GlassStorage/rawhistory.vue
@@ -45,13 +45,13 @@
prop="taskType"
>
<template #default="scope">
- <el-tag :type="getStatusText1(scope.row.taskType)">
- {{ getStatusType1(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="100" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -102,9 +102,13 @@
})
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);
@@ -121,33 +125,6 @@
historicala(currentPage2.value);
};
const historicala = async (page) => {
- try {
- let page = window.localStorage.getItem('pagenumber')
- let startTime = window.localStorage.getItem('startTime')
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
- pageNo: page,
- pageSize: 20,
- taskState: [],
- taskType: [],
- beginDate: startTime,
- endDate: getglobalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
- totalRecords.value = response.data.total/2 || 0
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-// 鍘嗗彶鏌ヨ鐐瑰嚮
-const sethistorical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
let celllist=[]
@@ -177,17 +154,80 @@
ptargetSlot = '0'
}
let page = window.localStorage.getItem('pagenumber')
- const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
+ const response = await request.post("/glassStorage/rawGlassStorageTask/queryRawGlassHistoryTask", {
pageNo: page,
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;
+ 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 sethistorical = async () => {
+ try {
+ 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: 1,
+ pageSize: 20,
+ taskState: celllist,
+ taskType: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ 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);
}
diff --git a/UI-Project/src/views/Returns/upreturnhistory.vue b/UI-Project/src/views/Returns/upreturnhistory.vue
index e76fe37..4641812 100644
--- a/UI-Project/src/views/Returns/upreturnhistory.vue
+++ b/UI-Project/src/views/Returns/upreturnhistory.vue
@@ -56,8 +56,8 @@
</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="100" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -96,8 +96,8 @@
const rawGlassWidth = ref('');
const rawGlassfilmsId = ref('');
const slot = ref('');
-let getglobalDate = window.localStorage.getItem('globalDate')
-const historical = async (page) => {
+let getglobalDate = window.localStorage.getItem('getglobalDate')
+const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
@@ -115,7 +115,13 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
@@ -151,9 +157,13 @@
})
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);
@@ -170,7 +180,7 @@
let page = window.localStorage.getItem('pagenumber')
console.log(page);
const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
rawGlassHeight: rawGlassHeight.value,
rawGlassThickness: rawGlassThickness.value,
@@ -184,7 +194,14 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
+ 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);
}
@@ -266,7 +283,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
diff --git a/UI-Project/src/views/Returns/upreturnhistory2.vue b/UI-Project/src/views/Returns/upreturnhistory2.vue
new file mode 100644
index 0000000..ae762e4
--- /dev/null
+++ b/UI-Project/src/views/Returns/upreturnhistory2.vue
@@ -0,0 +1,290 @@
+<template>
+ <div>
+ <div style="display: flex;width: 1770px;">
+ <el-input v-model="rawGlassWidth" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.width')" />
+ <el-input v-model="rawGlassHeight" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.height')" />
+ <el-input v-model="rawGlassThickness" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('Mounting.thickness')" />
+ <el-input v-model="rawGlassfilmsId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.coatingtypesbe')" />
+ <el-input v-model="slot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('workOrder.upnumber')" />
+ <el-select
+ :placeholder="$t('searchOrder.taskstatus')"
+ clearable
+ style="width: 270px;margin-left: 10px;"
+ v-model="taskStateList">
+ <el-option
+ v-for="item in optionsa"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </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"
+ :end-placeholder="$t('reportmanage.endtime')">
+ </el-date-picker>
+ <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="rawGlassWidth" align="center" :label="$t('Mounting.width')" min-width="80" />
+ <el-table-column prop="rawGlassHeight" align="center" :label="$t('Mounting.height')" min-width="80" />
+ <el-table-column prop="rawGlassThickness" align="center" :label="$t('Mounting.thickness')" min-width="80" />
+ <el-table-column prop="slot" align="center" :label="$t('workOrder.upnumber')" min-width="80" />
+ <el-table-column prop="totalCount" align="center" :label="$t('basicData.tonumber')" min-width="80" />
+ <el-table-column prop="finishCount" align="center" :label="$t('basicData.finishnumber')" min-width="80" />
+ <el-table-column prop="damageCount" align="center" :label="$t('hellow.damagenumber')" min-width="80" />
+ <el-table-column
+ align="center"
+ :label="$t('film.taskstatus')"
+ min-width="80"
+ prop="taskState"
+ >
+ <template #default="scope">
+ <el-tag :type="getStatusTypeb(scope.row.taskState)">
+ {{ getStatusTextb(scope.row.taskState) }}
+ </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 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>
+ <div style="margin-top: 20px;margin-left: 40%;">
+ <el-pagination
+ v-model:current-page="currentPage2"
+ :page-size="pageSize"
+ :size="large"
+ :disabled="disabled"
+ layout="prev, pager, next, jumper"
+ :total="totalRecords"
+ @current-change="handlePageChange2"
+ style="margin-top: 10px;"
+ />
+ </div>
+ </div>
+ </template>
+<script lang="ts" setup>
+import {useI18n} from 'vue-i18n'
+import {useRouter} from "vue-router"
+import request from "@/utils/request"
+import {host, WebSocketHost} from '@/utils/constants'
+import {onBeforeUnmount, onMounted, onUnmounted, reactive, ref} from "vue";
+import {closeWebSocket, initializeWebSocket} from '@/utils/WebSocketService';
+import {ElMessage, ElMessageBox} from 'element-plus'
+const {t} = useI18n()
+let language = ref(localStorage.getItem('lang') || 'zh')
+import { inject } from 'vue';
+const globalDate = inject('globalDate');
+const router = useRouter()
+const timeRange = ref([])
+const taskStateList = reactive([]);
+const tableDatax = ref([])
+const currentPage2 = ref(1)
+const totalRecords = ref(0)
+const rawGlassHeight = ref('');
+const rawGlassThickness = ref('');
+const rawGlassWidth = ref('');
+const rawGlassfilmsId = ref('');
+const slot = ref('');
+let getglobalDate = window.localStorage.getItem('getglobalDate')
+const historical = async () => {
+ try {
+ let startTime = window.localStorage.getItem('startTime')
+ const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
+ pageNo: 1,
+ pageSize: 20,
+ rawGlassHeight: '',
+ rawGlassThickness: '',
+ rawGlassWidth: '',
+ rawGlassfilmsId: '',
+ slot: '',
+ station: 2,
+ taskStateList: '',
+ beginDate: startTime,
+ endDate: getglobalDate
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ console.log(response.data.pages);
+ totalRecords.value = response.data.total/2 || 0
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(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')
+ const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
+ pageNo: page,
+ pageSize: 20,
+ rawGlassHeight: '',
+ rawGlassThickness: '',
+ rawGlassWidth: '',
+ rawGlassfilmsId: '',
+ slot: '',
+ station: 2,
+ taskStateList: '',
+ beginDate: startTime,
+ endDate: getglobalDate
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ 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 sethistorical = async () => {
+ try {
+ let startTime = window.localStorage.getItem('startTime')
+ let page = window.localStorage.getItem('pagenumber')
+ console.log(page);
+ const response = await request.post("/loadGlass/loadglassdevicetaskhistory/queryLoadGlassHistoryTask", {
+ pageNo: 1,
+ pageSize: 20,
+ rawGlassHeight: rawGlassHeight.value,
+ rawGlassThickness: rawGlassThickness.value,
+ rawGlassWidth: rawGlassWidth.value,
+ rawGlassfilmsId: rawGlassfilmsId.value,
+ slot: slot.value,
+ station: 2,
+ taskStateList: '',
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ 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);
+ }
+}
+// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
+function formatTimestamp(timestamp) {
+ const date = new Date(timestamp);
+ const year = date.getFullYear();
+ const month = String(date.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝闇�瑕佸姞1锛屽苟琛ラ浂
+ const day = String(date.getDate()).padStart(2, '0'); // 琛ラ浂
+ const hours = String(date.getHours()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const minutes = String(date.getMinutes()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ const seconds = String(date.getSeconds()).padStart(2, '0'); // 琛ラ浂锛堝鏋滈渶瑕佹樉绀烘椂闂达級
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+}
+// 鏍煎紡鍖栧悗绔椂闂村苟璁＄畻涓�鍛ㄥ墠鐨勬椂闂�
+const defaultTime = ref<[Date, Date]>([new Date(), new Date()]);
+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);
+ timeRange.value = [formatTimestamp(oneWeekAgo), formatTimestamp(backendTime)];
+ window.localStorage.setItem('startTime', formatTimestamp(oneWeekAgo))
+}
+function getStatusTypeb(taskState: number) {
+ switch (taskState) {
+ case 0:
+ return 'primary';
+ case 1:
+ return 'success';
+ case 2:
+ return 'success';
+ }
+}
+function getStatusTextb(taskState: number) {
+ switch (taskState) {
+ case 0:
+ return t('searchOrder.empty');
+ case 1:
+ return t('film.execution');
+ case 2:
+ return t('searchOrder.endtask');
+ }
+}
+function getStatusTypea(taskRunning: number) {
+ switch (taskRunning) {
+ case 0:
+ return 'primary';
+ case 1:
+ return 'success';
+ }
+}
+function getStatusTexta(taskRunning: number) {
+ switch (taskRunning) {
+ case 0:
+ return t('basicData.untask');
+ case 1:
+ return t('basicData.up');
+ }
+}
+const optionsa = [
+ {
+ value: 0,
+ label: t('searchOrder.empty'),
+ },
+ {
+ value: 1,
+ label: t('film.execution'),
+ },
+ {
+ value: 2,
+ label: t('searchOrder.endtask'),
+ }
+]
+onMounted(() => {
+ parseAndSetTime();
+ historical();
+});
+ </script>
+ <style scoped>
+ </style>
\ No newline at end of file
diff --git a/UI-Project/src/views/Returns/upreturns.vue b/UI-Project/src/views/Returns/upreturns.vue
index 32b51cc..87b14cc 100644
--- a/UI-Project/src/views/Returns/upreturns.vue
+++ b/UI-Project/src/views/Returns/upreturns.vue
@@ -119,10 +119,6 @@
// });
// }
-
-
-
-
if(data.loadTask1!=null){
tableData.value = data.loadTask1[0]
window.localStorage.setItem('engineeringIda', tableData.value[0].engineeringId)
@@ -192,7 +188,6 @@
console.error(error);
}
}
-
// 寮�濮嬩笂鐗�
const handleon = async () => {
let filmRemove = window.localStorage.getItem('filmRemove')
diff --git a/UI-Project/src/views/Returns/upreturns2.vue b/UI-Project/src/views/Returns/upreturns2.vue
index 441f232..ba13560 100644
--- a/UI-Project/src/views/Returns/upreturns2.vue
+++ b/UI-Project/src/views/Returns/upreturns2.vue
@@ -17,7 +17,7 @@
const blinda = ref(false)
const ReportData = ref(true);
const blindb = ref(false)
-const dialoglea = ref(false)
+const blindbd = ref(false)
const canSelectProjecta = ref(true);
const canSelectProjectb = ref(true);
const canSelectProjectc = ref(false);
@@ -379,6 +379,12 @@
console.error('鍙戠敓閿欒:', error);
}
};
+// 鍘嗗彶浠诲姟
+const iframeUrl = ref('');
+const handlehistorical = (row) => {
+ blindbd.value = true;
+ iframeUrl.value = `${window.location.origin}/#/Returns/upreturnhistory`;
+};
function getStatusType2(filmRemove) {
switch (filmRemove) {
case 0:
@@ -423,6 +429,7 @@
<el-button :disabled="!canSelectProjectb" style="margin-top: 5px;margin-left: 20px;" type="success" @click="handleBind">{{ $t('basicData.startloading') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="warning" @click="handleBinda">{{ $t('basicData.stop') }}</el-button>
<el-button :disabled="!canSelectProjectc" style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="danger" @click="deleteTask">{{ $t('searchOrder.deleteTask') }}</el-button>
+ <el-button style="margin-top: 5px;margin-left: 20px;" id="searchButton" type="info" @click="handlehistorical">{{ $t('searchOrder.historicaltasks') }}</el-button>
<el-select disabled v-model="selectValuesa[1]" clearable :placeholder="$t('Mounting.oneloadingline')"
style="margin-top: 5px;margin-left: 20px;">
<el-option :label="$t('Mounting.all')" value="0"></el-option>
@@ -488,6 +495,17 @@
</div>
</div>
</div>
+ <!-- 鍘嗗彶浠诲姟 -->
+ <el-dialog v-model="blindbd" top="10vh" width="90%">
+ <iframe
+ :src="iframeUrl"
+ marginwidth="2000px"
+ marginheight="2000px"
+ width="100%"
+ height="700px"
+ frameborder="0"
+ ></iframe>
+ </el-dialog>
<el-dialog v-model="blind" top="30vh" width="25%" :title="$t('basicData.startfilm')">
<template #footer>
<div id="dialog-footer">
diff --git a/UI-Project/src/views/Slicecage/slicecagehistory.vue b/UI-Project/src/views/Slicecage/slicecagehistory.vue
index 4b5e906..0d060e3 100644
--- a/UI-Project/src/views/Slicecage/slicecagehistory.vue
+++ b/UI-Project/src/views/Slicecage/slicecagehistory.vue
@@ -2,8 +2,8 @@
<div>
<div style="display: flex;width: 1770px;">
<el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('searchOrder.inglassID')" />
- <el-input v-model="startSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('film.originateslot')" />
- <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('film.endslot')" />
+ <el-input v-model="startSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputa" :placeholder="$t('film.originateslot')" />
+ <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('film.endslot')" />
<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="0"></el-option>
@@ -51,8 +51,8 @@
</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="100" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -106,7 +106,13 @@
})
if (response.code == 200) {
ElMessage.success(response.message);
- tableDatax.value = response.data.records;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
@@ -126,37 +132,6 @@
};
const historicala = async (page) => {
try {
- let page = window.localStorage.getItem('pagenumber')
- let startTime = window.localStorage.getItem('startTime')
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
- pageNo: page,
- pageSize: 20,
- glassId: glassId.value,
- startSlot: 0,
- targetSlot: 0,
- taskStateList: [],
- taskTypeList: [],
- beginDate: startTime,
- endDate: getglobalDate
- })
- if (response.code == 200) {
- ElMessage.success(response.message);
- tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
- totalRecords.value = response.data.total/2 || 0
- } else {
- ElMessage.error(response.message);
- }
-}
-catch (error) {
- console.error(error);
- }
-}
-// 鍘嗗彶鏌ヨ鐐瑰嚮
-const sethistorical = async () => {
- try {
- let startTime = window.localStorage.getItem('startTime')
let celllist=[]
let stateList=[]
let pstartSlot= ''
@@ -171,8 +146,6 @@
stateList=[selectValuesa[1]];
}
}
- console.log(startSlot.value);
-
if(startSlot.value != ""){
pstartSlot = startSlot.value
}else{
@@ -184,7 +157,8 @@
ptargetSlot = '0'
}
let page = window.localStorage.getItem('pagenumber')
- const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
+ let startTime = window.localStorage.getItem('startTime')
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
pageNo: page,
pageSize: 20,
glassId: glassId.value,
@@ -192,12 +166,21 @@
targetSlot: ptargetSlot,
taskStateList: celllist,
taskTypeList: 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;
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ console.log(response.data.pages);
+
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -206,6 +189,79 @@
console.error(error);
}
}
+// 鍘嗗彶鏌ヨ鐐瑰嚮
+const sethistorical = async () => {
+ try {
+ 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'
+ }
+ const response = await request.post("/cacheVerticalGlass/bigStorageCageHistoryTask/queryBigStorageCageHistoryTask", {
+ pageNo: 1,
+ pageSize: 20,
+ glassId: glassId.value,
+ startSlot: pstartSlot,
+ targetSlot: ptargetSlot,
+ taskStateList: celllist,
+ taskTypeList: stateList,
+ beginDate: (timeRange.value && timeRange.value[0]) || '',
+ endDate: (timeRange.value && timeRange.value[1]) || '',
+ })
+ if (response.code == 200) {
+ ElMessage.success(response.message);
+ currentPage2.value = 1
+ totalRecords.value = response.data.total/2 || 0
+ const formattedData = response.data.records.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ formattedUpdateTime: formatTimestamp(record.updateTime),
+ }));
+ // tableDatax.value = response.data.records;
+ tableDatax.value = formattedData;
+ } else {
+ ElMessage.error(response.message);
+ }
+}
+catch (error) {
+ console.error(error);
+ }
+}
+const handleInputa = (value: string) => {
+ const isNumeric = /^\d*$/.test(value);
+ if (isNumeric) {
+ startSlot.value = value;
+ } else {
+ startSlot.value = '';
+ }
+};
+const handleInputb = (value: string) => {
+ const isNumeric = /^\d*$/.test(value);
+ if (isNumeric) {
+ targetSlot.value = value;
+ } else {
+ targetSlot.value = '';
+ }
+};
// 鏍煎紡鍖栨椂闂存埑涓哄勾鏈堟棩鏃堕棿瀛楃涓茬殑鍑芥暟
function formatTimestamp(timestamp) {
const date = new Date(timestamp);
diff --git a/UI-Project/src/views/StockBasicData/stockhistory.vue b/UI-Project/src/views/StockBasicData/stockhistory.vue
index 7374591..2885ba6 100644
--- a/UI-Project/src/views/StockBasicData/stockhistory.vue
+++ b/UI-Project/src/views/StockBasicData/stockhistory.vue
@@ -99,7 +99,7 @@
const taskState = ref('');
const taskType = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
-const historical = async (page) => {
+const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
@@ -115,7 +115,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -126,10 +125,10 @@
}
}
const handlePageChange2 = (newPage) => {
- currentPage2.value = newPage;
- console.log(currentPage2.value);
- window.localStorage.setItem('pagenumber', currentPage2.value)
- historicala(currentPage2.value);
+currentPage2.value = newPage;
+console.log(newPage);
+window.localStorage.setItem('pagenumber', currentPage2.value)
+historicala(currentPage2.value);
};
const historicala = async (page) => {
try {
@@ -148,8 +147,6 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
- console.log(response.data.pages);
-
totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
@@ -164,10 +161,9 @@
try {
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- console.log(page);
const response = await request.post("/cacheGlass/edgStorageDeviceTaskHistory", {
deviceId: 2,
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
glassId: glassId.value,
taskState: taskState.value,
@@ -178,6 +174,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
tableDatax.value = response.data.records;
+ totalRecords.value = response.data.total/2 || 0
} else {
ElMessage.error(response.message);
}
@@ -269,7 +266,7 @@
]
onMounted(() => {
parseAndSetTime();
- historical(1);
+ historical();
});
</script>
<style scoped>
diff --git a/UI-Project/src/views/hollow/hellowslicecagehistory.vue b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
index 55df5c4..f5379ce 100644
--- a/UI-Project/src/views/hollow/hellowslicecagehistory.vue
+++ b/UI-Project/src/views/hollow/hellowslicecagehistory.vue
@@ -2,8 +2,8 @@
<div>
<div style="display: flex;width: 1770px;">
<el-input v-model="glassId" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('searchOrder.inglassID')" />
- <el-input v-model="startSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('film.originateslot')" />
- <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" :placeholder="$t('film.endslot')" />
+ <el-input v-model="startSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputa" :placeholder="$t('film.originateslot')" />
+ <el-input v-model="targetSlot" clearable style="margin-left: 10px;margin-bottom: 10px;width: 200px;" @input="handleInputb" :placeholder="$t('film.endslot')" />
<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="0"></el-option>
@@ -13,9 +13,9 @@
</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('searchOrder.inkage')" value="4"></el-option>
+ <el-option :label="$t('searchOrder.outfilm')" value="5"></el-option>
+ <el-option :label="$t('film.dispatch')" value="6"></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"
@@ -51,8 +51,8 @@
</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="100" />
+ <el-table-column prop="formattedUpdateTime" align="center" :label="$t('reportmanage.endtime')" min-width="100" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination
@@ -90,6 +90,23 @@
const startSlot = ref('');
const targetSlot = ref('');
let getglobalDate = window.localStorage.getItem('getglobalDate')
+// 澶勭悊杈撳叆浜嬩欢
+const handleInputa = (value: string) => {
+ const isNumeric = /^\d*$/.test(value);
+ if (isNumeric) {
+ startSlot.value = value;
+ } else {
+ startSlot.value = '';
+ }
+};
+const handleInputb = (value: string) => {
+ const isNumeric = /^\d*$/.test(value);
+ if (isNumeric) {
+ targetSlot.value = value;
+ } else {
+ targetSlot.value = '';
+ }
+};
const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
@@ -106,9 +123,13 @@
})
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);
@@ -126,24 +147,52 @@
};
const historicala = async (page) => {
try {
+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')
let startTime = window.localStorage.getItem('startTime')
const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowBigStorageCageHistoryTask", {
pageNo: page,
pageSize: 20,
glassId: glassId.value,
- startSlot: 0,
- targetSlot: 0,
- taskStateList: [],
- taskTypeList: [],
- beginDate: startTime,
- endDate: getglobalDate
+ startSlot: pstartSlot,
+ targetSlot: ptargetSlot,
+ taskStateList: celllist,
+ taskTypeList: 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);
@@ -183,19 +232,27 @@
}
let page = window.localStorage.getItem('pagenumber')
const response = await request.post("/hollowGlass/hollowBigStorageCageHistoryTask/queryHollowBigStorageCageHistoryTask", {
- pageNo: page,
+ pageNo: 1,
pageSize: 20,
glassId: glassId.value,
startSlot: pstartSlot,
targetSlot: ptargetSlot,
taskStateList: celllist,
taskTypeList: 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
+ ElMessage.success(response.message);
+ 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);
}
@@ -252,21 +309,21 @@
}
function getStatusTypea(taskType: number) {
switch (taskType) {
- case 1:
+ case 4:
return 'primary';
- case 2:
+ case 5:
return 'success';
- case 3:
+ case 6:
return 'warning';
}
}
function getStatusTexta(taskType: number) {
switch (taskType) {
- case 1:
+ case 4:
return t('searchOrder.inkage');
- case 2:
+ case 5:
return t('searchOrder.outfilm');
- case 3:
+ case 6:
return t('film.dispatch');
}
}
--
Gitblit v1.8.0