mirror
/
glances
mirror of https://github.com/nicolargo/glances.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Display date correctly in WebUI Alarm

This commit is contained in:
nicolargo 2024-04-27 10:04:00 +02:00
parent 5e58c0b8a8
commit c09d9256c7
3 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -188,14 +188,26 @@ snapcraft:
docker: docker-alpine docker-ubuntu ## Generate local docker images
docker-alpine: ## Generate local docker images (Alpine)
docker-alpine: docker-alpine-full docker-alpine-minimal docker-alpine-dev ## Generate local docker images (Alpine)
docker-alpine-full: ## Generate local docker image (Alpine full)
docker build --target full -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-full .
docker-alpine-minimal: ## Generate local docker image (Alpine minimal)
docker build --target minimal -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-minimal .
docker-alpine-dev: ## Generate local docker image (Alpine dev)
docker build --target dev -f ./docker-files/alpine.Dockerfile -t glances:local-alpine-dev .
docker-ubuntu: ## Generate local docker images (Ubuntu)
docker-ubuntu: docker-ubuntu-full docker-ubuntu-minimal docker-ubuntu-dev ## Generate local docker images (Ubuntu)
docker-ubuntu-full: ## Generate local docker image (Ubuntu full)
docker build --target full -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-full .
docker-ubuntu-minimal: ## Generate local docker image (Ubuntu minimal)
docker build --target minimal -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-minimal .
docker-ubuntu-dev: ## Generate local docker image (Ubuntu dev)
docker build --target dev -f ./docker-files/ubuntu.Dockerfile -t glances:local-ubuntu-dev .
# ===================================================================

10
glances/outputs/static/js/components/plugin-now.vue
View File

@ -1,7 +1,7 @@
<template>
<section id="now" class="plugin">
<div class="table-row">
<div class="table-cell text-left">{{ value }}</div>
<div class="table-cell text-left">{{ localDate(value) }}</div>
</div>
</section>
</template>
@ -17,6 +17,14 @@ export default {
value() {
return this.data.stats['now'];
}
},
methods: {
localDate(date) {
console.log(date)
var local_date = new Date(date)
console.log(local_date)
return local_date.toISOString().slice(0, 19).replace(/[^\d-:]/, ' ');
}
}
};
</script>

2
glances/outputs/static/public/glances.js vendored
View File

File diff suppressed because one or more lines are too long