seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2022-1-7

pull/112/head
Caozhenhui 2022-01-07 16:31:44 +08:00
parent b96528e70b 00e30108cb
commit f28431a511
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/views/settings/meter/virtualmeter.model.html
View File

@ -84,7 +84,7 @@
</form> </form>
</div> </div>
<div class="col-sm-8"> <div class="col-sm-8">
<table id="variablesTable" class="footable table table-bordered table-hover" data-sort="false" data-page-size="7" > <table id="variablesTable" class="footable table table-bordered table-hover" data-sort="false" data-page-size="20" >
<thead> <thead>
<tr> <tr>
<th class="text-center">{{'SETTING.VARIABLE_NAME' | translate}}</th> <th class="text-center">{{'SETTING.VARIABLE_NAME' | translate}}</th>

2
myems-api/core/virtualmeter.py
View File

@ -89,7 +89,7 @@ class VirtualMeterCollection:
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 "
" FROM tbl_virtual_meters vm, tbl_variables v " " FROM tbl_virtual_meters vm, tbl_variables v "
" WHERE vm.id = %s AND v.virtual_meter_id = vm.id " " WHERE vm.id = %s AND v.virtual_meter_id = vm.id "
" ORDER BY v.name ") " ORDER BY SUBSTRING(v.name,2) + 0 ")
cursor.execute(query_variables, (meta_result['id'],)) cursor.execute(query_variables, (meta_result['id'],))
rows_variables = cursor.fetchall() rows_variables = cursor.fetchall()
if rows_variables is not None: if rows_variables is not None: