修改界面

ruoyi-admin/src/main/resources/static/css/board/month.css

@@ -21,8 +21,8 @@ body {
     position: absolute;
     width: 23%;
     height: 35%;
-    top: 18.5%;
-    left: 75.3%;
+    top: 61.5%;
+    left: 2.3%;
 }
 .quality{
     position: absolute;
@@ -40,6 +40,20 @@ body {
     /*top: 15%;*/
     /*left: 75%;*/
 }
+.safe{
+    position: absolute;
+    width: 22%;
+    height: 34%;
+    top: 61%;
+    left: 75.5%;
+}
+.abnormal{
+    position: absolute;
+    width: 22%;
+    height: 34%;
+    top: 61%;
+    left: 51.5%;
+}
 .scene{
     background: url(../../img/board/month/two.jpg) no-repeat;
     background-size: 100% 100%;

ruoyi-admin/src/main/resources/static/js/board/month.js

@@ -7,7 +7,6 @@ $(() => {
     const INTERVAL = 30000
 
     autoUpdate(url + "/selectUserSatisfaction", INTERVAL, data => {
-        console.log(data)
         multipleVerticalBarChartTwo({
             xName: ['产品体验', "购物体验", "服务体验", "订单履行率"],
             yDataOne: [data[0].productRate, data[0].shoppingRate, data[0].serviceRate, data[0].orderRate],
@@ -16,6 +15,44 @@ $(() => {
             yDataTwoName: '' + data.map(val => val.yearName)[1],
         }, document.getElementById("satisfaction"), undefined, '%')
     })
+
+    autoUpdate(url + "/selectMonthNumberQaS", INTERVAL, data => {
+        multipleVerticalBarChartTwo({
+            xName:data.map(val => `${val.monthName}月`),
+            yDataOne: data.map(val => val.bhNumber),
+            yDataOneName: '闭环数',
+            yDataTwo: data.map(val => val.qaNumber),
+            yDataTwoName: "隐患数",
+        }, document.getElementById("safe"), '')
+    })
+    autoUpdate(url + "/selectMonthQANumber", INTERVAL, data => {
+        console.log(data)
+        pieChart(data.map((val,index) => {
+            if (index == 0 ) {
+                return {
+                    name: val.name,
+                    value: val.rate,
+                    itemStyle: {
+                        color: 'red',
+                    }
+                }
+            }
+            if (index == 1) {
+                return {
+                    name: val.name,
+                    value: val.rate,
+                    itemStyle: {
+                        color: 'yellow',
+                    }
+                }
+            }
+            return {
+                name: val.name,
+                value: val.rate
+            }
+
+        }), document.getElementById("abnormal"),'%');
+    })
     autoUpdate(url + "/selectProductInStoreGroupMonth", INTERVAL, data => {
 
         total(data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0), '#total')
@@ -69,14 +106,14 @@ const curWeek = () => {
 
 const moduleTitle = () => {
     const html = `
-    <span style="position: absolute;top: 2.9%;left: 50%;color: #fff;font-size: 1.1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜集成控制中心</span>
+    <span style="position: absolute;top: 2.9%;left: 50%;color: #fff;font-size: 1.1vw;transform: translateX(-50%);letter-spacing: 0.3vw">智能冷柜中央管控平台</span>
     <span style="position: absolute;top: 14.5%;left: 2.6%;color: #CFD2D0;font-size: 1.0vw">用户满意度</span>
     <span style="position: absolute;top: 14.5%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">产品升级</span>
     <span style="position: absolute;top: 14.5%;left: 68%;color: #CFD2D0;font-size: 1.0vw">场景升级</span>
-    <span style="position: absolute;top: 14.5%;left: 93%;color: #CFD2D0;font-size: 1.0vw">全价值链</span>
+    <span style="position: absolute;top: 14.5%;left: 92%;color: #CFD2D0;font-size: 1.0vw">品质提升</span>
     <span style="position: absolute;top: 57.8%;left: 3.3%;color: #CFD2D0;font-size: 1.0vw">产量统计</span>
-    <span style="position: absolute;top: 57.8%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">品质提升</span>
-    <span style="position: absolute;top: 57.8%;left: 68%;color: #CFD2D0;font-size: 1.0vw">周质量分析</span>
+    <span style="position: absolute;top: 57.8%;left: 27.6%;color: #CFD2D0;font-size: 1.0vw">单台能耗</span>
+    <span style="position: absolute;top: 57.8%;left: 68%;color: #CFD2D0;font-size: 1.0vw">质量分析</span>
     <span style="position: absolute;top: 57.8%;left: 93%;color: #CFD2D0;font-size: 1.0vw">安全生产</span>
     `
     $('body').append(html)

ruoyi-admin/src/main/resources/static/js/echartsCommon.js

@@ -1065,7 +1065,7 @@ const lineChart = function (data, id) {
 
 
 // 饼图
-const pieChart = function (data, id) {
+const pieChart = function (data, id,unit='次') {
     let charts = echarts.init(id);
     console.log(data)
     if (!data) {
@@ -1115,7 +1115,7 @@ const pieChart = function (data, id) {
                 roseType: "radius",
                 label: {
                     normal: {
-                        formatter: "{b|{b}} \n {c|{c}次}",
+                        formatter: `{b|{b}} \n {c|{c}${unit}}`,
                         rich: {
                             c: {
                                 color: "rgb(241,246,104)",

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

@@ -46,6 +46,14 @@
 <!--工业互联网生态圈-->
 <div class="ecosphere" id="ecosphere"></div>
 
+<!--安全-->
+<div class="safe" id="safe"></div>
+<!--异常-->
+<div class="abnormal" id="abnormal"></div>
+<span style="position: absolute;transform: translateX(-50%);top: 7.9%;left: 28.8%;font-size: 0.8vw;font-weight: 800;color: red;">品牌赋能</span>
+<span style="position: absolute;transform: translateX(-50%);top: 7.9%;left: 37.2%;font-size: 0.8vw;font-weight: 800;color: red;">全网协同</span>
+<span style="position: absolute;transform: translateX(-50%);top: 7.9%;left: 62.8%;font-size: 0.8vw;font-weight: 800;color: red;">生态终端</span>
+<span style="position: absolute;transform: translateX(-50%);top: 7.9%;left: 71.1%;font-size: 0.8vw;font-weight: 800;color: red;">感动用户</span>
 <!--亮点产品-->
 <!--<div class="HighlightOne" id="HighlightOne"></div>-->
 <!--<div class="HighlightTwo" id="HighlightTwo"></div>-->