Merge branch 'develop'

pull/12/head
13621160019@163.com 2021-02-21 13:56:57 +08:00
commit 34b0cbe746
11 changed files with 19 additions and 15 deletions

View File

@ -18,7 +18,7 @@ MyEMS项目由下列组件构成:
### MyEMS Web APP
参考[myems-web](https://github.com/myems/myems-web.git) 获取更多信息。
参考[web](./web/README.md) 获取更多信息。
### MyEMS 管理面板
@ -42,7 +42,7 @@ MyEMS项目由下列组件构成:
### MyEMS 数据接口API
参考仓库[myems-api](https://github.com/myems/myems-api.git) 获取更多信息。
参考仓库[myems-api](https://github.com/MyEMS/myems-api.git) 获取更多信息。
### MyEMS MQTT 数据发布服务 (从MyEMS转发到第三方)

View File

@ -17,7 +17,7 @@ Dieses Projekt besteht aus folgenden Komponenten:
### MyEMS Web APP
Weitere Informationen finden Sie im Repository [myems-web](https://github.com/myems/myems-web.git).
Weitere Informationen finden Sie [web](./web/README.md).
### MyEMS Admin Panel
@ -41,7 +41,7 @@ Weitere Informationen finden Sie im [myems-aggregation](./myems-aggregation/READ
### MyEMS API
Weitere Informationen finden Sie im Repository [myems-api](https://github.com/myems/myems-api.git).
Weitere Informationen finden Sie im Repository [myems-api](https://github.com/MyEMS/myems-api.git).
### MyEMS MQTT Data Publisher Service (transmit data from MyEMS to 3rd Party)

View File

@ -17,7 +17,7 @@ This project is compose of following components:
### MyEMS Web APP
See the repository [myems-web](https://github.com/myems/myems-web.git) for more information.
See the repository [web](./web/README.md) for more information.
### MyEMS Admin Panel
@ -41,7 +41,7 @@ See [myems-aggregation](./myems-aggregation/README.md) for more information.
### MyEMS API
See the repository [myems-api](https://github.com/myems/myems-api.git) for more information.
See the repository [myems-api](https://github.com/MyEMS/myems-api.git) for more information.
### MyEMS MQTT Data Publisher Service (transmit data from MyEMS to 3rd Party)

2
admin/README.md vendored
View File

@ -46,7 +46,7 @@ Add another new 'server' section, add values as below:
* Download myems-admin
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
```
* Install myems-admin :

View File

@ -31,7 +31,7 @@ Download and install MySQL Connector:
Install myems-aggregation service:
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ sudo git checkout master (or the latest release tag)
$ sudo cp -R ~/myems/myems-aggregation /myems-aggregation

View File

@ -46,7 +46,7 @@ Download and install bacpypes library
Install myems-bacnet service
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ git checkout master (or the latest release tag)
$ sudo cp -R ~/myems/myems-bacnet /myems-bacnet

View File

@ -33,7 +33,7 @@ Download and install MySQL Connector:
Install myems-cleaning service
```bash
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ sudo git checkout master (or the latest release tag)
$ sudo cp -R ~/myems/myems-cleaning /myems-cleaning

View File

@ -42,7 +42,7 @@ Download and install modbus-tk
Install myems-modbus-tcp service
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ sudo git checkout master (or the latest release tag)
$ sudo cp -R ~/myems/myems-modbus-tcp /myems-modbus-tcp
@ -61,7 +61,6 @@ Install myems-modbus-tcp service
### Add Data Sources and Points in MyEMS Admin
refer to https://github.com/myems/myesm-admin.git
NOTE: If you modified Modbus TCP datasources and points, please restart this service:
```

View File

@ -46,7 +46,7 @@ Download and install paho-mqtt:
Install myems-mqtt-publisher service
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ sudo git checkout master (or the latest release tag)
$ sudo cp -R ~/myems/myems-mqtt-publisher /myems-mqtt-publisher

View File

@ -73,7 +73,7 @@ Download and install openpyxl
Install myems-normalization service:
```
$ cd ~
$ git clone https://github.com/myems/myems.git
$ git clone https://github.com/MyEMS/myems.git
$ cd myems
$ sudo git checkout master (or the latest release tag)
$ sudo cp -r ~/myems/myems-normalization /myems-normalization

7
web/README.md vendored
View File

@ -39,11 +39,16 @@ You can run 'node server.js' to run the production build locally at http://local
refer to http://nginx.org/en/docs/install.html
* Download myems:
```
$ cd ~
$ git clone https://github.com/MyEMS/myems.git
```
* Install myems-web :
Check and change the config file if necessary:
```
$ cd ~/myems-web
$ cd ~/myems/web
$ sudo nano src/config.js
```
Build and Compress