From a4099cf645628c8f49df230e6787da20cd82cf1b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 22 Sep 2021 09:06:51 +0800
Subject: [PATCH] Excel注解支持自定义数据处理器
---
ruoyi-ui/src/views/system/logininfor/index.vue | 50 +++++++++++++++++++++++++++++---------------------
1 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/ruoyi-ui/src/views/system/logininfor/index.vue b/ruoyi-ui/src/views/system/logininfor/index.vue
index 5172c83..edf8422 100644
--- a/ruoyi-ui/src/views/system/logininfor/index.vue
+++ b/ruoyi-ui/src/views/system/logininfor/index.vue
@@ -30,10 +30,10 @@
style="width: 240px"
>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_common_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -50,7 +50,7 @@
></el-date-picker>
</el-form-item>
<el-form-item>
- <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+ <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
@@ -59,6 +59,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@@ -69,6 +70,7 @@
<el-col :span="1.5">
<el-button
type="danger"
+ plain
icon="el-icon-delete"
size="mini"
@click="handleClean"
@@ -78,6 +80,7 @@
<el-col :span="1.5">
<el-button
type="warning"
+ plain
icon="el-icon-download"
size="mini"
@click="handleExport"
@@ -87,14 +90,18 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
- <el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
+ <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="访问编号" align="center" prop="infoId" />
- <el-table-column label="用户名称" align="center" prop="userName" />
+ <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="地址" align="center" prop="ipaddr" width="130" :show-overflow-tooltip="true" />
- <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="dict.type.sys_common_status" :value="scope.row.status"/>
+ </template>
+ </el-table-column>
<el-table-column label="描述" align="center" prop="msg" />
- <el-table-column label="访问时间" align="center" prop="accessTime" width="180">
+ <el-table-column label="访问时间" align="center" prop="accessTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.accessTime) }}</span>
</template>
@@ -116,6 +123,7 @@
export default {
name: "Logininfor",
+ dicts: ['sys_common_status'],
data() {
return {
// 遮罩层
@@ -130,10 +138,10 @@
total: 0,
// 表格数据
list: [],
- // 状态数据字典
- statusOptions: [],
// 日期范围
dateRange: [],
+ // 默认排序
+ defaultSort: {prop: 'loginTime', order: 'descending'},
// 查询参数
queryParams: {
pageNum: 1,
@@ -146,9 +154,6 @@
},
created() {
this.getList();
- this.getDicts("sys_common_status").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
/** 查询登录日志列表 */
@@ -161,10 +166,6 @@
}
);
},
- // 登录状态字典翻译
- statusFormat(row, column) {
- return this.selectDictLabel(this.statusOptions, row.status);
- },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -174,12 +175,19 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
+ this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
this.handleQuery();
},
- // 多选框选中数据
+ /** 多选框选中数据 */
handleSelectionChange(selection) {
this.ids = selection.map(item => item.infoId)
this.multiple = !selection.length
+ },
+ /** 排序触发事件 */
+ handleSortChange(column, prop, order) {
+ this.queryParams.orderByColumn = column.prop;
+ this.queryParams.isAsc = column.order;
+ this.getList();
},
/** 删除按钮操作 */
handleDelete(row) {
@@ -193,7 +201,7 @@
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
- })
+ }).catch(() => {});
},
/** 清空按钮操作 */
handleClean() {
@@ -206,7 +214,7 @@
}).then(() => {
this.getList();
this.msgSuccess("清空成功");
- })
+ }).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
--
Gitblit v1.9.3