From 0ac79875f5c471ccbcd0d00a0e315287e7fc6211 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 14 九月 2022 15:55:42 +0800
Subject: [PATCH] 1

---
 KB_EquipmentUtilizationRate.html |   72 ++++++++++++++++++-----------------
 1 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/KB_EquipmentUtilizationRate.html b/KB_EquipmentUtilizationRate.html
index f042b49..86bcb32 100644
--- a/KB_EquipmentUtilizationRate.html
+++ b/KB_EquipmentUtilizationRate.html
@@ -222,17 +222,18 @@
     </style>
     <script type="text/javascript">
         //鍙傛暟閰嶇疆
-        var HouseCode = '509'; //浠撳簱缂栫爜
+        var HouseCode = '509'; 
 
 
         var interval;//璁℃椂鍣�
         var interval1;//璁℃椂鍣�
         var num = 0;
-        var LackMastProgress = [];     //缂烘枡鐜囨暟鎹暟缁�
-        var BadProgress = [];          //鏉ユ枡涓嶈壇鐜囨暟鎹暟缁�
+        var NetQtys = [];     //寮�鏈�
+        var SumQtys = [];     //寮�宸�
+        var WayQtys = [];     //缁翠慨
+        var MatsQtys = [];     //寰呮満
         var ToDayDt = [];              //浠婃棩涓嶈壇瀵规瘮鏃堕棿鏁扮粍
         var GoodQty = [];              //浠婃棩涓嶈壇瀵规瘮鍚堟牸鏁版暟缁�
-        var BadQty = [];               //浠婃棩涓嶈壇瀵规瘮涓嶈壇鏁版暟缁�
         $(document).ready(function () {
             // 鍒涘缓涓や釜鍙橀噺锛屼竴涓暟缁勪腑鐨勬湀鍜屾棩鐨勫悕绉�
             var monthNames = ["1 鏈�", "2 鏈�", "3 鏈�", "4 鏈�", "5 鏈�", "6 鏈�", "7 鏈�", "8 鏈�", "9 鏈�", "10 鏈�", "11 鏈�", "12 鏈�"];
@@ -266,11 +267,12 @@
             // 瀹氭椂鍣�
             interval = setInterval(function () {
                 num = 0;
-                LackMastProgress = [];     //缂烘枡鐜囨暟鎹暟缁�
-                BadProgress = [];          //鏉ユ枡涓嶈壇鐜囨暟鎹暟缁�
+                NetQtys = [];     //寮�鏈�
+                SumQtys = [];     //寮�宸�
+                WayQtys = [];     //缁翠慨
+                MatsQtys = [];     //寰呮満
                 ToDayDt = [];              //浠婃棩涓嶈壇瀵规瘮鏃堕棿鏁扮粍
                 GoodQty = [];              //浠婃棩涓嶈壇瀵规瘮鍚堟牸鏁版暟缁�
-                BadQty = [];               //浠婃棩涓嶈壇瀵规瘮涓嶈壇鏁版暟缁�
                 Chart(mychart1, mychart2, mychart3);
             }, 20000);
             interval1 = setInterval(function () {
@@ -286,7 +288,7 @@
 
         function Chart(mychart1, mychart2, mychart3) {
             $.ajax({
-                url: "http://122.227.199.62:5058/HDKanBanApi/api/loaddata/LackMatsData",
+                url: "http://localhost:12298/api/loaddata/KB_EquipmentUtilizationRateData",
                 dataType: "JSON",
                 async: false,//浣跨敤鍚屾鐨勬柟寮�,true涓哄紓姝ユ柟寮�
                 type: "Get",
@@ -322,15 +324,16 @@
                     $("#MatsQty").html(parseFloat(data.data[0][0].LackMastQty).toFixed(0));
                     $("#WayQty").html(parseFloat(data.data[0][0].PuchQty).toFixed(0));
 
-                    //缂烘枡鐜�
-                    LackMastProgress.push(data.data[1][0].LackMastProgress);
+                    //寮�鏈虹巼  寮�宸ョ巼  缁翠慨鐜�  寰呮満鐜�
+                    NetQtys.push(data.data[1][0]["NetQtys"]);
+                    SumQtys.push(data.data[1][0]["SumQtys"]);
+                    WayQtys.push(data.data[1][0]["WayQtys"]);
+                    MatsQtys.push(data.data[1][0]["MatsQtys"]);
                     //鏉ユ枡涓嶈壇鐜�
-                    BadProgress.push(data.data[2][0].BadProgress);
                     //浠婃棩涓嶈壇瀵规瘮
-                    $.each(data.data[3], function (index, val) {
-                        ToDayDt.push(val.hour.substring(5));
-                        GoodQty.push(parseFloat(val.GoodQty).toFixed(0));
-                        BadQty.push(parseFloat(val.BadQty).toFixed(0));
+                    $.each(data.data[2], function (index, val) {
+                        ToDayDt.push(val.num);
+                        GoodQty.push(val.workOEE);
                     });
                 },
                 error: function (data) {
@@ -338,12 +341,12 @@
                 }
             })
 
-            const colorList = ['#47A2FF', '#ff9900']
+            const colorList = ['#47A2FF', '#ff9900', '#c0ffff','#ffffff']
             option1 = {
                 title: [
                     {
-                        text: '',
-                        subtext: LackMastProgress + '%',
+                        text: '寮�鏈虹巼',
+                        subtext: NetQtys + '%',
                         textStyle: {
                             fontSize: 16,
                             color: '#999',
@@ -355,11 +358,11 @@
                         },
                         textAlign: 'center',
                         left: '50%',
-                        top: '85%'
+                        top: '78%'
                     },
                     {
                         show: true,
-                        text: '鎬荤鍔ㄧ巼鍒嗘瀽',
+                        text: '鐘舵�佸姣斿垎鏋�',
                         textStyle: {
                             color: '#00c6ff',
                             fontSize: '16',
@@ -375,7 +378,11 @@
                 legend: {
                     type: 'scroll',
                     icon: 'pin',
-                    show: false
+                    top: '15%',
+                    left: 'center',
+                    textStyle: {
+                        color: '#09d1ea'
+                    }
                 },
                 color: colorList,
                 series: [
@@ -384,7 +391,6 @@
                         type: 'pie',
                         radius: [50, 80],
                         center: ['50%', '50%'],
-                        center: ['50%', '60%'],
                         avoidLabelOverlap: false,
                         label: {
                             show: false
@@ -397,8 +403,10 @@
                             borderColor: '#000000'
                         },
                         data: [
-                            { name: '', value: LackMastProgress },
-                            { name: '', value: 100 - LackMastProgress }
+                            { name: '寮�鏈�', value: NetQtys },
+                            { name: '寮�宸�', value: SumQtys },
+                            { name: '寰呮満', value: WayQtys },
+                            { name: '缁翠慨涓�', value: MatsQtys }
                         ],
                     }
                 ]
@@ -408,7 +416,7 @@
                 title: [
                     {
                         text: '',
-                        subtext: BadProgress + '%',
+                        subtext: 0 + '%',
                         textStyle: {
                             fontSize: 16,
                             color: '#999',
@@ -462,8 +470,8 @@
                             borderColor: '#000000'
                         },
                         data: [
-                            { name: '', value: BadProgress },
-                            { name: '', value: 100 - BadProgress }
+                            { name: '', value: 0 },
+                            { name: '', value: 100 - 2 }
                         ],
                     }
                 ]
@@ -492,7 +500,7 @@
                 },
                 legend: {
                     left: 'right',
-                    data: ['浠诲姟鏁�', '瀹屾垚鏁�'],
+                    data: ['宸ヤ綔绋煎姩鐜�'],
                     textStyle: {
                         color: '#00c6ff',
                         fontSize: 16,
@@ -549,16 +557,10 @@
                 ],
                 series: [
                     {
-                        name: '浠诲姟鏁�',
+                        name: '宸ヤ綔绋煎姩鐜�',
                         type: 'bar',
                         barWidth: 15,
                         data: GoodQty
-                    },
-                    {
-                        name: '瀹屾垚鏁�',
-                        type: 'bar',
-                        barWidth: 15,
-                        data: BadQty
                     }
                 ]
             };

--
Gitblit v1.9.1