From 26bdf2e7768ee5dfc400c3970a5aa129fed49453 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期一, 20 三月 2023 15:31:43 +0800 Subject: [PATCH] Merge branch '级联' into main-dev --- web_src/src/components/CloudRecord.vue | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue index 4784e05..bd374fc 100644 --- a/web_src/src/components/CloudRecord.vue +++ b/web_src/src/components/CloudRecord.vue @@ -109,20 +109,31 @@ that.mediaServerList = data.data; if (that.mediaServerList.length > 0) { that.mediaServerId = that.mediaServerList[0].id - let port = that.mediaServerList[0].httpPort; - if (location.protocol === "https:" && that.mediaServerList[0].httpSSlPort) { - port = that.mediaServerList[0].httpSSlPort - } - that.mediaServerPath = location.protocol + "//" + that.mediaServerList[0].streamIp + ":" + port + that.setMediaServerPath(that.mediaServerId); that.getRecordList(); } }) + }, + setMediaServerPath: function (serverId) { + let that = this; + let i; + for (i = 0; i < that.mediaServerList.length; i++) { + if (serverId === that.mediaServerList[i].id) { + break; + } + } + let port = that.mediaServerList[i].httpPort; + if (location.protocol === "https:" && that.mediaServerList[i].httpSSlPort) { + port = that.mediaServerList[i].httpSSlPort + } + that.mediaServerPath = location.protocol + "//" + that.mediaServerList[i].streamIp + ":" + port + console.log(that.mediaServerPath) }, getRecordList: function (){ let that = this; this.$axios({ method: 'get', - url:`/record_proxy/${that.mediaServerId}/api/record/list`, + url:`./record_proxy/${that.mediaServerId}/api/record/list`, params: { page: that.currentPage, count: that.count @@ -146,6 +157,7 @@ console.log(val) this.total = 0; this.recordList = []; + this.setMediaServerPath(val); this.getRecordList(); }, showRecordDetail(row){ @@ -173,7 +185,7 @@ let that = this; this.$axios({ method: 'delete', - url:`/record_proxy/api/record/delete`, + url:`./record_proxy/api/record/delete`, params: { page: that.currentPage, count: that.count -- Gitblit v1.8.0