Merge branch 'develop'

pull/121/MERGE
13621160019@163.com 2022-02-04 10:11:35 +08:00
commit 68646e540b
5 changed files with 9 additions and 2 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -96,6 +96,8 @@
| Admin UI | ✔️ | ✔️ | 基于Angular开发用于系统配置管理 | | Admin UI | ✔️ | ✔️ | 基于Angular开发用于系统配置管理 |
| BACnet/IP 协议 | ❌ | ✔️ | 采集数据 http://www.bacnet.org/ | | BACnet/IP 协议 | ❌ | ✔️ | 采集数据 http://www.bacnet.org/ |
| MQTT 订阅 | ❌ | ✔️ | 采集数据 https://mqtt.org/ | | MQTT 订阅 | ❌ | ✔️ | 采集数据 https://mqtt.org/ |
| MQTT 订阅 | ❌ | ✔️ | 采集数据 https://mqtt.org/ |
| MQTT 订阅 | ❌ | ✔️ | 采集数据 https://mqtt.org/ |
| Modbus RTU 协议 | ❌ | ✔️ | 采集数据 https://modbus.org/ | | Modbus RTU 协议 | ❌ | ✔️ | 采集数据 https://modbus.org/ |
| OPC UA 协议 | ❌ | ✔️ | 采集数据 https://opcfoundation.org/ | | OPC UA 协议 | ❌ | ✔️ | 采集数据 https://opcfoundation.org/ |
| OPC DA 协议 | ❌ | ✔️ | 采集数据 https://opcfoundation.org/ | | OPC DA 协议 | ❌ | ✔️ | 采集数据 https://opcfoundation.org/ |
@ -121,6 +123,7 @@
| Modbus TCP Server | ❌ | ✔️ | 发布数据 https://modbus.org/ | | Modbus TCP Server | ❌ | ✔️ | 发布数据 https://modbus.org/ |
| OPC UA Server | ❌ | ✔️ | 发布数据 https://opcfoundation.org/ | | OPC UA Server | ❌ | ✔️ | 发布数据 https://opcfoundation.org/ |
| MQTT 发布 | ❌ | ✔️ | 发布数据 https://mqtt.org/ | | MQTT 发布 | ❌ | ✔️ | 发布数据 https://mqtt.org/ |
| Kafka Producer | ❌ | ✔️ | 生产数据 https://kafka.apache.org/ |
| iOS APP | ❌ | ✔️ | 需要企业版组件许可或定制开发 | | iOS APP | ❌ | ✔️ | 需要企业版组件许可或定制开发 |
| Android APP | ❌ | ✔️ | 需要企业版组件许可或定制开发 | | Android APP | ❌ | ✔️ | 需要企业版组件许可或定制开发 |
| 微信小程序 | ❌ | ✔️ | 需要企业版组件许可或定制开发 | | 微信小程序 | ❌ | ✔️ | 需要企业版组件许可或定制开发 |

View File

@ -93,6 +93,7 @@
| Admin UI | ✔️ | ✔️ | | | Admin UI | ✔️ | ✔️ | |
| BACnet/IP | ❌️ | ✔️ | http://www.bacnet.org/ | | BACnet/IP | ❌️ | ✔️ | http://www.bacnet.org/ |
| MQTT Subscriber | ❌ | ✔️ | https://mqtt.org/ | | MQTT Subscriber | ❌ | ✔️ | https://mqtt.org/ |
| Kafka Consumer | ❌ | ✔️ | https://kafka.apache.org/ |
| Modbus RTU | ❌ | ✔️ | https://modbus.org/ | | Modbus RTU | ❌ | ✔️ | https://modbus.org/ |
| OPC UA | ❌ | ✔️ | https://opcfoundation.org/ | | OPC UA | ❌ | ✔️ | https://opcfoundation.org/ |
| OPC DA | ❌ | ✔️ | https://opcfoundation.org/ | | OPC DA | ❌ | ✔️ | https://opcfoundation.org/ |
@ -118,6 +119,7 @@
| Modbus TCP Server | ❌ | ✔️ | https://modbus.org/ | | Modbus TCP Server | ❌ | ✔️ | https://modbus.org/ |
| OPC UA Server | ❌ | ✔️ | https://opcfoundation.org/ | | OPC UA Server | ❌ | ✔️ | https://opcfoundation.org/ |
| MQTT Publisher | ❌ | ✔️ | https://mqtt.org/ | | MQTT Publisher | ❌ | ✔️ | https://mqtt.org/ |
| Kafka Producer | ❌ | ✔️ | Produce Data https://kafka.apache.org/ |
| iOS APP | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung | | iOS APP | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung |
| Android APP | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung | | Android APP | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung |
| WeChat Mini Program | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung | | WeChat Mini Program | ❌ | ✔️ | Erfordert eine Standardkomponentenlizenz oder eine benutzerdefinierte Entwicklung |

View File

@ -96,6 +96,7 @@
| Admin UI | ✔️ | ✔️ | | | Admin UI | ✔️ | ✔️ | |
| BACnet/IP | ❌ | ✔️ | http://www.bacnet.org/ | | BACnet/IP | ❌ | ✔️ | http://www.bacnet.org/ |
| MQTT Subscriber | ❌ | ✔️ | https://mqtt.org/ | | MQTT Subscriber | ❌ | ✔️ | https://mqtt.org/ |
| Kafka Consumer | ❌ | ✔️ | https://kafka.apache.org/ |
| Modbus RTU | ❌ | ✔️ | https://modbus.org/ | | Modbus RTU | ❌ | ✔️ | https://modbus.org/ |
| OPC UA | ❌ | ✔️ | https://opcfoundation.org/ | | OPC UA | ❌ | ✔️ | https://opcfoundation.org/ |
| OPC DA | ❌ | ✔️ | https://opcfoundation.org/ | | OPC DA | ❌ | ✔️ | https://opcfoundation.org/ |
@ -120,7 +121,8 @@
| BACnet Server | ❌ | ✔️ | http://www.bacnet.org/ | | BACnet Server | ❌ | ✔️ | http://www.bacnet.org/ |
| Modbus TCP Server | ❌ | ✔️ | https://modbus.org/ | | Modbus TCP Server | ❌ | ✔️ | https://modbus.org/ |
| OPC UA Server | ❌ | ✔️ | https://opcfoundation.org/ | | OPC UA Server | ❌ | ✔️ | https://opcfoundation.org/ |
| MQTT Publisher | ❌️ | ✔️ | https://mqtt.org/ | | MQTT Publisher | ❌️ | ✔️ | Publish Data https://mqtt.org/ |
| Kafka Producer | ❌ | ✔️ | Produce Data https://kafka.apache.org/ |
| iOS APP | ❌ | ✔️ | Requires standard component license or custom development | | iOS APP | ❌ | ✔️ | Requires standard component license or custom development |
| Android APP | ❌ | ✔️ | Requires standard component license or custom development | | Android APP | ❌ | ✔️ | Requires standard component license or custom development |
| WeChat Mini Program | ❌ | ✔️ | Requires standard component license or custom development | | WeChat Mini Program | ❌ | ✔️ | Requires standard component license or custom development |

View File

@ -98,7 +98,7 @@ docker load --input .\myems-normalization.tar
In this section, you will install myems-normalization on Ubuntu Server with internet access. In this section, you will install myems-normalization on Ubuntu Server with internet access.
```bash ```bash
cp -r myems-normalization /myems-normalization cp -r myems/myems-normalization /myems-normalization
cd /myems-normalization cd /myems-normalization
pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
``` ```