From d7a1b94f905c5f28c9c8f2d48c3f9e28ebcf9cc4 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期六, 24 九月 2022 21:04:58 +0800 Subject: [PATCH] Merge branch 'wvp-28181-2.0' --- web_src/src/components/StreamProxyList.vue | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/web_src/src/components/StreamProxyList.vue b/web_src/src/components/StreamProxyList.vue index f99f8e9..5eff9d5 100644 --- a/web_src/src/components/StreamProxyList.vue +++ b/web_src/src/components/StreamProxyList.vue @@ -168,12 +168,14 @@ count: that.count } }).then(function (res) { - that.total = res.data.total; - for (let i = 0; i < res.data.list.length; i++) { - res.data.list[i]["startBtnLoading"] = false; + if (res.data.code === 0) { + that.total = res.data.data.total; + for (let i = 0; i < res.data.data.list.length; i++) { + res.data.data.list[i]["startBtnLoading"] = false; + } + that.streamProxyList = res.data.data.list; } - that.streamProxyList = res.data.list; - that.getListLoading = false; + that.getListLoading = false; }).catch(function (error) { console.log(error); that.getListLoading = false; @@ -190,7 +192,7 @@ url:`/api/onvif/search?timeout=3000`, }).then((res) =>{ this.getListLoading = false; - if (res.data.code == 0 ){ + if (res.data.code === 0 ){ if (res.data.data.length > 0) { this.$refs.onvifEdit.openDialog(res.data.data, (url)=>{ if (url != null) { @@ -218,7 +220,7 @@ this.getListLoading = true; this.$axios({ method: 'get', - url:`/api/media/stream_info_by_app_and_stream`, + url:`/api/push/getPlayUrl`, params: { app: row.app, stream: row.stream, @@ -277,7 +279,7 @@ }).then(function (res) { that.getListLoading = false; that.$set(row, 'startBtnLoading', false) - if (res.data == "success"){ + if (res.data.code === 0){ that.initData() }else { that.$message({ -- Gitblit v1.8.0