diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index 2a42bc10..ec41bb4a 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -1503,7 +1503,6 @@ class Sf_Dashboard_Connect(http.Controller): ); """, (item, item, item)) results = cur.fetchall() - print(results) if len(results) >= 1: total_power_on_time += convert_to_seconds(results[0][0]) else: @@ -1518,7 +1517,6 @@ class Sf_Dashboard_Connect(http.Controller): else: today_power_on_time += 0 today_power_on_dict[item] = 0 - print(total_power_on_time, month_power_on_time, today_power_on_time) with conn.cursor() as cur: cur.execute(""" @@ -1565,10 +1563,7 @@ class Sf_Dashboard_Connect(http.Controller): conn.close() - print('报警时间=============', total_alarm_time, month_alarm_time, today_alarm_time) - logging.info("报警时间=%s" % total_alarm_time) - logging.info("报警时间=%s" % month_alarm_time) - logging.info("报警时间=%s" % today_alarm_time) + logging.info('报警时间总月日=============%s, %s, %s' % (total_alarm_time, month_alarm_time, today_alarm_time)) # 计算时间开动率(累计、月、日) if total_power_on_time: total_power_on_rate = (total_power_on_time - total_alarm_time) / total_power_on_time @@ -1584,29 +1579,28 @@ class Sf_Dashboard_Connect(http.Controller): total_power_on_time - today_power_on_time) else: today_power_on_rate = 0 - print("总开动率: %s" % total_power_on_rate) - print("月开动率: %s" % month_power_on_rate) - print("日开动率: %s" % today_power_on_rate) + logging.info("总开动率: %s" % total_power_on_rate) + logging.info("月开动率: %s" % month_power_on_rate) + logging.info("日开动率: %s" % today_power_on_rate) # 计算性能开动率(累计、月、日) - print('===========', orders) - print(len(orders)) + logging.info('完成工单数量: %s' % 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) 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) - print("月性能率: %s" % month_performance_rate) - print("日性能率: %s" % today_performance_rate) + logging.info("总性能率: %s" % total_performance_rate) + logging.info("月性能率: %s" % month_performance_rate) + logging.info("日性能率: %s" % today_performance_rate) # 计算累计合格率 total_pass_rate = (len(orders) - len(today_check_ng)) / len(orders) if len(orders) != 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) + logging.info("总合格率: %s" % total_pass_rate) + logging.info("月合格率: %s" % month_pass_rate) + logging.info("日合格率: %s" % today_pass_rate) # # 返回数据 # res['data'][item] = { @@ -1614,14 +1608,9 @@ class Sf_Dashboard_Connect(http.Controller): # 'month_utilization_rate': month_power_on_rate * month_performance_rate * month_pass_rate, # 'today_utilization_rate': today_power_on_rate * today_performance_rate * today_pass_rate, # } - print(machine_list) - 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]) - print('===========', single_machine_utilization_rate) single_machine_dict[i] = single_machine_utilization_rate * today_performance_rate * today_pass_rate res['data'] = {