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

Merge branch 'develop'

pull/142/MERGE
13621160019@163.com 2022-04-10 22:16:27 +08:00
parent 8a59f171b0 8e7c30cafa
commit 3065e17d66
4 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
myems-admin/app/translations.js
View File

@ -979,7 +979,6 @@ function config($translateProvider) {
THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter',
THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter',
THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter',
THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted',
THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted',
TIMEZONE_NOT_FOUND: 'Timezone Not Found', TIMEZONE_NOT_FOUND: 'Timezone Not Found',
TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login',
@ -1979,7 +1978,6 @@ function config($translateProvider) {
THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter',
THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter',
THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter',
THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted',
THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted',
TIMEZONE_NOT_FOUND: 'Timezone Not Found', TIMEZONE_NOT_FOUND: 'Timezone Not Found',
TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login',
@ -2977,7 +2975,6 @@ function config($translateProvider) {
THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter', THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER: 'This Data Source Is Being Used By A Meter',
THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter', THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Meter Is Being Used By A Virtual Meter',
THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter', THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER: 'This Offline Meter Is Being Used By A Virtual Meter',
THIS_SHOPFLOOR_CANNOT_BE_DELETED: 'This Shopfloor Cannot Be Deleted',
THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted', THIS_SPACE_CANNOT_BE_DELETED: 'This Space Cannot Be Deleted',
TIMEZONE_NOT_FOUND: 'Timezone Not Found', TIMEZONE_NOT_FOUND: 'Timezone Not Found',
TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login', TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN: 'Token Not Found In Headers Please Login',

6
myems-api/core/combinedequipment.py
View File

@ -29,9 +29,9 @@ class CombinedEquipmentCollection:
cost_center_dict = dict() cost_center_dict = dict()
if rows_cost_centers is not None and len(rows_cost_centers) > 0: if rows_cost_centers is not None and len(rows_cost_centers) > 0:
for row in rows_cost_centers: for row in rows_cost_centers:
cost_center_dict[row['id']] = {"id": row[0], cost_center_dict[row[0]] = {"id": row[0],
"name": row[1], "name": row[1],
"uuid": row[2]} "uuid": row[2]}
query = (" SELECT id, name, uuid, " query = (" SELECT id, name, uuid, "
" is_input_counted, is_output_counted, " " is_input_counted, is_output_counted, "

3
myems-api/core/shopfloor.py
View File

@ -262,9 +262,6 @@ class ShopfloorItem:
if not id_.isdigit() or int(id_) <= 0: if not id_.isdigit() or int(id_) <= 0:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST', raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.INVALID_SHOPFLOOR_ID') description='API.INVALID_SHOPFLOOR_ID')
if int(id_) == 1:
raise falcon.HTTPError(falcon.HTTP_400, title='API.BAD_REQUEST',
description='API.THIS_SHOPFLOOR_CANNOT_BE_DELETED')
cnx = mysql.connector.connect(**config.myems_system_db) cnx = mysql.connector.connect(**config.myems_system_db)
cursor = cnx.cursor() cursor = cnx.cursor()

3
myems-web/src/i18n.js
View File

@ -784,7 +784,6 @@ const resources = {
'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter',
'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter',
'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter',
'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted',
'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted',
'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found',
'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login',
@ -1595,7 +1594,6 @@ const resources = {
'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter',
'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter',
'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter',
'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted',
'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted',
'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found',
'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login',
@ -2379,7 +2377,6 @@ const resources = {
'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter', 'API.THIS_DATA_SOURCE_IS_BEING_USED_BY_A_METER': 'This data source is being used by a meter',
'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter', 'API.THIS_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This meter is being used by a virtual meter',
'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter', 'API.THIS_OFFLINE_METER_IS_BEING_USED_BY_A_VIRTUAL_METER': 'This offline meter is being used by a virtual meter',
'API.THIS_SHOPFLOOR_CANNOT_BE_DELETED': 'This shopfloor cannot be deleted',
'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted', 'API.THIS_SPACE_CANNOT_BE_DELETED': 'This space cannot be deleted',
'API.TIMEZONE_NOT_FOUND': 'Timezone not found', 'API.TIMEZONE_NOT_FOUND': 'Timezone not found',
'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login', 'API.TOKEN_NOT_FOUND_IN_HEADERS_PLEASE_LOGIN': 'Token not found in headers please login',