From a57f59918c67ba1b978f1a8eab53000ec53ccb73 Mon Sep 17 00:00:00 2001 From: hyh123a Date: Mon, 19 Jul 2021 18:18:10 +0800 Subject: [PATCH] modify the field to parameters --- myems-api/excelexporters/combinedequipmentcost.py | 9 +++++---- .../excelexporters/combinedequipmentefficiency.py | 9 +++++---- .../excelexporters/combinedequipmentenergycategory.py | 9 +++++---- .../excelexporters/combinedequipmentenergyitem.py | 9 +++++---- myems-api/excelexporters/combinedequipmentincome.py | 9 +++++---- myems-api/excelexporters/combinedequipmentload.py | 9 +++++---- myems-api/excelexporters/combinedequipmentoutput.py | 9 +++++---- myems-api/excelexporters/combinedequipmentsaving.py | 9 +++++---- .../excelexporters/combinedequipmentstatistics.py | 9 +++++---- myems-api/excelexporters/equipmentcost.py | 9 +++++---- myems-api/excelexporters/equipmentefficiency.py | 9 +++++---- myems-api/excelexporters/equipmentenergycategory.py | 9 +++++---- myems-api/excelexporters/equipmentenergyitem.py | 9 +++++---- myems-api/excelexporters/equipmentincome.py | 9 +++++---- myems-api/excelexporters/equipmentload.py | 9 +++++---- myems-api/excelexporters/equipmentoutput.py | 9 +++++---- myems-api/excelexporters/equipmentsaving.py | 9 +++++---- myems-api/excelexporters/equipmentstatistics.py | 9 +++++---- myems-api/excelexporters/metercost.py | 9 +++++---- myems-api/excelexporters/meterenergy.py | 9 +++++---- myems-api/excelexporters/metersubmetersbalance.py | 9 +++++---- myems-api/excelexporters/metertrend.py | 9 +++++---- myems-api/excelexporters/shopfloorcost.py | 9 +++++---- myems-api/excelexporters/shopfloorenergycategory.py | 9 +++++---- myems-api/excelexporters/shopfloorenergyitem.py | 9 +++++---- myems-api/excelexporters/shopfloorload.py | 9 +++++---- myems-api/excelexporters/shopfloorsaving.py | 9 +++++---- myems-api/excelexporters/shopfloorstatistics.py | 9 +++++---- myems-api/excelexporters/spacecost.py | 9 +++++---- myems-api/excelexporters/spaceefficiency.py | 9 +++++---- myems-api/excelexporters/spaceenergycategory.py | 9 +++++---- myems-api/excelexporters/spaceenergyitem.py | 9 +++++---- myems-api/excelexporters/spaceincome.py | 9 +++++---- myems-api/excelexporters/spaceload.py | 9 +++++---- myems-api/excelexporters/spaceoutput.py | 9 +++++---- myems-api/excelexporters/spacesaving.py | 9 +++++---- myems-api/excelexporters/spacestatistics.py | 9 +++++---- myems-api/excelexporters/storecost.py | 9 +++++---- myems-api/excelexporters/storeenergycategory.py | 9 +++++---- myems-api/excelexporters/storeenergyitem.py | 9 +++++---- myems-api/excelexporters/storeload.py | 9 +++++---- myems-api/excelexporters/storesaving.py | 9 +++++---- myems-api/excelexporters/storestatistics.py | 9 +++++---- myems-api/excelexporters/tenantcost.py | 9 +++++---- myems-api/excelexporters/tenantenergycategory.py | 9 +++++---- myems-api/excelexporters/tenantenergyitem.py | 10 +++++----- myems-api/excelexporters/tenantload.py | 9 +++++---- myems-api/excelexporters/tenantsaving.py | 9 +++++---- myems-api/excelexporters/tenantstatistics.py | 9 +++++---- 49 files changed, 245 insertions(+), 197 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentcost.py b/myems-api/excelexporters/combinedequipmentcost.py index 55032407..c781f29d 100644 --- a/myems-api/excelexporters/combinedequipmentcost.py +++ b/myems-api/excelexporters/combinedequipmentcost.py @@ -685,7 +685,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -744,7 +745,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -800,7 +801,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -817,7 +818,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index 65411790..f8da4d24 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -416,7 +416,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -475,7 +476,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -531,7 +532,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -548,7 +549,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentenergycategory.py b/myems-api/excelexporters/combinedequipmentenergycategory.py index 6f4533f2..21c38d79 100644 --- a/myems-api/excelexporters/combinedequipmentenergycategory.py +++ b/myems-api/excelexporters/combinedequipmentenergycategory.py @@ -555,7 +555,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -614,7 +615,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -669,7 +670,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -686,7 +687,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentenergyitem.py b/myems-api/excelexporters/combinedequipmentenergyitem.py index bcb33419..7cd42153 100644 --- a/myems-api/excelexporters/combinedequipmentenergyitem.py +++ b/myems-api/excelexporters/combinedequipmentenergyitem.py @@ -515,7 +515,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -574,7 +575,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -630,7 +631,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -647,7 +648,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentincome.py b/myems-api/excelexporters/combinedequipmentincome.py index 983d2137..542de3a1 100644 --- a/myems-api/excelexporters/combinedequipmentincome.py +++ b/myems-api/excelexporters/combinedequipmentincome.py @@ -556,7 +556,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -615,7 +616,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -671,7 +672,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -688,7 +689,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index 60ba2aec..23b2f0cb 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -464,7 +464,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -523,7 +524,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -579,7 +580,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -596,7 +597,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentoutput.py b/myems-api/excelexporters/combinedequipmentoutput.py index 00994261..1e19486e 100644 --- a/myems-api/excelexporters/combinedequipmentoutput.py +++ b/myems-api/excelexporters/combinedequipmentoutput.py @@ -455,7 +455,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -514,7 +515,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -570,7 +571,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -587,7 +588,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentsaving.py b/myems-api/excelexporters/combinedequipmentsaving.py index f92abd4e..7961498e 100644 --- a/myems-api/excelexporters/combinedequipmentsaving.py +++ b/myems-api/excelexporters/combinedequipmentsaving.py @@ -645,7 +645,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -704,7 +705,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -760,7 +761,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -777,7 +778,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/combinedequipmentstatistics.py b/myems-api/excelexporters/combinedequipmentstatistics.py index f21ccb00..8b265b29 100644 --- a/myems-api/excelexporters/combinedequipmentstatistics.py +++ b/myems-api/excelexporters/combinedequipmentstatistics.py @@ -495,7 +495,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -554,7 +555,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -610,7 +611,7 @@ def generate_excel(report, ################################################################################################################ ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -627,7 +628,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentcost.py b/myems-api/excelexporters/equipmentcost.py index 2e081812..5b8162c4 100644 --- a/myems-api/excelexporters/equipmentcost.py +++ b/myems-api/excelexporters/equipmentcost.py @@ -548,7 +548,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -607,7 +608,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -663,7 +664,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -680,7 +681,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index c8c5eb78..853f92f5 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -416,7 +416,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -475,7 +476,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -531,7 +532,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -548,7 +549,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentenergycategory.py b/myems-api/excelexporters/equipmentenergycategory.py index b537fa67..f66986f8 100644 --- a/myems-api/excelexporters/equipmentenergycategory.py +++ b/myems-api/excelexporters/equipmentenergycategory.py @@ -596,7 +596,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -655,7 +656,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -711,7 +712,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -728,7 +729,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentenergyitem.py b/myems-api/excelexporters/equipmentenergyitem.py index d6b34f5b..a9a808e2 100644 --- a/myems-api/excelexporters/equipmentenergyitem.py +++ b/myems-api/excelexporters/equipmentenergyitem.py @@ -459,7 +459,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -518,7 +519,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -574,7 +575,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -591,7 +592,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentincome.py b/myems-api/excelexporters/equipmentincome.py index 5ff99f37..b4d86174 100644 --- a/myems-api/excelexporters/equipmentincome.py +++ b/myems-api/excelexporters/equipmentincome.py @@ -480,7 +480,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -539,7 +540,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -595,7 +596,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -612,7 +613,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentload.py b/myems-api/excelexporters/equipmentload.py index 4d395998..3262129f 100644 --- a/myems-api/excelexporters/equipmentload.py +++ b/myems-api/excelexporters/equipmentload.py @@ -401,7 +401,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -460,7 +461,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -516,7 +517,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -533,7 +534,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentoutput.py b/myems-api/excelexporters/equipmentoutput.py index 8e683b49..8c727d27 100644 --- a/myems-api/excelexporters/equipmentoutput.py +++ b/myems-api/excelexporters/equipmentoutput.py @@ -398,7 +398,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -457,7 +458,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -513,7 +514,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -530,7 +531,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentsaving.py b/myems-api/excelexporters/equipmentsaving.py index e4594d22..46c0f98f 100644 --- a/myems-api/excelexporters/equipmentsaving.py +++ b/myems-api/excelexporters/equipmentsaving.py @@ -585,7 +585,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -644,7 +645,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -700,7 +701,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -717,7 +718,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/equipmentstatistics.py b/myems-api/excelexporters/equipmentstatistics.py index 19f9b6b6..a63c4e15 100644 --- a/myems-api/excelexporters/equipmentstatistics.py +++ b/myems-api/excelexporters/equipmentstatistics.py @@ -434,7 +434,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -493,7 +494,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -549,7 +550,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -566,7 +567,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index f0246e42..571e23db 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -393,7 +393,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -452,7 +453,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -508,7 +509,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -525,7 +526,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/meterenergy.py b/myems-api/excelexporters/meterenergy.py index cccd7186..1a13e382 100644 --- a/myems-api/excelexporters/meterenergy.py +++ b/myems-api/excelexporters/meterenergy.py @@ -412,7 +412,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -471,7 +472,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -527,7 +528,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -544,7 +545,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metersubmetersbalance.py b/myems-api/excelexporters/metersubmetersbalance.py index ff700236..5dd08ef0 100644 --- a/myems-api/excelexporters/metersubmetersbalance.py +++ b/myems-api/excelexporters/metersubmetersbalance.py @@ -352,7 +352,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -411,7 +412,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -467,7 +468,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -484,7 +485,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/metertrend.py b/myems-api/excelexporters/metertrend.py index 6c5fe719..78b4a0d9 100644 --- a/myems-api/excelexporters/metertrend.py +++ b/myems-api/excelexporters/metertrend.py @@ -307,7 +307,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -358,7 +359,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -414,7 +415,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -431,7 +432,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorcost.py b/myems-api/excelexporters/shopfloorcost.py index 9bd7ea8b..0569fadc 100644 --- a/myems-api/excelexporters/shopfloorcost.py +++ b/myems-api/excelexporters/shopfloorcost.py @@ -636,7 +636,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -695,7 +696,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -751,7 +752,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -768,7 +769,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorenergycategory.py b/myems-api/excelexporters/shopfloorenergycategory.py index 3b45f5e5..92204c37 100644 --- a/myems-api/excelexporters/shopfloorenergycategory.py +++ b/myems-api/excelexporters/shopfloorenergycategory.py @@ -522,7 +522,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -581,7 +582,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -637,7 +638,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -654,7 +655,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorenergyitem.py b/myems-api/excelexporters/shopfloorenergyitem.py index 5485ce20..ce5273e2 100644 --- a/myems-api/excelexporters/shopfloorenergyitem.py +++ b/myems-api/excelexporters/shopfloorenergyitem.py @@ -480,7 +480,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -539,7 +540,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -595,7 +596,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -612,7 +613,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index bd226e8e..1e8aefe7 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -453,7 +453,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -512,7 +513,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -568,7 +569,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -585,7 +586,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorsaving.py b/myems-api/excelexporters/shopfloorsaving.py index 869e0c88..8921af39 100644 --- a/myems-api/excelexporters/shopfloorsaving.py +++ b/myems-api/excelexporters/shopfloorsaving.py @@ -623,7 +623,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -682,7 +683,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -755,7 +756,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/shopfloorstatistics.py b/myems-api/excelexporters/shopfloorstatistics.py index f3871ede..c0bcb6a9 100644 --- a/myems-api/excelexporters/shopfloorstatistics.py +++ b/myems-api/excelexporters/shopfloorstatistics.py @@ -558,7 +558,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -617,7 +618,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -673,7 +674,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -690,7 +691,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacecost.py b/myems-api/excelexporters/spacecost.py index c00d0cc9..d253b290 100644 --- a/myems-api/excelexporters/spacecost.py +++ b/myems-api/excelexporters/spacecost.py @@ -674,7 +674,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -733,7 +734,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -789,7 +790,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -806,7 +807,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index 7cb08dfc..dd0d7f20 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -418,7 +418,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -477,7 +478,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -533,7 +534,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -550,7 +551,7 @@ def generate_excel(report, data_col = 3+col_index*3 labels_col = 2+col_index*3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i])+parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceenergycategory.py b/myems-api/excelexporters/spaceenergycategory.py index 8a5951ad..24b18057 100644 --- a/myems-api/excelexporters/spaceenergycategory.py +++ b/myems-api/excelexporters/spaceenergycategory.py @@ -713,7 +713,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -772,7 +773,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -828,7 +829,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -845,7 +846,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceenergyitem.py b/myems-api/excelexporters/spaceenergyitem.py index 8767d57b..8d1e6960 100644 --- a/myems-api/excelexporters/spaceenergyitem.py +++ b/myems-api/excelexporters/spaceenergyitem.py @@ -566,7 +566,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -625,7 +626,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -681,7 +682,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -698,7 +699,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceincome.py b/myems-api/excelexporters/spaceincome.py index b4254c65..b69d912c 100644 --- a/myems-api/excelexporters/spaceincome.py +++ b/myems-api/excelexporters/spaceincome.py @@ -606,7 +606,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -665,7 +666,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -721,7 +722,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceload.py b/myems-api/excelexporters/spaceload.py index d4380ad5..2ebd0cb0 100644 --- a/myems-api/excelexporters/spaceload.py +++ b/myems-api/excelexporters/spaceload.py @@ -513,7 +513,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -572,7 +573,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -628,7 +629,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -645,7 +646,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spaceoutput.py b/myems-api/excelexporters/spaceoutput.py index e41cf23e..95e39df7 100644 --- a/myems-api/excelexporters/spaceoutput.py +++ b/myems-api/excelexporters/spaceoutput.py @@ -502,7 +502,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -561,7 +562,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -617,7 +618,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -634,7 +635,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacesaving.py b/myems-api/excelexporters/spacesaving.py index 3342eff9..c734f48e 100644 --- a/myems-api/excelexporters/spacesaving.py +++ b/myems-api/excelexporters/spacesaving.py @@ -710,7 +710,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -769,7 +770,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -825,7 +826,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -842,7 +843,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/spacestatistics.py b/myems-api/excelexporters/spacestatistics.py index eefda06f..279acd9d 100644 --- a/myems-api/excelexporters/spacestatistics.py +++ b/myems-api/excelexporters/spacestatistics.py @@ -551,7 +551,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -610,7 +611,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -666,7 +667,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -683,7 +684,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storecost.py b/myems-api/excelexporters/storecost.py index 14183597..00472753 100644 --- a/myems-api/excelexporters/storecost.py +++ b/myems-api/excelexporters/storecost.py @@ -598,7 +598,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -657,7 +658,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -713,7 +714,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -730,7 +731,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeenergycategory.py b/myems-api/excelexporters/storeenergycategory.py index e4e448ee..38c53daf 100644 --- a/myems-api/excelexporters/storeenergycategory.py +++ b/myems-api/excelexporters/storeenergycategory.py @@ -523,7 +523,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -582,7 +583,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -638,7 +639,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -655,7 +656,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeenergyitem.py b/myems-api/excelexporters/storeenergyitem.py index 898bffe8..2ad6dd28 100644 --- a/myems-api/excelexporters/storeenergyitem.py +++ b/myems-api/excelexporters/storeenergyitem.py @@ -482,7 +482,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -541,7 +542,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -597,7 +598,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -614,7 +615,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storeload.py b/myems-api/excelexporters/storeload.py index a5f63645..4d5ed3f3 100644 --- a/myems-api/excelexporters/storeload.py +++ b/myems-api/excelexporters/storeload.py @@ -451,7 +451,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -510,7 +511,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -566,7 +567,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -583,7 +584,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storesaving.py b/myems-api/excelexporters/storesaving.py index 1aec8830..7dac382d 100644 --- a/myems-api/excelexporters/storesaving.py +++ b/myems-api/excelexporters/storesaving.py @@ -623,7 +623,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -682,7 +683,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -738,7 +739,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -755,7 +756,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/storestatistics.py b/myems-api/excelexporters/storestatistics.py index 00528e05..cddb418e 100644 --- a/myems-api/excelexporters/storestatistics.py +++ b/myems-api/excelexporters/storestatistics.py @@ -559,7 +559,8 @@ def generate_excel(report, parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -618,7 +619,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -674,7 +675,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -691,7 +692,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantcost.py b/myems-api/excelexporters/tenantcost.py index 73845ee5..b28834be 100644 --- a/myems-api/excelexporters/tenantcost.py +++ b/myems-api/excelexporters/tenantcost.py @@ -579,7 +579,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -638,7 +639,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -694,7 +695,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -711,7 +712,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantenergycategory.py b/myems-api/excelexporters/tenantenergycategory.py index 93a746a4..ccb30c16 100644 --- a/myems-api/excelexporters/tenantenergycategory.py +++ b/myems-api/excelexporters/tenantenergycategory.py @@ -644,7 +644,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -703,7 +704,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -759,7 +760,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -776,7 +777,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantenergyitem.py b/myems-api/excelexporters/tenantenergyitem.py index 8d00fed9..ca168648 100644 --- a/myems-api/excelexporters/tenantenergyitem.py +++ b/myems-api/excelexporters/tenantenergyitem.py @@ -474,8 +474,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -534,7 +534,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -590,7 +590,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -607,7 +607,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantload.py b/myems-api/excelexporters/tenantload.py index 80151363..9ddda203 100644 --- a/myems-api/excelexporters/tenantload.py +++ b/myems-api/excelexporters/tenantload.py @@ -515,7 +515,8 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -574,7 +575,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -630,7 +631,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -647,7 +648,7 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantsaving.py b/myems-api/excelexporters/tenantsaving.py index 890a8326..f4e89b40 100644 --- a/myems-api/excelexporters/tenantsaving.py +++ b/myems-api/excelexporters/tenantsaving.py @@ -618,7 +618,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -677,7 +678,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -733,7 +734,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -750,7 +751,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number)) diff --git a/myems-api/excelexporters/tenantstatistics.py b/myems-api/excelexporters/tenantstatistics.py index 3dec847b..7e82c97c 100644 --- a/myems-api/excelexporters/tenantstatistics.py +++ b/myems-api/excelexporters/tenantstatistics.py @@ -550,7 +550,8 @@ def generate_excel(report, parameters_data = report['parameters'] parameters_names_len = len(parameters_data['names']) - parameters_ws = wb.create_sheet('相关参数') + file_name = __file__.split('/')[-1].replace(".py", "") + parameters_ws = wb.create_sheet(file_name + 'Parameters') parameters_timestamps_data_max_len = \ get_parameters_timestamps_lists_max_len(list(parameters_data['timestamps'])) @@ -609,7 +610,7 @@ def generate_excel(report, parameters_ws_current_row_number = 6 parameters_ws['B' + str(parameters_ws_current_row_number)].font = title_font - parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' 相关参数' + parameters_ws['B' + str(parameters_ws_current_row_number)] = name + ' Parameters' parameters_ws_current_row_number += 1 @@ -665,7 +666,7 @@ def generate_excel(report, ######################################################## ws['B' + str(current_sheet_parameters_row_number)].font = title_font - ws['B' + str(current_sheet_parameters_row_number)] = name + ' 相关参数' + ws['B' + str(current_sheet_parameters_row_number)] = name + ' Parameters' current_sheet_parameters_row_number += 1 @@ -682,7 +683,7 @@ def generate_excel(report, data_col = 3 + col_index * 3 labels_col = 2 + col_index * 3 col_index += 1 - line.title = '相关参数 - ' + \ + line.title = 'Parameters - ' + \ parameters_ws.cell(row=parameters_table_start_row_number, column=data_col).value labels = Reference(parameters_ws, min_col=labels_col, min_row=parameters_table_start_row_number + 1, max_row=(len(parameters_data['timestamps'][i]) + parameters_table_start_row_number))