From 074f334d060ec7d33d39cdeaae5ed84a2a2dd3a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 八月 2023 18:20:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmMes
---
platform_web/src/views/system/loginLog.vue | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/platform_web/src/views/system/loginLog.vue b/platform_web/src/views/system/loginLog.vue
index 315bf68..60d10ae 100644
--- a/platform_web/src/views/system/loginLog.vue
+++ b/platform_web/src/views/system/loginLog.vue
@@ -17,6 +17,15 @@
<el-option value="false" label="鐧诲綍澶辫触"/>
</el-select>
</el-form-item>
+ <el-form-item label="鏉ユ簮" prop="success">
+ <el-select v-model="searchForm.orgin" placeholder="璇烽�夋嫨鐧诲綍鏉ユ簮" clearable @change="search">
+ <el-option value="0" label="PC鐧婚檰"/>
+ <el-option value="1" label="閽夐拤骞冲彴"/>
+ <el-option value="2" label="缇氱緤骞冲彴"/>
+ <el-option value="3" label="EDGP骞冲彴"/>
+ <el-option value="4" label="寰俊灏忕▼搴�"/>
+ </el-select>
+ </el-form-item>
<el-form-item label="鐧诲綍鏃堕棿" prop="loginTime">
<el-date-picker
v-model="searchDateRange"
@@ -44,6 +53,12 @@
:default-sort="{prop: 'loginTime', order: 'descending'}"
@sort-change="handleSortChange"
>
+ <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="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="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>
@@ -89,7 +104,8 @@
serverIp: '',
success: '',
startTime: null,
- endTime: null
+ endTime: null,
+ orgin:''
}
}
},
@@ -100,6 +116,19 @@
return '鐧诲綍鎴愬姛'
}
return '鐧诲綍澶辫触'
+ },
+ orginText (value) {
+ if (value ==0) {
+ return 'pc骞冲彴'
+ }else if (value == 1) {
+ return '閽夐拤骞冲彴'
+ }else if (value == 2) {
+ return '缇氱緤骞冲彴'
+ }else if (value == 3) {
+ return 'EDGP骞冲彴'
+ }else{
+ return 'pc-骞冲彴';
+ }
}
},
methods: {
--
Gitblit v1.9.3