diff --git a/myems-api/excelexporters/metercost.py b/myems-api/excelexporters/metercost.py index dbb51c70..53e8bc2d 100644 --- a/myems-api/excelexporters/metercost.py +++ b/myems-api/excelexporters/metercost.py @@ -322,13 +322,19 @@ def generate_excel(report, name, reporting_start_datetime_local, reporting_end_d category = report['meter']['energy_category_name'] ca_len = len(category) times = reporting_period_data['timestamps'] + parameters_names_len = len(report['parameters']['names']) + parameters_data = report['parameters'] + parameters_parameters_datas_len = 0 + for i in range(0, parameters_names_len): + if len(parameters_data['timestamps'][i]) == 0: + continue + parameters_parameters_datas_len += 1 if "values" not in reporting_period_data.keys() or len(reporting_period_data['values']) == 0: has_cost_datail_flag = False if has_cost_datail_flag: - parameters_names_len = len(report['parameters']['names']) - start_detail_data_row_number = 7 + (parameters_names_len + ca_len) * 6 + start_detail_data_row_number = 13 + (parameters_parameters_datas_len + ca_len) * 6 ws['B11'].font = title_font ws['B11'] = name + '详细数据'