diff --git a/nezha-fronted/src/components/chart/chart/chartBubble.vue b/nezha-fronted/src/components/chart/chart/chartBubble.vue index b891f7c60..aef1284a4 100644 --- a/nezha-fronted/src/components/chart/chart/chartBubble.vue +++ b/nezha-fronted/src/components/chart/chart/chartBubble.vue @@ -175,6 +175,7 @@ export default { .style('font-size', function (d) { return d.r / 3 > 10 ? d.r / 3 : 0 }) + .style('border-radius', '50%') .html((d) => { return this.bubbleFormatterLabel(d) }) @@ -237,19 +238,19 @@ export default { this.drawBubbleChart() }, 50) }, - bubbleEnter (e, node) { // 移入六边形 + bubbleEnter (e, node) { // 移入气泡 this.tooltip.title = node.data.alias this.tooltip.value = node.data.showValue this.tooltip.mapping = node.data.mapping this.tooltip.show = true this.setPosition(e) }, - bubbleMove (e) { // 六边形内移动 + bubbleMove (e) { // 气泡内移动 if (this.tooltip.show) { this.setPosition(e) } }, - bubbleLeave () { + bubbleLeave () { // 移出气泡 this.tooltip.show = false }, setPosition (e) { diff --git a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue index 14aad7aee..65b9b9685 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/chartConfig.vue @@ -484,25 +484,28 @@
- - - - - {{item.value}} - - + + + + + {{item.value}} + + - - - - - - - - - - + + + + + + + + + + + + +
@@ -542,7 +545,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue index 10a2049dd..a569e3915 100644 --- a/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue +++ b/nezha-fronted/src/components/common/rightBox/chart/systemChartConfig.vue @@ -437,25 +437,28 @@
- - - - - {{item.value}} - - + + + + + {{item.value}} + + - - - - - - - - - - + + + + + + + + + + + + +
@@ -469,11 +472,11 @@
{{$t('dashboard.panel.chartForm.unit')}}
@@ -495,7 +498,7 @@ - + diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js index f36d71774..f5c807e7e 100644 --- a/nezha-fronted/src/permission.js +++ b/nezha-fronted/src/permission.js @@ -142,8 +142,10 @@ router.beforeEach((to, from, next) => { returnMenuCode(res.data.menus, arr) store.commit('setButtonList', arr) store.commit('setRoleList', res.data.roles) - const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' - document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme) + if (localStorage.getItem('nz-user-id')) { + const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' + document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme) + } resolve() } else { localStorage.removeItem('nz-token') @@ -152,8 +154,10 @@ router.beforeEach((to, from, next) => { }) }) } else { - const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' - document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme) + if (localStorage.getItem('nz-user-id')) { + const theme = localStorage.getItem(`nz-user-${localStorage.getItem('nz-user-id')}-theme`) || 'light' + document.getElementsByTagName('body')[0].setAttribute('class', 'theme-' + theme) + } resolve() } }) diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js index b891da96c..023b6cc3b 100644 --- a/nezha-fronted/src/store/user.js +++ b/nezha-fronted/src/store/user.js @@ -168,6 +168,7 @@ const user = { localStorage.removeItem('nz-username') localStorage.removeItem('nz-username') localStorage.removeItem('nz-token') + localStorage.removeItem('nz-user-id') } } }