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 b8350d7..ebf46ba 100644 --- a/ruoyi-admin/src/main/resources/static/css/board/month.css +++ b/ruoyi-admin/src/main/resources/static/css/board/month.css @@ -12,8 +12,15 @@ body { .satisfaction{ position: absolute; - width: 25%; + width: 23%; height: 35%; top: 15%; - left: 71.5%; + left: 2.5%; +} +.outputStatistics{ + position: absolute; + width: 23%; + height: 35%; + top: 60%; + left: 2.5%; } \ No newline at end of file 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 02157fb..569bd7b 100644 --- a/ruoyi-admin/src/main/resources/static/js/board/month.js +++ b/ruoyi-admin/src/main/resources/static/js/board/month.js @@ -1,31 +1,22 @@ $(() => { moduleTitle() // 公共请求地址 - let url = '/broad/zhou' + let url = '/broad/month' // 轮询间隔时间 const INTERVAL = 30000 - autoUpdate(url + "/selectProductInStore", INTERVAL, data => { + autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => { let list = data.map(val => val.list) - multipleVerticalBarChartTwo({ - xName: data.map(val => val.code), - yDataOne: yDataOne, - yDataOneName: '计划', - yDataTwo: yDataTwo, - yDataTwoName: "产量", - }, document.getElementById("satisfaction"), -20) + multipleVerticalBarChartTwo(null, document.getElementById("satisfaction"), -20) + }) + autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => { + verticalBarChart(null, document.getElementById("outputStatistics"), -20) }) }) -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(); @@ -42,13 +33,15 @@ const curWeek = () => { const moduleTitle = () => { const html = ` - 第${curWeek()}周 生产数据分析平台 - 第${curWeek()}周 产量统计 - 周订单执行情况 - 班组 6s 排行榜 - 周生产型号统计 - 周质量分析 - 安全生产 + 第${new Date().getMonth().toString()}月 生产数据分析平台 + 用户满意度 + 周订单执行情况 + 班组 6s 排行榜 + 周生产型号统计 + 产量统计 + 品质提升 + 周质量分析 + 安全生产 ` $('body').append(html) } diff --git a/ruoyi-admin/src/main/resources/templates/broad/month.html b/ruoyi-admin/src/main/resources/templates/broad/month.html index acd97a2..b4ebd12 100644 --- a/ruoyi-admin/src/main/resources/templates/broad/month.html +++ b/ruoyi-admin/src/main/resources/templates/broad/month.html @@ -31,6 +31,9 @@
+ + +