瀏覽代碼

fix: 修复日志管理时间格式化

qindao 1 年之前
父節點
當前提交
fd217d5f04

+ 1 - 1
src/types/log/type.ts

@@ -83,7 +83,7 @@ export type SystemLogResponse = PaginationResponse<SystemLogItem>;
 export type OperationPageDetail = Pick<
   OperationLogItem,
   "module" | "operatorType" | "operatorName" | "clientIp" | "isSuccess" | "createdAt"
-> & { parameter: string };
+> & { parameter: string, operation: string };
 
 /* 通用导出参数 */
 interface BaseExportRequest {

+ 11 - 5
src/views/system/log/components/DetailDialog.vue

@@ -5,14 +5,17 @@
         <span>{{ form.module + '/' + OperationType[form.operatorType] }}</span>
       </el-form-item>
       <el-form-item label="请求地址:">
-        <span>{{ form.clientIp }}</span>
+        <span>{{ form.url }}</span>
       </el-form-item>
       <el-form-item label="登录信息:">
-        <span>{{ form.operatorName }}</span>
+        <span>{{ form.operatorName + '/' + form.clientIp}}</span>
       </el-form-item>
       <el-form-item label="请求方式:">
         <span>{{ form.method }}</span>
       </el-form-item>
+      <el-form-item label="操作方法:">
+        <span>{{ form.operation }}</span>
+      </el-form-item>
       <el-form-item label="请求参数:">
         <span >{{ form.params }}</span>
       </el-form-item>
@@ -32,11 +35,11 @@
 <script setup lang="ts">
 import { reactive, ref } from 'vue';
 import { queryOperationLogDetail } from '@/api/system/log';
-import { OpretionPageDetail } from '@/types/log/type';
+import { OperationPageDetail } from '@/types/log/type';
 import { OperationType } from '@/types/log/constants';
 
 const dialogTableVisible = ref(false);
-const form = reactive<OpretionPageDetail & { params: string, method: string, result: string }>({
+const form = reactive<OperationPageDetail & { params: string, method: string, result: string,url: string }>({
   operatorType: '',
   operatorName: '',
   clientIp: '',
@@ -46,7 +49,9 @@ const form = reactive<OpretionPageDetail & { params: string, method: string, res
   module: '',
   params: '',
   method: '',
-  result: ''
+  result: '',
+  url: '',
+  operation: ''
 })
 
 /**
@@ -71,6 +76,7 @@ const loadDetailPage = async (id: number) => {
   form.params = parsedData.params;
   form.result = parsedData.result;
   form.method = parsedData.method;
+  form.url = parsedData.url;
 }
 
 defineExpose({ open });

+ 4 - 1
src/views/system/log/components/LoginLog.vue

@@ -33,7 +33,10 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :disabled-date="disabledDate"
-              clearable />
+              clearable 
+              format="YYYY/MM/DD"
+              value-format="YYYY/MM/DD"
+              />
           </el-form-item>
           <el-form-item label="请选择组织:" label-position="left" prop="deptId">
             <el-tree-select type="daterange" range-separator="To" start-placeholder="开始时间" end-placeholder="结束时间"

+ 4 - 1
src/views/system/log/components/OperationLog.vue

@@ -42,7 +42,10 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :disabled-date="disabledDate"
-              clearable />
+              clearable 
+              format="YYYY/MM/DD"
+              value-format="YYYY/MM/DD"
+              />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" :icon="Search" @click="queryOperationLogPage">查询</el-button>

+ 4 - 1
src/views/system/log/components/SystemLog.vue

@@ -28,7 +28,10 @@
               start-placeholder="开始时间"
               end-placeholder="结束时间"
               :disabled-date="disabledDate"
-              clearable />
+              clearable 
+              format="YYYY/MM/DD"
+              value-format="YYYY/MM/DD"
+              />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" :icon="Search" @click="querySystemLogPage">查询</el-button>

+ 2 - 2
src/views/system/log/hooks/useLoginLogQuery.ts

@@ -38,8 +38,8 @@ export default function useLoginLogRequest () {
         }
       });
       if (date && date.length > 0) {
-        requestParams.queryParam.startTime = date[0];
-        requestParams.queryParam.endTime = date[1];
+        requestParams.queryParam.startTime = date[0] + ' 00:00:00';
+        requestParams.queryParam.endTime = date[1] + ' 23:59:59';
       }
      
       const data = await queryLoginLogList(requestParams);

+ 2 - 2
src/views/system/log/hooks/useSystemQuery.ts

@@ -27,8 +27,8 @@ export default function useSystemLogRequest () {
       loading.value = true;
       const { date } = requestParams.queryParam;
       if (date && date.length > 0) {
-        requestParams.queryParam.startTime = date[0];
-        requestParams.queryParam.endTime = date[1];
+        requestParams.queryParam.startTime = date[0] + ' 00:00:00';
+        requestParams.queryParam.endTime = date[1] + ' 23:59:59';
       }
      
       const data = await querySystemLogList(requestParams);

+ 6 - 6
src/views/system/log/hooks/userOperationQuery.ts

@@ -1,11 +1,11 @@
 
 import { reactive, ref, shallowRef } from "vue"
-import { OperatinoLogPageRequest, OpreationLogItem  } from "@/types/log/type"
+import { OperationLogPageRequest, OperationLogItem  } from "@/types/log/type"
 import { DEFAULT_PAGE_SIZE } from "@/types/common/constants"
 import { cloneDeep } from "lodash-es"
 import { queryOperationLogList } from "@/api/system/log"
 
-const defaultOperationLogRequest: OperatinoLogPageRequest = {
+const defaultOperationLogRequest: OperationLogPageRequest = {
   pageNumber: 1,
   pageSize: DEFAULT_PAGE_SIZE,
   queryParam: {
@@ -23,8 +23,8 @@ const defaultOperationLogRequest: OperatinoLogPageRequest = {
 }
 
 export default function useOperationLogRequest () {
-  const requestParams = reactive<OperatinoLogPageRequest>(cloneDeep(defaultOperationLogRequest));
-  const operationLogList = shallowRef<OpreationLogItem[]>([]);
+  const requestParams = reactive<OperationLogPageRequest>(cloneDeep(defaultOperationLogRequest));
+  const operationLogList = shallowRef<OperationLogItem[]>([]);
   const total = ref(0);
   const loading = ref(false);
 
@@ -40,8 +40,8 @@ export default function useOperationLogRequest () {
         }
       });
       if (date && date.length > 0) {
-        requestParams.queryParam.startTime = date[0];
-        requestParams.queryParam.endTime = date[1];
+        requestParams.queryParam.startTime = date[0] + ' 00:00:00';
+        requestParams.queryParam.endTime = date[1] + ' 23:59:59';
       }
      
       const data = await queryOperationLogList(requestParams);