diff --git a/src/components/charts/panel.scss b/src/components/charts/panel.scss index 00e7eb54..327648ce 100644 --- a/src/components/charts/panel.scss +++ b/src/components/charts/panel.scss @@ -11,6 +11,7 @@ .cn-icon-arrow-left-circle { color: $--color-primary; + font-size: 20px; } } .cn-panel, .cn-panel>.cn-chart__tabs>.el-tabs__content>.el-tab-pane { diff --git a/src/utils/unit-convert.js b/src/utils/unit-convert.js index 7f66cd5e..65e5e0f8 100644 --- a/src/utils/unit-convert.js +++ b/src/utils/unit-convert.js @@ -65,7 +65,15 @@ export function timeUnitFormatter (time, sourceUnit = 'ms', targetUnit, dot = 2) // unitType = time / number / byte export default function unitConvert (value, unitType, sourceUnit, targetUnit, dot = 2) { if (unitType === unitTypes.string) { - return [value, ''] + if (value) { + if (typeof value === 'string') { + return [value, ''] + } else { + return ['-', ''] + } + } else { + return ['-', ''] + } } if (!Number(value) && Number(value) !== 0) { return ['-', ''] diff --git a/src/views/charts/Panel.vue b/src/views/charts/Panel.vue index 2b84011f..5725be1e 100644 --- a/src/views/charts/Panel.vue +++ b/src/views/charts/Panel.vue @@ -1,11 +1,10 @@ - + - - {{typeName}} {{$t('overall.detail')}} + - + @@ -71,7 +70,7 @@ export default { setup (props, ctx) { let tab = '' if (!_.isEmpty(props.tabs)) { - tab = ref(props.tabs[0].key) + tab = ref(props.tabs[0].label) } // data const dateRangeValue = 60 @@ -90,6 +89,11 @@ export default { } }, methods: { + goBack () { + this.$emit('goBack') + }, + changeTab (label) { + }, async init () { const panels = await getPanelList({ type: this.panelType }) if (panels && panels.length > 0) { diff --git a/src/views/entities/EntityExplorer.vue b/src/views/entities/EntityExplorer.vue index d5947402..8e4efdeb 100644 --- a/src/views/entities/EntityExplorer.vue +++ b/src/views/entities/EntityExplorer.vue @@ -36,7 +36,7 @@ > - +