From e7b835416602aaaa57e17b44b701fe6cd04f91c9 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Mon, 9 Nov 2020 15:23:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8console?= =?UTF-8?q?=EF=BC=8Casset=20option=E5=88=97=E5=8F=96=E6=B6=88tooltip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/asset/asset.vue | 2 +- nezha-fronted/src/components/page/dashboard/overview/chart.vue | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 20d4e163e..68f7aa5da 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -63,7 +63,7 @@ :key="`col_${index}`" :label="item.label" :fixed="item.fixed" - :show-overflow-tooltip="item.prop != 'Alert' || item.prop != 'Module'" + :show-overflow-tooltip="item.prop != 'Alert' && item.prop != 'Module' && item.prop != 'option'" :class-name="item.prop == 'option' ? 'content-right-options' : ''" :sortable="$tableSet.sortableShow(item.prop,'asset')" :prop="$tableSet.propTitle(item.prop,'asset')" diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index dd87e95af..a0b20783b 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -315,7 +315,6 @@ defaultXAxisFormatter:function(value,index){ value=bus.computeTimezone(value) let t_date = new Date(value); - console.log(t_date) let month=t_date.getMonth()+1>9?t_date.getMonth()+1:'0'+(t_date.getMonth()+1); let day = t_date.getDate()>9?t_date.getDate():'0'+t_date.getDate(); let hour = t_date.getHours()>9?t_date.getHours():'0'+t_date.getHours();