diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py index b8f2dca6..f14d3790 100644 --- a/sf_machine_connect/controllers/controllers.py +++ b/sf_machine_connect/controllers/controllers.py @@ -906,9 +906,7 @@ class Sf_Dashboard_Connect(http.Controller): 'name': log.name, 'alarm_time': log.alarm_time.strftime('%Y-%m-%d %H:%M:%S'), 'fault_alarm_info': log.fault_alarm_info, - 'status': log.status, - 'note': log.note, - 'alarm_level': log.alarm_level + 'fault_process': log.fault_process }) except Exception as e: @@ -916,7 +914,6 @@ class Sf_Dashboard_Connect(http.Controller): return json.dumps(res) - # 设备oee @http.route('/api/OEE', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*") def OEE(self, **kw): diff --git a/sf_maintenance/models/sf_maintenance_logs.py b/sf_maintenance/models/sf_maintenance_logs.py index 62672e16..c1a82a1b 100644 --- a/sf_maintenance/models/sf_maintenance_logs.py +++ b/sf_maintenance/models/sf_maintenance_logs.py @@ -10,7 +10,6 @@ class SfMaintenanceLogs(models.Model): code = fields.Char(string='编码', readonly=True) name = fields.Char(string='名称', compute='_compute_name') type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型') - status = fields.Selection([('待处理', '待处理'), ('已处理', '已处理')], string='状态', default='待处理') brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌') maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='机台号') maintenance_equipment_oee_id = fields.Many2one('maintenance.equipment.oee', string='设备oee') diff --git a/sf_maintenance/views/maintenance_logs_views.xml b/sf_maintenance/views/maintenance_logs_views.xml index 43ee0ccf..1b7b28f3 100644 --- a/sf_maintenance/views/maintenance_logs_views.xml +++ b/sf_maintenance/views/maintenance_logs_views.xml @@ -58,9 +58,6 @@ - - - @@ -86,7 +83,6 @@ -