Commit Graph

262 Commits (master)

Author SHA1 Message Date
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 93a87cb1b0 Implemented the EquipmentSaving Excel Exporter 2021-03-05 17:13:21 +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 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
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
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 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
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 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
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
YangZhang-GitHub a079a04587 Implemented the ShopFloorEnergyItem Excel Exporter 2021-03-02 11:44:48 +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
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