diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py
index 3aef6445..0c75ba53 100644
--- a/sf_maintenance/models/sf_maintenance_oee.py
+++ b/sf_maintenance/models/sf_maintenance_oee.py
@@ -92,7 +92,7 @@ class SfMaintenanceEquipmentOEE(models.Model):
print(base_url)
config = self.env['ir.config_parameter'].sudo()
# url = 'http://172.16.10.112:8069/api/logs/list'
- # url_time = 'http://localhost:9069/api/RunningTimeDetail'
+ # url_time = 'http://localhost:9069/api/RunningTimeDetail'
url = base_url + '/api/logs/list'
url_time = base_url + '/api/RunningTimeDetail'
machine_list = [self.equipment_code]
@@ -113,7 +113,7 @@ class SfMaintenanceEquipmentOEE(models.Model):
print(data)
# 发送POST请求
- # response = requests.post(url, json={}, data=data)
+ response = requests.post(url, json={}, data=data)
response_time = requests.post(url_time, json={}, data=data_time)
# print(response.json()) # 输出服务器返回的响应
print(response_time.json())
@@ -141,41 +141,44 @@ class SfMaintenanceEquipmentOEE(models.Model):
self.fault_nums = real_dict['alarm_last_24_nums']
self.idle_nums = real_dict['idle_count']
- # if response.status_code == 200:
- # result = response.json()
- # print('============', result)
- # if result['status'] == 1:
- # logs_list = result['data'][self.equipment_code]
- # logs_detail = ''
- # log_state = ''
- # for log in logs_list:
- # if log['state'] != log_state:
- # print('loooooooooooooooooooogs', log)
- # production_name = log['production_name'] if log['production_name'] else ' '
- # logs_detail += '| ' + log['time'] + ' | ' + log[
- # 'state'] + ' | ' + production_name + ' |
'
- # log_state = log['state']
- # # self.day_logs_detail = '| 时间 | 事件/状态 | 加工工单 |
|---|
' + logs_detail + '
'
- # self.day_logs_detail = '''
- #
- #
- # | 时间 |
- # 事件/状态 |
- # 加工工单 |
- #
- # {logs_detail}
- #
- # '''.format(logs_detail=logs_detail)
- #
- # else:
- # self.day_logs_detail = '获取日志失败'
- # else:
- # self.day_logs_detail = '获取日志失败'
+ if response.status_code == 200:
+ result = response.json()
+ print('============', result)
+ if result['status'] == 1:
+ logs_list = result['data'][self.equipment_code]
+ logs_detail = ''
+ log_state = ''
+ for log in logs_list:
+ if log['state'] != log_state:
+ print('loooooooooooooooooooogs', log)
+ production_name = log['production_name'] if log['production_name'] else ' '
+ logs_detail += '| ' + log['time'] + ' | ' + log[
+ 'state'] + ' | ' + production_name + ' |
'
+ log_state = log['state']
+ # self.day_logs_detail = '| 时间 | 事件/状态 | 加工工单 |
|---|
' + logs_detail + '
'
+ self.day_logs_detail = '''
+
+
+ | 时间 |
+ 事件/状态 |
+ 加工工单 |
+
+ {logs_detail}
+
+ '''.format(logs_detail=logs_detail)
+
+ else:
+ self.day_logs_detail = '获取日志失败'
+ else:
+ self.day_logs_detail = '获取日志失败'
# 获取历史日志详情
def get_history_logs(self):
config = self.env['ir.config_parameter'].sudo()
- url = 'http://172.16.10.112:8069/api/logs/list'
+ base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+ # url = 'http://172.16.10.112:8069/api/logs/list'
+ url = base_url + '/api/logs/list'
+ url_time = base_url + '/api/RunningTimeDetail'
machine_list = [self.equipment_code]
if not self.begin_time:
raise UserError('请选择开始时间')
diff --git a/sf_maintenance/views/maintenance_equipment_oee_views.xml b/sf_maintenance/views/maintenance_equipment_oee_views.xml
index 0ec8c601..98d6dec5 100644
--- a/sf_maintenance/views/maintenance_equipment_oee_views.xml
+++ b/sf_maintenance/views/maintenance_equipment_oee_views.xml
@@ -110,28 +110,28 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
+
+
+