Просмотр исходного кода

Merge branch 'all-v4-qindao' into 'all-v4'

fix: 修复【操作日志】筛选项显示的是登录时间,应该改为操作时间

See merge request skyeye/skyeye_frontend/skyeye-admin!312
Fei Liu 1 год назад
Родитель
Сommit
c576768b9c
2 измененных файлов с 4 добавлено и 29 удалено
  1. 0 25
      src/types/log/constants.ts
  2. 4 4
      src/views/system/log/components/OperationLog.vue

+ 0 - 25
src/types/log/constants.ts

@@ -52,25 +52,16 @@ export interface OptionsProps {
 
 /* 日志管理操作类型 */
 export enum OperationType{
-  QUERY = '查询',
   INSERT = '新增',
   UPDATE = '修改',
   DELETE='删除',
-  GRANT = '授杈',
   EXPORT = '导出',
   SWITCH = '开启/关闭',
-  IMPORT = '导入',
-  LOGIN = '登录',
-  LOGOUT = '登出',
   URGE = '加急'
 }
 
 /* 日志管理操作类型 */
 export const operationList = [
-  {
-    value: 'QUERY',
-    label: '查询'    
-  },
   {
     value: 'INSERT',
     label: '新增'    
@@ -83,10 +74,6 @@ export const operationList = [
     value: 'DELETE',
     label: '删除'    
   },
-  {
-    value: 'GRANT',
-    label: '授杈'    
-  },
   {
     value: 'EXPORT',
     label: '导出'    
@@ -95,18 +82,6 @@ export const operationList = [
     value: 'SWITCH',
     label: '开启/关闭'    
   },
-  {
-    value: 'IMPORT',
-    label: '导入'    
-  },
-  {
-    value: 'LOGOUT',
-    label: '登出'    
-  },
-  {
-    value: 'LOGIN',
-    label: '登录'    
-  },
   {
     value: 'URGE',
     label: '加急'    

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

@@ -33,11 +33,11 @@
               <el-option :label="item.label" :value="item.value" v-for="item in operationList" :key="item.value" />
             </el-select>
           </el-form-item>
-          <el-form-item label="登录时间" prop="date">
+          <el-form-item label="操作时间" prop="date">
             <el-date-picker 
               v-model="requestParams.queryParam.date" 
               type="daterange" 
-              placeholder="请选择登录时间" 
+              placeholder="请选择操作时间" 
               range-separator="~"
               start-placeholder="开始时间"
               end-placeholder="结束时间"
@@ -104,7 +104,7 @@
 import { ref, onMounted } from 'vue';
 import { Search, Refresh, Edit ,SuccessFilled, CircleCloseFilled} from '@element-plus/icons-vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { exportLoginLog } from '@/api/system/log';
+import { exportOperationLog } from '@/api/system/log';
 import { downloadByData } from '@/utils/file/download';
 import type { FormInstance } from 'element-plus'
 import DetailDialog from './DetailDialog.vue';
@@ -125,7 +125,7 @@ const handleExport = () => {
       type: 'warning',
     })
       .then(() => {
-        exportLoginLog(requestParams.queryParam).then(async (responnse) => {
+        exportOperationLog(requestParams.queryParam).then(async (responnse) => {
           if (!responnse) {
             throw new Error('下载文件失败');
           }