From 2cd1b00491cbf2a1b54cdb8ce08727ca64106a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Fri, 29 Jul 2022 12:11:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/static/css/board/month.css | 4 ++-- ruoyi-admin/src/main/resources/static/js/board/month.js | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/css/board/month.css b/ruoyi-admin/src/main/resources/static/css/board/month.css index 469c610..1963309 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/month.css +++ b/ruoyi-admin/src/main/resources/static/css/board/month.css @@ -43,8 +43,8 @@ body { .safe{ position: absolute; width: 22%; - height: 34%; - top: 61%; + height: 30%; + top: 64%; left: 75.5%; } .abnormal{ diff --git a/ruoyi-admin/src/main/resources/static/js/board/month.js b/ruoyi-admin/src/main/resources/static/js/board/month.js index 1a14e3f..02134a3 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -133,6 +133,12 @@ const curWeek = () => { let d = Math.ceil((today.valueOf() - firstDayOfYear.valueOf()) / 86400000); return Math.ceil((d / 7) + 1); } +const today = () => { + const currentYear = new Date().getFullYear().toString(); + const hasTimestamp = new Date() - new Date(currentYear); + const hasDays = Math.ceil(hasTimestamp / 86400000); + return hasDays +} const moduleTitle = () => { const html = ` @@ -145,6 +151,7 @@ const moduleTitle = () => { 单台能耗 质量分析 数字化安全 + ${new Date().getFullYear()} 年连续安全生产 ${today()} 天 ` $('body').append(html) }