mirror of
https://github.com/nicolargo/glances.git
synced 2024-11-23 20:45:33 +03:00
Merge branch 'issue2939' into develop
This commit is contained in:
commit
10c98f6fda
@ -13,7 +13,8 @@ check_update=true
|
||||
# Default is 1200 values (~1h with the default refresh rate)
|
||||
history_size=1200
|
||||
# Set the way Glances should display the date (default is %Y-%m-%d %H:%M:%S %Z)
|
||||
#strftime_format="%Y-%m-%d %H:%M:%S %Z"
|
||||
# strftime_format=%Y-%m-%d %H:%M:%S %Z
|
||||
strftime_format=%Y-%m-%d
|
||||
# Define external directory for loading additional plugins
|
||||
# The layout follows the glances standard for plugin definitions
|
||||
#plugin_dir=/home/user/dev/plugins
|
||||
|
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<section id="now" class="plugin">
|
||||
<div class="table-row">
|
||||
<div class="table-cell text-left">{{ localDate(date_iso) }}</div>
|
||||
<div class="table-cell text-left">{{ date_custom }}</div>
|
||||
</div>
|
||||
</section>
|
||||
</template>
|
||||
@ -14,13 +14,8 @@ export default {
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
date_iso() {
|
||||
return this.data.stats['now']['iso'];
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
localDate(date) {
|
||||
return new Date(date).toLocaleString();
|
||||
date_custom() {
|
||||
return this.data.stats['now']['custom'];
|
||||
}
|
||||
}
|
||||
};
|
||||
|
840
glances/outputs/static/package-lock.json
generated
840
glances/outputs/static/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
glances/outputs/static/public/glances.js
vendored
10
glances/outputs/static/public/glances.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user