XCKJ
/
irc_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2025-01-22 09:48:44 +08:00
parent 6e66dd8bbe b209c6566b
commit 8f46819b9a
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/trials/trials-layout/components/trialsNavbar.vue
View File

@ -146,7 +146,11 @@ export default {
return this.$store.state.user.roles return this.$store.state.user.roles
}, },
hasRole() { hasRole() {
return this.roles && this.roles.length > 1 return (
this.roles &&
this.roles.length > 1 &&
this.roles.filter((item) => !item.IsUserRoleDisabled).length > 1
)
}, },
}, },
watch: { watch: {

2
src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
View File

@ -24,6 +24,7 @@
<el-button <el-button
size="mini" size="mini"
type="primary" type="primary"
style="margin-right: 10px"
icon="el-icon-refresh-left" icon="el-icon-refresh-left"
@click="handleReset" @click="handleReset"
> >
@ -491,6 +492,7 @@ export default {
.participant-container { .participant-container {
height: 100%; height: 100%;
.el-header { .el-header {
padding-right: 5px;
.filter-container { .filter-container {
display: flex; display: flex;
align-items: center; align-items: center;