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

978 Commits (e2d7db0d8d1f4465e5f139f09887b74033a63e07)

Author SHA1 Message Date
hyh123a e2d7db0d8d modify the space 2021-07-29 15:40:04 +08:00
hyh123a 8513544e7d add the cmd in Dockfile 2021-07-29 15:38:10 +08:00
hyh123a d72b12363a Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-07-29 15:34:37 +08:00
hyh123a 356a1a645b add the build dic for web 2021-07-29 15:32:11 +08:00
hyh123a 7a5cde8f16 fixed the bugs for nginx and pip 2021-07-29 15:30:29 +08:00
13621160019@163.com 14af3b6969 Added Apache2 Server installation guides for Admin UI and Web UI 
Merge branch 'PR55' into develop
 2021-07-29 13:27:02 +08:00
13621160019@163.com fcc2c3e30b updated REAEME files in Admin UI and Web UI 2021-07-29 13:26:50 +08:00
hyh123a 9f7eefce10 Merge branch 'docker' into develop 2021-07-29 13:17:14 +08:00
hyh123a 12d046fcf2 modify the README.md 2021-07-29 13:14:49 +08:00
hyh123a 020a4a85a5 add the docker installation 2021-07-29 13:14:06 +08:00
Caozhenhui ca0fe37a9d Added how to install Apache 2021-07-29 11:33:14 +08:00
13621160019@163.com e76dd988b3 added Child Space Share Pies for SpaceCost in Web UI 
Merge branch 'PR52' into develop
 2021-07-28 12:35:26 +08:00
13621160019@163.com 852bb68ed8 added translation of Child Space Total Proportion for SpaceCost in Web UI 2021-07-28 12:35:17 +08:00
tianlinzhong 4e866dbc58 Fixed some bugs 2021-07-27 18:40:25 +08:00
13621160019@163.com 4822e1472b upgraded jquery to v2.2.4 in Admin UI 2021-07-27 14:39:09 +08:00
13621160019@163.com 3e448cb93b updated README 2021-07-27 12:43:51 +08:00
tianlinzhong c6eef934dd Added a total cost ratio chart 2021-07-26 20:45:50 +08:00
13621160019@163.com 7bdb806994 updated postman collection of API 2021-07-26 15:58:51 +08:00
13621160019@163.com dfc1dbecd7 added Meter Batch Analysis Report to Web UI and API 2021-07-26 15:56:38 +08:00
13621160019@163.com 7b1961656e fixed issue in Meter Batch Analysis Report of API 2021-07-26 10:18:12 +08:00
13621160019@163.com 557f8f72b8 Added Meter Batch Analysis Report to API 
Merge branch 'PR54' into develop
 2021-07-25 22:18:06 +08:00
13621160019@163.com 3c3a93b693 added Meter Batch Analysis Report API to README 2021-07-25 22:17:52 +08:00
Caozhenhui 77231fe07e modified typo 2021-07-23 17:28:03 +08:00
Caozhenhui 2da93761d6 Added meterbatch API 2021-07-23 17:24:27 +08:00
Caozhenhui 301c51eb5e Merge remote-tracking branch 'upstream/develop' into develop 2021-07-23 17:19:22 +08:00
13621160019@163.com 62ccf58599 deleted uncessary controllers from Admin UI 2021-07-23 15:58:46 +08:00
Caozhenhui 43a21d9f49 Implemented the meterbatch Excel Exporter 2021-07-22 20:26:16 +08:00
13621160019@163.com 56ec24c94b deleted unnecessary words in translations of Admin UI 2021-07-21 12:27:19 +08:00
13621160019@163.com af49dcdb2b updated README 2021-07-21 11:12:10 +08:00
13621160019@163.com fd990f94b9 upgraded to v1.1.5 2021-07-20 18:57:27 +08:00
13621160019@163.com 4015e101e6 fixed issue of gitignore in Admin UI 2021-07-20 18:29:35 +08:00
13621160019@163.com e033c4eb27 updated upgrade1.1.4 sql 2021-07-20 18:06:25 +08:00
13621160019@163.com b3451e8ff8 changed all worksheet names of excel exporters in API 
Merge branch 'PR53' into develop
 2021-07-20 17:43:31 +08:00
13621160019@163.com 89f04523f4 fixed warnings of excel exporters in API 2021-07-20 17:43:06 +08:00
13621160019@163.com 1404d6b150 changed modbus acquisition interval to 10 minutes 2021-07-20 09:52:42 +08:00
13621160019@163.com abb45dadbc added Cost File to API and Admin UI and upgraded to v1.1.4 2021-07-19 19:48:00 +08:00
hyh123a a57f59918c modify the field to parameters 2021-07-19 18:18:10 +08:00
hyh123a d8c26d571d modify the excel title 2021-07-19 18:09:51 +08:00
tianlinzhong 2cd13bc7d5 Add Child Spaces Share Pie to Space Cost Report Web UI 2021-07-19 17:59:56 +08:00
hyh123a 7d7ec5d170 Merge branch 'develop' of https://gitee.com/hyh123_a/myems into develop 2021-07-19 17:43:14 +08:00
hyh123a dafbe77460 modify the sheet title for excel 2021-07-19 17:43:10 +08:00
13621160019@163.com dbc2eaeda1 added restore button to offline meter file in API and Admin UI 
Merge branch 'develop'
 2021-07-19 16:22:33 +08:00
13621160019@163.com 44403742a5 added restore button to offline meter file in API and Admin UI 2021-07-19 16:20:37 +08:00
13621160019@163.com 72fd78adf6 added EquipmentBatch to Web UI 
Merge branch 'develop'
 2021-07-19 15:12:53 +08:00
13621160019@163.com 36e31d9942 added EquipmentBatch to Web UI 2021-07-19 15:09:57 +08:00
13621160019@163.com 15cf01c7cc added Offline Cost File actions to API 
Merge branch 'develop'
 2021-07-16 20:12:47 +08:00
13621160019@163.com 9443eca6f0 added Offline Cost File actions to API 2021-07-16 20:10:49 +08:00
13621160019@163.com 3af7296e1a added Equipment Batch Analysis report API 
Merge branch 'develop'
 2021-07-16 18:59:08 +08:00
13621160019@163.com 00a17b0d71 added Equipment Batch Analysis report API 
Merge branch 'PR51' into develop
 2021-07-16 18:57:05 +08:00
13621160019@163.com cdc9414c9d updated README and Postman Collection for API 2021-07-16 18:56:55 +08:00