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 | 64 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/web_src/src/components/CloudRecord.vue b/web_src/src/components/CloudRecord.vue
old mode 100644
new mode 100755
index 1d0819b..c13cdc4
--- a/web_src/src/components/CloudRecord.vue
+++ b/web_src/src/components/CloudRecord.vue
@@ -1,7 +1,11 @@
<template>
<div id="app" style="width: 100%">
<div class="page-header">
- <div class="page-title">浜戠褰曞儚</div>
+ <div class="page-title">
+ <el-page-header v-if="recordDetail" @back="backToList" content="浜戠褰曞儚"></el-page-header>
+ <div v-if="!recordDetail">浜戠褰曞儚</div>
+ </div>
+
<div class="page-header-btn">
鑺傜偣閫夋嫨:
<el-select size="mini" @change="chooseMediaChange" style="width: 16rem; margin-right: 1rem;" v-model="mediaServerId" placeholder="璇烽�夋嫨" :disabled="recordDetail">
@@ -18,19 +22,17 @@
<div v-if="!recordDetail">
<!--璁惧鍒楄〃-->
- <el-table :data="recordList" border style="width: 100%" :height="winHeight">
- <el-table-column prop="app" label="搴旂敤鍚�" align="center">
+ <el-table :data="recordList" style="width: 100%" :height="winHeight">
+ <el-table-column prop="app" label="搴旂敤鍚�" >
</el-table-column>
- <el-table-column prop="stream" label="娴両D" align="center">
+ <el-table-column prop="stream" label="娴両D" >
</el-table-column>
- <el-table-column prop="time" label="鏃堕棿" align="center">
+ <el-table-column prop="time" label="鏃堕棿" >
</el-table-column>
- <el-table-column label="鎿嶄綔" width="360" align="center" fixed="right">
+ <el-table-column label="鎿嶄綔" width="360" fixed="right">
<template slot-scope="scope">
- <el-button-group>
- <el-button size="mini" icon="el-icon-video-camera-solid" type="primary" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
- <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
- </el-button-group>
+ <el-button size="medium" icon="el-icon-folder-opened" type="text" @click="showRecordDetail(scope.row)">鏌ョ湅</el-button>
+ <!-- <el-button size="mini" icon="el-icon-delete" type="danger" @click="deleteRecord(scope.row)">鍒犻櫎</el-button>-->
</template>
</el-table-column>
</el-table>
@@ -45,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 {
@@ -107,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;
@@ -127,8 +138,10 @@
}
}).then(function (res) {
console.log(res)
- that.total = res.data.data.total;
- that.recordList = res.data.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.recordList = res.data.data.list;
+ }
that.loading = false;
}).catch(function (error) {
console.log(error);
@@ -142,6 +155,7 @@
console.log(val)
this.total = 0;
this.recordList = [];
+ this.setMediaServerPath(val);
this.getRecordList();
},
showRecordDetail(row){
@@ -162,7 +176,7 @@
// }).catch(function (error) {
// console.log(error);
// });
-
+ this.$router.push(`/cloudRecordDetail/${row.app}/${row.stream}`)
},
deleteRecord(){
// TODO
@@ -176,12 +190,14 @@
}
}).then(function (res) {
console.log(res)
- that.total = res.data.data.total;
- that.recordList = res.data.data.list;
+ if (res.data.code === 0) {
+ that.total = res.data.data.total;
+ that.recordList = res.data.data.list;
+ }
}).catch(function (error) {
console.log(error);
});
- }
+ },
}
--
Gitblit v1.8.0