From 3f096b592d03eb7762b4fbbeca466bfb8234b5b1 Mon Sep 17 00:00:00 2001 From: tianlinzhong <673359306@qq.com> Date: Tue, 4 Jan 2022 15:34:12 +0800 Subject: [PATCH] Improved Virtual Meter Editor --- admin/views/settings/meter/virtualmeter.model.html | 2 +- myems-api/core/virtualmeter.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/views/settings/meter/virtualmeter.model.html b/admin/views/settings/meter/virtualmeter.model.html index bec5fdba..76f0e3a7 100644 --- a/admin/views/settings/meter/virtualmeter.model.html +++ b/admin/views/settings/meter/virtualmeter.model.html @@ -84,7 +84,7 @@
- +
diff --git a/myems-api/core/virtualmeter.py b/myems-api/core/virtualmeter.py index 78e720a3..a9b7e3a5 100644 --- a/myems-api/core/virtualmeter.py +++ b/myems-api/core/virtualmeter.py @@ -86,10 +86,10 @@ class VirtualMeterCollection: if meta_result["equation"] is not None: expression = {'equation': meta_result["equation"], 'variables': []} - query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id " + query_variables = (" SELECT v.id, v.name, v.meter_type, v.meter_id, SUBSTRING(v.name,2) as name2" " FROM tbl_virtual_meters vm, tbl_variables v " " WHERE vm.id = %s AND v.virtual_meter_id = vm.id " - " ORDER BY v.name ") + " ORDER BY name2+0 ") cursor.execute(query_variables, (meta_result['id'],)) rows_variables = cursor.fetchall() if rows_variables is not None:
{{'SETTING.VARIABLE_NAME' | translate}}