From 86903050702bb898277ed8f87202c0224867c47f Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 14 三月 2025 16:18:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/ReportWork/reportWork.vue | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index aef6133..f20b55e 100644
--- a/UI-Project/src/views/ReportWork/reportWork.vue
+++ b/UI-Project/src/views/ReportWork/reportWork.vue
@@ -2,16 +2,11 @@
<div style="height: 600px;">
<div style="display: flex; flex-direction: row; align-items: center; margin-top: 20px;">
<span style="margin-left: 10px;" class="demonstration">{{ $t('reportmanage.productiontime') }}</span>
- <!-- <el-date-picker style="margin-left: 10px;" v-model="timeRange" type="daterange" format="YYYY/MM/DD"
- value-format="YYYY-MM-DD" :start-placeholder="$t('reportmanage.starttime')"
- :end-placeholder="$t('reportmanage.endtime')" :default-time="defaultTime" /> -->
<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-select v-model="report.type" :placeholder="$t('reportmanage.ctype')" style="margin-left: 10px;">
- <!-- <el-option :label="$t('reportmanage.all')" value="0"></el-option> -->
- <!-- <el-option :label="$t('reportmanage.completed')" value="1"></el-option> -->
<el-option :label="$t('reportmanage.broke')" value="8"></el-option>
<el-option :label="$t('reportmanage.takeout')" value="9"></el-option>
</el-select>
@@ -49,8 +44,8 @@
<el-table-column prop="engineerId" align="center" :label="$t('reportmanage.projectnumber')" min-width="120" />
<el-table-column prop="temperingLayoutId" align="center" :label="$t('reportmanage.layoutID')"
min-width="120" />
- <el-table-column prop="damageTime" align="center" :label="$t('reportmanage.productiontime')"
- min-width="230" />
+ <el-table-column prop="formattedCreateTime" align="center" :label="$t('reportmanage.productiontime')"
+ min-width="230" />damageTime
<el-table-column prop="type" align="center" :label="$t('reportmanage.type')" min-width="120" />
<el-table-column prop="status" align="center" :label="$t('reportmanage.state')" min-width="120" />
<el-table-column prop="processId" align="center" :label="$t('reportmanage.processcards')" min-width="140" />
@@ -156,6 +151,7 @@
function parseAndSetTime() {
const backendTime = new Date(globalDate);
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)];
@@ -173,11 +169,8 @@
const selectValuese = reactive({});
const inputValuesa = reactive({});
const inputValuesb = reactive({});
-
const selectedType = ref(true);
const selectedStatus = ref(false);
-
-
// 鏌ヨ鏁版嵁
const selectReportData = async () => {
const response = await request.post("/cacheVerticalGlass/damage/selectDamage", {
@@ -198,13 +191,16 @@
selectedStatus.value = false;
}
if (response.code === 200) {
- reportData.value = response.data;
+ const formattedData = response.data.map(record => ({
+ ...record,
+ formattedCreateTime: formatTimestamp(record.createTime),
+ }));
+ reportData.value = formattedData;
ElMessage.success(response.message);
} else {
ElMessage.error(response.message);
}
-
// const responses = await request.post("/cacheVerticalGlass/damage/insertDamage", {
// glassId:"P24081502|1|1",
// line:"1001",
--
Gitblit v1.8.0