seg_yinzy
/
myems
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,292 Commits
2 Branches
32 Tags
112 MiB
Commit Graph

360 Commits (c3467423877927d410e82b59a39748e8b80f6f0c)

Author SHA1 Message Date
13621160019@163.com 302fdf2ce8 updated Dockerfile 2021-07-30 19:05:54 +08:00
hyh123a 95c1dcca63 fixed the bug and add the notes 2021-07-30 18:58:05 +08:00
hyh123a 9bc743f7c9 fixed the bug for menu 2021-07-30 15:14:49 +08:00
hyh123a 8611c8d799 add the menu api 2021-07-30 15:08:20 +08:00
hyh123a 8513544e7d add the cmd in Dockfile 2021-07-29 15:38:10 +08:00
hyh123a 7a5cde8f16 fixed the bugs for nginx and pip 2021-07-29 15:30:29 +08:00
hyh123a 9f7eefce10 Merge branch 'docker' into develop 2021-07-29 13:17:14 +08:00
hyh123a 020a4a85a5 add the docker installation 2021-07-29 13:14:06 +08:00
13621160019@163.com 7bdb806994 updated postman collection of API 2021-07-26 15:58:51 +08:00
13621160019@163.com dfc1dbecd7 added Meter Batch Analysis Report to Web UI and API 2021-07-26 15:56:38 +08:00
13621160019@163.com 7b1961656e fixed issue in Meter Batch Analysis Report of API 2021-07-26 10:18:12 +08:00
13621160019@163.com 3c3a93b693 added Meter Batch Analysis Report API to README 2021-07-25 22:17:52 +08:00
Caozhenhui 77231fe07e modified typo 2021-07-23 17:28:03 +08:00
Caozhenhui 2da93761d6 Added meterbatch API 2021-07-23 17:24:27 +08:00
Caozhenhui 43a21d9f49 Implemented the meterbatch Excel Exporter 2021-07-22 20:26:16 +08:00
13621160019@163.com b3451e8ff8 changed all worksheet names of excel exporters in API 
Merge branch 'PR53' into develop
 2021-07-20 17:43:31 +08:00
13621160019@163.com 89f04523f4 fixed warnings of excel exporters in API 2021-07-20 17:43:06 +08:00
13621160019@163.com abb45dadbc added Cost File to API and Admin UI and upgraded to v1.1.4 2021-07-19 19:48:00 +08:00
hyh123a a57f59918c modify the field to parameters 2021-07-19 18:18:10 +08:00
hyh123a d8c26d571d modify the excel title 2021-07-19 18:09:51 +08:00
hyh123a 7d7ec5d170 Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-07-19 17:43:14 +08:00
hyh123a dafbe77460 modify the sheet title for excel 2021-07-19 17:43:10 +08:00
13621160019@163.com 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com 9443eca6f0 added Offline Cost File actions to API 2021-07-16 20:10:49 +08:00
13621160019@163.com cdc9414c9d updated README and Postman Collection for API 2021-07-16 18:56:55 +08:00
Caozhenhui 443fe4e56e Implemented the equipmentbatch Excel Exporte 2021-07-16 12:41:29 +08:00
hyh123a b4bcefab11 modify the pie location for child space 2021-07-14 10:17:56 +08:00
hyh123a 96a50af5c3 modify the spaceenergycategory for child space 2021-07-13 11:32:03 +08:00
13621160019@163.com 9f6fa02de0 fixed wrong HTTP Status Code issues in API 2021-07-07 14:06:19 +08:00
13621160019@163.com ad78ba8741 added ORDER BY utc_date_time to all digital parameters data in API 2021-06-30 23:04:41 +08:00
13621160019@163.com fc40ba1ad1 fixed base period cost units issue of Dashboard API 2021-06-26 21:43:27 +08:00
13621160019@163.com 5f603548d7 added last year data to dashboard 2021-06-26 21:21:49 +08:00
13621160019@163.com e71e0c1f22 deleted parameters data from Dashboard 2021-06-26 20:13:27 +08:00
13621160019@163.com afc3ea98b4 added new category to FDD rule in API & Admin UI 2021-06-17 16:06:18 +08:00
13621160019@163.com 1bee235c6d validate expression of rule in API 2021-06-11 17:09:36 +08:00
13621160019@163.com d4e4b7af3f changed equipent and combined equipment associated points name to parameters name in reports API 2021-06-01 16:39:38 +08:00
13621160019@163.com 043dacfe24 changed GET Data Source Point Collection to order by ID 2021-06-01 14:31:08 +08:00
13621160019@163.com 6176107164 updated postman collection in API 2021-05-21 11:38:21 +08:00
YangZhang-GitHub 676886a844 Implemented the combinedequipmentbatch Excel Exporter 2021-05-20 15:48:50 +08:00
YangZhang-GitHub 05547c42a8 The combinedequipmentbatch API has been completed 2021-05-20 15:48:17 +08:00
YangZhang-GitHub c7ed16ec00 Added combinedequipmentbatch API 2021-05-20 15:47:36 +08:00
YangZhang-GitHub b94b4c49d3 Add Combined Equipment API information to the MyEMS.postman_collection.json 2021-05-20 15:45:06 +08:00
YangZhang-GitHub f912c27299 Add Combined Equipment API information to the README 2021-05-20 15:39:46 +08:00
13621160019@163.com 64aa3daf95 updated README and Postman collection in API 2021-05-20 12:19:24 +08:00
YangZhang-GitHub ca6ab5af3d Implemented the shopfloorbatch Excel Exporter 2021-05-19 15:59:46 +08:00
YangZhang-GitHub eda0cd7fd0 The shopfloorbatch API has been completed 2021-05-19 15:58:36 +08:00
YangZhang-GitHub fb8285c8df Added shopfloorbatch API 2021-05-19 15:57:13 +08:00
13621160019@163.com 1a9b73f092 removed unnecessory validator in tenant batch analysis report in API 2021-05-19 15:08:04 +08:00
13621160019@163.com 465f60768b added Store Batch Analysis Report 
Merge branch 'PR43' into develop
 2021-05-19 14:59:51 +08:00
13621160019@163.com b8f3d1f431 replaced fetchone with fetchall to avoid error in case there are duplicate rows in API 2021-05-18 14:36:53 +08:00
YangZhang-GitHub 2494c73bd0 Modify variable name 2021-05-18 10:56:40 +08:00
YangZhang-GitHub 9ca3752945 Implemented the storebatch Excel Exporter 2021-05-17 17:25:29 +08:00
YangZhang-GitHub 1a8148845d The storebatch API has been completed 2021-05-17 16:59:42 +08:00
YangZhang-GitHub a3b82aafc3 Added storebatch API 2021-05-17 16:58:27 +08:00
13621160019@163.com e868491db8 added excel exporter of tenant batch analysis report 2021-05-13 10:04:25 +08:00
13621160019@163.com 12e2864e0f added excel exporter of tenant batch report 2021-05-13 09:54:53 +08:00
13621160019@163.com 13249842e6 added Tenant Batch Analysis Report 2021-05-13 08:19:05 +08:00
13621160019@163.com 95983aaf4e implemented virtual point calculating in myems-normalization service 2021-05-08 13:37:17 +08:00
13621160019@163.com aee2ca5b53 updated README 2021-05-07 10:20:03 +08:00
13621160019@163.com f9b72c6997 added is_virtual to point in myems-api 2021-05-07 09:00:13 +08:00
13621160019@163.com cefeef57db updated metertracking report by adding point type condition to meter point query string 2021-05-03 18:33:08 +08:00
13621160019@163.com 77c5a4fb2d updated metertracking report to reduce duplicated meters 2021-05-03 12:41:21 +08:00
YangZhang-GitHub c6f4ed9003 Completed the start and end values increase 2021-04-29 20:23:18 +08:00
13621160019@163.com feef4fd6fb fixed detailed value missing issue in SpaceEfficiency report in Web UI 
Merge branch 'PR39' into develop
 2021-04-28 16:08:50 +08:00
13621160019@163.com 1619849c16 added last seen datetime to data source setting in Admin UI 2021-04-28 15:55:10 +08:00
13621160019@163.com e4b9cffd18 added last seen datetime to Gateway Setting in Admin UI 2021-04-28 15:02:56 +08:00
YangZhang-GitHub f0659882ac Modify the null data display effect 2021-04-28 14:30:40 +08:00
YangZhang-GitHub 4f4b376ed4 Implemented the SpaceEfficiency Excel Exporter 2021-04-27 17:30:13 +08:00
YangZhang-GitHub d04b8c9d4c Added 'excelexporters.spaceefficiency.export()' method 2021-04-27 17:29:36 +08:00
13621160019@163.com e2a4c63c8e fixed PEP8 warnings 2021-04-27 15:15:17 +08:00
Caozhenhui 5557c64e1f Column Letter and Column Index Converter have been added to Excel Exporters 2021-04-26 17:51:13 +08:00
Caozhenhui 2545457de4 Merge remote-tracking branch 'upstream/develop' into develop 2021-04-26 14:33:00 +08:00
Caozhenhui d36b37133f 2021/4/26 2021-04-26 14:32:49 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +08:00
13621160019@163.com 35bb9600b5 fixed issue when links is None in energyflowdiagram in API 2021-04-25 10:59:27 +08:00
13621160019@163.com a367bfc140 updated changelog and set version number to 1.1.2 2021-04-23 11:28:14 +08:00
13621160019@163.com 2214caf3db added assoicated parameters data to excel exporter of shopfloorstatistics in API 2021-04-22 17:06:30 +08:00
13621160019@163.com 6fce96b262 added associated parameters data to excel exporter of shopfloorsaving in API 2021-04-22 16:50:24 +08:00
13621160019@163.com 24f970fa02 added associated parameters data to excel exporter of shopfloorload in API 2021-04-22 16:41:28 +08:00
13621160019@163.com 87a49f808a added associated parameters data to excel exporter of shopfloorenergyitem in API 2021-04-22 16:23:16 +08:00
13621160019@163.com fae8c29176 added associated parameters data to excel exporter of shopfloorenergycategory in API 2021-04-19 18:49:50 +08:00
13621160019@163.com 1b233ba962 added associated parameters data to excel exporter of shopfloorcost in API 2021-04-19 18:27:45 +08:00
Caozhenhui 7e18d31887 Merge remote-tracking branch 'upstream/develop' into develop 2021-04-19 16:49:14 +08:00
Caozhenhui c81eb24644 2021/4/19 2021-04-19 16:48:47 +08:00
Caozhenhui 12665bc02a 2021/4/19 2021-04-19 16:45:58 +08:00
Caozhenhui 14c87ea613 Parameter Data is added to Excel Exporter of All Shopfloor Reports 2021-04-19 16:25:01 +08:00
13621160019@163.com e744744dfa fixed issues in excel exporters of combinedequipment in API 2021-04-18 23:23:51 +08:00
13621160019@163.com 73516fba3e fixed issues in excel exporters of combinedequipment in API 2021-04-18 23:18:44 +08:00
13621160019@163.com 43f1da4c0f added associated parameters data to excel exporter of storestatistics in API 2021-04-15 12:21:01 +08:00
13621160019@163.com ffd52393af added associated parameters data to excel exporter of storesaving in API 2021-04-15 12:12:54 +08:00
13621160019@163.com 2534489f60 added associated parameters data to excel exporter of storeload in API 2021-04-15 11:43:21 +08:00
13621160019@163.com 81235f2c15 added associated parameters data to storeenergyitem in API 2021-04-15 11:22:56 +08:00
13621160019@163.com cd94b8307c added associated parameters data to excel exporter of storeenergycategory in API 2021-04-15 11:19:17 +08:00
13621160019@163.com 5ed3c7bf6a added associated parameters data to excel exporter of storecost in API 2021-04-15 11:11:12 +08:00
Caozhenhui 001412323e Parameter Data is added to Excel Exporter of All Store Reports 2021-04-14 21:26:40 +08:00
13621160019@163.com de6eb0d05f added associated parameters data to excel exporter of spacestatistics in API 2021-04-14 12:15:01 +08:00
13621160019@163.com 31597a98b2 added associated parameters data to excel exporter of spacesaving in API 2021-04-14 12:11:21 +08:00
13621160019@163.com 0c8ff5f59e added associated parameters data to excel exporter of spaceoutput in API 2021-04-14 12:07:07 +08:00
13621160019@163.com c21e8c6848 added associated parameters data to excel exporter of spaceload in API 2021-04-14 11:58:54 +08:00
13621160019@163.com fa0094ce42 added associated parameters data to excel exporter of spaceincome in API 2021-04-14 11:50:48 +08:00