648540858 96bb3814f6 Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network ...

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/conf/UserSetting.java
#	src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommanderFroPlatform.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
#	web_src/src/components/dialog/devicePlayer.vue
#	web_src/src/components/live.vue

2022-11-08 20:43:25 +08:00

..

assets

添加发送媒体流, 添加媒体服务器节点管理ui,修复修改密码

2021-09-25 22:12:15 +08:00

components

Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

2022-11-08 20:43:25 +08:00

layout

首页改造完成,待添加系统信息

2022-10-24 15:20:35 +08:00

router

首页改造,完成cpu,内存,网络图

2022-10-20 18:03:40 +08:00

App.vue

调整页面样式

2022-06-14 23:16:58 +08:00

main.js

首页改造,完成cpu,内存,网络图

2022-10-20 18:03:40 +08:00