From 56859d09df8d4226882d43934acf32d60a3b51d7 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期二, 30 三月 2021 18:46:34 +0800
Subject: [PATCH] 添加推流列表和拉流代理，下一步与国标关联
---
web_src/src/components/dialog/devicePlayer.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/gb28181/devicePlayer.vue b/web_src/src/components/dialog/devicePlayer.vue
similarity index 98%
rename from web_src/src/components/gb28181/devicePlayer.vue
rename to web_src/src/components/dialog/devicePlayer.vue
index 2341831..48d295a 100644
--- a/web_src/src/components/gb28181/devicePlayer.vue
+++ b/web_src/src/components/dialog/devicePlayer.vue
@@ -26,7 +26,7 @@
</div>
</el-tab-pane>
<!--{"code":0,"data":{"paths":["22-29-30.mp4"],"rootPath":"/home/kkkkk/Documents/ZLMediaKit/release/linux/Debug/www/record/hls/kkkkk/2020-05-11/"}}-->
- <el-tab-pane label="褰曞儚鏌ヨ" name="record">
+ <el-tab-pane label="褰曞儚鏌ヨ" name="record" v-if="showRrecord">
<el-date-picker size="mini" v-model="videoHistory.date" type="date" value-format="yyyy-MM-dd" placeholder="鏃ユ湡" @change="queryRecords()"></el-date-picker>
<el-table :data="videoHistory.searchHistoryResult" height="150" v-loading="recordsLoading">
<el-table-column label="鍚嶇О" prop="name"></el-table-column>
@@ -42,7 +42,7 @@
</el-table>
</el-tab-pane>
<!--閬ユ帶鐣岄潰-->
- <el-tab-pane label="浜戝彴鎺у埗" name="control">
+ <el-tab-pane label="浜戝彴鎺у埗" name="control" v-if="showPtz">
<div style="display: flex; justify-content: left;">
<div class="control-wrapper">
<div class="control-btn control-top" @mousedown="ptzCamera(0, 2, 0)" @mouseup="ptzCamera(0, 0, 0)">
@@ -136,7 +136,7 @@
</template>
<script>
-import player from './player.vue'
+import player from '../dialog/player.vue'
export default {
name: 'devicePlayer',
props: {},
@@ -184,7 +184,9 @@
tracks: [],
coverPlaying:false,
tracksLoading: false,
- recordPlay: ""
+ recordPlay: "",
+ showPtz: true,
+ showRrecord: true,
};
},
methods: {
@@ -230,6 +232,11 @@
this.videoHistory.date = param.date;
this.queryRecords()
break;
+ case "streamPlay":
+ this.showRrecord = false,
+ this.showPtz = false,
+ this.play(param.streamInfo, param.hasAudio)
+ break;
case "control":
break;
}
--
Gitblit v1.8.0