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

1292 Commits (c3467423877927d410e82b59a39748e8b80f6f0c)

Author SHA1 Message Date
13621160019@163.com 07dd1eb806 added excel exporter of equipmentcost reporter in API 
Merge branch 'develop'
 2021-03-28 17:06:45 +08:00
13621160019@163.com 7c19344e8f added excel exporter of equipmentcost reporter in API 
Merge branch 'PR96' into develop
 2021-03-28 17:05:44 +08:00
tianlinzhong 3b705722bf Fixed the error 2021-03-28 12:19:05 +08:00
13621160019@163.com 2b11bf15e4 added associated equipment data to CombinedEquipmentStatistics in Web UI 
added associated equipment data to CombinedEquipmentLoad in Web UI
Merge branch 'develop'
 2021-03-28 11:34:38 +08:00
13621160019@163.com 80391f7acd added associated equipment data to CombinedEquipmentStatistics in Web UI 2021-03-28 11:33:05 +08:00
13621160019@163.com 776340e624 added associated equipment data to CombinedEquipmentLoad in Web UI 2021-03-28 11:03:43 +08:00
13621160019@163.com cb856387b3 updated README 2021-03-28 10:37:12 +08:00
guangyuzhang a1ffe43fa2 updated README 
Merge branch 'develop'
 2021-03-27 23:15:27 +08:00
guangyuzhang ffdb6794e2 updated README 2021-03-27 23:15:00 +08:00
tianlinzhong 4b40835d4b Implemented the equipmentcost Excel export 2021-03-26 21:44:52 +08:00
13621160019@163.com 68b3d11741 fixed omission mistakes in myems-cleaning 
Merge branch 'develop'
 2021-03-26 16:59:57 +08:00
13621160019@163.com f676ec7199 fixed omissioin mistakes in myems-cleaning 2021-03-26 16:58:57 +08:00
13621160019@163.com c9ac3cdf7f added associated equipment to combinedequipmentenergyitem report in API 
Merge branch 'develop'
 2021-03-26 10:35:00 +08:00
13621160019@163.com 9e32d75470 added associated equipment to combinedequipmentenergyitem report in API 
Merge branch 'PR23' into develop
 2021-03-26 10:31:16 +08:00
13621160019@163.com 1296e69231 fixed typo in combinedequipmentenergyitem report in API 2021-03-26 10:31:05 +08:00
Caozhenhui 3ccce287ee added associated equipment data to CombinedEquipmentEnergyItem report & excel reporter 2021-03-25 17:10:37 +08:00
13621160019@163.com c07f320377 fixed error for large number of parameters in combinedequipmentefficiency and equipmentefficiency in API 
Merge branch 'develop'
 2021-03-25 16:43:34 +08:00
13621160019@163.com 9a0b749d6c fixed error for large number of parameters in combinedequipmentefficiency and equipmentefficiency in API 
Merge branch 'PR24' into develop
 2021-03-25 16:42:18 +08:00
YangZhang-GitHub eb0c2df3e0 Fixed a bug 2021-03-25 16:03:51 +08:00
13621160019@163.com 6915cc7150 fixed error of None Comparision in API 
Merge branch 'develop'
 2021-03-25 12:19:43 +08:00
13621160019@163.com 398f96d4bd fixed error of None Comparision in API 2021-03-25 12:15:20 +08:00
13621160019@163.com 95f2e37c78 added sample data for myems_fdd_db.tbl_rules 2021-03-24 11:17:21 +08:00
13621160019@163.com 01cdb7bc11 added sample data for myems_fdd_db.tbl_rules 2021-03-24 10:57:05 +08:00
hyh123a e253cf3617 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-24 10:33:04 +08:00
13621160019@163.com 64cc72119e added AssociatedEquipmentTable to CombinedEquipmentSaving report in web UI 
Merge branch 'develop'
 2021-03-23 18:17:01 +08:00
13621160019@163.com d82f1eb829 added AssociatedEquipmentTable to CombinedEquipmentSaving report in web UI 2021-03-23 18:13:09 +08:00
13621160019@163.com 097b15c2d0 added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI 
Merge branch 'develop'
 2021-03-23 18:11:04 +08:00
13621160019@163.com 3efce5f620 added AssociatedEquipmentTable to CombinedEquipmentOutput report in web UI 2021-03-23 18:09:52 +08:00
13621160019@163.com ff51822b08 added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI 
Merge branch 'develop'
 2021-03-23 18:07:42 +08:00
13621160019@163.com 78ba4d0ed1 added AssociatedEquipmentTable to CombinedEquipmentIncome report in web UI 2021-03-23 18:06:42 +08:00
13621160019@163.com 13592ccdea added AssociatedEquipmentTable to CombinedEquipmentCost report in web UI 
Merge branch 'develop'
 2021-03-23 18:02:32 +08:00
13621160019@163.com 59d195bdb2 added AssociatedEquipmentTable to CombinedEquipmentCost report in web UI 2021-03-23 18:00:38 +08:00
13621160019@163.com 6b37d58466 added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI 
Merge branch 'develop'
 2021-03-23 17:57:04 +08:00
13621160019@163.com 64db7d9542 added AssociatedEquipmentTable to CombinedEquipmentEnergyCategory report in web UI 2021-03-23 17:56:06 +08:00
13621160019@163.com 36a9eed599 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem report in web UI 
Merge branch 'develop'
 2021-03-23 17:47:40 +08:00
13621160019@163.com 60c55df622 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:47:16 +08:00
13621160019@163.com 6ee35da206 added AssociatedEquipmentTable to CombinedEquipmentEnergyItem Report in web UI 2021-03-23 17:46:54 +08:00
Caozhenhui ca4fdc0872 2021/3/23 #86 2021-03-23 17:19:03 +08:00
13621160019@163.com 6779eff096 fixed NoneType error in ShopfloorLoad report in API 
Merge branch 'develop'
 2021-03-23 16:47:20 +08:00
13621160019@163.com fca523a616 fixed NoneType error in ShopfloorLoad report in API 2021-03-23 16:46:09 +08:00
Caozhenhui 92a8e9dbf5 Merge remote-tracking branch 'upstream/develop' into issue#86 2021-03-23 16:15:17 +08:00
13621160019@163.com ae5df59325 fixed NoneType error in CombinedEquipmentLoad report in API 
Merge branch 'develop'
 2021-03-23 16:01:57 +08:00
13621160019@163.com 7a86423068 fixed NoneType error in CombinedEquipmentLoad report in API 2021-03-23 16:01:44 +08:00
13621160019@163.com 7d88b63dd5 fixed NoneType error in StoreLoad report API 
Merge branch 'develop'
 2021-03-23 15:59:22 +08:00
13621160019@163.com 1448c17749 fixed NoneType error in StoreLoad report API 2021-03-23 15:58:50 +08:00
13621160019@163.com 66dcba4cce fixed NoneType error in TenantLoad Report API 
Merge branch 'develop'
 2021-03-23 15:54:56 +08:00
13621160019@163.com 6a1b986f56 fixed NoneType error in TenantLoad Report API 2021-03-23 15:54:48 +08:00
13621160019@163.com f46ceb8790 fixed NoneType error in EquipmentLoad Report API 
Merge branch 'develop'
 2021-03-23 15:48:58 +08:00
13621160019@163.com 9538ffc1e3 fixed NoneType error in EquipmentLoad Report API 2021-03-23 15:48:44 +08:00
13621160019@163.com c7559e0470 fixed NoneType error in SpaceLoad report in API 2021-03-23 15:42:31 +08:00