diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index bad3d625..723ddcdc 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -185,6 +185,17 @@ class Machine_ftp(models.Model): y_compensation_node = fields.Char('y补偿值节点') # 数采配置相关 machine_ip = fields.Char('机床IP') + machine_signed = fields.Char('刷新间隔') + machine_status = fields.Char('机床在线状态') + machine_time_on = fields.Char('机床总在线时长') + machine_tool_num = fields.Char('机床当前刀具') + machine_program = fields.Char('机床当前程序') + machine_run_status = fields.Char('机床运行状态') + machine_run_time = fields.Char('机床总运行时长') + machine_cut_time = fields.Char('机床总切削时长') + machine_cut_status = fields.Char('机床切削状态') + machine_emg_status = fields.Char('机床急停状态') + machine_mode = fields.Char('机床操作模式') # 机床采集项目 timestamp = fields.Datetime('时间戳', readonly=True) diff --git a/sf_machine_connect/views/machine_monitor.xml b/sf_machine_connect/views/machine_monitor.xml index 45711a8b..e90e8856 100644 --- a/sf_machine_connect/views/machine_monitor.xml +++ b/sf_machine_connect/views/machine_monitor.xml @@ -115,6 +115,17 @@ + + + + + + + + + + +