diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss index d7e6414c..8eb76259 100644 --- a/jikimo_frontend/static/src/scss/custom_style.scss +++ b/jikimo_frontend/static/src/scss/custom_style.scss @@ -108,6 +108,10 @@ td.o_required_modifier { } .color_3 { + background-color: #808080; +} + +.color_4 { background-color: rgb(255, 150, 0); } diff --git a/sf_machine_connect/models/ftp_client.py b/sf_machine_connect/models/ftp_client.py index b5c99a7a..18c5b878 100644 --- a/sf_machine_connect/models/ftp_client.py +++ b/sf_machine_connect/models/ftp_client.py @@ -217,7 +217,7 @@ class Machine_ftp(models.Model): status = fields.Boolean('机床在线状态', readonly=True) # run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='机床运行状态', # readonly=True, default='0') - run_status = fields.Char('机床运行状态', readonly=True) + # run_status = fields.Char('机床运行状态', readonly=True) run_time = fields.Char('机床累计运行时长', readonly=True) # 机床系统日期 system_date = fields.Char('机床系统日期', readonly=True) diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py index 46f26257..d5bfa6b4 100644 --- a/sf_maintenance/models/sf_maintenance.py +++ b/sf_maintenance/models/sf_maintenance.py @@ -38,6 +38,8 @@ class SfMaintenanceEquipment(models.Model): crea_url = "/api/machine_tool/create" + run_status = fields.Char('机床运行状态', readonly=True) + # AGV运行日志 agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志') # 1212修改后的字段 diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml index 8b084f04..8c6cb40d 100644 --- a/sf_maintenance/views/maintenance_views.xml +++ b/sf_maintenance/views/maintenance_views.xml @@ -1142,14 +1142,16 @@
-