summaryrefslogtreecommitdiff
path: root/src/client/app/common/views/widgets
diff options
context:
space:
mode:
authorMeiMei <30769358+mei23@users.noreply.github.com>2018-12-16 07:06:43 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2018-12-16 07:06:43 +0900
commit2faa58928fb4fc772002aa40df0fbddee3d3457b (patch)
tree5cfcd826f2b2f208e90032ea9657797da6879583 /src/client/app/common/views/widgets
parentReturn 404 for invalid Object ID (#3627) (diff)
downloadsharkey-2faa58928fb4fc772002aa40df0fbddee3d3457b.tar.gz
sharkey-2faa58928fb4fc772002aa40df0fbddee3d3457b.tar.bz2
sharkey-2faa58928fb4fc772002aa40df0fbddee3d3457b.zip
Format uptimes (#3629)
* Format uptime * 逆だわ * ザ * 1個多い * Fix comment
Diffstat (limited to 'src/client/app/common/views/widgets')
-rw-r--r--src/client/app/common/views/widgets/server.uptimes.vue9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/client/app/common/views/widgets/server.uptimes.vue b/src/client/app/common/views/widgets/server.uptimes.vue
index 06713d83ce..56d0398e3a 100644
--- a/src/client/app/common/views/widgets/server.uptimes.vue
+++ b/src/client/app/common/views/widgets/server.uptimes.vue
@@ -1,13 +1,14 @@
<template>
<div class="uptimes">
<p>Uptimes</p>
- <p>Process: {{ process ? process.toFixed(0) : '---' }}s</p>
- <p>OS: {{ os ? os.toFixed(0) : '---' }}s</p>
+ <p>Process: {{ process }}</p>
+ <p>OS: {{ os }}</p>
</div>
</template>
<script lang="ts">
import Vue from 'vue';
+import formatUptime from '../../scripts/format-uptime';
export default Vue.extend({
props: ['connection'],
@@ -25,8 +26,8 @@ export default Vue.extend({
},
methods: {
onStats(stats) {
- this.process = stats.process_uptime;
- this.os = stats.os_uptime;
+ this.process = formatUptime(stats.process_uptime);
+ this.os = formatUptime(stats.os_uptime);
}
}
});