From 271f34a03b4624c741090e5a7544302542eb6ca0 Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Thu, 15 Aug 2024 17:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=8A=A8=E7=8E=87?= =?UTF-8?q?=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_machine_connect/controllers/controllers.py | 3 +++ sf_machine_connect/models/ftp_client.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index b006e4b2..2fe2e7a5 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -89,6 +89,9 @@ class Sf_Dashboard_Connect(http.Controller): 'alarm_time': machine_data.alarm_time, 'alarm_msg': machine_data.alarm_msg, 'clear_time': machine_data.clear_time, + # 计算出来的数据 + # 开动率：运行时间/通电时间 + 'run_rate': machine_data.run_rate, }) return json.JSONEncoder().encode(res) diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index 1e09f665..f2dcc826 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -275,7 +275,8 @@ class Machine_ftp(models.Model): alarm_msg = fields.Char('故障报警信息', readonly=True) clear_time = fields.Char('故障消除时间(复原时间)', readonly=True) - # 当前程序名, 机床累计运行时间, 机床系统日期, 机床系统时间, 当前刀具号, 机床循环时间 + # # 开动率 + run_rate = fields.Char('开动率', readonly=True) class WorkCenterBarcode(models.Model):