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

655 Commits (731c03f82837bed1f5b87055aa8c7482b0010027)

Author SHA1 Message Date
tianlinzhong 007d7a987c Implemented the combinedequipmentincome Excel export 2021-03-08 22:54:57 +08:00
Caozhenhui 7a322f5b4d Merge remote-tracking branch 'upstream/develop' into develop 2021-03-08 16:58:29 +08:00
Caozhenhui 4f7ccfa0cc Implemented the CombinedEquipmentStatistics Excel Exporter 2021-03-08 15:32:17 +08:00
YangZhang-GitHub 2b852e2634 Added 'excelexporters.storesaving.export()' method 2021-03-08 15:26:01 +08:00
YangZhang-GitHub 5f405215f6 Implemented the StoreSaving Excel Exporter 2021-03-08 15:24:47 +08:00
YangZhang-GitHub 5221016bd4 Add the data of per unit area 2021-03-08 15:22:47 +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 291fabca0f Add a subspace title. Modify the subspace text display format. 2021-03-08 11:45:05 +08:00
YangZhang-GitHub ea00fc9d9f Modify the subspace location. Add a subspace diagram. Add a subspace title 2021-03-08 11:43:44 +08:00
YangZhang-GitHub d0f364b287 Increase the proportion column 2021-03-08 10:25:02 +08:00
YangZhang-GitHub b067abb46d Implemented the ShopFloorSaving Excel Exporter 2021-03-08 09:58:32 +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 38d98a5ca1 updated change log and version number 2021-03-07 15:29: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
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 75015e1417 fixed DivisionUndefined issues in combinedequipmentsaving 2021-03-07 11:16:50 +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 0a797a96b5 removed abs function for calculating percentage in combinedequipmentsaving 2021-03-07 10:52:48 +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
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 22ba6615f4 Added 'excelexporters.spaceoutput.export()' method 2021-03-04 20:34:03 +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
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 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
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