Merge branch 'uat' into main

2025-02-14 17:26:58 +08:00 · 2025-02-14 17:26:58 +08:00 · 596ea8f658
parent 4a479258f2 b24548dd8b
commit 596ea8f658
1 changed files with 3 additions and 3 deletions
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@ -74,7 +74,7 @@
          v-if="!isMine"
        >
          <el-select
-            v-model="searchData.LoginUserTypeEnum"
+            v-model="searchData.LoginUserType"
            clearable
            style="width: 120px"
          >
@ -82,7 +82,7 @@
              v-for="item of $d.UserType"
              v-show="item.value !== 7 && item.value !== 8"
              :key="'UserType' + item.label"
-              :value="item.value"
+              :value="item.id"
              :label="item.label"
            />
          </el-select>
@ -250,7 +250,7 @@ const searchDataDefault = () => {
    Ip: '',
    LoginFaildName: '',
    LoginUserName: '',
-    LoginUserTypeEnum: null,
+    LoginUserType: null,
    BeginDate: '',
    EndDate: '',
    Asc: false,