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

408 Commits (30a026c34740cfef4a5b9adf59bceb7184325e42)

Author SHA1 Message Date
13621160019@163.com 59db05182b added excel exporter of shopfloorcost report 
Merge branch 'PR52' into develop
 2021-03-04 18:33:07 +08:00
13621160019@163.com 1b604745bf added excel exporter of shopfloorload report 
Merge branch 'develop'
 2021-03-04 18:16:30 +08:00
13621160019@163.com 4d9e31276e added excel exporter of shopfloorload report 
Merge branch 'PR1' into develop
 2021-03-04 18:14:55 +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
hyh123a 5be55c2922 add the de translation 2021-03-03 15:28:03 +08:00
13621160019@163.com ae5231f12b added excel exporter of combinedequipmentenergycategory report 
Merge branch 'develop'
 2021-03-03 14:12:57 +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 55334906fb added excel exporter of combinedequipmentitem report 
Merge branch 'develop'
 2021-03-03 13:25:42 +08:00
13621160019@163.com 43a18a6046 added excel exporter of combinedequipmentitem report 2021-03-03 13:24:46 +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
hyh123a 29dc12913f revert the commit 2021-03-03 11:35:17 +08:00
hyh123a 2f391800bb Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-03 11:10:04 +08:00
hyh123a 7ca12b43cd add the de translation 2021-03-03 10:57:35 +08:00
Caozhenhui c493c797ad 2021/3/2 2021-03-02 20:25:48 +08:00
13621160019@163.com 71fcd79a6b added excel exporter of equipmentenergyitem report 
Merge branch 'develop'
 2021-03-02 17:56:43 +08:00
13621160019@163.com 0123167b58 added excel exporter of equipmentenergyitem report 2021-03-02 17:55:02 +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
13621160019@163.com e55e674297 added excel exporter of equipmentenergycategory report 
Merge branch 'develop'
 2021-03-02 17:07:14 +08:00
13621160019@163.com 61e8006a5e added excel exporter of equipmentenergycategory report 2021-03-02 17:06:08 +08:00
13621160019@163.com ef77bc21de added excel exporter of equipmentenergycategory report 
Merge branch 'PR51' into develop
 2021-03-02 17:05:50 +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 9e90627055 Merge branch 'develop' 2021-03-02 16:46:07 +08:00
13621160019@163.com 2790e6e5c3 added excel exporter of shopfloorenergyitem report 2021-03-02 16:45:12 +08:00
13621160019@163.com 5d043c4b71 Merge branch 'PR53' into develop 2021-03-02 16:44:11 +08:00
13621160019@163.com 32d5cd8cd4 added badge to README 2021-03-02 15:55:51 +08:00
13621160019@163.com a3d32b74b1 added badge to README 2021-03-02 15:54:21 +08:00
13621160019@163.com 987376d472 Updated README 
Merge branch 'develop'
 2021-03-02 15:30:24 +08:00
13621160019@163.com a24f14eb21 updated README 2021-03-02 15:29:11 +08:00
13621160019@163.com a1be1bea0a fixed wrong headers issues in admin 
Merge branch 'develop'
 2021-03-02 14:59:32 +08:00
13621160019@163.com 6797790785 fixed wrong headers issues in admin 2021-03-02 14:57:56 +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 651355af07 updated badges in README 
Merge branch 'develop'
 2021-03-02 12:04:10 +08:00
13621160019@163.com 3e2eae7a77 Merge branch 'develop' of https://github.com/myems/myems into develop 2021-03-02 12:02:44 +08:00
13621160019@163.com aaf72ba41d updated badges in README 2021-03-02 12:02:23 +08:00