From 786fca2937fa59effe39053717971b8faf11f304 Mon Sep 17 00:00:00 2001
From: mgw <1392924357@qq.com>
Date: Thu, 10 Oct 2024 14:01:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E2=80=9C=E9=A9=BE=E9=A9=B6?=
 =?UTF-8?q?=E8=88=B1=E2=80=9D=E7=9A=84=E6=9C=BA=E5=BA=8A=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8E=E5=B7=A5=E5=8E=82=E4=BA=A7=E7=BA=BF=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/src/scss/custom_style.scss            |  4 ++++
 sf_machine_connect/models/ftp_client.py          |  2 +-
 sf_maintenance/models/sf_maintenance.py          |  2 ++
 sf_maintenance/views/maintenance_views.xml       | 16 +++++++++-------
 4 files changed, 16 insertions(+), 8 deletions(-)

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 @@
                         </div>
                         <div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
                         ">
-                            <div t-attf-class="#{record.state.raw_value == '正常' ? 'color_1' : ''}"></div>
-                            <div t-attf-class="#{record.state.raw_value == '故障' ? 'color_2' : ''}"></div>
-                            <div t-attf-class="#{record.state.raw_value == '不可用' ? 'color_3' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '运行中' ? 'color_1' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '待机' ? 'color_4' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '故障' ? 'color_2' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '离线' ? 'color_3' : ''}"></div>
                             <p class="o_kanban_record_bottom state_zc"
-                               t-attf-class="#{record.state.raw_value == '正常' ? 'font_color_1' : ''}
-                        #{record.state.raw_value == '故障' ? 'font_color_2' : ''}
-                        #{record.state.raw_value == '不可用' ? 'font_color_3' : ''}">
-                                <field name="state"/>
+                               t-attf-class="#{record.run_status.raw_value == '运行中' ? 'font_color_1' : ''}
+                               #{record.run_status.raw_value == '待机' ? 'font_color_4' : ''}
+                        #{record.run_status.raw_value == '故障' ? 'font_color_2' : ''}
+                        #{record.run_status.raw_value == '离线' ? 'font_color_3' : ''}">
+                                <field name="run_status"/>
                             </p>
                         </div>
                     </div>