From 3e9de79589be9ad2806dcef4c5fd70d04143f695 Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 28 Apr 2021 14:12:52 +0800 Subject: [PATCH 1/2] Fix the bug of missing detailed value and the bug of web interface stuck with empty data --- web/src/components/MyEMS/Space/SpaceEfficiency.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/web/src/components/MyEMS/Space/SpaceEfficiency.js b/web/src/components/MyEMS/Space/SpaceEfficiency.js index 3c11de69..44da2c5e 100644 --- a/web/src/components/MyEMS/Space/SpaceEfficiency.js +++ b/web/src/components/MyEMS/Space/SpaceEfficiency.js @@ -304,9 +304,9 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['startdatetime'] = currentTimestamp; json['reporting_period_efficiency']['values'].forEach((currentValue, energyCategoryIndex) => { if (json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex] != null) { - detailed_value['a' + 2 * energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); + detailed_value['a' + energyCategoryIndex] = json['reporting_period_efficiency']['values'][energyCategoryIndex][timestampIndex].toFixed(2); } else { - detailed_value['a' + 2 * energyCategoryIndex] = ''; + detailed_value['a' + energyCategoryIndex] = ''; }; }); @@ -318,7 +318,11 @@ const SpaceEfficiency = ({ setRedirect, setRedirectUrl, t }) => { detailed_value['id'] = detailed_value_list.length; detailed_value['startdatetime'] = t('Subtotal'); json['reporting_period_efficiency']['cumulations'].forEach((currentValue, index) => { - detailed_value['a' + index] = currentValue.toFixed(2); + if (currentValue != null) { + detailed_value['a' + index] = currentValue.toFixed(2); + }else { + detailed_value['a' + index] = ''; + } }); detailed_value_list.push(detailed_value); setDetailedDataTableData(detailed_value_list); From f0659882aca13420bffb591aa1ac7c4bf969ec1f Mon Sep 17 00:00:00 2001 From: YangZhang-GitHub <2533471770@qq.com> Date: Wed, 28 Apr 2021 14:30:40 +0800 Subject: [PATCH 2/2] Modify the null data display effect --- myems-api/excelexporters/spaceefficiency.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/myems-api/excelexporters/spaceefficiency.py b/myems-api/excelexporters/spaceefficiency.py index 85e5e9a9..d66225e8 100644 --- a/myems-api/excelexporters/spaceefficiency.py +++ b/myems-api/excelexporters/spaceefficiency.py @@ -218,7 +218,7 @@ def generate_excel(report, ws[col + str(current_row_number)].alignment = c_c_alignment ws[col + str(current_row_number)].border = f_border ws[col + str(current_row_number)] = round(reporting_period_data['cumulations'][i], 2) \ - if reporting_period_data['cumulations'][i] is not None else 0 + if reporting_period_data['cumulations'][i] is not None else None col = chr(ord(col) + 1) @@ -336,7 +336,7 @@ def generate_excel(report, ws[col + str(current_row_number)].alignment = c_c_alignment ws[col + str(current_row_number)].border = f_border ws[col + str(current_row_number)] = round(reporting_period_data['values'][j][i], 2) \ - if reporting_period_data['values'][j][i] is not None else 0.00 + if reporting_period_data['values'][j][i] is not None else None col = chr(ord(col) + 1) current_row_number += 1 @@ -355,7 +355,7 @@ def generate_excel(report, ws[col + str(current_row_number)].alignment = c_c_alignment ws[col + str(current_row_number)].border = f_border ws[col + str(current_row_number)] = round(reporting_period_data['cumulations'][i], 2) \ - if reporting_period_data['cumulations'][i] is not None else 0.00 + if reporting_period_data['cumulations'][i] is not None else None col = chr(ord(col) + 1) current_row_number += 2