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

1031 Commits (fb6576ab368a2a11b4b01fc253af4aa769fac69b)

Author SHA1 Message Date
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
13621160019@163.com c2b175c380 fixed issue when links is None in energyflowdiagram in API 
Merge branch 'develop'
 2021-04-25 11:00:35 +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 4103dbb12b Merge branch 'develop' 2021-04-23 11:38:22 +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 5501ba5ee0 added assoicated parameters data to excel exporter of shopfloorstatistics in API 2021-04-22 17:07:55 +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 e394c91765 added associated parameters data to excel exporter of shopfloorsaving in API 2021-04-22 16:52:00 +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 2ee7eab1b2 added associated parameters data to excel exporter of shopfloorload in API 2021-04-22 16:44:15 +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 875b929584 added associated parameters data to excel exporter of shopfloorenergyitem in API 
Merge branch 'develop'
 2021-04-22 16:23:29 +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 e2d7956e61 added associated parameters data to excel exporter of shopfloorenergycategory in API 
Merge branch 'develop'
 2021-04-19 18:50:53 +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 c3a7b3a95a added associated parameters data to excel exporter of shopfloorcost in API 
Merge branch 'develop'
 2021-04-19 18:28: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 9dd0082dff fixed issues in excel exporters of combinedequipment in API 
Merge branch 'develop'
 2021-04-18 23:24:06 +08:00
13621160019@163.com e744744dfa fixed issues in excel exporters of combinedequipment in API 2021-04-18 23:23:51 +08:00