Commit Graph

325 Commits (029ce72b803a0d3088169c8b29ec8dffdc5bfb2f)

Author SHA1 Message Date
hyh123a 029ce72b80 Merge remote-tracking branch 'origin_myems/develop' into issure31 2021-03-07 19:05:51 +08:00
hyh123a 4b7691342a revert the translation 2021-03-07 18:59:24 +08:00
13621160019@163.com baab37cfce Merge branch 'master' into develop 2021-03-07 16:55:44 +08:00
13621160019@163.com e5176eb9b0 updated version number to v1.0.7 2021-03-07 16:45:29 +08:00
13621160019@163.com d8f488ee3c Merge branch 'develop' 2021-03-07 15:30:49 +08:00
13621160019@163.com 38d98a5ca1 updated change log and version number 2021-03-07 15:29:57 +08:00
13621160019@163.com 58217f75bf added excel exporter of storeload report
Merge branch 'develop'
2021-03-07 14:59:04 +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 2405bf3a32 added excel exporter of spaceincome report
Merge branch 'develop'
2021-03-07 13:47:10 +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
13621160019@163.com b3c14adeee Merge branch 'develop' 2021-03-07 11:57:16 +08:00
13621160019@163.com be39176900 Merge branch 'PR5' into develop 2021-03-07 11:56:14 +08:00
13621160019@163.com 0d667e6e1d fixed PEP8 warning in spacesaving 2021-03-07 11:56:00 +08:00
Caozhenhui c50840a720 Implemented the storeload Excel Exporter 2021-03-07 11:47:11 +08:00
13621160019@163.com 91dc1f5a0b Merge branch 'develop' 2021-03-07 11:17:55 +08:00
13621160019@163.com 75015e1417 fixed DivisionUndefined issues in combinedequipmentsaving 2021-03-07 11:16:50 +08:00
13621160019@163.com 43fffd6700 Merge branch 'develop' 2021-03-07 11:10:06 +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
13621160019@163.com cd6237d57c fixed divide by zero issues in equipmentsaving 2021-03-07 11:08:36 +08:00
13621160019@163.com 57a4bf377b removed abs functions for calculating percentage in equipmentsaving 2021-03-07 10:58:30 +08:00
13621160019@163.com 2ca35c980f Merge branch 'develop' 2021-03-07 10:53:43 +08:00
13621160019@163.com 0a797a96b5 removed abs function for calculating percentage in combinedequipmentsaving 2021-03-07 10:52:48 +08:00
13621160019@163.com 2affa23972 added excel exporter of combinedequipmentsaving report
Merge branch 'develop'
2021-03-07 10:44:29 +08:00
13621160019@163.com d71ab3a28f added excel exporter of combinedequipmentsaving report
Merge branch 'PR7' into develop
2021-03-07 10:43:05 +08:00
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 0f9b2fffb7 Added 'excelexporters.equipmentsaving.export()' method 2021-03-05 17:14:52 +08:00
YangZhang-GitHub 93a87cb1b0 Implemented the EquipmentSaving Excel Exporter 2021-03-05 17:13:21 +08:00
YangZhang-GitHub 5e107e3b5c Added 'excelexporters.combinedequipmentsaving.export()' method 2021-03-05 16:55:40 +08:00
YangZhang-GitHub aaddf6b80b Implemented the CombinedEquipmentSaving Excel Exporter 2021-03-05 16:53:46 +08:00
tianlinzhong db31bb56fd Implemented the spaceIncome Excel export 2021-03-05 16:05:45 +08:00
hyh123a 76db0d1fec Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-05 15:54:07 +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 2d84658c50 added excel exporter of combinedequipmentload report
Merge branch 'develop'
2021-03-05 13:51:51 +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 55053587f0 added excel exporter of spaceoutput report
Merge branch 'develop'
2021-03-05 13:36:14 +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 3991b72183 added excel exporter of combinedequipmentoutput report
Merge branch 'develop'
2021-03-05 13:28:12 +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