From 16cd5600efc6f94ed617cb09e1a2dd579017ddef Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期二, 05 九月 2023 16:02:01 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://139.186.142.91:29418/productDev/dmMes into dev
---
platform_web/src/views/system/loginLog.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/platform_web/src/views/system/loginLog.vue b/platform_web/src/views/system/loginLog.vue
index e7c0584..bd26f42 100644
--- a/platform_web/src/views/system/loginLog.vue
+++ b/platform_web/src/views/system/loginLog.vue
@@ -2,7 +2,7 @@
<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">
@@ -10,13 +10,13 @@
</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>
<el-form-item label="鏉ユ簮" prop="orgin">
<el-select v-model="searchForm.orgin" placeholder="璇烽�夋嫨鐧诲綍鏉ユ簮" clearable @change="search">
<el-option value="0" label="PC鐧婚檰"/>
@@ -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"
@@ -36,7 +36,7 @@
end-placeholder="缁撴潫鏃堕棿"
@change="handleSearchTimeChange"
></el-date-picker>
- </el-form-item> -->
+ </el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
<el-button :loading="isWorking.export" @click="exportExcel">瀵煎嚭</el-button>
--
Gitblit v1.9.3