From 195302b67faf1c01d9a33c9bdb03cb69fb9638f0 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Wed, 16 Apr 2025 11:20:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9C=88=E5=90=88=E6=A0=BC?=
 =?UTF-8?q?=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_machine_connect/controllers/controllers.py | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 077281c4..2a42bc10 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -1444,8 +1444,8 @@ class Sf_Dashboard_Connect(http.Controller):
         today_alarm_dict = {}
         single_machine_dict = {}
 
-        today_data = []
-        month_data = []
+        today_order_data = []
+        month_order_data = []
         today_check_ng = []
         month_check_ng = []
 
@@ -1456,9 +1456,9 @@ class Sf_Dashboard_Connect(http.Controller):
         for order in orders:
             time = order.date_finished
             if time >= today_start:
-                today_data.append(order)
+                today_order_data.append(order)
             if time >= month_start:
-                month_data.append(order)
+                month_order_data.append(order)
 
         for faulty_plan in faulty_plans:
             time = faulty_plan.write_date
@@ -1593,7 +1593,7 @@ class Sf_Dashboard_Connect(http.Controller):
         print(len(orders))
         total_performance_rate = len(orders) * 30 * 60 / (total_power_on_time - total_alarm_time)
         month_performance_rate = len(month_data) * 30 * 60 / (
-                    total_power_on_time - month_power_on_time - month_alarm_time)
+                total_power_on_time - month_power_on_time - month_alarm_time)
         today_performance_rate = len(today_data) * 30 * 60 / (
                 total_power_on_time - today_power_on_time - today_alarm_time) if today_power_on_time != 0 else 0
         print("总性能率: %s" % total_performance_rate)
@@ -1602,8 +1602,8 @@ class Sf_Dashboard_Connect(http.Controller):
 
         # 计算累计合格率
         total_pass_rate = (len(orders) - len(today_check_ng)) / len(orders) if len(orders) != 0 else 0
-        month_pass_rate = (len(month_data) - len(month_check_ng)) / len(month_data) if len(month_data) != 0 else 0
-        today_pass_rate = (len(today_data) - len(today_check_ng)) / len(today_data) if len(today_data) != 0 else 0
+        month_pass_rate = (len(month_order_data) - len(month_check_ng)) / len(month_order_data) if len(month_order_data) != 0 else 0
+        today_pass_rate = (len(today_order_data) - len(today_check_ng)) / len(today_order_data) if len(today_order_data) != 0 else 0
         print("总合格率: %s" % total_pass_rate)
         print("月合格率: %s" % month_pass_rate)
         print("日合格率: %s" % today_pass_rate)
@@ -1615,11 +1615,12 @@ class Sf_Dashboard_Connect(http.Controller):
         #     'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate,
         # }
         print(machine_list)
-        print('111',today_power_on_dict)
+        print('111', today_power_on_dict)
         print('222', today_alarm_dict)
         for i in machine_list:
             print(i)
-            single_machine_utilization_rate = total_power_on_time - today_power_on_dict[i] - today_alarm_dict[i] / (total_power_on_time - today_power_on_dict[i])
+            single_machine_utilization_rate = total_power_on_time - today_power_on_dict[i] - today_alarm_dict[i] / (
+                        total_power_on_time - today_power_on_dict[i])
             print('===========', single_machine_utilization_rate)
             single_machine_dict[i] = single_machine_utilization_rate * today_performance_rate * today_pass_rate