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

655 Commits (731c03f82837bed1f5b87055aa8c7482b0010027)

Author SHA1 Message Date
13621160019@163.com 6811a22eea added aliyunsmsapi to api/core 2021-10-11 16:53:55 +08:00
13621160019@163.com 0c8988ba2e updated distibutionssystem point value timeout value to 30 minutes 2021-10-11 16:53:55 +08:00
13621160019@163.com 99f05c4311 updated README for installing openpyxl 2021-10-11 16:53:54 +08:00
13621160019@163.com 16630dc30e modified API error message for knowledge file cannot be removed from disk 2021-10-11 16:53:54 +08:00
13621160019@163.com 14d0b7aa77 removed cookies usages from API 2021-10-11 16:53:54 +08:00
13621160019@163.com 859ed6826c updated userlogger in API to pass HTTPError to client 2021-10-11 16:53:54 +08:00
13621160019@163.com fc379e4e3b added trusted-host to Dockerfiles 2021-10-11 16:53:54 +08:00
13621160019@163.com 89c287148c updated README 2021-10-11 16:53:54 +08:00
13621160019@163.com 25b42b9c8a added user log to UserLogin, ChangePassword and ResetPassword in API 2021-10-11 16:53:54 +08:00
13621160019@163.com 74c847e657 fixed typos in API 2021-10-11 16:53:54 +08:00
13621160019@163.com 5858943cd7 fixed typo in userlogger of API 2021-10-11 16:53:54 +08:00
13621160019@163.com b7b8f78ba1 removed user_logger decorators from some actions in API 2021-10-11 16:53:53 +08:00
13621160019@163.com ce55c0484f added user_logger decorators to all on_put, on_post and on_delete actions in API 2021-10-11 16:53:53 +08:00
13621160019@163.com 91a0342c2f updated userlogger in API 2021-10-11 16:53:53 +08:00
hyh123a 61fdc9ca74 modify the date_time to utc 2021-10-11 16:53:53 +08:00
hyh123a 4f1d2f5ad4 add the judge for admin 2021-10-11 16:53:53 +08:00
hyh123a 4c8a93380f add the log function and test in equipments 2021-10-11 16:53:53 +08:00
13621160019@163.com 912d5863c0 updated README 2021-10-09 20:54:39 +08:00
hyh123a 1803533b28 modfiy the doc for docker-compose 2021-10-09 12:16:03 +08:00
Winnerineast Lee 9a82cbb999
Merge pull request #2 from MyEMS/master 
catch up with the main site.
 2021-10-05 16:10:30 +08:00
13621160019@163.com e098ec5763 updated format of excel exporters 2021-10-03 09:55:10 +08:00
13621160019@163.com 70525e0631 updated format of excel exporters 2021-10-02 22:50:58 +08:00
Winnerineast Lee aa7db89bb9
Merge pull request #1 from MyEMS/master 
catch up with the main site.
 2021-10-02 19:47:37 +08:00
winnerineast 60906080f4 mask out all clear password into encrypted ones. 2021-10-01 18:58:05 +08:00
winnerineast 1bfdedf0cc fixed one bug for database. 
created a dirty and easy way to run myems-api.
enhanced requirements.txt for both database and myems-api.
 2021-10-01 18:38:34 +08:00
13621160019@163.com e1da419a2f updated format of excel exporters 2021-09-30 22:39:29 +08:00
13621160019@163.com 047241d466 updated format of excel exporters 2021-09-30 22:21:44 +08:00
13621160019@163.com afaa33e4fb updated format of excel exporters 2021-09-29 22:42:47 +08:00
13621160019@163.com 5f4776df4d reformatted excel exporters 2021-09-28 22:57:52 +08:00
13621160019@163.com 0cefad0ef1 reformatted excel exporter of spaceenergycategory 2021-09-28 22:18:31 +08:00
13621160019@163.com 2e22c5cb92 fixed NoneType issues in ExcelExporters 2021-09-26 15:40:49 +08:00
13621160019@163.com 3acb170e98 changed name font from Constantia to Arial in excel exporters 2021-09-25 22:42:26 +08:00
13621160019@163.com 2496c1a32b fixed PEP8 warnings and update version number to v1.3.0 2021-09-24 13:47:31 +08:00
13621160019@163.com 685e96c0aa replaced Chinese with English in Excel Exporters of API 2021-09-23 17:33:39 +08:00
13621160019@163.com b29d8d1e9b removed gsmmodem and aliyun sms api from API & Admin UI 2021-09-22 22:42:37 +08:00
13621160019@163.com 02caabc640 changed start&end datetime formater for tariff from timestamp to strftime 2021-09-22 18:09:13 +08:00
13621160019@163.com 26000b5af7 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:10:10 +08:00
13621160019@163.com efda021649 changed lease start&end datetime formater for tenant from timestamp to strftime 2021-09-22 16:07:38 +08:00
13621160019@163.com dec9bc6e87 changed last run datetime and next run datetime formater for rule from timestamp to strftime 2021-09-22 15:44:28 +08:00
13621160019@163.com 15ca471b83 changed last seen datetime formater for gateway from timestamp to strftime 2021-09-22 15:25:30 +08:00
13621160019@163.com 9624b75414 changed last seen datetime formater of datasource from timestamp to strftime 2021-09-22 14:50:41 +08:00
13621160019@163.com f27b95adee changed upload datetime formater of knowledgefile and offlinemeterfile from timestamp to strftime; 2021-09-22 13:55:50 +08:00
13621160019@163.com 6962c65aab changed cost file upload datetime formatter from timestamp to strftime 2021-09-22 12:41:12 +08:00
13621160019@163.com 0ac76ccd96 added expiration datetimes to User in Admin UI 2021-09-22 11:28:33 +08:00
13621160019@163.com 01b6dabb31 added expiration datetimes to user actions in API 2021-09-21 16:03:39 +08:00
13621160019@163.com bd43969274 added column ID to StoreBatch Excel Exporter in API 2021-09-17 12:24:25 +08:00
13621160019@163.com d2d4ced4d6 added meter ID to meterbatch excel exporter in API 2021-09-15 22:35:25 +08:00
13621160019@163.com b25559414d added new protocols of datasource into API 2021-09-14 15:30:47 +08:00
13621160019@163.com 982b71f1a4 added new datasource protocols to API 2021-09-14 11:10:18 +08:00
13621160019@163.com 447eb57202 added aliyunsmsapi to api/core 2021-09-12 22:50:36 +08:00
13621160019@163.com 7a760ad088 updated distibutionssystem point value timeout value to 30 minutes 2021-09-10 15:56:12 +08:00
13621160019@163.com 0018459f0e updated README for installing openpyxl 2021-09-07 17:33:10 +08:00
13621160019@163.com f24deea941 modified API error message for knowledge file cannot be removed from disk 2021-09-06 15:01:24 +08:00
13621160019@163.com 4243ad043e removed cookies usages from API 2021-09-06 11:52:47 +08:00
13621160019@163.com 928ee6535e updated userlogger in API to pass HTTPError to client 2021-09-04 15:41:06 +08:00
13621160019@163.com ddb95d87a3 added trusted-host to Dockerfiles 2021-09-01 15:35:13 +08:00
13621160019@163.com 3c95f47415 updated README 2021-08-28 13:32:38 +08:00
13621160019@163.com 6c90203d51 added user log to UserLogin, ChangePassword and ResetPassword in API 2021-08-28 11:26:26 +08:00
13621160019@163.com ee056857d5 fixed typos in API 2021-08-27 18:50:08 +08:00
13621160019@163.com c00b252de6 fixed typo in userlogger of API 2021-08-27 18:29:25 +08:00
13621160019@163.com 457efdbf9c removed user_logger decorators from some actions in API 2021-08-27 18:19:17 +08:00
13621160019@163.com 6a5c8bd3cf added user_logger decorators to all on_put, on_post and on_delete actions in API 2021-08-27 18:09:47 +08:00
13621160019@163.com eabce3c42c implemented user_logger decorators in API 
Merge branch 'PR63' into develop
 2021-08-27 17:21:15 +08:00
13621160019@163.com 9b5b9a38d7 updated userlogger in API 2021-08-27 17:21:01 +08:00
13621160019@163.com c350ddd808 fixed code style warnings in README 2021-08-26 14:57:44 +08:00
hyh123a 279ebde9f9 modify the date_time to utc 2021-08-26 10:02:30 +08:00
hyh123a 329b5f732b add the judge for admin 2021-08-25 15:49:18 +08:00
hyh123a 0f637e8a4b Merge branch 'develop' into logs 2021-08-25 15:24:08 +08:00
hyh123a 3565d0dbcc add the log function and test in equipments 2021-08-25 15:13:34 +08:00
13621160019@163.com b389887b50 fixed PEP8 warnings in API 2021-08-25 12:01:14 +08:00
13621160019@163.com f39ad7f039 fixed code style warnings in API 2021-08-25 10:15:27 +08:00
13621160019@163.com bbbc93acda fixed issues of markdown in README files 2021-08-23 16:53:48 +08:00
13621160019@163.com 7766723f60 changed user token hash algorithm from sha1 to sha256 in API 2021-08-23 15:38:49 +08:00
13621160019@163.com 3b2914eb87 fixed 'import * may pollute namespace' in API 2021-08-15 14:09:41 +08:00
13621160019@163.com 61737feea8 removed 'unused import' from API 2021-08-15 14:06:46 +08:00
13621160019@163.com 17dfe5d687 removed unused local variable in costfile.py of API 2021-08-15 13:56:44 +08:00
13621160019@163.com 8372d3f741 removed unused import from meterbatch.py of API 2021-08-15 13:46:58 +08:00
13621160019@163.com 0d4f0a57ab fixed 'Clear-text logging of sensitive information' in API 2021-08-15 13:40:34 +08:00
13621160019@163.com 6de60a8f0e fixed 'The variable binary_file_data does not seem to be defined for all execution paths' in API 2021-08-15 13:14:35 +08:00
13621160019@163.com 06b2892e84 fixed response body Restore actions 2021-08-14 17:24:35 +08:00
13621160019@163.com 04bc0b2fdf updated Dockerfiles to add pip mirrors 2021-08-11 18:27:42 +08:00
13621160019@163.com 72d045e277 added version tags to images in Dockerfile 2021-08-11 13:17:30 +08:00
13621160019@163.com c0e363c87d updated Admin UI translations for Error Messages of API 2021-08-10 16:41:01 +08:00
13621160019@163.com cb8cf6a424 fixed typo in API 2021-08-10 11:28:43 +08:00
hyh123a 1656d9b131 Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-08-06 16:12:00 +08:00
13621160019@163.com 7270b1cdbb fixed warnings of excelexporters in API 2021-08-05 16:27:05 +08:00
13621160019@163.com 8fbf155960 replaced every_day_* to periodic_* in excelexporters of API 2021-08-05 10:52:05 +08:00
13621160019@163.com b6c6659106 replaced every_day_* to periodic_* in excelexporters of API 2021-08-05 10:52:00 +08:00
hyh123a 35d9ea4a02 modify the Dockerfile 2021-08-05 10:35:15 +08:00
13621160019@163.com 4e11c36877 updated Menu API 2021-08-02 11:30:55 +08:00
13621160019@163.com 39452605cd fixed issue in Menu API 2021-08-02 11:10:53 +08:00
13621160019@163.com 2c0de0f673 updated Menu Setting in Admin UI 2021-08-02 10:52:13 +08:00
13621160019@163.com efd239be06 added Menu Setting to Admin UI 2021-08-01 20:43:24 +08:00
13621160019@163.com ec5ad8792c added Menu actions to API 
Merge branch 'PR57' into develop
 2021-08-01 12:13:36 +08:00
13621160019@163.com f3fe884268 updated README and Postman Collection for Menu of API 2021-08-01 12:13:20 +08:00
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
13621160019@163.com d7156009fb added associated parameters data to excel exporter of spaceenergyitem in API 2021-04-14 11:46:26 +08:00
13621160019@163.com 68f6f3474c added associated parameters data to excel exporter of spaceenergycategory in API 2021-04-14 11:38:57 +08:00
13621160019@163.com 60719de143 added associated parameters data to excel export of spacecost in API 2021-04-14 11:28:48 +08:00
13621160019@163.com 7b9e632f1c updated excel exporter of metertrend in API 2021-04-13 12:09:44 +08:00
13621160019@163.com c0918f98bb updated excel exporter of metersubmetersbalance in API 2021-04-13 12:03:16 +08:00
13621160019@163.com 42efb7fcd7 updated excel exporter of meterenergy in API 2021-04-13 12:00:29 +08:00
13621160019@163.com 5dfd5e1b03 updated excel exporter of metercost in API 2021-04-13 11:57:59 +08:00
13621160019@163.com de588d9397 added associated parameters data to excel exporter of metertrend in API 2021-04-12 18:08:36 +08:00
13621160019@163.com aa0df09f86 added associated parameters data to excel exporter of metersubmetersbalance in API 2021-04-12 17:44:23 +08:00
13621160019@163.com e9224ec264 added associated parameters data to excel exporter of meterenergy in API 2021-04-12 17:35:10 +08:00
13621160019@163.com 98dcc10990 added parameters data to excel exporter of metercost in API 2021-04-12 16:38:06 +08:00
13621160019@163.com 8b1ead660f added parameters validator to statistics_hourly_data_by_period in API 2021-04-12 15:09:00 +08:00
13621160019@163.com 985ffb55aa added code to validate parameters of averaging_hourly_data_by_period in API 2021-04-12 14:46:10 +08:00
13621160019@163.com ab7645a13a added associated parameters data to excel exporter of tenantstatistics in API 2021-04-10 19:51:37 +08:00
13621160019@163.com 2c51196ba8 added associated paramters data to excel exporter of tenantsaving in API 2021-04-10 19:47:37 +08:00
13621160019@163.com 62640ac367 added associated paramters data to excel exporter of tenantload in API 2021-04-10 19:41:09 +08:00
13621160019@163.com 1362189140 added associated parameters data to excel exporter of tenantload in API 2021-04-10 19:29:48 +08:00
13621160019@163.com bfe8c4d853 added associated paramters data to excel exporter of tenantenergyitem in API 2021-04-10 19:25:35 +08:00
13621160019@163.com 65493319d3 added associated parameters data to excel exporter of tenantenergycategory in API 2021-04-10 19:19:31 +08:00
13621160019@163.com 217d19454d added associated parameters data to excel exporter of tenantcost in API 2021-04-10 19:11:52 +08:00
13621160019@163.com 7e8b101bac added associated parameters data to excel exporter of combinedequipmentstatistics in API 2021-04-06 22:24:53 +08:00
13621160019@163.com bc27862094 added associated paramters data to combinedequipmentsaving in API 2021-04-06 17:57:00 +08:00
13621160019@163.com 77b1eb6591 added associated paramters data to excel exporter of combinedequipmentoutput in API 2021-04-06 17:29:42 +08:00
13621160019@163.com db4f887975 added associated parameters data to combinedequipmentload in API 2021-04-06 17:21:23 +08:00
13621160019@163.com 3967ad5d08 added associated parameters data to excel exporter of combinedequipmentincome in API 2021-04-06 08:46:26 +08:00
13621160019@163.com 1445756d22 added associated parameters data to excel exporter of combinedequipmentenergyitem in API 2021-04-05 20:26:49 +08:00
13621160019@163.com f19ee1f3ae added associated parameters data to excel exporter of combinedequipmentenergycategory in API 2021-04-05 20:20:25 +08:00
13621160019@163.com 2f8a96abf6 added associated parameters data to excel exporter of combinedequipmentcost in API 2021-04-05 20:11:19 +08:00
13621160019@163.com 152ab66064 fixed issue in excel exporter of equipmentincome in API 2021-04-05 19:51:42 +08:00
tianlinzhong dc8a0eba2b Fixed the Income bug 2021-04-04 15:33:45 +08:00
tianlinzhong 5b9305ee5a Fixed the Income bug 2021-04-04 15:24:56 +08:00
13621160019@163.com 51cd31faa7 fixed unit issue in CombinedEquipmentCost report in API 2021-04-02 13:49:55 +08:00
Caozhenhui a397de2c3f fixed a bug with associated equipment data of combinedequipmentincome 2021-04-01 23:38:13 +08:00
YangZhang-GitHub 8279c4ba7a Add 'quick_mode variable is used to speed up 2021-04-01 15:23:09 +08:00
13621160019@163.com 0c75dc4db8 added paramter data to excel exporter of EquipmentStatistics in API 2021-04-01 11:59:41 +08:00
13621160019@163.com 6c20da74ed added parameter data to excel exporter of EquipmentSaving in API 2021-04-01 11:56:31 +08:00
13621160019@163.com 980958f8eb added paramter data to excel exporter of EquipmentOutput in API 2021-04-01 11:36:57 +08:00
13621160019@163.com d729198278 added parameter data to excel exporter of EquipmentLoad in API 2021-04-01 11:32:48 +08:00
13621160019@163.com 5c5d23784e added paramters data to excel exporter of EquipmentEnergyItem in API 2021-04-01 10:57:54 +08:00
13621160019@163.com 4e28aac1da added parameters data to excel exporter of EquipmentEnergyCategory in API 2021-04-01 10:48:53 +08:00
13621160019@163.com e76066b62a upgraded version to v1.1.1 2021-03-31 15:49:23 +08:00
13621160019@163.com d5261e8e01 added associated equipment data to combinedequipmentcost report in API 2021-03-31 15:20:32 +08:00
13621160019@163.com 8ae8d33618 added associated equipment data to combinedequipmentstatistics report in API 2021-03-31 15:09:33 +08:00
13621160019@163.com 4bd5b175f4 added associated equipment data to combinedequipmentsaving report in API 2021-03-31 14:58:24 +08:00
13621160019@163.com 979d5d7b8c added associated equipment data to combinedequipmentoutput report in API 2021-03-31 14:42:27 +08:00
13621160019@163.com 32eb0441cb added associated equipment data to combinedequipmentload report in API 2021-03-31 14:34:27 +08:00
13621160019@163.com a24a6ddd09 added associated equipment data to combinedeuqipmentincome report in API 2021-03-31 13:34:39 +08:00
13621160019@163.com 3bf04cc27d added associated equipment data to combinedequipmentenergyitem report in API 2021-03-31 13:15:07 +08:00
13621160019@163.com 7800a96e64 added associated equipment data to combinedequipmentenergycategory report in API 2021-03-31 13:05:19 +08:00
13621160019@163.com ede74ec298 added quickmode paramter to combinedequipmentefficiency report in API 2021-03-29 16:53:35 +08:00
13621160019@163.com 7c19344e8f added excel exporter of equipmentcost reporter in API 
Merge branch 'PR96' into develop
 2021-03-28 17:05:44 +08:00
tianlinzhong 3b705722bf Fixed the error 2021-03-28 12:19:05 +08:00
tianlinzhong 4b40835d4b Implemented the equipmentcost Excel export 2021-03-26 21:44:52 +08:00
13621160019@163.com 9e32d75470 added associated equipment to combinedequipmentenergyitem report in API 
Merge branch 'PR23' into develop
 2021-03-26 10:31:16 +08:00
13621160019@163.com 1296e69231 fixed typo in combinedequipmentenergyitem report in API 2021-03-26 10:31:05 +08:00
Caozhenhui 3ccce287ee added associated equipment data to CombinedEquipmentEnergyItem report & excel reporter 2021-03-25 17:10:37 +08:00
YangZhang-GitHub eb0c2df3e0 Fixed a bug 2021-03-25 16:03:51 +08:00
13621160019@163.com 398f96d4bd fixed error of None Comparision in API 2021-03-25 12:15:20 +08:00
Caozhenhui ca4fdc0872 2021/3/23 #86 2021-03-23 17:19:03 +08:00
13621160019@163.com fca523a616 fixed NoneType error in ShopfloorLoad report in API 2021-03-23 16:46:09 +08:00
13621160019@163.com 7a86423068 fixed NoneType error in CombinedEquipmentLoad report in API 2021-03-23 16:01:44 +08:00
13621160019@163.com 1448c17749 fixed NoneType error in StoreLoad report API 2021-03-23 15:58:50 +08:00
13621160019@163.com 6a1b986f56 fixed NoneType error in TenantLoad Report API 2021-03-23 15:54:48 +08:00
13621160019@163.com 9538ffc1e3 fixed NoneType error in EquipmentLoad Report API 2021-03-23 15:48:44 +08:00
13621160019@163.com c7559e0470 fixed NoneType error in SpaceLoad report in API 2021-03-23 15:42:31 +08:00
13621160019@163.com f38d7e3691 fixed NoneType issue in SpaceEfficiency Report API 2021-03-23 15:20:32 +08:00
13621160019@163.com cee412557a moved category before fdd_code of rule in admin UI and API 2021-03-23 10:51:34 +08:00
13621160019@163.com 5ab0f47c96 added last_run_datetime and next_run_datetime to rule in API 2021-03-22 17:29:40 +08:00
13621160019@163.com e614888026 fixed issues of excel exporter of conbinedequipmentefficiency and equipmentefficiency reports in API 
Merge branch 'PR22' into develop
 2021-03-19 14:57:29 +08:00
YangZhang-GitHub fadbb98b1d Fixed a bug 2021-03-19 14:15:36 +08:00
13621160019@163.com 30a026c347 fixed undefined error in virtualmeterenergy report API 2021-03-19 13:35:56 +08:00
13621160019@163.com a5789343e8 updated excel exporter of combinedequipmentefficiency report 
Merge branch 'PR21' into develop
 2021-03-19 10:45:06 +08:00
13621160019@163.com c08db755f4 updated version to v1.1.0 2021-03-18 11:47:46 +08:00
13621160019@163.com 0f3e5ff641 added excel exporter of equipmentefficiency report 
Merge branch 'PR20' into develop
 2021-03-18 11:29:57 +08:00
YangZhang-GitHub a425b8ff35 Added row height to resolve the problem of incomplete time display 2021-03-18 11:26:08 +08:00
YangZhang-GitHub b6d9b44765 Added row height to resolve the problem of incomplete time display 2021-03-18 11:24:48 +08:00
YangZhang-GitHub c3a5799bb9 Implemented the EquipmentEfficiency Excel Exporter 2021-03-18 10:14:10 +08:00
YangZhang-GitHub b72d7b48bb Added 'excelexporters.equipmentefficiency.export()' method 2021-03-18 10:13:29 +08:00
13621160019@163.com d35ccb4302 added excel exporter of conbinedequipmentefficiency report in API 
Merge branch 'PR19' into develop
 2021-03-18 10:00:40 +08:00
YangZhang-GitHub 8b25860ad7 Modify the layout 2021-03-17 14:43:44 +08:00
YangZhang-GitHub 3d5d924d56 Modify the column width 2021-03-16 15:00:26 +08:00
13621160019@163.com 82479e8b18 fixed issue when deleting offline meter file 2021-03-16 12:07:10 +08:00
13621160019@163.com 45414659df updated user login session expire time to 8 hours 2021-03-16 12:05:43 +08:00
YangZhang-GitHub 3d143fecc3 Inspect Code 2021-03-15 19:01:36 +08:00
YangZhang-GitHub dd1fe3c2d4 Improvement of related parameter time 2021-03-15 18:59:52 +08:00
YangZhang-GitHub b531831499 Implemented the CombinedEquipmentEfficiency Excel Exporter 2021-03-15 17:20:09 +08:00
YangZhang-GitHub e47166aa09 Added 'excelexporters.combinedequipmentefficiency.export()' method 2021-03-15 17:16:01 +08:00
13621160019@163.com 57b6dd3266 changed to set contact of space is optional in web UI and API 2021-03-15 13:46:16 +08:00
13621160019@163.com d242e7226a fixed typos in combindedequipmentefficiency and equipmentefficiency report api 2021-03-14 16:40:57 +08:00
13621160019@163.com f870e8b483 fixed issues of historcial database close and disconnect in api 2021-03-13 09:19:33 +08:00
13621160019@163.com 82fb8c2e5a added cominbedequipmentefficiency report to api and web 2021-03-13 08:14:21 +08:00
13621160019@163.com 9f6f688cce fixed issue in eqipmentefficiency report 2021-03-12 22:28:05 +08:00
13621160019@163.com db6f0a4662 added equipmentefficiency report api 2021-03-12 19:59:28 +08:00
13621160019@163.com 319b5738d9 added historical database close and disconnect at the end of reports 2021-03-12 14:44:15 +08:00
13621160019@163.com 7eb371bf30 updated version to v1.0.8 2021-03-11 16:09:33 +08:00
Caozhenhui e9a272a68f change line chart insertion position and delete annotation code 2021-03-11 15:47:18 +08:00
Caozhenhui 2d966aa46a Change the code variable name and add the LineChart comment 2021-03-10 19:27:30 +08:00
Caozhenhui cdfe37dd2a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 19:23:39 +08:00
13621160019@163.com 6c2d66019f updated excel exporters of combinedequipmentenergyitem, combinedequipmentoutput, equipmentenergyitem, equipmentoutput, shopfloorenergyitem, spaceoutput, storeenergyitem and tenantenergytime 
Merge branch 'PR6' into develop
 2021-03-10 19:00:36 +08:00
Caozhenhui d962457c67 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 16:06:16 +08:00
13621160019@163.com e863754cc3 updated excel exporter of spacesot, spaceenergycategory, spaceenergyitem and spaceincome 
Merge branch 'PR13' into develop
 2021-03-10 13:23:51 +08:00
13621160019@163.com c9cb56d8ee fixed issue in excel exporter of spaceincome report 2021-03-10 13:23:40 +08:00
Caozhenhui 7345f1de8a Merge remote-tracking branch 'upstream/develop' into develop 2021-03-10 12:58:04 +08:00
13621160019@163.com 67be8e5b04 added excel exporter of storesaving report 
Merge branch 'PR14' into develop
 2021-03-10 11:33:13 +08:00
13621160019@163.com 1da9704abf updated excel exporter of spacesaving and tenantsaving reports 
Merge branch 'PR12' into develop
 2021-03-10 09:54:21 +08:00