diff --git a/nezha-fronted/src/components/common/popBox/guide.vue b/nezha-fronted/src/components/common/popBox/guide.vue index 8f2a5f879..d67b17a72 100644 --- a/nezha-fronted/src/components/common/popBox/guide.vue +++ b/nezha-fronted/src/components/common/popBox/guide.vue @@ -12,52 +12,52 @@ @mouseenter="enter(index)" @mouseleave="leave(index)" >
{{guide.title}}
-
+
@@ -83,42 +83,42 @@ export default { title: this.$t('guide.dc'), icon: 'nz-icon nz-icon-datacenter1', tip: this.$t('guide.dcTip'), - buttonPermissions: 'dc_add' + permissionCode: 'dc_view' }, { route: '/agent', title: this.$t('guide.agent'), icon: 'nz-icon nz-icon-agent', tip: this.$t('guide.agentTip'), - buttonPermissions: 'agent_add' + permissionCode: 'agent_view' }, { route: '/asset', title: this.$t('guide.asset'), icon: 'nz-icon nz-icon-menu-assets', tip: this.$t('guide.assetTip'), - buttonPermissions: 'asset_add' + permissionCode: 'asset_view' }, { route: '/monitor/project', title: this.$t('guide.monitor'), icon: 'nz-icon nz-icon-menu-project', tip: this.$t('guide.monitorTip'), - buttonPermissions: 'project_add' + permissionCode: 'project_view' }, { route: '/panel', title: this.$t('guide.visualization'), icon: 'nz-icon nz-icon-visualization', tip: this.$t('guide.visualizationTip'), - buttonPermissions: 'panel_add' + permissionCode: 'panel_view' }, { route: '/alertRule', title: this.$t('guide.alert'), icon: 'nz-icon nz-icon-menu-alert', tip: this.$t('guide.alertTip'), - buttonPermissions: "alertRule_add" + permissionCode: 'alertRule_view' } ], interval: null @@ -157,13 +157,13 @@ export default { this.$store.commit('openConsole') }, jump (route) { - let buttonPermissions = true + let allowed = false this.guideList.forEach(ele => { - if (!this.hasButton(ele.buttonPermissions)){ - buttonPermissions = false + if (this.hasButton(ele.permissionCode)) { + allowed = true } }) - if (!buttonPermissions){ + if (!allowed) { return } this.$emit('close') @@ -407,6 +407,9 @@ export default { color: #ABABAB; } } + .item__icon.item__icon--disabled { + cursor: not-allowed; + } } .item__title { padding-top: 20px; @@ -483,9 +486,8 @@ export default { .guide__btn:hover { opacity: .9; } - .nz-btn-permissions { - pointer-events: none; - cursor: default; + .guide__btn.guide__btn--disabled { + cursor: not-allowed; opacity: 0.4; } } diff --git a/nezha-fronted/src/components/common/table/settings/mibTable.vue b/nezha-fronted/src/components/common/table/settings/mibTable.vue index e2acf4ae3..729f01cec 100644 --- a/nezha-fronted/src/components/common/table/settings/mibTable.vue +++ b/nezha-fronted/src/components/common/table/settings/mibTable.vue @@ -106,12 +106,12 @@ export default { prop: 'id', show: true, width: 80, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('overall.name'), prop: 'name', show: true, - sortable:'custom' + sortable: 'custom' }, { label: this.$t('config.mib.fileName'), prop: 'fileName', @@ -127,11 +127,11 @@ export default { }, { label: this.$t('config.mib.updateUser'), prop: 'updateUser', - show: true + show: false }, { label: this.$t('config.mib.updateAt'), prop: 'updateAt', - show: true + show: false } ] } diff --git a/nezha-fronted/static/config.json b/nezha-fronted/static/config.json index 11023ada9..032748342 100644 --- a/nezha-fronted/static/config.json +++ b/nezha-fronted/static/config.json @@ -1 +1 @@ -{"baseUrl":"http://192.168.40.42:8080/nz-admin/", "version": "2.0.2021.05.11.19.43"} +{"baseUrl":"/", "version": "2.0.2021.05.11.19.43"}