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 d703e7a..c13483b 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -133,12 +133,6 @@ 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 = () => { // 智能冷柜中央管控平台 @@ -151,7 +145,6 @@ const moduleTitle = () => { 单台能耗 质量分析 数字化安全 - ${new Date().getFullYear()} 年连续安全生产 ${today()} 隐患排查治理体系 ` $('body').append(html) diff --git a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js index 13b3e72..e8c4829 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js +++ b/ruoyi-admin/src/main/resources/static/js/board/orderVisualization.js @@ -1,6 +1,5 @@ $(() => { moduleTitle() - safe('#safe') importData('#importData') top3Data('#top3Data') // 公共请求地址 @@ -288,12 +287,6 @@ $(() => { }) }) -const today = () => { - const currentYear = new Date().getFullYear().toString(); - const hasTimestamp = new Date() - new Date(currentYear); - const hasDays = Math.ceil(hasTimestamp / 86400000); - return hasDays -} const curWeek = () => { let today = new Date(); @@ -321,14 +314,6 @@ const moduleTitle = () => { $('body').append(html) } -const safe = (el) => { - const html = ` - ${new Date().getFullYear().toString()}年连续安全生产天数 - ${today()} - 智能冷柜互联工厂 - ` - $(el).html(html) -} const card = (val = { top: 1, diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html index a4f0c74..7153f42 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/month.html +++ b/ruoyi-admin/src/main/resources/templates/broad/month.html @@ -26,6 +26,7 @@ + @@ -70,8 +71,28 @@
+
\ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html b/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html index 12cfe8f..d23b0f0 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html +++ b/ruoyi-admin/src/main/resources/templates/broad/orderVisualization.html @@ -6,7 +6,8 @@ name="viewport"> 清单/6S/安全看板 - + @@ -23,6 +24,7 @@ + @@ -54,5 +56,26 @@ \ No newline at end of file