diff --git a/sql/mysql.sql b/sql/mysql.sql index 6b937e5c..e3e9e234 100644 --- a/sql/mysql.sql +++ b/sql/mysql.sql @@ -48,6 +48,7 @@ CREATE TABLE `device` ( `ssrcCheck` int DEFAULT '0', `geoCoordSys` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, `treeType` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL, + `mediaServerId` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT 'auto', `custom_name` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL, `password` varchar(255) COLLATE utf8mb4_general_ci DEFAULT NULL, PRIMARY KEY (`id`), diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue index 4784e05c..b046fc91 100644 --- a/web_src/src/components/CloudRecord.vue +++ b/web_src/src/components/CloudRecord.vue @@ -109,15 +109,26 @@ 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({ @@ -146,6 +157,7 @@ console.log(val) this.total = 0; this.recordList = []; + this.setMediaServerPath(val); this.getRecordList(); }, showRecordDetail(row){