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

1008 Commits (4e11c3687718cf51185798debc99363a6ec91b7c)

Author SHA1 Message Date
Caozhenhui d36b37133f 2021/4/26 2021-04-26 14:32:49 +08:00
13621160019@163.com 9980be5978 updated year in LICENSE 
Merge branch 'develop'
 2021-04-25 11:56:44 +08:00
13621160019@163.com c2bc3bac85 updated year in LICENSE 2021-04-25 11:55:17 +08:00
13621160019@163.com 5887f29e37 improved theme of energyflowdiagram in Web UI 
Merge branch 'develop'
 2021-04-25 11:13:10 +08:00
13621160019@163.com d1d8d96243 improved theme of energyflowdiagram in Web UI 2021-04-25 11:11:50 +08:00
13621160019@163.com c2b175c380 fixed issue when links is None in energyflowdiagram in API 
Merge branch 'develop'
 2021-04-25 11:00:35 +08:00
13621160019@163.com 35bb9600b5 fixed issue when links is None in energyflowdiagram in API 2021-04-25 10:59:27 +08:00
13621160019@163.com 4103dbb12b Merge branch 'develop' 2021-04-23 11:38:22 +08:00
13621160019@163.com a367bfc140 updated changelog and set version number to 1.1.2 2021-04-23 11:28:14 +08:00
13621160019@163.com 5501ba5ee0 added assoicated parameters data to excel exporter of shopfloorstatistics in API 2021-04-22 17:07:55 +08:00
13621160019@163.com 2214caf3db added assoicated parameters data to excel exporter of shopfloorstatistics in API 2021-04-22 17:06:30 +08:00
13621160019@163.com e394c91765 added associated parameters data to excel exporter of shopfloorsaving in API 2021-04-22 16:52:00 +08:00
13621160019@163.com 6fce96b262 added associated parameters data to excel exporter of shopfloorsaving in API 2021-04-22 16:50:24 +08:00
13621160019@163.com 2ee7eab1b2 added associated parameters data to excel exporter of shopfloorload in API 2021-04-22 16:44:15 +08:00
13621160019@163.com 24f970fa02 added associated parameters data to excel exporter of shopfloorload in API 2021-04-22 16:41:28 +08:00
13621160019@163.com 875b929584 added associated parameters data to excel exporter of shopfloorenergyitem in API 
Merge branch 'develop'
 2021-04-22 16:23:29 +08:00
13621160019@163.com 87a49f808a added associated parameters data to excel exporter of shopfloorenergyitem in API 2021-04-22 16:23:16 +08:00
13621160019@163.com e2d7956e61 added associated parameters data to excel exporter of shopfloorenergycategory in API 
Merge branch 'develop'
 2021-04-19 18:50:53 +08:00
13621160019@163.com fae8c29176 added associated parameters data to excel exporter of shopfloorenergycategory in API 2021-04-19 18:49:50 +08:00
13621160019@163.com c3a7b3a95a added associated parameters data to excel exporter of shopfloorcost in API 
Merge branch 'develop'
 2021-04-19 18:28:50 +08:00
13621160019@163.com 1b233ba962 added associated parameters data to excel exporter of shopfloorcost in API 2021-04-19 18:27:45 +08:00
Caozhenhui 7e18d31887 Merge remote-tracking branch 'upstream/develop' into develop 2021-04-19 16:49:14 +08:00
Caozhenhui c81eb24644 2021/4/19 2021-04-19 16:48:47 +08:00
Caozhenhui 12665bc02a 2021/4/19 2021-04-19 16:45:58 +08:00
Caozhenhui 14c87ea613 Parameter Data is added to Excel Exporter of All Shopfloor Reports 2021-04-19 16:25:01 +08:00
13621160019@163.com 9dd0082dff fixed issues in excel exporters of combinedequipment in API 
Merge branch 'develop'
 2021-04-18 23:24:06 +08:00
13621160019@163.com e744744dfa fixed issues in excel exporters of combinedequipment in API 2021-04-18 23:23:51 +08:00
13621160019@163.com a9194383a4 fixed issues in excel exporters of combinedequipment in API 
Merge branch 'develop'
 2021-04-18 23:19:15 +08:00
13621160019@163.com 73516fba3e fixed issues in excel exporters of combinedequipment in API 2021-04-18 23:18:44 +08:00
13621160019@163.com 57f34afa65 updated README 
Merge branch 'develop'
 2021-04-18 11:35:06 +08:00
13621160019@163.com fe5a62d426 updated README 2021-04-18 11:33:39 +08:00
guangyuzhang bfeb6e9147 Merge branch 'master' of https://gitee.com/myems/myems 2021-04-17 21:55:19 +08:00
guangyuzhang 3d87251157 updated README 
Merge branch 'develop'
 2021-04-17 21:53:47 +08:00
guangyuzhang 922e52c293 updated README 2021-04-17 21:52:18 +08:00
13621160019@163.com ca70c1f5c8 updated README 
Merge branch 'develop'
 2021-04-16 10:12:22 +08:00
13621160019@163.com 899d24397d updated README 2021-04-16 10:10:47 +08:00
guangyuzhang dab6436bfa updated README 
Merge branch 'develop'
 2021-04-15 22:33:26 +08:00
guangyuzhang 19a0f53545 updated README 2021-04-15 22:28:31 +08:00
guangyuzhang 6a9153846a updated README 
Merge branch 'develop'
 2021-04-15 22:20:17 +08:00
guangyuzhang 2762bbd53c updated READMD 2021-04-15 22:19:04 +08:00
13621160019@163.com eb068a55a6 updated README 
Merge branch 'master' into develop
 2021-04-15 19:02:10 +08:00
13621160019@163.com a50b51c3ac updated README 2021-04-15 19:01:50 +08:00
13621160019@163.com 6f0ad158db updated README 
Merge branch 'develop'
 2021-04-15 16:34:21 +08:00
13621160019@163.com d5982ea13b updated README 2021-04-15 16:32:21 +08:00
13621160019@163.com 52f89ac409 added associated parameters data to excel exporter of storestatistics in API 
Merge branch 'develop'
 2021-04-15 12:21:13 +08:00
13621160019@163.com 43f1da4c0f added associated parameters data to excel exporter of storestatistics in API 2021-04-15 12:21:01 +08:00
13621160019@163.com 7a0b62d1b6 added associated parameters data to excel exporter of storesaving in API 
Merge branch 'develop'
 2021-04-15 12:13:08 +08:00
13621160019@163.com ffd52393af added associated parameters data to excel exporter of storesaving in API 2021-04-15 12:12:54 +08:00
13621160019@163.com a909aa4297 added associated parameters data to excel exporter of storeload in API 
Merge branch 'develop'
 2021-04-15 11:43:34 +08:00
13621160019@163.com 2534489f60 added associated parameters data to excel exporter of storeload in API 2021-04-15 11:43:21 +08:00