Merge branch 'uat' into main
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
596ea8f658
|
@ -74,7 +74,7 @@
|
||||||
v-if="!isMine"
|
v-if="!isMine"
|
||||||
>
|
>
|
||||||
<el-select
|
<el-select
|
||||||
v-model="searchData.LoginUserTypeEnum"
|
v-model="searchData.LoginUserType"
|
||||||
clearable
|
clearable
|
||||||
style="width: 120px"
|
style="width: 120px"
|
||||||
>
|
>
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
v-for="item of $d.UserType"
|
v-for="item of $d.UserType"
|
||||||
v-show="item.value !== 7 && item.value !== 8"
|
v-show="item.value !== 7 && item.value !== 8"
|
||||||
:key="'UserType' + item.label"
|
:key="'UserType' + item.label"
|
||||||
:value="item.value"
|
:value="item.id"
|
||||||
:label="item.label"
|
:label="item.label"
|
||||||
/>
|
/>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -250,7 +250,7 @@ const searchDataDefault = () => {
|
||||||
Ip: '',
|
Ip: '',
|
||||||
LoginFaildName: '',
|
LoginFaildName: '',
|
||||||
LoginUserName: '',
|
LoginUserName: '',
|
||||||
LoginUserTypeEnum: null,
|
LoginUserType: null,
|
||||||
BeginDate: '',
|
BeginDate: '',
|
||||||
EndDate: '',
|
EndDate: '',
|
||||||
Asc: false,
|
Asc: false,
|
||||||
|
|
Loading…
Reference in New Issue