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

860 Commits (d429ba09a7e44c8f828e898103a7a76160524f6c)

Author SHA1 Message Date
13621160019@163.com 635fa307dd updated README 2021-03-31 12:30:34 +08:00
13621160019@163.com 57114a239c reduced font size of meterrealtime in Web UI 
Merge branch 'develop'
 2021-03-31 09:58:33 +08:00
13621160019@163.com 49013e9516 reduced font size of meterrealtime in Web UI 2021-03-31 09:58:04 +08:00
13621160019@163.com 436177b2c3 Merge branch 'develop' 2021-03-30 17:01:54 +08:00
13621160019@163.com f9ac97d792 updated sample data of tbl_rules in database 2021-03-30 16:56:30 +08:00
13621160019@163.com 6d37bb2ff0 updated sample data of tbl_rules in database 
Merge branch 'PR99' into develop
 2021-03-30 16:35:03 +08:00
13621160019@163.com bbe307b603 added quickmode paramter to combinedequipmentefficiency report in API 
Merge branch 'develop'
 2021-03-29 16:54:35 +08:00
13621160019@163.com ede74ec298 added quickmode paramter to combinedequipmentefficiency report in API 2021-03-29 16:53:35 +08:00
hyh123a eba1a124c6 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-29 13:14:52 +08:00
hyh123a 21dbbca631 add the tbl_rules data 2021-03-29 13:13:13 +08:00
13621160019@163.com b40d858f99 updated sample data of tbl_rules in database 
Merge branch 'develop'
 2021-03-29 10:40:40 +08:00
13621160019@163.com f1fa8b30c4 updated sample data of tbl_rules in database 2021-03-29 10:39:33 +08:00
13621160019@163.com 28fcfd9c63 updated sample data of tbl_rules in database 
Merge branch 'develop'
 2021-03-29 10:32:55 +08:00
13621160019@163.com 26782ad7eb updated sample data of tbl_rules in database 
Merge branch 'PR98' into develop
 2021-03-29 10:32:17 +08:00
hyh123a 37413915cb modify the diff of new line 2021-03-29 10:21:27 +08:00
hyh123a 916fa9d4b7 fixed the version 2021-03-28 19:57:07 +08:00
hyh123a 0f6a6d20c1 Merge remote-tracking branch 'origin_myems/develop' into develop 2021-03-28 19:51:24 +08:00
hyh123a d4712b1dd5 modify tbl_rules data 2021-03-28 19:50:54 +08:00
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