Commit Graph

803 Commits (95983aaf4ec76b1b1d62e2a1d35bacd0db1af20c)

Author SHA1 Message Date
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 2cefdcb705 added is_virtual to point in myems-bacnet and myems-modbus-tcp 2021-05-07 09:01:56 +08:00
13621160019@163.com bb875521ef added is_virtual to point in myems-admin 2021-05-07 09:01:19 +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 e45de9c394 added is_virtual to tbl_points in database 2021-05-05 07:43:39 +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 2ae9fca00f added start value and end value to metertracking report
Merge branch 'PR40' into develop
2021-05-03 12:41:34 +08:00
13621160019@163.com 77c5a4fb2d updated metertracking report to reduce duplicated meters 2021-05-03 12:41:21 +08:00
13621160019@163.com 9126d1981a updated comments and log messages in myems-modbust-tcp service 2021-05-01 20:10:23 +08:00
13621160019@163.com 041171c28d added gateway procedure to myems-modbus-tcp service 2021-04-30 14:19:50 +08:00
13621160019@163.com afe05816b5 added gateway process to myems-modbus-tcp service 2021-04-30 14:07:46 +08:00
13621160019@163.com b87d41af87 added multiprocessing to main of myems-bacnet service 2021-04-30 12:40:50 +08:00
13621160019@163.com 3eebbbc533 Merge branch 'master' into develop 2021-04-30 12:32:40 +08:00
13621160019@163.com 6f92e88ece removed schedule library from gateway process in myems-bacnet service 2021-04-30 12:27:38 +08:00
13621160019@163.com 050304256f added gateway process to myems-bacnet service
Merge branch 'develop'
2021-04-30 11:28:11 +08:00
13621160019@163.com 546365dc74 added gateway process to myems-bacnet service 2021-04-30 11:27:54 +08:00
13621160019@163.com c014ee5030 added gateway process to myems-bacnet service
Merge branch 'develop'
2021-04-30 10:46:30 +08:00
13621160019@163.com 6bedd5d73c added gateway process to myems-bacnet service 2021-04-30 10:46:00 +08:00
YangZhang-GitHub c6f4ed9003 Completed the start and end values increase 2021-04-29 20:23:18 +08:00
13621160019@163.com 3906770cd8 added procedure to update last seen datetime of data source in myems-modbus server
Merge branch 'develop'
2021-04-29 11:34:00 +08:00
13621160019@163.com 6f70a27a72 added procedure to update last seen datetime of data source in myems-modbus server 2021-04-29 11:33:44 +08:00
13621160019@163.com fc7113e6f8 added procedure to update data source last seen datetime in myems-bacnet service
Merge branch 'develop'
2021-04-28 18:15:36 +08:00
13621160019@163.com 16734a220b added procedure to update data source last seen datetime in myems-bacnet service 2021-04-28 18:15:18 +08:00
13621160019@163.com 75e37c55dc added procedure to update data source last seen datetime in myems-bacnet service
Merge branch 'develop'
2021-04-28 17:47:00 +08:00
13621160019@163.com 34d2639d0d added procedure to update data source last seen datetime in myems-bacnet service 2021-04-28 17:46:48 +08:00
13621160019@163.com 8697ab3137 added procedure to update data source last seen datetime in myems-bacnet service
Merge branch 'develop'
2021-04-28 17:16:41 +08:00
13621160019@163.com 9ce793e6ee added procedure to update data source last seen datetime in myems-bacnet service 2021-04-28 17:12:40 +08:00
13621160019@163.com 64eac25c46 fixed detailed value missing issue in SpaceEfficiency report in Web UI
Merge branch 'develop'
2021-04-28 16:09:49 +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 6bdc5e977e added last seen datetime to data source setting in Admin UI
Merge branch 'develop'
2021-04-28 15:56:27 +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 b0c1fcb786 added last seen datetime to Gateway Setting in Admin UI
Merge branch 'develop'
2021-04-28 15:03:12 +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 3e9de79589 Fix the bug of missing detailed value and the bug of web interface stuck with empty data 2021-04-28 14:12:52 +08:00
13621160019@163.com 7e87af00a2 added excel exporter of spaceefficiency report in API
Merge branch 'develop'
2021-04-28 10:58:18 +08:00
13621160019@163.com f73936a452 added excel exporter of spaceefficiency report in API
Merge branch 'PR38' into develop
2021-04-28 10:57:37 +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 80013c5321 added openpyxl.utils.cell.get_column_letter to excel exporters
Merge branch 'develop'
2021-04-27 15:56:06 +08:00
13621160019@163.com bbf83f67f6 Merge branch 'PR37' into develop 2021-04-27 15:15:44 +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 9980be5978 updated year in LICENSE
Merge branch 'develop'
2021-04-25 11:56:44 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +08:00
13621160019@163.com 5887f29e37 improved theme of energyflowdiagram in Web UI
Merge branch 'develop'
2021-04-25 11:13:10 +08:00
13621160019@163.com d1d8d96243 improved theme of energyflowdiagram in Web UI 2021-04-25 11:11:50 +08:00