Merge remote-tracking branch 'gitee/master'

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

@@ -2,7 +2,6 @@ $(() => {
     moduleTitle()
     LOSS()
     jp()
-    total('#total')
     // 公共请求地址
     let url = '/broad/zz'
 
@@ -38,6 +37,7 @@ $(() => {
             data = JSON.parse(data)
             // 实际
             targetTop.reality = data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0)
+            total('#total', data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0))
             // 起始时间
             let oneTime = parseFloat(data[0].name.split(':')[0])
             // 横坐标
@@ -103,7 +103,7 @@ $(() => {
                 targetBottom.targetArr = arr
                 xName = ['0:00', '1:00', '2:00', '3:00', '4:00', '5:00', '6:00', '7:00', '8:00', '9:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00', '18:00', '19:00', '20:00', '21:00', '22:00', '23:00']
             }
-            targetBottom.reality = Number((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)*100).toFixed(2)
+            targetBottom.reality = Number((data.map(val => val.rate).reduce((val1, val2) => val1 + val2, 0) / data.map(val => val.rate).length)).toFixed(2)
             targetBottom.total = data.map(val => val.qty).reduce((val1, val2) => val1 + val2, 0)
             barChartAndLineChartFour({
                 xName: xName,
@@ -119,7 +119,6 @@ $(() => {
         //当班入库执行订单
         $.post(url + "/selectInStoreOrderInfo", {}, data => {
             data = JSON.parse(data)
-            total('#total', data.map(val => val.actual_number).reduce((val1, val2) => val1 + val2, 0))
             $('#trackEvents').remove()
             $('.trackEventsScrollTable').html('<div class="trackEvents" id="trackEvents"></div>')
             dynamicTable({

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

@@ -136,7 +136,7 @@ $(() => {
         // console.log(data)
         horizontalRoundedBarChartWithBackgroundTwo({
             yNameOne: data.map(val => val.name),
-            yData: data.map(val => val.rate),
+            yData: data.map(val => val.qty),
             xDataName: "达成率",
         }, document.getElementById("IQC"))
     })
@@ -155,11 +155,10 @@ $(() => {
 
     // 生产效率
     autoUpdate(url + "/selectInstoreNumByday", INTERVAL, data => {
-        console.log(data)
         singleVerticalBarChart({
             xName: data.map(val => val.name),
-            yData: [12, 20, 11, 30, 14, 80, 50],
+            yData: data.map(val => val.qty),
-        }, document.getElementById("productionEfficiency"))
+        }, document.getElementById("productionEfficiency"),-20)
     })
     // 成品入库统计
     // autoUpdate(url + "/inStore3d", INTERVAL, data => {

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

@@ -154,11 +154,12 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
     let option = {
         grid: {
             left: "0%",
-            right: "5%",
+            right: "8%",
             bottom: "0%",
             top: "0%",
             containLabel: true,
         },
+        dataZoom:[],
         xAxis: {
             show: false,
         },
@@ -180,28 +181,6 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
                     color: "#fff",
                 },
             },
-            {
-                show: true,
-                inverse: true,
-                data: data.yData,
-                axisLabel: {
-                    textStyle: {
-                        fontSize: 12,
-                        color: "#fff",
-
-                    },
-                    formatter: '{value}%'
-                },
-                axisLine: {
-                    show: false,
-                },
-                splitLine: {
-                    show: false,
-                },
-                axisTick: {
-                    show: false,
-                },
-            },
         ],
         series: [
             {
@@ -223,10 +202,21 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
             {
                 name: "框",
                 type: "bar",
-                yAxisIndex: 1,
+                yAxisIndex: 0,
                 barGap: "-100%",
                 data: bgBar,
-                barWidth: '90%',
+                barWidth: '80%',
+                label: {
+                    show: true,
+                    position: "right",
+                    textStyle: {
+                        color: "#fff",
+                        fontSize: 0.75 * vw
+                    },
+                    formatter: function (val,index,e) {
+                        return data.yData[val.dataIndex] +'%'
+                    }
+                },
                 itemStyle: {
                     normal: {
                         color: "none",
@@ -239,20 +229,36 @@ const horizontalRoundedBarChartWithBackgroundTwo = function (data, id) {
         ],
     };
 
-    // if (data.xData?.length >= 3) {
+    if (data.yNameOne.length > 8) {
-    //     option.dataZoom.push({
+        option.dataZoom.push({
-    //         show: true,
+            show: false,
-    //         type: 'slider',
+            type: 'slider',
-    //         yAxisIndex: 0,
+            bottom: '0%',
-    //         width: 0.75 * vw,
+            yAxisIndex: 0,
-    //         start: 0,
+            height: 12,
-    //         end: 1 / (data.xData.length / 4) * 100,
+            start: 0,
-    //         textStyle: {
+            end: 1 / (data.yNameOne.length / 9) * 100,
-    //             fontSize: 0,
+            textStyle: {
-    //             color: 'rgba(0,0,0,0)'
+                fontSize: 0,
-    //         }
+                color: 'rgba(0,0,0,0)'
-    //     })
+            }
-    // }
+        })
+
+        let step = 1 / (data.yNameOne.length / 9) * 100
+        setInterval(() => {
+            option.dataZoom[0].end += step
+            option.dataZoom[0].start += step
+            if (option.dataZoom[0].start >= 100) {
+                option.dataZoom[0].start = 0
+                option.dataZoom[0].end = step
+            }
+            if (option.dataZoom[0].end >= 100) {
+                option.dataZoom[0].end = 100
+                option.dataZoom[0].start = option.dataZoom[0].end - step
+            }
+            charts.setOption(option);
+        }, 3000)
+    }
     charts.setOption(option);
     $(window).resize(charts.resize);
 }
@@ -1497,7 +1503,7 @@ const multipleVerticalBarChartTwo = function (data, id) {
 }
 
 // 单个垂直柱状图
-const singleVerticalBarChart = function (data, id) {
+const singleVerticalBarChart = function (data, id,rotate=0) {
     let charts = echarts.init(id);
     if (!data) {
         data = {
@@ -1514,7 +1520,7 @@ const singleVerticalBarChart = function (data, id) {
             top: "10%",
             left: left(),
             right: "5%",
-            bottom: "25%",
+            bottom: "15%",
             // containLabel: true
         },
         dataZoom: [],
@@ -1528,6 +1534,7 @@ const singleVerticalBarChart = function (data, id) {
             axisLabel: {
                 color: "#fff",
                 fontSize: 14,
+                rotate: rotate,
             },
         },
         yAxis: {