Merge branch 'develop'

MyEMS · Jun 14, 2024 · 77b186f · 77b186f
2 parents a19101f + 8cde670
commit 77b186f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/myems-api/reports/energystoragepowerstationreportingenergy.py b/myems-api/reports/energystoragepowerstationreportingenergy.py
@@ -317,7 +317,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Charge',
+ "name": row_meter[1] + '-充',
  "energy_category_id": row_meter[2]})
 
  cursor_system.execute(" SELECT m.id, mb.name, m.energy_category_id "
@@ -327,7 +327,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Discharge',
+ "name": row_meter[1] + '-放',
  "energy_category_id": row_meter[2]})
 
  ################################################################################################################
@@ -351,7 +351,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Buy',
+ "name": row_meter[1] + '-购',
  "energy_category_id": row_meter[2]})
 
  cursor_system.execute(" SELECT m.id, mg.name, m.energy_category_id "
@@ -361,7 +361,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Sell',
+ "name": row_meter[1] + '-售',
  "energy_category_id": row_meter[2]})
 
  ################################################################################################################

diff --git a/myems-api/reports/energystoragepowerstationreportingrevenue.py b/myems-api/reports/energystoragepowerstationreportingrevenue.py
@@ -317,7 +317,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Charge',
+ "name": row_meter[1] + '-充',
  "energy_category_id": row_meter[2]})
 
  cursor_system.execute(" SELECT m.id, mb.name, m.energy_category_id "
@@ -327,7 +327,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Discharge',
+ "name": row_meter[1] + '-放',
  "energy_category_id": row_meter[2]})
 
  ################################################################################################################
@@ -351,7 +351,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Buy',
+ "name": row_meter[1] + '-购',
  "energy_category_id": row_meter[2]})
 
  cursor_system.execute(" SELECT m.id, mg.name, m.energy_category_id "
@@ -361,7 +361,7 @@ def on_get(req, resp):
  row_meter = cursor_system.fetchone()
  if row_meter is not None:
  meter_list.append({"id": row_meter[0],
- "name": row_meter[1] + '.Sell',
+ "name": row_meter[1] + '-售',
  "energy_category_id": row_meter[2]})
 
  ################################################################################################################