From dbfd4bc96205dd957827ee16c1149058fc2b88bb Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期三, 04 三月 2026 15:31:14 +0800
Subject: [PATCH] perf:
---
ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
index 1489ba2..ce8a1d2 100644
--- a/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
+++ b/ruoyi-plus-soybean/src/views/analy/store-silk/modules/store-silk-search.vue
@@ -1,6 +1,5 @@
<script setup lang="ts">
import { onMounted, ref, toRaw, watch } from 'vue';
-import dayjs from 'dayjs';
import { jsonClone } from '@sa/utils';
import { useNaiveForm } from '@/hooks/common/form';
import { $t } from '@/locales';
@@ -26,38 +25,40 @@
}
function getDefaultRange(): [string, string] {
- const end = dayjs().format('YYYY-MM-DD');
- const start = dayjs().subtract(3, 'day').format('YYYY-MM-DD');
- return [start, end];
+ const now = new Date();
+ const threeDaysAgo = new Date(now.getTime() - 3 * 24 * 60 * 60 * 1000);
+ const todayStart = `${threeDaysAgo.getFullYear()}-${String(threeDaysAgo.getMonth() + 1).padStart(2, '0')}-${String(threeDaysAgo.getDate()).padStart(2, '0')} 00:00:00`;
+ const todayEnd = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')} 23:59:59`;
+ return [todayStart, todayEnd];
}
-const dateRange = ref<[string, string]>(getDefaultRange());
-
-function isDateDisabled(ts: number) {
- const min = dayjs().subtract(3, 'day').startOf('day').valueOf();
- const max = dayjs().endOf('day').valueOf();
- return ts < min || ts > max;
-}
+const dateRange = ref<[string, string] | null>(null);
onMounted(() => {
- if (!model.value.distimebegin || !model.value.distimeend) {
- dateRange.value = getDefaultRange();
- model.value.distimebegin = dateRange.value[0];
- model.value.distimeend = dateRange.value[1];
+ if (model.value.params?.beginTime && model.value.params?.endTime) {
+ dateRange.value = [model.value.params.beginTime as string, model.value.params.endTime as string];
} else {
- dateRange.value = [model.value.distimebegin as string, model.value.distimeend as string];
+ dateRange.value = getDefaultRange();
+ if (!model.value.params) {
+ model.value.params = {};
+ }
+ model.value.params.beginTime = dateRange.value[0];
+ model.value.params.endTime = dateRange.value[1];
}
});
watch(
dateRange,
val => {
+ if (!model.value.params) {
+ model.value.params = {};
+ }
if (val && val[0] && val[1]) {
- model.value.distimebegin = val[0];
- model.value.distimeend = val[1];
+ model.value.params.beginTime = val[0];
+ model.value.params.endTime = val[1];
} else {
- model.value.distimebegin = null;
- model.value.distimeend = null;
+ model.value.params.beginTime = null;
+ model.value.params.endTime = null;
}
},
{ deep: true }
@@ -67,8 +68,11 @@
await restoreValidation();
resetModel();
dateRange.value = getDefaultRange();
- model.value.distimebegin = dateRange.value[0];
- model.value.distimeend = dateRange.value[1];
+ if (!model.value.params) {
+ model.value.params = {};
+ }
+ model.value.params.beginTime = dateRange.value[0];
+ model.value.params.endTime = dateRange.value[1];
emit('search');
}
@@ -112,17 +116,17 @@
</NFormItemGi>
<NFormItemGi
span="24 s:12 m:8 l:8 xl:8"
- label="鍑烘枡鏃堕棿"
+ label="鍑烘枡缁撴潫鏃堕棿"
label-width="auto"
- path="distimebegin"
+ path="params.beginTime"
class="pr-24px"
>
<NDatePicker
v-model:formatted-value="dateRange"
- type="daterange"
- value-format="yyyy-MM-dd"
+ type="datetimerange"
+ :default-time="['00:00:00', '23:59:59']"
+ value-format="yyyy-MM-dd HH:mm:ss"
clearable
- :is-date-disabled="isDateDisabled"
/>
</NFormItemGi>
<NFormItemGi
--
Gitblit v1.9.3