From 74f2191aaec3f98f5f9d5a24b908a0ec93f26b5c Mon Sep 17 00:00:00 2001
From: AN <1983933789@qq.com>
Date: Wed, 14 May 2025 14:42:43 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E6=97=A0=E6=B3=95=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E5=85=B6=E4=BB=96=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E6=9C=9F=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                      |  2 +-
 src/views/monitor/login-infor/index.vue       |  3 +-
 .../modules/login-infor-search.vue            | 16 ++++++++++
 src/views/monitor/oper-log/index.vue          |  2 +-
 .../oper-log/modules/oper-log-search.vue      | 20 +++++++++++--
 src/views/system/config/index.vue             |  2 +-
 .../system/config/modules/config-search.vue   | 29 ++++++++++++++++---
 .../system/notice/modules/notice-search.vue   |  6 ++--
 src/views/system/oss/index.vue                |  3 +-
 src/views/system/oss/modules/oss-search.vue   |  6 ++--
 src/views/system/role/modules/role-search.vue |  1 -
 src/views/system/user/modules/user-search.vue | 12 +++++---
 12 files changed, 80 insertions(+), 22 deletions(-)

diff --git a/.env.dev b/.env.dev
index 0daad891..4e18fee1 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,5 +1,5 @@
 # backend service base url, test environment
-VITE_SERVICE_BASE_URL=http://127.0.0.1:8080
+VITE_SERVICE_BASE_URL=https://ruoyi.xlsea.cn/prod-api
 
 VITE_APP_BASE_API=/dev-api
 
diff --git a/src/views/monitor/login-infor/index.vue b/src/views/monitor/login-infor/index.vue
index b2c30e5a..2daf63cb 100644
--- a/src/views/monitor/login-infor/index.vue
+++ b/src/views/monitor/login-infor/index.vue
@@ -49,7 +49,8 @@ const {
     // the value can not be undefined, otherwise the property in Form will not be reactive
     userName: null,
     ipaddr: null,
-    status: null
+    status: null,
+    params: {}
   },
   columns: () => [
     {
diff --git a/src/views/monitor/login-infor/modules/login-infor-search.vue b/src/views/monitor/login-infor/modules/login-infor-search.vue
index ff131804..0192899b 100644
--- a/src/views/monitor/login-infor/modules/login-infor-search.vue
+++ b/src/views/monitor/login-infor/modules/login-infor-search.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from 'vue';
 import { useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 
@@ -15,15 +16,22 @@ const emit = defineEmits<Emits>();
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 
+const dateRangeLoginTime = ref<[string, string] | null>(null);
+
 const model = defineModel<Api.Monitor.LoginInforSearchParams>('model', { required: true });
 
 async function reset() {
+  dateRangeLoginTime.value = null;
   await restoreValidation();
   emit('reset');
 }
 
 async function search() {
   await validate();
+  if (dateRangeLoginTime.value?.length) {
+    model.value.params!.beginTime = dateRangeLoginTime.value[0];
+    model.value.params!.endTime = dateRangeLoginTime.value[1];
+  }
   emit('search');
 }
 </script>
@@ -48,6 +56,14 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:6" label="登录时间" path="loginTime" class="pr-24px">
+              <NDatePicker
+                v-model:formatted-value="dateRangeLoginTime"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable
+              />
+            </NFormItemGi>
             <NFormItemGi span="24" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
diff --git a/src/views/monitor/oper-log/index.vue b/src/views/monitor/oper-log/index.vue
index 8e2b4c1d..a6abdef3 100644
--- a/src/views/monitor/oper-log/index.vue
+++ b/src/views/monitor/oper-log/index.vue
@@ -45,7 +45,7 @@ const {
     operName: null,
     operIp: null,
     status: null,
-    operTime: null
+    params: {}
   },
   columns: () => [
     {
diff --git a/src/views/monitor/oper-log/modules/oper-log-search.vue b/src/views/monitor/oper-log/modules/oper-log-search.vue
index fbd3a0ab..69b4077a 100644
--- a/src/views/monitor/oper-log/modules/oper-log-search.vue
+++ b/src/views/monitor/oper-log/modules/oper-log-search.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from 'vue';
 import { useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 
@@ -15,15 +16,22 @@ const emit = defineEmits<Emits>();
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 
+const dateRangeOperTime = ref<[string, string] | null>(null);
+
 const model = defineModel<Api.Monitor.OperLogSearchParams>('model', { required: true });
 
 async function reset() {
+  dateRangeOperTime.value = null;
   await restoreValidation();
   emit('reset');
 }
 
 async function search() {
   await validate();
+  if (dateRangeOperTime.value?.length) {
+    model.value.params!.beginTime = dateRangeOperTime.value[0];
+    model.value.params!.endTime = dateRangeOperTime.value[1];
+  }
   emit('search');
 }
 </script>
@@ -51,7 +59,7 @@ async function search() {
             <NFormItemGi span="24 s:12 m:6" label="操作IP" path="operIp" class="pr-24px">
               <NInput v-model:value="model.operIp" placeholder="请输入操作IP" />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:6" label="操作状态" path="status" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:8" label="操作状态" path="status" class="pr-24px">
               <DictSelect
                 v-model:value="model.status"
                 placeholder="请选择操作状态"
@@ -59,7 +67,15 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="24" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:8" label="操作时间" path="operTime" class="pr-24px">
+              <NDatePicker
+                v-model:formatted-value="dateRangeOperTime"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable
+              />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:8" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 58f331f9..0041de49 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -42,7 +42,7 @@ const {
     configName: null,
     configKey: null,
     configType: null,
-    createTime: null
+    params: {}
   },
   columns: () => [
     {
diff --git a/src/views/system/config/modules/config-search.vue b/src/views/system/config/modules/config-search.vue
index 0b4df2c2..fa04b1a1 100644
--- a/src/views/system/config/modules/config-search.vue
+++ b/src/views/system/config/modules/config-search.vue
@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from 'vue';
 import { useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 
@@ -15,15 +16,22 @@ const emit = defineEmits<Emits>();
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 
+const dateRangeCreateTime = ref<[string, string] | null>(null);
+
 const model = defineModel<Api.System.ConfigSearchParams>('model', { required: true });
 
 async function reset() {
+  dateRangeCreateTime.value = null;
   await restoreValidation();
   emit('reset');
 }
 
 async function search() {
   await validate();
+  if (dateRangeCreateTime.value?.length) {
+    model.value.params!.beginTime = dateRangeCreateTime.value[0];
+    model.value.params!.endTime = dateRangeCreateTime.value[1];
+  }
   emit('search');
 }
 </script>
@@ -35,7 +43,7 @@ async function search() {
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
           <NGrid responsive="screen" item-responsive>
             <NFormItemGi
-              span="6 s:12 m:6"
+              span="24 s:12 m:6"
               :label="$t('page.system.config.configName')"
               path="configName"
               class="pr-24px"
@@ -45,11 +53,16 @@ async function search() {
                 :placeholder="$t('page.system.config.form.configName.required')"
               />
             </NFormItemGi>
-            <NFormItemGi span="6 s:12 m:6" :label="$t('page.system.config.configKey')" path="configKey" class="pr-24px">
+            <NFormItemGi
+              span="24 s:12 m:6"
+              :label="$t('page.system.config.configKey')"
+              path="configKey"
+              class="pr-24px"
+            >
               <NInput v-model:value="model.configKey" :placeholder="$t('page.system.config.form.configKey.required')" />
             </NFormItemGi>
             <NFormItemGi
-              span="6 s:12 m:6"
+              span="24 s:12 m:6"
               :label="$t('page.system.config.configType')"
               path="configType"
               class="pr-24px"
@@ -61,7 +74,15 @@ async function search() {
                 clearable
               />
             </NFormItemGi>
-            <NFormItemGi span="6" class="pr-24px">
+            <NFormItemGi span="24 s:12 m:12" label="创建时间" path="createTime" class="pr-24px">
+              <NDatePicker
+                v-model:formatted-value="dateRangeCreateTime"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                clearable
+              />
+            </NFormItemGi>
+            <NFormItemGi span="24 s:12 m:12" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/notice/modules/notice-search.vue b/src/views/system/notice/modules/notice-search.vue
index ef19d9e7..ec3bbb49 100644
--- a/src/views/system/notice/modules/notice-search.vue
+++ b/src/views/system/notice/modules/notice-search.vue
@@ -33,13 +33,13 @@ async function search() {
       <NCollapseItem :title="$t('common.search')" name="user-search">
         <NForm ref="formRef" :model="model" label-placement="left" :label-width="80">
           <NGrid responsive="screen" item-responsive>
-            <NFormItemGi span="24 s:12 m:6" label="公告标题" path="noticeTitle" class="pr-24px">
+            <NFormItemGi span="8" label="公告标题" path="noticeTitle" class="pr-24px">
               <NInput v-model:value="model.noticeTitle" placeholder="请输入公告标题" />
             </NFormItemGi>
-            <NFormItemGi span="24 s:12 m:6" label="公告类型" path="noticeType" class="pr-24px">
+            <NFormItemGi span="8" label="公告类型" path="noticeType" class="pr-24px">
               <DictSelect v-model:value="model.noticeType" dict-code="sys_notice_type" placeholder="请选择公告类型" />
             </NFormItemGi>
-            <NFormItemGi span="24" class="pr-24px">
+            <NFormItemGi span="8" class="pr-24px">
               <NSpace class="w-full" justify="end">
                 <NButton @click="reset">
                   <template #icon>
diff --git a/src/views/system/oss/index.vue b/src/views/system/oss/index.vue
index c9b255ae..923f6621 100644
--- a/src/views/system/oss/index.vue
+++ b/src/views/system/oss/index.vue
@@ -48,7 +48,8 @@ const {
     fileName: null,
     originalName: null,
     fileSuffix: null,
-    service: null
+    service: null,
+    params: {}
   },
   columns: () => [
     {
diff --git a/src/views/system/oss/modules/oss-search.vue b/src/views/system/oss/modules/oss-search.vue
index de183253..a26a6036 100644
--- a/src/views/system/oss/modules/oss-search.vue
+++ b/src/views/system/oss/modules/oss-search.vue
@@ -16,12 +16,12 @@ const emit = defineEmits<Emits>();
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 
-const dateRangeCreateTime = ref<[string, string]>();
+const dateRangeCreateTime = ref<[string, string] | null>(null);
 
 const model = defineModel<Api.System.OssSearchParams>('model', { required: true });
 
 async function reset() {
-  dateRangeCreateTime.value = undefined;
+  dateRangeCreateTime.value = null;
   await restoreValidation();
   emit('reset');
 }
@@ -30,7 +30,7 @@ async function search() {
   await validate();
   if (dateRangeCreateTime.value?.length) {
     model.value.params!.beginCreateTime = dateRangeCreateTime.value[0];
-    model.value.params!.endCreateTime = dateRangeCreateTime.value[0];
+    model.value.params!.endCreateTime = dateRangeCreateTime.value[1];
   }
   emit('search');
 }
diff --git a/src/views/system/role/modules/role-search.vue b/src/views/system/role/modules/role-search.vue
index 7a51345b..04283a87 100644
--- a/src/views/system/role/modules/role-search.vue
+++ b/src/views/system/role/modules/role-search.vue
@@ -25,7 +25,6 @@ const { options: sysNormalDisableOptions } = useDict('sys_normal_disable');
 
 async function reset() {
   dateRangeCreateTime.value = null;
-  Object.assign(model.value.params!, {});
   await restoreValidation();
   emit('reset');
 }
diff --git a/src/views/system/user/modules/user-search.vue b/src/views/system/user/modules/user-search.vue
index 64033f9e..1bf4ad3b 100644
--- a/src/views/system/user/modules/user-search.vue
+++ b/src/views/system/user/modules/user-search.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue';
+import { NDatePicker } from 'naive-ui';
 import { useNaiveForm } from '@/hooks/common/form';
 import { $t } from '@/locales';
 
@@ -16,12 +17,14 @@ const emit = defineEmits<Emits>();
 
 const { formRef, validate, restoreValidation } = useNaiveForm();
 
-const dateRangeCreateTime = ref<[string, string]>();
+const dateRangeCreateTime = ref<[string, string] | null>(null);
+
+const datePickerRef = ref<InstanceType<typeof NDatePicker>>();
 
 const model = defineModel<Api.System.UserSearchParams>('model', { required: true });
 
 async function reset() {
-  dateRangeCreateTime.value = undefined;
+  dateRangeCreateTime.value = null;
   await restoreValidation();
   emit('reset');
 }
@@ -29,8 +32,8 @@ async function reset() {
 async function search() {
   await validate();
   if (dateRangeCreateTime.value?.length) {
-    model.value.params!.beginCreateTime = dateRangeCreateTime.value[0];
-    model.value.params!.endCreateTime = dateRangeCreateTime.value[0];
+    model.value.params!.beginTime = dateRangeCreateTime.value[0];
+    model.value.params!.endTime = dateRangeCreateTime.value[1];
   }
   emit('search');
 }
@@ -74,6 +77,7 @@ async function search() {
               class="pr-24px"
             >
               <NDatePicker
+                ref="datePickerRef"
                 v-model:formatted-value="dateRangeCreateTime"
                 type="datetimerange"
                 value-format="yyyy-MM-dd HH:mm:ss"