From 777f29f47e28c79f5a108b2730dbd85827cb092d Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期三, 26 三月 2025 15:00:18 +0800
Subject: [PATCH] 中英俄重复文档更改、涉及页面修改
---
UI-Project/src/views/ReportWork/reportWork.vue | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/UI-Project/src/views/ReportWork/reportWork.vue b/UI-Project/src/views/ReportWork/reportWork.vue
index 5a40295..ef5e1b9 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>
@@ -35,7 +30,7 @@
$t('reportmanage.signingwork')
}}</el-button>
</div>
- <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" v-loading="loading">
+ <el-card style="flex: 1;margin-left: 10px;margin-top: 20px;" >
<div style="width: 98%; height: calc(100% - 35px); overflow-y: auto;">
<el-table height="740" ref="table" :data="reportData"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
@@ -156,8 +151,7 @@
function parseAndSetTime() {
const backendTime = new Date(globalDate);
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))
}
@@ -290,7 +284,6 @@
}
});
onBeforeUnmount(() => {
- console.log("鍏抽棴浜�")
closeWebSocket();
});
</script>
--
Gitblit v1.8.0