diff --git a/web/index.html b/web/index.html
index 68b39b4..1102cd0 100644
--- a/web/index.html
+++ b/web/index.html
@@ -247,6 +247,7 @@
end-placeholder="结束时间"
value-format="YYYY-MM-DD HH:mm:ss"
:shortcuts="dateShortcuts"
+ :default-time="dateDefaultTime"
style="width:100%"
/>
diff --git a/web/main.js b/web/main.js
index c70bcec..5cb2aa7 100644
--- a/web/main.js
+++ b/web/main.js
@@ -181,6 +181,12 @@ const app = createApp({
const exportRules = ValidationRules.createExportRules();
// ==================== 时间快捷选项 ====================
+ // Element Plus datetimerange 默认时间:开始 00:00:00,结束 23:59:59(仅用于 UI 默认显示)
+ const dateDefaultTime = [
+ new Date(2000, 0, 1, 0, 0, 0),
+ new Date(2000, 0, 1, 23, 59, 59),
+ ];
+
const dateShortcuts = [
{
text: '本日',
@@ -666,8 +672,23 @@ const app = createApp({
filters.type_eq = Number(typeValue);
}
+ const normalizeMarketingEndTime = (endStr) => {
+ const s = String(endStr || '').trim();
+ if (!s) return s;
+ // value-format is 'YYYY-MM-DD HH:mm:ss' so we just normalize "00:00:00" to end-of-day for marketing exports
+ if (s.length >= 19 && s.slice(11, 19) === '00:00:00') {
+ return s.slice(0, 10) + ' 23:59:59';
+ }
+ return s;
+ };
+
if (dateRange?.length === 2) {
- filters.create_time_between = [dateRange[0], dateRange[1]];
+ const start = String(dateRange[0] || '').trim();
+ let end = String(dateRange[1] || '').trim();
+ if (datasource === 'marketing') {
+ end = normalizeMarketingEndTime(end);
+ }
+ filters.create_time_between = [start, end];
}
if (planId) filters.plan_id_eq = Number(planId);
@@ -976,6 +997,7 @@ const app = createApp({
createRules,
editRules,
exportRules,
+ dateDefaultTime,
dateShortcuts,
// 表单引用
createFormRef,