登录日志添加登录用户和角色搜索条件

src/views/trials/trials-panel/trial-summary/login-log/index.vue

@@ -37,6 +37,31 @@
             style="width:120px;"
           />
         </el-form-item>
+        <el-form-item
+          :label="$t('trials:loginLog:table:userName')"
+          prop="LoginUserName"
+        >
+          <el-input
+            v-model="searchData.LoginUserName"
+            size="small"
+            clearable
+            style="width:120px;"
+          />
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:loginLog:table:userType')"
+          prop="OptType"
+        >
+          <el-select v-model="searchData.LoginUserTypeEnum" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.UserType"
+              v-show="item.value !== 7 && item.value !== 8"
+              :key="'UserType' + item.label"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="$t('trials:loginLog:table:createTime')"
         >
@@ -120,7 +145,7 @@
         </el-table-column>
         <el-table-column
           :label="$t('trials:loginLog:table:optUserName')"
-          prop="optUserName"
+          prop="OptUserName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
@@ -160,6 +185,8 @@ const searchDataDefault = () => {
     OptType: null,
     Ip: '',
     LoginFaildName: '',
+    LoginUserName: '',
+    LoginUserTypeEnum: null,
     BeginDate: '',
     EndDate: '',
     Asc: false,