From 9361943e47a09ea46f76adf06fa0d24a07ac711d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 26 十月 2020 11:40:46 +0800
Subject: [PATCH] 修复ui录象播放 优化录象查询接口
---
web_src/src/components/channelList.vue | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 4bcbe31..930da5b 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -26,7 +26,7 @@
</el-select>
</div>
- <devicePlayer ref="devicePlayer"></devicePlayer>
+ <devicePlayer ref="devicePlayer" v-loading="isLoging"></devicePlayer>
<!--璁惧鍒楄〃-->
<el-table ref="channelListTable" :data="deviceChannelList" :height="winHeight" border style="width: 100%">
<el-table-column prop="channelId" label="閫氶亾缂栧彿" width="210">
@@ -58,8 +58,8 @@
<el-button size="mini" icon="el-icon-video-play" @click="sendDevicePush(scope.row)">鎾斁</el-button>
<el-button size="mini" icon="el-icon-switch-button" type="danger" v-if="scope.row.play" @click="stopDevicePush(scope.row)">鍋滄</el-button>
<el-button size="mini" icon="el-icon-s-open" type="primary" v-if="scope.row.parental == 1" @click="changeSubchannel(scope.row)">鏌ョ湅</el-button>
- <!-- <el-button size="mini" icon="el-icon-video-camera" type="primary" >璁惧褰曡薄</el-button>-->
- <!-- <el-button size="mini" @click="sendDevicePush(scope.row)">褰曞儚鏌ヨ</el-button> -->
+ <el-button size="mini" icon="el-icon-video-camera" type="primary" @click="queryRecords(scope.row)">璁惧褰曡薄</el-button>
+<!-- <el-button size="mini" @click="sendDevicePush(scope.row)">褰曞儚鏌ヨ</el-button> -->
</el-button-group>
</template>
</el-table-column>
@@ -69,20 +69,18 @@
</el-main>
</el-container>
- <Loading v-if="isLoging" marginTop="-50%"></Loading>
</div>
</template>
<script>
import devicePlayer from './gb28181/devicePlayer.vue'
import uiHeader from './UiHeader.vue'
-import Loading from './Loading.vue'
+import moment from "moment";
export default {
name: 'channelList',
components: {
devicePlayer,
- uiHeader,
- Loading
+ uiHeader
},
data() {
return {
@@ -209,13 +207,23 @@
let ssrc = res.data.ssrc;
that.isLoging = false;
if (!!ssrc) {
- that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio);
+ // that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio);
+ that.$refs.devicePlayer.openDialog("media", deviceId, channelId,{
+ streamInfo: res.data,
+ hasAudio: itemData.hasAudio
+ });
that.initData();
} else {
that.$message.error(res.data);
}
}).catch(function (e) {});
},
+ queryRecords: function (itemData) {
+ var format = moment().format("YYYY-M-D");
+ let deviceId = this.deviceId;
+ let channelId = itemData.channelId;
+ this.$refs.devicePlayer.openDialog("record", deviceId, channelId, {date:format})
+ },
stopDevicePush: function (itemData) {
console.log(itemData)
var that = this;
--
Gitblit v1.8.0