gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:删除无用console，asset option列取消tooltip

Browse Source
This commit is contained in:
wangwenrui
2020-11-09 15:23:05 +08:00
parent 1ee556e11c
commit e7b8354166
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/page/asset/asset.vue
View File

@@ -63,7 +63,7 @@
:key="`col_${index}`" :key="`col_${index}`"
:label="item.label" :label="item.label"
:fixed="item.fixed" :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' : ''" :class-name="item.prop == 'option' ? 'content-right-options' : ''"
:sortable="$tableSet.sortableShow(item.prop,'asset')" :sortable="$tableSet.sortableShow(item.prop,'asset')"
:prop="$tableSet.propTitle(item.prop,'asset')" :prop="$tableSet.propTitle(item.prop,'asset')"

1
nezha-fronted/src/components/page/dashboard/overview/chart.vue
View File

@@ -315,7 +315,6 @@
defaultXAxisFormatter:function(value,index){ defaultXAxisFormatter:function(value,index){
value=bus.computeTimezone(value) value=bus.computeTimezone(value)
let t_date = new Date(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 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 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(); let hour = t_date.getHours()>9?t_date.getHours():'0'+t_date.getHours();