jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整url的获取方式；暂时屏蔽历史日志部分

Browse Source
This commit is contained in:
mgw
2024-09-27 14:31:22 +08:00
parent 76c5db61da
commit f7381c43aa
2 changed files with 54 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
sf_maintenance/models/sf_maintenance_oee.py
View File

@@ -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 += '<tr><td>' + log['time'] + '</td><td>' + log[
# 'state'] + '</td><td>' + production_name + '</td></tr>'
# log_state = log['state']
# # self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
# self.day_logs_detail = '''
# <table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
# <tr style="background-color: #f2f2f2;">
# <th style="padding: 8px; border: 1px solid #ddd;">时间</th>
# <th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
# <th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
# </tr>
# {logs_detail}
# </table>
# '''.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 += '<tr><td>' + log['time'] + '</td><td>' + log[
'state'] + '</td><td>' + production_name + '</td></tr>'
log_state = log['state']
# self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
self.day_logs_detail = '''
<table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
<tr style="background-color: #f2f2f2;">
<th style="padding: 8px; border: 1px solid #ddd;">时间</th>
<th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
<th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
</tr>
{logs_detail}
</table>
'''.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('请选择开始时间')