Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/修改机床参数bug

# Conflicts:
#	sf_maintenance/views/maintenance_views.xml

sf_maintenance/models/sf_maintenance.py

@@ -44,11 +44,9 @@ class SfMaintenanceEquipment(models.Model):
     overhaul_period = fields.Integer(string='预防检修频次')
     overhaul_duration = fields.Float(string='检修时长')
 
-
     overhaul_id = fields.Many2one('equipment.maintenance.standards', string='设备检修标准',
                                   domain="[('maintenance_type','=','检修')]")
 
-
     @api.onchange('eq_maintenance_id', 'overhaul_id')
     def _compute_equipment_maintenance_standards_ids(self):
         for record in self:
@@ -145,7 +143,6 @@ class SfMaintenanceEquipment(models.Model):
     machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志')
 
-
     def name_get(self):
         result = []
         for parameter in self:
@@ -156,7 +153,6 @@ class SfMaintenanceEquipment(models.Model):
             result.append((parameter.id, name))
         return result
 
-
     @api.constrains('rotate_speed')
     def _check_rotate_speed(self):
         if self.rotate_speed <= 0:
@@ -478,14 +474,17 @@ class SfMaintenanceEquipment(models.Model):
 
     image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id', string='设备图文')
 
+
 class MaintenanceStandardImage(models.Model):
     _name = 'maintenance.equipment.image'
-    _description = '设备图文展示'
-
+    _description = '能力特征库'
 
     active = fields.Boolean('有效', default=True)
-    name = fields.Char('加工能力')
-    image = fields.Binary(string='设备图文')
+    name = fields.Char('名称')
+    image = fields.Binary(string='图文')
+    type = fields.Selection(
+        [('加工能力', '加工能力'), ('刀尖特征', '刀尖特征'), ('柄部类型', '柄部类型'), ('走刀方向', '走刀方向'), ('冷却液', '冷却液')],
+        string='特征')
     equipment_id = fields.Many2many('maintenance.equipment', 'image_id', string='设备')
 
     @api.model
@@ -518,6 +517,3 @@ class MaintenanceStandardImage(models.Model):
             new_res.append([id, name, data_uri])
         # 返回新的结果列表
         return new_res
-
-
-