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

137 Commits (master)

Author SHA1 Message Date
13621160019@163.com 13249842e6 added Tenant Batch Analysis Report 2021-05-13 08:19:05 +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
YangZhang-GitHub d04b8c9d4c Added 'excelexporters.spaceefficiency.export()' method 2021-04-27 17:29:36 +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 62640ac367 added associated paramters data to excel exporter of tenantload in API 2021-04-10 19:41:09 +08:00
13621160019@163.com 51cd31faa7 fixed unit issue in CombinedEquipmentCost report in API 2021-04-02 13:49:55 +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 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 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
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 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 30a026c347 fixed undefined error in virtualmeterenergy report API 2021-03-19 13:35:56 +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 b72d7b48bb Added 'excelexporters.equipmentefficiency.export()' method 2021-03-18 10:13:29 +08:00
YangZhang-GitHub e47166aa09 Added 'excelexporters.combinedequipmentefficiency.export()' method 2021-03-15 17:16:01 +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 f3b62c91a7 added excel exporter of combinedequipmentstatistics report 2021-03-11 15:26:18 +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
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
YangZhang-GitHub 2b852e2634 Added 'excelexporters.storesaving.export()' method 2021-03-08 15:26:01 +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 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 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
Caozhenhui c50840a720 Implemented the storeload Excel Exporter 2021-03-07 11:47:11 +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
hyh123a e6ea72ecad add the excel report of equipment load 2021-03-06 16:39:13 +08:00
YangZhang-GitHub 0f9b2fffb7 Added 'excelexporters.equipmentsaving.export()' method 2021-03-05 17:14:52 +08:00
YangZhang-GitHub 5e107e3b5c Added 'excelexporters.combinedequipmentsaving.export()' method 2021-03-05 16:55:40 +08:00
tianlinzhong 1f9699a318 Implemented the spaceIncome Excel export 2021-03-05 15:43:59 +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 fee9c5cf0f Merge remote-tracking branch 'upstream/develop' into issue25 2021-03-05 12:22:22 +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
Caozhenhui 9048dac16c Implemented the combinedequipmentload Excel Exporter 2021-03-04 20:25:32 +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 59db05182b added excel exporter of shopfloorcost report 
Merge branch 'PR52' into develop
 2021-03-04 18:33:07 +08:00
YangZhang-GitHub 18a3e8e7d8 Added 'excelexporters.equipmentoutput.export()' method 2021-03-04 14:53:50 +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 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
hyh123a 736bd111ff Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-02 16:56:04 +08:00
hyh123a e3f5076e50 add the excel report of equipment energy category 2021-03-02 13:50:14 +08:00
YangZhang-GitHub 0e8021d887 Added 'excelexporters.shopfloorenergyitem.export()' method 2021-03-02 11:49:46 +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
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
13621160019@163.com e940d827a1 merged myems-api 2021-02-26 15:07:38 +08:00