Merge branch 'develop'

pull/1/head
guangyuzhang 2021-02-08 22:42:26 +08:00
commit caa048229c
2 changed files with 2 additions and 2 deletions

View File

@ -103,7 +103,7 @@ MyEMS项目由下列组件构成:
| 设备数据/负荷分析 | ✔️ | ✔️ | | 设备数据/负荷分析 | ✔️ | ✔️ |
| 设备数据/统计分析 | ✔️ | ✔️ | | 设备数据/统计分析 | ✔️ | ✔️ |
| 设备数据/节能分析 | ❌ | ✔️ | | 设备数据/节能分析 | ❌ | ✔️ |
| 设备数据/设备台账 | ✔️ | ✔️ | 设备数据/设备台账 | ✔️ | ✔️ |
| 计量表数据/能耗分析 | ✔️ | ✔️ | | 计量表数据/能耗分析 | ✔️ | ✔️ |
| 计量表数据/成本分析 | ✔️ | ✔️ | | 计量表数据/成本分析 | ✔️ | ✔️ |
| 计量表数据/趋势分析 | ✔️ | ✔️ | | 计量表数据/趋势分析 | ✔️ | ✔️ |

View File

@ -131,7 +131,7 @@ See the repository [myems-modbus-tcp](https://github.com/myems/myems-modbus-tcp.
| Shopfloor/Cost Data | ✔️ | ✔️ | | Shopfloor/Cost Data | ✔️ | ✔️ |
| Shopfloor/Load Data | ✔️ | ✔️ | | Shopfloor/Load Data | ✔️ | ✔️ |
| Shopfloor/Statistics | ✔️ | ✔️ | | Shopfloor/Statistics | ✔️ | ✔️ |
| Shopfloor/Saving Data | ❌ | ✔️ | Shopfloor/Saving Data | ❌ | ✔️ |
| Combined Equipment/Energy Category Data | ✔️ | ✔️ | | Combined Equipment/Energy Category Data | ✔️ | ✔️ |
| Combined Equipment/Energy Item Data | ✔️ | ✔️ | | Combined Equipment/Energy Item Data | ✔️ | ✔️ |
| Combined Equipment/Cost Data | ✔️ | ✔️ | | Combined Equipment/Cost Data | ✔️ | ✔️ |