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

642 Commits (cf87c7b7ec212e05f89008cb1b1f08eee42a57f3)

Author SHA1 Message Date
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
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
Caozhenhui 7a322f5b4d Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 16:58:29 +08:00
Caozhenhui 4f7ccfa0cc Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 15:32:17 +08:00
YangZhang-GitHub 2b852e2634 Added 'excelexporters.storesaving.export()' method 2021-03-08 15:26:01 +08:00
YangZhang-GitHub 5f405215f6 Implemented the StoreSaving Excel Exporter 2021-03-08 15:24:47 +08:00
YangZhang-GitHub 5221016bd4 Add the data of per unit area 2021-03-08 15:22:47 +08:00
13621160019@163.com 6612269ab3 added excel exporter of equipmentincome report 
Merge branch 'PR65' into develop
 2021-03-08 15:22:20 +08:00
YangZhang-GitHub 291fabca0f Add a subspace title. Modify the subspace text display format. 2021-03-08 11:45:05 +08:00
YangZhang-GitHub ea00fc9d9f Modify the subspace location. Add a subspace diagram. Add a subspace title 2021-03-08 11:43:44 +08:00
YangZhang-GitHub d0f364b287 Increase the proportion column 2021-03-08 10:25:02 +08:00
YangZhang-GitHub b067abb46d Implemented the ShopFloorSaving Excel Exporter 2021-03-08 09:58:32 +08:00
YangZhang-GitHub f55d9734f2 Added 'excelexporters.shopfloorsaving.export()' method 2021-03-08 09:56:01 +08:00
hyh123a 029ce72b80 Merge remote-tracking branch 'origin_myems/develop' into issure31 2021-03-07 19:05:51 +08:00
tianlinzhong b52f1ef42d Implemented the equipmentincome Excel export 2021-03-07 15:47:57 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
13621160019@163.com 98ff0adcae added excel exporter of storeload report 
Merge branch 'PR10' into develop
 2021-03-07 14:57:39 +08:00
13621160019@163.com 6ca8f86f73 added excel exporter of spaceincome report 
Merge branch 'PR64' into develop
 2021-03-07 13:45:51 +08:00
tianlinzhong f73e528a9a delete unrelated code and Correct errors in Reports 2021-03-07 13:07:11 +08:00
13621160019@163.com be39176900 Merge branch 'PR5' into develop 2021-03-07 11:56:14 +08:00
13621160019@163.com 0d667e6e1d fixed PEP8 warning in spacesaving 2021-03-07 11:56:00 +08:00
Caozhenhui c50840a720 Implemented the storeload Excel Exporter 2021-03-07 11:47:11 +08:00
13621160019@163.com 75015e1417 fixed DivisionUndefined issues in combinedequipmentsaving 2021-03-07 11:16:50 +08:00
13621160019@163.com 30522bc75a added excel exporter of equipmentsaving report 
Merge branch 'PR8' into develop
 2021-03-07 11:08:58 +08:00
13621160019@163.com cd6237d57c fixed divide by zero issues in equipmentsaving 2021-03-07 11:08:36 +08:00
13621160019@163.com 57a4bf377b removed abs functions for calculating percentage in equipmentsaving 2021-03-07 10:58:30 +08:00
13621160019@163.com 0a797a96b5 removed abs function for calculating percentage in combinedequipmentsaving 2021-03-07 10:52:48 +08:00
hyh123a e6ea72ecad add the excel report of equipment load 2021-03-06 16:39:13 +08:00
YangZhang-GitHub a62735c9b6 Percentage added 2021-03-05 21:24:00 +08:00
YangZhang-GitHub b2b2905205 Percentage added 2021-03-05 21:19:54 +08:00
YangZhang-GitHub 73e1e876b9 Modify the G3 cell style 2021-03-05 17:17:10 +08:00
YangZhang-GitHub 0f9b2fffb7 Added 'excelexporters.equipmentsaving.export()' method 2021-03-05 17:14:52 +08:00
YangZhang-GitHub 93a87cb1b0 Implemented the EquipmentSaving Excel Exporter 2021-03-05 17:13:21 +08:00
YangZhang-GitHub 5e107e3b5c Added 'excelexporters.combinedequipmentsaving.export()' method 2021-03-05 16:55:40 +08:00
YangZhang-GitHub aaddf6b80b Implemented the CombinedEquipmentSaving Excel Exporter 2021-03-05 16:53:46 +08:00
YangZhang-GitHub 35cef1b9e7 Change the location of the judgment code logic 2021-03-05 16:21:24 +08:00
YangZhang-GitHub 7344e7745f Change the location of the judgment code logic 2021-03-05 16:10:40 +08:00
tianlinzhong db31bb56fd Implemented the spaceIncome Excel export 2021-03-05 16:05:45 +08:00
tianlinzhong 1f9699a318 Implemented the spaceIncome Excel export 2021-03-05 15:43:59 +08:00
YangZhang-GitHub 1b4189138a Delete comment code 2021-03-05 15:32:18 +08:00
YangZhang-GitHub 498d33d278 1. Change the subspace location 2021-03-05 15:29:19 +08:00
YangZhang-GitHub 811d0cba0d 1. Change the subspace location 
2. Change the code judgment logic
 2021-03-05 15:23:42 +08:00
YangZhang-GitHub ea55e306aa 1. Change the subspace location 
2. Added a TCE ratio module
3. Added a TCO2E ratio module
 2021-03-05 15:16:11 +08:00
YangZhang-GitHub a3724999dd Inspect code 2021-03-05 15:13:15 +08:00
YangZhang-GitHub 8f8e3fdc5b Add layout logic 2021-03-05 14:59:38 +08:00
YangZhang-GitHub aa8d71dec1 1. Change the subspace location 
2. Added a cost ratio module
 2021-03-05 14:48:09 +08:00
13621160019@163.com 9c603094ac added excel exporter of combinedequipmentload report 
Merge branch 'PR2' into develop
 2021-03-05 13:44:04 +08:00
13621160019@163.com 20545e8dbf added excel exporter of spaceoutput report 
Merge branch 'PR4' into develop
 2021-03-05 13:34:52 +08:00
13621160019@163.com dbb2398498 added excel exporter of combinedequipmentoutput 
Merge branch 'PR3' into develop
 2021-03-05 13:26:56 +08:00
Caozhenhui b782ea91a9 fixd the detail table column order 2021-03-05 12:44:44 +08:00
Caozhenhui fee9c5cf0f Merge remote-tracking branch 'upstream/develop' into issue25 2021-03-05 12:22:22 +08:00
YangZhang-GitHub ceaa72a883 Change the subspace location 2021-03-05 11:51:53 +08:00
YangZhang-GitHub 739ab78949 Delete comment code 2021-03-05 11:36:38 +08:00
Caozhenhui bf9e256d39 fixd pep8 2021-03-04 20:46:50 +08:00
tianlinzhong 80601589eb Implemented the combinedequipmentcost Excel export 2021-03-04 20:44:38 +08:00
YangZhang-GitHub 22ba6615f4 Added 'excelexporters.spaceoutput.export()' method 2021-03-04 20:34:03 +08:00
YangZhang-GitHub 7796eeed5f Implemented the SpaceOutput Excel Exporter 2021-03-04 20:31:13 +08:00
Caozhenhui 9048dac16c Implemented the combinedequipmentload Excel Exporter 2021-03-04 20:25:32 +08:00
YangZhang-GitHub 1d2923e915 Change the cell name 'consume' to 'output' 2021-03-04 20:18:38 +08:00
YangZhang-GitHub 413077a6ee Implemented the CombinedEquipmentOutput Excel Exporter 2021-03-04 19:57:00 +08:00
YangZhang-GitHub 2f5c9673de Added 'excelexporters.combinedequipmentoutput.export()' method 2021-03-04 19:55:57 +08:00
13621160019@163.com 76b83136a2 added excel exporter of equipmentoutput report 
Merge branch 'PR60' into develop
 2021-03-04 18:58:53 +08:00
13621160019@163.com 187f1d33a0 added excel exporter of shopfloorcost report 2021-03-04 18:34:52 +08:00
13621160019@163.com 59db05182b added excel exporter of shopfloorcost report 
Merge branch 'PR52' into develop
 2021-03-04 18:33:07 +08:00
tianlinzhong 14bfb16cda Fix some errors and add data ratio 2021-03-04 15:55:01 +08:00
YangZhang-GitHub c9fad53977 Implemented the EquipmentOutput Excel Exporter 2021-03-04 14:54:38 +08:00
YangZhang-GitHub 18a3e8e7d8 Added 'excelexporters.equipmentoutput.export()' method 2021-03-04 14:53:50 +08:00
Caozhenhui 9134e88153 Remove the load factor per unit area[B 2021-03-04 14:35:27 +08:00
tianlinzhong 78f02914dc 更改完成 2021-03-04 12:03:10 +08:00
tianlinzhong 8bebedf6f1 added shopfloorcost master 2021-03-03 16:38:12 +08:00
Caozhenhui 25a96729ae 2021/3/3 2021-03-03 16:04:49 +08:00
Caozhenhui d719e95ab0 Merge remote-tracking branch 'upstream/develop' into develop 2021-03-03 15:47:45 +08:00
13621160019@163.com f1d95e3037 added excel exporter of combinedequipmentenergycategory report 2021-03-03 14:11:22 +08:00
13621160019@163.com e717b23bde added excel exporter of combinedequipmentenergycategory report 
Merge branch 'PR58' into develop
 2021-03-03 14:08:50 +08:00
13621160019@163.com 76139d6645 added excel exporter of combinedequipmentitem report 
Merge branch 'PR57' into develop
 2021-03-03 13:23:36 +08:00
hyh123a 83e8c27d36 add the excel report of combined equipment energy category 2021-03-03 11:52:12 +08:00
YangZhang-GitHub f0589cbb97 Implemented the CombinedEquipmentEnergyItem Excel Exporter 2021-03-03 11:48:07 +08:00
YangZhang-GitHub 0d6c14b999 Added 'excelexporters.combinedequipmentenergyitem.export()' method 2021-03-03 11:47:26 +08:00
Caozhenhui c493c797ad 2021/3/2 2021-03-02 20:25:48 +08:00
13621160019@163.com 6375d7893a added excel exporter of equipmentenergyitem report 
Merge branch 'PR54' into develop
 2021-03-02 17:52:58 +08:00
YangZhang-GitHub 46dedb15b4 Added 'excelexporters.equipmentenergyitem.export()' method 2021-03-02 17:31:09 +08:00
YangZhang-GitHub 16d38614b2 Implemented the EquipmentEnergyItem Excel Exporter 2021-03-02 17:30:05 +08:00
hyh123a 736bd111ff Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-02 16:56:04 +08:00
hyh123a 12eab9741f modify the data format 2021-03-02 16:55:37 +08:00
13621160019@163.com 5d043c4b71 Merge branch 'PR53' into develop 2021-03-02 16:44:11 +08:00
tianlinzhong 28ae913f03 added shopfloorcost exporper 2021-03-02 13:55:21 +08:00
hyh123a e3f5076e50 add the excel report of equipment energy category 2021-03-02 13:50:14 +08:00
tianlinzhong 02f3aec483 added shopfloorcost exporper 2021-03-02 13:46:22 +08:00
13621160019@163.com aaf72ba41d updated badges in README 2021-03-02 12:02:23 +08:00
YangZhang-GitHub 0e8021d887 Added 'excelexporters.shopfloorenergyitem.export()' method 2021-03-02 11:49:46 +08:00
YangZhang-GitHub a079a04587 Implemented the ShopFloorEnergyItem Excel Exporter 2021-03-02 11:44:48 +08:00
hyh123a 73a7760575 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-02-28 22:16:07 +08:00
hyh123a 1fe0b5ba1b add the excel of shopfloor energy category 2021-02-28 22:15:48 +08:00
hyh123a 9f98d12973 fixed the bug of storeenergycategory 2021-02-28 21:46:05 +08:00
13621160019@163.com 6ab2ac36cf fixed typo in energyflowdiagram report 2021-02-28 17:21:33 +08:00
hyh123a bbd67b7f0e add the reference of the storeenergycategory 2021-02-28 14:46:39 +08:00
hyh123a b0273e733a Merge remote-tracking branch 'origin_myems/develop' into develop 2021-02-28 14:14:14 +08:00
13621160019@163.com 9754b0b8cb Merge branch 'develop' of https://github.com/myems/myems into develop 2021-02-28 12:11:01 +08:00
13621160019@163.com 5736a6eac0 discard change of tbl_energy_flow_diagrams_links 2021-02-28 12:10:36 +08:00
hyh123a 84b6fee32a Merge remote-tracking branch 'origin_myems/develop' into develop 2021-02-27 23:09:09 +08:00
hyh123a d158a06873 add the excel report of storeenergycategory 2021-02-27 23:08:35 +08:00
YangZhang-GitHub 78c02dd6a5 Improved the SpaceEnergyItem Execl Exporter 2021-02-27 20:06:18 +08:00
YangZhang-GitHub 3d46116678 Improved the SpaceEnergyCategory Execl Exporter 2021-02-27 20:05:49 +08:00
YangZhang-GitHub 26ff9762b9 Improved the SpaceCost Execl Exporter 2021-02-27 20:05:25 +08:00
YangZhang-GitHub a94fd8f023 Improved the SpaceSaving Execl Exporter 2021-02-27 20:05:07 +08:00
13621160019@163.com e940d827a1 merged myems-api 2021-02-26 15:07:38 +08:00