From a6fb1cdb74ca11c9dba798e64bf3d61bbfbdf05b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 11 九月 2023 16:17:29 +0800
Subject: [PATCH] 修复Web页面播放国标录像无声音的问题
---
web_src/src/components/channelList.vue | 45 +++++++++++++++++++++++++++++++++------------
1 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
old mode 100644
new mode 100755
index e324bdc..612416b
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -26,6 +26,12 @@
<el-option label="鍦ㄧ嚎" value="true"></el-option>
<el-option label="绂荤嚎" value="false"></el-option>
</el-select>
+ 娓呮櫚搴�:
+ <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="isSubStream" placeholder="璇烽�夋嫨"
+ default-first-option>
+ <el-option label="鍘熺敾" :value="false"></el-option>
+ <el-option label="娴佺晠" :value="true"></el-option>
+ </el-select>
</div>
<el-button icon="el-icon-refresh-right" circle size="mini" @click="refresh()"></el-button>
<el-button v-if="showTree" icon="iconfont icon-list" circle size="mini" @click="switchList()"></el-button>
@@ -69,7 +75,7 @@
<span v-if="scope.row.longitude*scope.row.latitude === 0">鏃�</span>
</template>
</el-table-column>
- <el-table-column prop="ptztypeText" label="浜戝彴绫诲瀷" min-width="120"/>
+ <el-table-column prop="PTZTypeText" label="浜戝彴绫诲瀷" min-width="120"/>
<el-table-column label="寮�鍚煶棰�" min-width="120">
<template slot-scope="scope">
<el-switch @change="updateChannel(scope.row)" v-model="scope.row.hasAudio" active-color="#409EFF">
@@ -79,8 +85,8 @@
<el-table-column label="鐘舵��" min-width="120">
<template slot-scope="scope">
<div slot="reference" class="name-wrapper">
- <el-tag size="medium" v-if="scope.row.status === 1">鍦ㄧ嚎</el-tag>
- <el-tag size="medium" type="info" v-if="scope.row.status === 0">绂荤嚎</el-tag>
+ <el-tag size="medium" v-if="scope.row.status === true">鍦ㄧ嚎</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status === false">绂荤嚎</el-tag>
</div>
</template>
</el-table-column>
@@ -98,6 +104,9 @@
</el-button>
<el-divider v-if="scope.row.subCount > 0 || scope.row.parental === 1" direction="vertical"></el-divider>
<el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-video-camera" type="text" @click="queryRecords(scope.row)">璁惧褰曞儚
+ </el-button>
+ <el-button size="medium" v-bind:disabled="device == null || device.online === 0" icon="el-icon-cloudy"
+ type="text" @click="queryCloudRecords(scope.row)">浜戠褰曞儚
</el-button>
</template>
</el-table-column>
@@ -123,7 +132,6 @@
<script>
import devicePlayer from './dialog/devicePlayer.vue'
import uiHeader from '../layout/UiHeader.vue'
-import moment from "moment";
import DeviceService from "./service/DeviceService";
import DeviceTree from "./common/DeviceTree";
@@ -147,6 +155,7 @@
searchSrt: "",
channelType: "",
online: "",
+ isSubStream: false,
winHeight: window.innerHeight - 200,
currentPage: 1,
count: 15,
@@ -206,7 +215,7 @@
if (typeof (this.$route.params.deviceId) == "undefined") return;
this.$axios({
method: 'get',
- url: `./api/device/query/devices/${this.$route.params.deviceId}/channels`,
+ url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
params: {
page: that.currentPage,
count: that.count,
@@ -238,7 +247,10 @@
let that = this;
this.$axios({
method: 'get',
- url: './api/play/start/' + deviceId + '/' + channelId
+ url: '/api/play/start/' + deviceId + '/' + channelId,
+ params:{
+ isSubStream: this.isSubStream
+ }
}).then(function (res) {
console.log(res)
that.isLoging = false;
@@ -274,11 +286,20 @@
this.$router.push(`/gbRecordDetail/${deviceId}/${channelId}`)
},
+ queryCloudRecords: function (itemData) {
+ let deviceId = this.deviceId;
+ let channelId = itemData.channelId;
+
+ this.$router.push(`/cloudRecordDetail/rtp/${deviceId}_${channelId}`)
+ },
stopDevicePush: function (itemData) {
var that = this;
this.$axios({
method: 'get',
- url: './api/play/stop/' + this.deviceId + "/" + itemData.channelId
+ url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId,
+ params:{
+ isSubStream: this.isSubStream
+ }
}).then(function (res) {
that.initData();
}).catch(function (error) {
@@ -290,8 +311,8 @@
});
},
getSnap: function (row) {
- let url = (process.env.NODE_ENV === 'development'? "debug": "") + '/api/device/query/snap/' + row.deviceId + '/' + row.channelId
- return url
+ let baseUrl = window.baseUrl ? window.baseUrl : "";
+ return ((process.env.NODE_ENV === 'development') ? process.env.BASE_API : baseUrl) + '/api/device/query/snap/' + row.deviceId + '/' + row.channelId;
},
getBigSnap: function (row) {
return [this.getSnap(row)]
@@ -334,7 +355,7 @@
if (!this.showTree) {
this.$axios({
method: 'get',
- url: `./api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+ url: `/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
params: {
page: this.currentPage,
count: this.count,
@@ -358,7 +379,7 @@
}else {
this.$axios({
method: 'get',
- url: `./api/device/query/tree/channel/${this.deviceId}`,
+ url: `/api/device/query/tree/channel/${this.deviceId}`,
params: {
parentId: this.parentChannelId,
page: this.currentPage,
@@ -387,7 +408,7 @@
updateChannel: function (row) {
this.$axios({
method: 'post',
- url: `./api/device/query/channel/update/${this.deviceId}`,
+ url: `/api/device/query/channel/update/${this.deviceId}`,
params: row
}).then(function (res) {
console.log(JSON.stringify(res));
--
Gitblit v1.8.0