From eb0c2df3e03e23600dc0b303354e3cc2bab6224a Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Thu, 25 Mar 2021 16:03:51 +0800 Subject: [PATCH] Fixed a bug --- .../combinedequipmentefficiency.py | 16 +++++++----- .../excelexporters/equipmentefficiency.py | 26 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentefficiency.py b/myems-api/excelexporters/combinedequipmentefficiency.py index d91e620d..c7698950 100644 --- a/myems-api/excelexporters/combinedequipmentefficiency.py +++ b/myems-api/excelexporters/combinedequipmentefficiency.py @@ -484,17 +484,19 @@ def generate_excel(report, parameters_ws_current_row_number += 1 - table_current_col_number = 'B' + table_current_col_number = 2 for i in range(0, parameters_names_len): if len(parameters_data['timestamps'][i]) == 0: continue - parameters_ws[table_current_col_number + str(parameters_ws_current_row_number-1)].fill = table_fill - parameters_ws[table_current_col_number + str(parameters_ws_current_row_number-1)].border = f_border + col = format_cell.get_column_letter(table_current_col_number) - col = chr(ord(table_current_col_number) + 1) + parameters_ws[col + str(parameters_ws_current_row_number-1)].fill = table_fill + parameters_ws[col + str(parameters_ws_current_row_number-1)].border = f_border + + col = format_cell.get_column_letter(table_current_col_number + 1) parameters_ws[col + str(parameters_ws_current_row_number-1)].fill = table_fill parameters_ws[col + str(parameters_ws_current_row_number-1)].border = f_border @@ -505,14 +507,14 @@ def generate_excel(report, table_current_row_number = parameters_ws_current_row_number for j, value in enumerate(list(parameters_data['timestamps'][i])): - col = table_current_col_number + col = format_cell.get_column_letter(table_current_col_number) parameters_ws[col + str(table_current_row_number)].border = f_border parameters_ws[col + str(table_current_row_number)].font = title_font parameters_ws[col + str(table_current_row_number)].alignment = c_c_alignment parameters_ws[col + str(table_current_row_number)] = value - col = chr(ord(col) + 1) + col = format_cell.get_column_letter(table_current_col_number + 1) parameters_ws[col + str(table_current_row_number)].border = f_border parameters_ws[col + str(table_current_row_number)].font = title_font @@ -521,7 +523,7 @@ def generate_excel(report, table_current_row_number += 1 - table_current_col_number = chr(ord(table_current_col_number) + 3) + table_current_col_number = table_current_col_number + 3 ######################################################## # parameters chart and parameters table diff --git a/myems-api/excelexporters/equipmentefficiency.py b/myems-api/excelexporters/equipmentefficiency.py index d91e620d..18165e59 100644 --- a/myems-api/excelexporters/equipmentefficiency.py +++ b/myems-api/excelexporters/equipmentefficiency.py @@ -484,35 +484,37 @@ def generate_excel(report, parameters_ws_current_row_number += 1 - table_current_col_number = 'B' + table_current_col_number = 2 for i in range(0, parameters_names_len): if len(parameters_data['timestamps'][i]) == 0: continue - parameters_ws[table_current_col_number + str(parameters_ws_current_row_number-1)].fill = table_fill - parameters_ws[table_current_col_number + str(parameters_ws_current_row_number-1)].border = f_border + col = format_cell.get_column_letter(table_current_col_number) - col = chr(ord(table_current_col_number) + 1) + parameters_ws[col + str(parameters_ws_current_row_number - 1)].fill = table_fill + parameters_ws[col + str(parameters_ws_current_row_number - 1)].border = f_border - parameters_ws[col + str(parameters_ws_current_row_number-1)].fill = table_fill - parameters_ws[col + str(parameters_ws_current_row_number-1)].border = f_border - parameters_ws[col + str(parameters_ws_current_row_number-1)].font = name_font - parameters_ws[col + str(parameters_ws_current_row_number-1)].alignment = c_c_alignment - parameters_ws[col + str(parameters_ws_current_row_number-1)] = parameters_data['names'][i] + col = format_cell.get_column_letter(table_current_col_number + 1) + + parameters_ws[col + str(parameters_ws_current_row_number - 1)].fill = table_fill + parameters_ws[col + str(parameters_ws_current_row_number - 1)].border = f_border + parameters_ws[col + str(parameters_ws_current_row_number - 1)].font = name_font + parameters_ws[col + str(parameters_ws_current_row_number - 1)].alignment = c_c_alignment + parameters_ws[col + str(parameters_ws_current_row_number - 1)] = parameters_data['names'][i] table_current_row_number = parameters_ws_current_row_number for j, value in enumerate(list(parameters_data['timestamps'][i])): - col = table_current_col_number + col = format_cell.get_column_letter(table_current_col_number) parameters_ws[col + str(table_current_row_number)].border = f_border parameters_ws[col + str(table_current_row_number)].font = title_font parameters_ws[col + str(table_current_row_number)].alignment = c_c_alignment parameters_ws[col + str(table_current_row_number)] = value - col = chr(ord(col) + 1) + col = format_cell.get_column_letter(table_current_col_number + 1) parameters_ws[col + str(table_current_row_number)].border = f_border parameters_ws[col + str(table_current_row_number)].font = title_font @@ -521,7 +523,7 @@ def generate_excel(report, table_current_row_number += 1 - table_current_col_number = chr(ord(table_current_col_number) + 3) + table_current_col_number = table_current_col_number + 3 ######################################################## # parameters chart and parameters table