Commit Graph

642 Commits (8d87b3625b6e3ed9d41f3317ba707c5423a33830)

Author SHA1 Message Date
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