From b782ea91a96ac49208a9a2125fb9acd332ef4ff5 Mon Sep 17 00:00:00 2001 From: Caozhenhui <823914102@qq.com> Date: Fri, 5 Mar 2021 12:44:44 +0800 Subject: [PATCH] fixd the detail table column order --- myems-api/excelexporters/combinedequipmentload.py | 10 +++++----- myems-api/excelexporters/shopfloorload.py | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/myems-api/excelexporters/combinedequipmentload.py b/myems-api/excelexporters/combinedequipmentload.py index b4057c48..f7908202 100644 --- a/myems-api/excelexporters/combinedequipmentload.py +++ b/myems-api/excelexporters/combinedequipmentload.py @@ -294,8 +294,8 @@ def generate_excel(report, ws['B' + str(row_da + 1)].border = f_border for i in range(0, ca_len): - col_average = chr(ord('C') + i) - col_maximum = chr(ord('C') + i + ca_len) + col_average = chr(ord('C') + 2 * i) + col_maximum = chr(ord('D') + 2 * i) ws[col_average + str(row_da + 1)].font = name_font ws[col_average + str(row_da + 1)].alignment = c_c_alignment @@ -318,8 +318,8 @@ def generate_excel(report, ws['B' + str(rows)].border = f_border for index in range(0, ca_len): - col_average = chr(ord('C') + index) - col_maximum = chr(ord(col_average) + ca_len) + col_average = chr(ord('C') + 2 * index) + col_maximum = chr(ord('D') + 2 * index) ws[col_average + str(rows)].font = name_font ws[col_average + str(rows)].alignment = c_c_alignment @@ -351,7 +351,7 @@ def generate_excel(report, lc.dLbls.showVal = True times = Reference(ws, min_col=2, min_row=row_da + 2, max_row=row_da + 2 + time_len) - lc_data = Reference(ws, min_col=3 + ca_len + i, min_row=row_da + 1, + lc_data = Reference(ws, min_col=2 + 2 * (i+1), min_row=row_da + 1, max_row=row_da + 1 + time_len) lc.add_data(lc_data, titles_from_data=True) lc.set_categories(times) diff --git a/myems-api/excelexporters/shopfloorload.py b/myems-api/excelexporters/shopfloorload.py index 2b5cf625..3a972e34 100644 --- a/myems-api/excelexporters/shopfloorload.py +++ b/myems-api/excelexporters/shopfloorload.py @@ -359,8 +359,8 @@ def generate_excel(report, ws['B' + str(row_da + 1)].border = f_border for i in range(0, ca_len): - col_average = chr(ord('C') + i) - col_maximum = chr(ord('C') + i + ca_len) + col_average = chr(ord('C') + 2 * i) + col_maximum = chr(ord('D') + 2 * i) ws[col_average + str(row_da + 1)].font = name_font ws[col_average + str(row_da + 1)].alignment = c_c_alignment @@ -383,8 +383,8 @@ def generate_excel(report, ws['B' + str(rows)].border = f_border for index in range(0, ca_len): - col_average = chr(ord('C') + index) - col_maximum = chr(ord(col_average) + ca_len) + col_average = chr(ord('C') + 2 * index) + col_maximum = chr(ord('D') + 2 * index) ws[col_average + str(rows)].font = name_font ws[col_average + str(rows)].alignment = c_c_alignment @@ -416,7 +416,7 @@ def generate_excel(report, lc.dLbls.showVal = True times = Reference(ws, min_col=2, min_row=row_da + 2, max_row=row_da + 2 + time_len) - lc_data = Reference(ws, min_col=3 + ca_len + i, min_row=row_da + 1, + lc_data = Reference(ws, min_col=2 + 2 * (i+1), min_row=row_da + 1, max_row=row_da + 1 + time_len) lc.add_data(lc_data, titles_from_data=True) lc.set_categories(times)