Merge branch 'wvp-28181-2.0'

# Conflicts:
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/MediaServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java
#	src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java
#	web_src/src/components/Login.vue
This commit is contained in:
648540858
2022-08-22 16:53:16 +08:00
146 changed files with 2878 additions and 17348 deletions

View File

@@ -125,7 +125,7 @@ export default {
params: this.form
}).then((res) => {
console.log(res.data)
if (res.data.code == 0) {
if (res.data.code === 0) {
this.listChangeCallback()
}else {
this.$message({