Merge branch 'master' of https://git.rokedata.com/dws/dwsproject

qdry_project/static/src/view/oee_analysis.html

@@ -2075,12 +2075,14 @@
             this.apiData.oeeRankData = oeeRankData;
             if (this.apiData.allEquipmentData && this.apiData.allEquipmentData.length > 0) {
               this.apiData.allEquipmentData.forEach(equipment => {
-                equipment.utilization_rate = this.apiData.oeeRankData.find(
+                oeeRank = this.apiData.oeeRankData.find(
                   (device) => device.code === equipment.code
                 );
+                equipment.utilization_rate = oeeRank ? oeeRank.utilization_rate : 0;
               });
-              this.apiData.allEquipmentData.sort((a, b) => a.utilization_rate - b.utilization_rate);
+              this.apiData.allEquipmentData.sort((a, b) => b.utilization_rate - a.utilization_rate);
               console.log("排序后的设备数据:", JSON.stringify(this.apiData.allEquipmentData));
+              console.log(this.apiData.allEquipmentData.map(e => e.utilization_rate));
               this.updateOEETrendChart();
             }
             // 更新OEE排名图表