From 5af58ea034158aa2d46683237ff5df1271f71e14 Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 25 May 2021 16:26:00 +0800 Subject: [PATCH 1/2] updated Dashboard in web to display energy data of this year --- .../components/MyEMS/dashboard/Dashboard.js | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js index 08b5f17b..b61a46ae 100644 --- a/web/src/components/MyEMS/dashboard/Dashboard.js +++ b/web/src/components/MyEMS/dashboard/Dashboard.js @@ -18,10 +18,10 @@ const ChildSpacesTable = loadable(() => import('../common/ChildSpacesTable')); const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { let current_moment = moment(); const [fetchSuccess, setFetchSuccess] = useState(false); - const [periodType, setPeriodType] = useState('daily'); - const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'months').startOf('month')); - const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'months')); - const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('month')); + const [periodType, setPeriodType] = useState('monthly'); + const [basePeriodBeginsDatetime, setBasePeriodBeginsDatetime] = useState(current_moment.clone().subtract(1, 'years').startOf('year')); + const [basePeriodEndsDatetime, setBasePeriodEndsDatetime] = useState(current_moment.clone().subtract(1, 'years')); + const [reportingPeriodBeginsDatetime, setReportingPeriodBeginsDatetime] = useState(current_moment.clone().startOf('year')); const [reportingPeriodEndsDatetime, setReportingPeriodEndsDatetime] = useState(current_moment); //Results const [costShareData, setCostShareData] = useState([]); @@ -358,7 +358,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => { {inputCardSummaryList.map(cardSummaryItem => ( { {costCardSummaryList.map(cardSummaryItem => ( { ))} { { - - { From 50eefdb9d7cf0695b13157f0668be2d775f0121c Mon Sep 17 00:00:00 2001 From: "13621160019@163.com" <13621160019@163.com> Date: Tue, 25 May 2021 16:26:32 +0800 Subject: [PATCH 2/2] updated Dashboard in web to display energy data of this year --- web/src/i18n.js | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/web/src/i18n.js b/web/src/i18n.js index 3d0fc899..5a0cc4b3 100644 --- a/web/src/i18n.js +++ b/web/src/i18n.js @@ -66,8 +66,8 @@ const resources = { "CATEGORY UNIT Consumption by Energy Items": "{{CATEGORY}} {{UNIT}} Comsumption by Energy Items", "Ton of Standard Coal by Energy Category": "Ton of Standard Coal(TCE) by Energy Category", "Ton of Carbon Dioxide Emissions by Energy Category": "Ton of Carbon Dioxide Emissions(TCO2E) by Energy Category", - "This Month's Consumption CATEGORY VALUE UNIT": "This Month's Consumption {{CATEGORY}} {{VALUE}} {{UNIT}}", - "This Month's Costs CATEGORY VALUE UNIT": "This Month's Costs {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Consumption CATEGORY VALUE UNIT": "This Year's Consumption {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Costs CATEGORY VALUE UNIT": "This Year's Costs {{CATEGORY}} {{VALUE}} {{UNIT}}", // Entities "Space": "Space", "Equipment": "Equipment", @@ -221,7 +221,6 @@ const resources = { "Tariff": "Tariff", "Detailed Data": "Detailed Data", "Child Spaces Data": "Child Spaces Data", - "Child Spaces Data of This Month": "Child Spaces Data of This Month", "Associated Equipment Data": "Associated Equipment Data", "This Year": "This Year", "This Month": "This Month", @@ -408,8 +407,8 @@ const resources = { "CATEGORY UNIT Consumption by Energy Items": "{{CATEGORY}} {{UNIT}} nach Unterpunkt Energieverbrauch", "Ton of Standard Coal by Energy Category": "Tonne Standardkohle(TCE) nach Energiekategorie", "Ton of Carbon Dioxide Emissions by Energy Category": "Tonne Kohlendioxidemissionen(TCO2E) nach Energiekategorie", - "This Month's Consumption CATEGORY VALUE UNIT": "Der Verbrauch dieses Monats {{CATEGORY}} {{VALUE}} {{UNIT}}", - "This Month's Costs CATEGORY VALUE UNIT": "Der Kosten dieses Monats {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Consumption CATEGORY VALUE UNIT": "Der Verbrauch Dieses Jahr {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Costs CATEGORY VALUE UNIT": "Der Kosten Dieses Jahr {{CATEGORY}} {{VALUE}} {{UNIT}}", // Entities "Space": "Platz", "Equipment": "Ausrüstung", @@ -563,7 +562,6 @@ const resources = { "Tariff": "Tarif", "Detailed Data": "Detaillierte Daten", "Child Spaces Data": "Teilplatz Daten", - "Child Spaces Data of This Month": "Teilplatz Daten dieses Monats", "Associated Equipment Data": "Dazugehörige Geräte Daten", "This Year": "Dieses Jahr", "This Month": "Diesen Monat", @@ -753,8 +751,8 @@ const resources = { "CATEGORY UNIT Consumption by Energy Items": "{{CATEGORY}} {{UNIT}} 分项消耗占比", "Ton of Standard Coal by Energy Category": "吨标准煤(TCE)占比", "Ton of Carbon Dioxide Emissions by Energy Category": "吨二氧化碳排放(TCO2E)占比", - "This Month's Consumption CATEGORY VALUE UNIT": "本月消耗 {{CATEGORY}} {{VALUE}} {{UNIT}}", - "This Month's Costs CATEGORY VALUE UNIT": "本月成本 {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Consumption CATEGORY VALUE UNIT": "本年消耗 {{CATEGORY}} {{VALUE}} {{UNIT}}", + "This Year's Costs CATEGORY VALUE UNIT": "本年成本 {{CATEGORY}} {{VALUE}} {{UNIT}}", // Entities "Space": "空间", "Equipment": "设备", @@ -908,7 +906,6 @@ const resources = { "Tariff": "费率", "Detailed Data": "详细数据", "Child Spaces Data": "子空间数据", - "Child Spaces Data of This Month": "本月子空间数据", "Associated Equipment Data": "相关设备数据", "This Year": "本年", "This Month": "本月",