refactor: 系统日志默认查询近 7 天日志数据

continew-org · Apr 22, 2024 · 2ddd900 · 2ddd900
1 parent 81194db
commit 2ddd900
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/src/apis/monitor/type.ts b/src/apis/monitor/type.ts
@@ -48,7 +48,7 @@ export interface LogQuery {
   module?: string
   ip?: string
   createUserString?: string
-  createTime?: string
+  createTime: Array<string>
   status?: number
   sort: Array<string>
 }

diff --git a/src/components/DateRangePicker/index.vue b/src/components/DateRangePicker/index.vue
@@ -13,6 +13,8 @@
 import type { ShortcutType } from '@arco-design/web-vue'
 import dayjs from 'dayjs'
 
+defineOptions({ name: 'DateRangePicker' })
+
 defineProps({
   format: {
     type: String,
@@ -57,10 +59,4 @@ const shortcuts = computed<ShortcutType[]>(() => {
 })
 </script>
 
-<script lang="ts">
-export default {
-  name: 'DateRangePicker'
-}
-</script>
-
 <style scoped lang="less"></style>
diff --git a/src/views/monitor/log/login/index.vue b/src/views/monitor/log/login/index.vue
@@ -49,6 +49,7 @@ import { exportLoginLog, listLog } from '@/apis'
 import type { TableInstanceColumns } from '@/components/GiTable/type'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import { useTable, useDownload } from '@/hooks'
+import dayjs from 'dayjs'
 
 defineOptions({ name: 'LoginLog' })
 
@@ -93,7 +94,10 @@ const queryForm = reactive({
   module: '登录',
   ip: undefined,
   createUserString: undefined,
-  createTime: undefined,
+  createTime: [
+    dayjs().subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ],
   status: undefined,
   sort: ['createTime,desc']
 })
@@ -109,7 +113,10 @@ const {
 const reset = () => {
   queryForm.ip = undefined
   queryForm.createUserString = undefined
-  queryForm.createTime = undefined
+  queryForm.createTime = [
+    dayjs().subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ]
   queryForm.status = undefined
   search()
 }

diff --git a/src/views/monitor/log/operation/index.vue b/src/views/monitor/log/operation/index.vue
@@ -61,6 +61,7 @@ import type { TableInstanceColumns } from '@/components/GiTable/type'
 import DateRangePicker from '@/components/DateRangePicker/index.vue'
 import OperationLogDetailDrawer from './OperationLogDetailDrawer.vue'
 import { useTable, useDownload } from '@/hooks'
+import dayjs from 'dayjs'
 
 defineOptions({ name: 'OperationLog' })
 
@@ -105,7 +106,10 @@ const queryForm = reactive({
   description: undefined,
   ip: undefined,
   createUserString: undefined,
-  createTime: undefined,
+  createTime: [
+    dayjs().subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ],
   status: undefined,
   sort: ['createTime,desc']
 })
@@ -122,7 +126,10 @@ const reset = () => {
   queryForm.description = undefined
   queryForm.ip = undefined
   queryForm.createUserString = undefined
-  queryForm.createTime = undefined
+  queryForm.createTime = [
+    dayjs().subtract(6, 'day').startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    dayjs().endOf('day').format('YYYY-MM-DD HH:mm:ss')
+  ]
   queryForm.status = undefined
   search()
 }

diff --git a/src/views/tool/generator/GenConfigDrawer.vue b/src/views/tool/generator/GenConfigDrawer.vue
@@ -21,7 +21,7 @@
             <a-input v-model="form.moduleName" placeholder="项目模块名称，例如：continew-admin-system" />
           </a-form-item>
           <a-form-item label="模块包名" field="packageName">
-            <a-input v-model="form.packageName" placeholder="项目模块包名，例如：top.charles7c.continew.admin.system" />
+            <a-input v-model="form.packageName" placeholder="项目模块包名，例如：top.continew.admin.system" />
           </a-form-item>
           <a-form-item label="去表前缀" field="tablePrefix">
             <a-input v-model="form.tablePrefix" placeholder="数据库表前缀，例如：sys_" />