From e9a7207e1f4bffa8aa44029bdf10548ac80d0cd9 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 18 十月 2022 22:17:58 +0800
Subject: [PATCH] Merge pull request #646 from XiaoQiTong/wvp-28181-2.0
---
sql/mysql.sql | 1 +
web_src/src/components/CloudRecord.vue | 22 +++++++++++++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/sql/mysql.sql b/sql/mysql.sql
index 6b937e5..e3e9e23 100644
--- a/sql/mysql.sql
+++ b/sql/mysql.sql
@@ -48,6 +48,7 @@
`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 4784e05..b046fc9 100644
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -109,14 +109,25 @@
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;
@@ -146,6 +157,7 @@
console.log(val)
this.total = 0;
this.recordList = [];
+ this.setMediaServerPath(val);
this.getRecordList();
},
showRecordDetail(row){
--
Gitblit v1.8.0