diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index f3a775dc..97bca316 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -2,152 +2,66 @@
-
-
-
+
+
+
-
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
+
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
-
-
-
+ ">
+
+
{{ scope.$index + 1 }}
-
+
{{ $fd('UserOptType', scope.row.OptType) }}
-
-
+
+
-
-
+
+
-
+
-
+
-
+
{{ $t('system:loginLog:message:detail') }}
-
+
@@ -241,6 +123,7 @@ import moment from 'moment'
const searchDataDefault = () => {
return {
OptType: null,
+ OptTypeList: [],
Ip: '',
LoginFaildName: '',
LoginUserName: '',
@@ -334,25 +217,30 @@ export default {
display: flex;
padding: 10px;
border-radius: 5px;
+
.left {
display: flex;
flex-direction: column;
width: 0;
flex-grow: 4;
+
// border-right: 1px solid #ccc;
.filter-container {
display: flex;
align-items: center;
margin: 5px;
}
+
.data-table {
flex: 1;
padding: 5px 0px;
}
+
.pagination-container {
text-align: right;
}
}
+
.icon-i {
color: #f56c6c;
cursor: pointer;
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index 3f097378..94c82162 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -2,31 +2,14 @@
-
-
-
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+ :end-placeholder="$t('trials:loginLog:table:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+ @change="handleDatetimeChange" />
{{ $t('common:button:search') }}
-
+
{{ $t('common:button:reset') }}
-
+
-
+
{{ $fd('UserOptType', scope.row.OptType) }}
-
+
-
-
+
+
-
+
-
+
-
+
{{ $t('trials:loginLog:message:detail') }}
-
+
-
+
@@ -247,6 +140,7 @@ const searchDataDefault = () => {
return {
TrialId: '',
OptType: null,
+ OptTypeList: [],
Ip: '',
LoginFaildName: '',
LoginUserName: '',