From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
platform_web/src/views/system/loginLog.vue | 57 ++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 40 insertions(+), 17 deletions(-)
diff --git a/platform_web/src/views/system/loginLog.vue b/platform_web/src/views/system/loginLog.vue
index 60d10ae..e4692e5 100644
--- a/platform_web/src/views/system/loginLog.vue
+++ b/platform_web/src/views/system/loginLog.vue
@@ -2,22 +2,22 @@
<TableLayout :permissions="['system:loginLog:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="鐧诲綍鐢ㄦ埛鍚�" prop="loginUsername">
+ <el-form-item label="鐢ㄦ埛鍚�" prop="loginUsername">
<el-input v-model="searchForm.loginUsername" placeholder="璇疯緭鍏ョ櫥褰曠敤鎴峰悕" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="鐧诲綍IP" prop="ip">
+ <!-- <el-form-item label="鐧诲綍IP" prop="ip">
<el-input v-model="searchForm.ip" placeholder="璇疯緭鍏ョ櫥褰旾P" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="鏈嶅姟鍣↖P" prop="serverIp">
<el-input v-model="searchForm.serverIp" placeholder="璇疯緭鍏ユ湇鍔″櫒IP" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏄惁鐧诲綍鎴愬姛" prop="success">
+ </el-form-item>-->
+ <el-form-item label="鐘舵��" prop="success">
<el-select v-model="searchForm.success" placeholder="璇烽�夋嫨鏄惁鐧诲綍鐘舵��" clearable @change="search">
<el-option value="true" label="鐧诲綍鎴愬姛"/>
<el-option value="false" label="鐧诲綍澶辫触"/>
</el-select>
</el-form-item>
- <el-form-item label="鏉ユ簮" prop="success">
+ <el-form-item label="鏉ユ簮" prop="orgin">
<el-select v-model="searchForm.orgin" placeholder="璇烽�夋嫨鐧诲綍鏉ユ簮" clearable @change="search">
<el-option value="0" label="PC鐧婚檰"/>
<el-option value="1" label="閽夐拤骞冲彴"/>
@@ -26,7 +26,7 @@
<el-option value="4" label="寰俊灏忕▼搴�"/>
</el-select>
</el-form-item>
- <el-form-item label="鐧诲綍鏃堕棿" prop="loginTime">
+ <el-form-item label="鏃堕棿" prop="loginTime">
<el-date-picker
v-model="searchDateRange"
type="datetimerange"
@@ -50,16 +50,23 @@
:data="tableData.list"
stripe
border
- :default-sort="{prop: 'loginTime', order: 'descending'}"
@sort-change="handleSortChange"
>
+ <!-- :default-sort="{prop: 'loginTime', order: 'descending'}" -->
+
<el-table-column prop="orgin" label="鏉ユ簮" align="center" min-width="100px">
<template slot-scope="{row}">
{{row.orgin | orginText}}
</template>
</el-table-column>
+ <el-table-column prop="companyUserId" label="鐢ㄦ埛id" align="center" min-width="100px"></el-table-column>
<el-table-column prop="companyName" label="浼佷笟鍚嶇О" align="center" min-width="100px"></el-table-column>
<el-table-column prop="loginUsername" label="鐧诲綍鐢ㄦ埛鍚�" align="center" min-width="100px"></el-table-column>
+ <el-table-column prop="companyUserName" label="浼佷笟鐢ㄦ埛鍚嶇О" align="center" min-width="100px">
+ <template slot-scope="{row}">
+ {{ row.companyUserName}}
+ </template>
+ </el-table-column>
<el-table-column prop="ip" label="鐧诲綍IP" align="center" min-width="120px"></el-table-column>
<el-table-column prop="location" label="鐧诲綍鍦板潃" align="center" min-width="160px"></el-table-column>
<el-table-column prop="clientInfo" label="瀹㈡埛绔�" align="center" min-width="160px"></el-table-column>
@@ -73,7 +80,11 @@
{{row.success | statusText}}
</template>
</el-table-column>
- <el-table-column prop="reason" label="澶辫触鍘熷洜" min-width="160px"></el-table-column>
+ <el-table-column prop="reason" label="澶辫触鍘熷洜" min-width="160px" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span class="lang-title-style">{{ row.reason }}</span>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -126,6 +137,8 @@
return '缇氱緤骞冲彴'
}else if (value == 3) {
return 'EDGP骞冲彴'
+ }else if (value == 4) {
+ return '寰俊灏忕▼搴�'
}else{
return 'pc-骞冲彴';
}
@@ -133,15 +146,7 @@
},
methods: {
// 鏃堕棿鎼滅储鑼冨洿鍙樺寲
- handleSearchTimeChange (value) {
- this.searchForm.startTime = null
- this.searchForm.endTime = null
- if (value != null) {
- this.searchForm.startTime = value[0]
- this.searchForm.endTime = value[1]
- }
- this.search()
- }
+
},
created () {
this.config({
@@ -155,6 +160,24 @@
}]
})
this.search()
+ },
+ methods: {
+ handleSearchTimeChange (value) {
+ this.searchForm.startTime = null
+ this.searchForm.endTime = null
+ if (value != null) {
+ this.searchForm.startTime = value[0]
+ this.searchForm.endTime = value[1]
+ }
+ this.search()
+ },
+ reset() {
+ this.$refs.searchForm.resetFields()
+ this.searchDateRange = []
+ this.searchForm.startTime = ''
+ this.searchForm.endTime = ''
+ this.search()
+ }
}
}
</script>
--
Gitblit v1.9.3