From 9a64be46ba1c07c89ebef889244e58b03ab25193 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 31 八月 2023 16:42:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
web_src/src/components/CloudRecord.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
old mode 100644
new mode 100755
index 4784e05..c13cdc4
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -47,19 +47,17 @@
:total="total">
</el-pagination>
</div>
- <cloud-record-detail ref="cloudRecordDetail" v-if="recordDetail" :recordFile="chooseRecord" :mediaServerId="mediaServerId" :mediaServerPath="mediaServerPath" ></cloud-record-detail>
</div>
</template>
<script>
import uiHeader from '../layout/UiHeader.vue'
- import cloudRecordDetail from './CloudRecordDetail.vue'
import MediaServer from './service/MediaServer'
export default {
name: 'app',
components: {
- uiHeader, cloudRecordDetail
+ uiHeader
},
data() {
return {
@@ -109,14 +107,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 +155,7 @@
console.log(val)
this.total = 0;
this.recordList = [];
+ this.setMediaServerPath(val);
this.getRecordList();
},
showRecordDetail(row){
@@ -166,7 +176,7 @@
// }).catch(function (error) {
// console.log(error);
// });
-
+ this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
},
deleteRecord(){
// TODO
--
Gitblit v1.8.0