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

217 Commits (c493c797ad013349e68f27000a28db2b148c6e46)

Author SHA1 Message Date
Caozhenhui c493c797ad 2021/3/2 2021-03-02 20:25:48 +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 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 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 a3d32b74b1 added badge to README 2021-03-02 15:54:21 +08:00
13621160019@163.com a24f14eb21 updated README 2021-03-02 15:29:11 +08:00
13621160019@163.com 6797790785 fixed wrong headers issues in admin 2021-03-02 14:57:56 +08:00
hyh123a e3f5076e50 add the excel report of equipment energy category 2021-03-02 13:50:14 +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
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
guangyuzhang ce7553afcb fixed null contact issue in space controller in admin 2021-03-01 22:38:20 +08:00
guangyuzhang 215e90aa4b deleted require property for space contact in admin 2021-03-01 22:17:50 +08:00
13621160019@163.com 645b8f6228 added exporters of storeenergycategory and shopfloorenergycategory 
Merge branch 'PR49' into develop
 2021-03-01 13:04:18 +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
guangyuzhang 50c2a6d70d fixed issue in excel exporter for spaceenergyitem report 2021-02-27 21:58:50 +08:00
YangZhang-GitHub 14d858d52c Merge branch 'develop' of https://github.com/YangZhang-GitHub/myems 2021-02-27 20:11:59 +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
YangZhang-GitHub 6a82e1c002
Merge pull request #6 from MyEMS/develop 
Develop
 2021-02-27 19:48:48 +08:00
YangZhang-GitHub e8660f2772
Merge pull request #5 from MyEMS/master 
develop
 2021-02-27 19:46:21 +08:00
13621160019@163.com 9c0adcaad3 updated changelog 2021-02-27 18:48:44 +08:00
13621160019@163.com 8d73aa551c modified database table tbl_energy_flow_diagrams_links 2021-02-27 18:47:26 +08:00
13621160019@163.com 21fdaf8fd3 Merge branch 'develop' 2021-02-27 12:53:27 +08:00
13621160019@163.com f9eb2e39ba fixed energy item undefined issue when edit virtual meter and offline meter 2021-02-27 12:52:27 +08:00
13621160019@163.com ee5eca4976 Merge branch 'develop' 2021-02-26 18:06:02 +08:00
13621160019@163.com 143dd46aa2 fixed typo in combinedequipment controller in admin 2021-02-26 18:04:50 +08:00
13621160019@163.com 00f1339c40 Merge branch 'develop' 2021-02-26 17:57:31 +08:00
13621160019@163.com 1399fbc3c8 removed required property from equipment model in admin 2021-02-26 17:57:06 +08:00
13621160019@163.com 4847a8d179 Merge branch 'develop' 2021-02-26 16:15:21 +08:00
13621160019@163.com 74b1374597 updated CHANGELOG 2021-02-26 16:14:26 +08:00