From 57c5b9bc8ede956e7d6daa4a30fb4eb127f3efb8 Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Sat, 19 Feb 2022 21:53:01 +0800
Subject: [PATCH] updated Dashboard report in Web UI

---
 README.md                                       |  2 +-
 README_DE.md                                    |  2 +-
 README_EN.md                                    |  2 +-
 web/README.md                                   |  2 +-
 web/src/components/MyEMS/dashboard/Dashboard.js |  4 ++--
 web/src/i18n.js                                 | 12 ++++++------
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 2b93178f..dcb7ea3e 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ MyEMS由资深专业团队开发维护，系统代码基于MIT开源软件许可
 ![MyEMS Architecture Site View](/docs/images/architecture-site-view-cn.png)
 
 
-## MyEMS截图
+## MyEMS UI 展示
 
 ![MyEMS Space EnergyCategory1](/docs/images/myems-space-energycategory1.gif)
 
diff --git a/README_DE.md b/README_DE.md
index bb00c5e1..b48f4151 100644
--- a/README_DE.md
+++ b/README_DE.md
@@ -26,7 +26,7 @@ Verwendung von Open Source, um die Ziele der CO2-Peak-Kohlenstoffneutralität zu
 
 ![MyEMS Architecture Site View](/docs/images/architecture-site-view-de.png)
 
-## MyEMS Bildschirmfoto
+## MyEMS UI-Präsentation
 
 ![MyEMS Space EnergyCategory1](/docs/images/myems-space-energycategory1.gif)
 
diff --git a/README_EN.md b/README_EN.md
index c4f77280..300278c5 100644
--- a/README_EN.md
+++ b/README_EN.md
@@ -26,7 +26,7 @@ Using open source to help achieve carbon peak carbon neutrality goals.
 ![MyEMS Architecture Site View](/docs/images/architecture-site-view-en.png)
 
 
-## MyEMS Screenshot
+## MyEMS UI Presentation
 
 ![MyEMS Space EnergyCategory1](/docs/images/myems-space-energycategory1.gif)
 
diff --git a/web/README.md b/web/README.md
index d79d6d89..1e0bf7b0 100644
--- a/web/README.md
+++ b/web/README.md
@@ -46,7 +46,7 @@ npm run scss
 *   Starting the Development Server
 A local web server will start at http://localhost:3000.
 We are using webpack and webpack-serve to automatically detect file changes. So, if you edit and save a file, your browser will automatically refresh and preview the change.
-```
+```bash
 npm start
 ```
 
diff --git a/web/src/components/MyEMS/dashboard/Dashboard.js b/web/src/components/MyEMS/dashboard/Dashboard.js
index 4821fea4..b23a38b1 100644
--- a/web/src/components/MyEMS/dashboard/Dashboard.js
+++ b/web/src/components/MyEMS/dashboard/Dashboard.js
@@ -413,7 +413,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
         {lastYearInputCardSummaryList.map(cardSummaryItem => (
           <CardSummary key={uuid()}
             rate={cardSummaryItem['increment_rate']}
-            title={t("Last Year's Consumption CATEGORY VALUE UNIT", { 'CATEGORY': cardSummaryItem['name'], 'VALUE': null, 'UNIT': '(' + cardSummaryItem['unit'] + ')' })}
+            title={t("Consumption CATEGORY VALUE UNIT in The Same Period Last Year", { 'CATEGORY': cardSummaryItem['name'], 'VALUE': null, 'UNIT': '(' + cardSummaryItem['unit'] + ')' })}
             color="success"
             footnote={t('Per Unit Area')}
             footvalue={cardSummaryItem['subtotal_per_unit_area']}
@@ -424,7 +424,7 @@ const Dashboard = ({ setRedirect, setRedirectUrl, t }) => {
         {lastYearCostCardSummaryList.map(cardSummaryItem => (
           <CardSummary key={uuid()}
             rate={cardSummaryItem['increment_rate']}
-            title={t("Last Year's Costs CATEGORY VALUE UNIT", { 'CATEGORY': cardSummaryItem['name'], 'VALUE': null, 'UNIT': '(' + cardSummaryItem['unit'] + ')' })}
+            title={t("Costs CATEGORY VALUE UNIT in The Same Period Last Year", { 'CATEGORY': cardSummaryItem['name'], 'VALUE': null, 'UNIT': '(' + cardSummaryItem['unit'] + ')' })}
             color="success"
             footnote={t('Per Unit Area')}
             footvalue={cardSummaryItem['subtotal_per_unit_area']}
diff --git a/web/src/i18n.js b/web/src/i18n.js
index ac8bf937..29591c47 100644
--- a/web/src/i18n.js
+++ b/web/src/i18n.js
@@ -62,8 +62,8 @@ const resources = {
         'An Industry Leading Open Source Energy Management System',
       "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}}",
-      "Last Year's Consumption CATEGORY VALUE UNIT": "Last Year's Consumption {{CATEGORY}} {{VALUE}} {{UNIT}}",
-      "Last Year's Costs CATEGORY VALUE UNIT": "Last Year's Costs {{CATEGORY}} {{VALUE}} {{UNIT}}",
+      "Consumption CATEGORY VALUE UNIT in The Same Period Last Year": "Consumption {{CATEGORY}} {{VALUE}} {{UNIT}}  in The Same Period Last Year",
+      "Costs CATEGORY VALUE UNIT in The Same Period Last Year": "Costs {{CATEGORY}} {{VALUE}} {{UNIT}} in The Same Period Last Year",
       // Entities
       'Space': 'Space',
       'Equipment': 'Equipment',
@@ -841,8 +841,8 @@ const resources = {
       'An Industry Leading Open Source Energy Management System': 'Ein branchenführendes Open Source Energie Management System',
       "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}}',
-      "Last Year's Consumption CATEGORY VALUE UNIT": 'Der Verbrauch Letztes Jahr {{CATEGORY}} {{VALUE}} {{UNIT}}',
-      "Last Year's Costs CATEGORY VALUE UNIT": 'Der Kosten Letztes Jahr {{CATEGORY}} {{VALUE}} {{UNIT}}',
+      "Consumption CATEGORY VALUE UNIT in The Same Period Last Year": 'Der Verbrauch {{CATEGORY}} {{VALUE}} {{UNIT}} im gleichen Zeitraum im vergangenen Jahr',
+      "Costs CATEGORY VALUE UNIT in The Same Period Last Year": 'Der Kosten {{CATEGORY}} {{VALUE}} {{UNIT}} im gleichen Zeitraum im vergangenen Jahr',
       // Entities
       'Space': 'Platz',
       'Equipment': 'Ausrüstung',
@@ -1631,8 +1631,8 @@ const resources = {
       'An Industry Leading Open Source Energy Management System': '行业领先的开源能源管理系统',
       "This Year's Consumption CATEGORY VALUE UNIT": '本年消耗 {{CATEGORY}} {{VALUE}} {{UNIT}}',
       "This Year's Costs CATEGORY VALUE UNIT": '本年成本 {{CATEGORY}} {{VALUE}} {{UNIT}}',
-      "Last Year's Consumption CATEGORY VALUE UNIT": '去年消耗 {{CATEGORY}} {{VALUE}} {{UNIT}}',
-      "Last Year's Costs CATEGORY VALUE UNIT": '去年成本 {{CATEGORY}} {{VALUE}} {{UNIT}}',
+      "Consumption CATEGORY VALUE UNIT in The Same Period Last Year": '去年同期消耗 {{CATEGORY}} {{VALUE}} {{UNIT}}',
+      "Costs CATEGORY VALUE UNIT in The Same Period Last Year": '去年同期成本 {{CATEGORY}} {{VALUE}} {{UNIT}}',
       // Entities
       'Space': '空间',
       'Equipment': '设备',