From f566c39026d0141b2b7516b12b3bae90cc16cd13 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 九月 2021 10:55:58 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/monitor/logininfor/index.vue | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/logininfor/index.vue b/ruoyi-ui/src/views/monitor/logininfor/index.vue
index 5d6c051..778492b 100644
--- a/ruoyi-ui/src/views/monitor/logininfor/index.vue
+++ b/ruoyi-ui/src/views/monitor/logininfor/index.vue
@@ -99,7 +99,11 @@
<el-table-column label="鐧诲綍鍦扮偣" align="center" prop="loginLocation" :show-overflow-tooltip="true" />
<el-table-column label="娴忚鍣�" align="center" prop="browser" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔绯荤粺" align="center" prop="os" />
- <el-table-column label="鐧诲綍鐘舵��" align="center" prop="status" :formatter="statusFormat" />
+ <el-table-column label="鐧诲綍鐘舵��" align="center" prop="status">
+ <template slot-scope="scope">
+ <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
<el-table-column label="鎿嶄綔淇℃伅" align="center" prop="msg" />
<el-table-column label="鐧诲綍鏃ユ湡" align="center" prop="loginTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
@@ -120,7 +124,6 @@
<script>
import { list, delLogininfor, cleanLogininfor } from "@/api/monitor/logininfor";
-import { downLoadExcel } from "@/utils/download";
export default {
name: "Logininfor",
@@ -172,10 +175,6 @@
this.loading = false;
}
);
- },
- // 鐧诲綍鐘舵�佸瓧鍏哥炕璇�
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -229,7 +228,7 @@
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- downLoadExcel('/monitor/logininfor/export', this.queryParams);
+ this.downLoadExcel('/monitor/logininfor/export', this.queryParams);
}
}
};
--
Gitblit v1.9.3