From 76d8aa5377d3f60500f97200be99f31c0c385203 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 07 十一月 2020 22:02:17 +0800
Subject: [PATCH] 修正设备在线离线判断的错误
---
web_src/src/components/channelList.vue | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 930da5b..b539e8c 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -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" @click="queryRecords(scope.row)">璁惧褰曡薄</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>
@@ -197,20 +197,21 @@
let deviceId = this.deviceId;
this.isLoging = true;
let channelId = itemData.channelId;
- console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId);
+ let getEncoding = itemData.hasAudio ? '1' : '0'
+ console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId + ":" + getEncoding);
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/' + deviceId + '/' + channelId
+ url: '/api/play/' + deviceId + '/' + channelId + '?getEncoding=' + getEncoding
}).then(function (res) {
console.log(res.data)
let ssrc = res.data.ssrc;
that.isLoging = false;
if (!!ssrc) {
// that.$refs.devicePlayer.play(res.data, deviceId, channelId, itemData.hasAudio);
- that.$refs.devicePlayer.openDialog("media", deviceId, channelId,{
- streamInfo: res.data,
- hasAudio: itemData.hasAudio
+ that.$refs.devicePlayer.openDialog("media", deviceId, channelId, {
+ streamInfo: res.data,
+ hasAudio: itemData.hasAudio
});
that.initData();
} else {
@@ -219,10 +220,10 @@
}).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})
+ 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)
--
Gitblit v1.8.0