修改界面

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%;
 }

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({
+        multipleVerticalBarChartTwo(null, document.getElementById("satisfaction"), -20)
-            xName: data.map(val => val.code),
+    })
-            yDataOne: yDataOne,
+    autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => {
-            yDataOneName: '计划',
+        verticalBarChart(null, document.getElementById("outputStatistics"), -20)
-            yDataTwo: yDataTwo,
-            yDataTwoName: "产量",
-        }, document.getElementById("satisfaction"), -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 = `
-    <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">第${curWeek()}周 生产数据分析平台</span>
+    <span style="position: absolute;top: 0.9%;left: 50%;color: #fff;font-size: 1.3vw;transform: translateX(-50%);letter-spacing: 0.3vw">第${new Date().getMonth().toString()}月 生产数据分析平台</span>
-    <span style="position: absolute;top: 10%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">第${curWeek()}周 产量统计 </span>
+    <span style="position: absolute;top: 10%;left: 3.3%;color: #CFD2D0;font-size: 1.0vw">用户满意度</span>
-    <span style="position: absolute;top: 10%;left: 32%;color: #CFD2D0;font-size: 1.0vw">周订单执行情况</span>
+    <span style="position: absolute;top: 10%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">周订单执行情况</span>
-    <span style="position: absolute;top: 10%;left: 73.5%;color: #CFD2D0;font-size: 1.0vw">班组 6s 排行榜</span>
+    <span style="position: absolute;top: 10%;left: 51.5%;color: #CFD2D0;font-size: 1.0vw">班组 6s 排行榜</span>
-    <span style="position: absolute;top: 54.5%;left: 5.5%;color: #CFD2D0;font-size: 1.0vw">周生产型号统计</span>
+    <span style="position: absolute;top: 10%;left: 76%;color: #CFD2D0;font-size: 1.0vw">周生产型号统计</span>
-    <span style="position: absolute;top: 54.5%;left: 32%;color: #CFD2D0;font-size: 1.0vw">周质量分析</span>
+    <span style="position: absolute;top: 54.5%;left: 3.3%;color: #CFD2D0;font-size: 1.0vw">产量统计</span>
-    <span style="position: absolute;top: 54.5%;left: 73.6%;color: #CFD2D0;font-size: 1.0vw">安全生产</span>
+    <span style="position: absolute;top: 54.5%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">品质提升</span>
+    <span style="position: absolute;top: 54.5%;left: 51.5%;color: #CFD2D0;font-size: 1.0vw">周质量分析</span>
+    <span style="position: absolute;top: 54.5%;left: 76%;color: #CFD2D0;font-size: 1.0vw">安全生产</span>
     `
     $('body').append(html)
 }

ruoyi-admin/src/main/resources/templates/broad/month.html

@@ -31,6 +31,9 @@
 <!--用户满意度-->
 <div class="satisfaction" id="satisfaction"></div>
 
+<!--产量统计-->
+<div class="outputStatistics" id="outputStatistics"></div>
+
 </body>
 <script src="../../static/js/board/month.js" th:src="@{/js/board/month.js}"></script>
 <script>