修改界面

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

@@ -141,7 +141,8 @@ $(() => {
         // console.log(data)
         horizontalRoundedBarChartWithBackgroundTwo({
             yNameOne: data.map(val => val.name),
-            yData: data.map(val => val.qty),
+            yData: data.map(val => val.rate),
+            status:data.map(val => val.qty),
             xDataName: "达成率",
         }, document.getElementById("IQC"))
     })
@@ -260,30 +261,31 @@ $(() => {
     })
 
     // 重点工序质量监控
-    // autoUpdate(url + "/inStore3d", INTERVAL, data => {
+    autoUpdate(url + "/selectQAZD", INTERVAL, data => {
+        console.log(data)
         percentageRingDiagram([
             {
                 name: "内胆检漏",
-            value: 54,
+                value: data.find(val => val.name == '内胆检漏').rate,
             },
             {
                 name: "安全检测",
-            value: 44,
+                value: data.find(val => val.name == '安全检测').rate,
             },
             {
                 name: "成品检漏",
-            value: 35,
+                value: data.find(val => val.name == '成品检漏').rate,
             },
             {
                 name: "测温性能",
-            value: 30,
+                value: data.find(val => val.name == '测温性能').rate,
             },
             {
                 name: "成品外观",
-            value: 44,
+                value: data.find(val => val.name == '成品外观').rate,
             },
         ], document.getElementById("mainData"))
-    // })
+    })
 
 })
 const today = () => {

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

@@ -146,9 +146,10 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
             yNameOne: ["设备000000001", "设备000000001", "设备000000001", "设备000000001", "设备000000001", "设备000000001", "设备000000001", "设备000000001", "设备000000001"],
             yData: [41, 99, 32, 41, 24, 4, 16, 64, 18],
             xDataName: "达成率",
+            status:[1,1,1,1,1,1,1,1,1]
         }
     }
-    let myColor = ["#1089E7", "#F57474", "#56D0E3", "#F8B448", "#8B78F6"];
+    let myColor = ["green", "red", "yellow", "blue", "#8B78F6"];
     let bgBar = []
     data.yData.forEach(() => {
         bgBar.push(100)
@@ -201,8 +202,8 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
                     normal: {
                         barBorderRadius: 30,
                         color: function (params) {
-                            var num = myColor.length;
+                            console.log(data.status[params.dataIndex])
-                            return myColor[params.dataIndex % num];
+                            return myColor[data.status[params.dataIndex]];
                         },
                     },
                 },
@@ -1706,6 +1707,18 @@ const singleVerticalBarChartTwo = function (data, id) {
                 type: 'bar',
                 barMaxWidth: 'auto',
                 barWidth: 1.5 * vw,
+                label:{
+                    normal: {
+                        show: true,
+                        position: "top",
+                        textStyle: {
+                            color: "#a8aab0",
+                            fontStyle: "normal",
+                            fontFamily: "微软雅黑",
+                            fontSize: 0.75 * vw,
+                        },
+                    },
+                }
             },
             {
                 data: data.yData,
@@ -1741,7 +1754,7 @@ const singleVerticalBarChartTwo = function (data, id) {
                     return {
                         value: val,
                         symbolPosition: 'end',
-                        symbolOffset: [0, '-120%']
+                        symbolOffset: [0, '-190%']
                     }
                 })
             },
@@ -2147,6 +2160,7 @@ const hollowPieChart = function (data, id) {
 // 多个环形图
 const percentageRingDiagram = function (data, id) {
     let charts = echarts.init(id);
+    console.log(data)
     data ??= [
         {
             name: "内胆检漏",