From c8b6ed5823fbe8e7eeef2e733859b4406b2ba4c5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 一月 2021 13:22:07 +0800
Subject: [PATCH] Merge pull request #38 from lawrencehj/wvp-28181-2.0
---
web_src/src/components/channelList.vue | 41 ++++++++++++++++++++++++++---------------
1 files changed, 26 insertions(+), 15 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 2867d7b..943fe3a 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -19,17 +19,19 @@
<el-option label="璁惧" value="false"></el-option>
<el-option label="瀛愮洰褰�" value="true"></el-option>
</el-select>
- 鍦ㄧ嚎鐘舵��: <el-select size="mini" @change="search" v-model="online" placeholder="璇烽�夋嫨" default-first-option>
+ 鍦ㄧ嚎鐘舵��: <el-select size="mini" style="margin-right: 1rem;" @change="search" v-model="online" placeholder="璇烽�夋嫨" default-first-option>
<el-option label="鍏ㄩ儴" value=""></el-option>
<el-option label="鍦ㄧ嚎" value="true"></el-option>
<el-option label="绂荤嚎" value="false"></el-option>
</el-select>
-
+ <el-checkbox size="mini" style="margin-right: 1rem; float: right;" v-model="autoList" @change="autoListChange">鑷姩鍒锋柊</el-checkbox>
</div>
<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">
+ </el-table-column>
+ <el-table-column prop="channelId" label="璁惧缂栧彿" width="210">
</el-table-column>
<el-table-column prop="name" label="閫氶亾鍚嶇О">
</el-table-column>
@@ -44,8 +46,8 @@
<el-table-column label="鐘舵��" width="180" align="center">
<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 == 1">寮�鍚�</el-tag>
+ <el-tag size="medium" type="info" v-if="scope.row.status == 0">鍏抽棴</el-tag>
</div>
</template>
</el-table-column>
@@ -56,7 +58,7 @@
<el-button-group>
<!-- <el-button size="mini" icon="el-icon-video-play" v-if="scope.row.parental == 0" @click="sendDevicePush(scope.row)">鎾斁</el-button> -->
<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-switch-button" type="danger" v-if="!!scope.row.streamId" @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> -->
@@ -98,13 +100,17 @@
count: parseInt(this.$route.params.count),
total: 0,
beforeUrl: "/videoList",
- isLoging: false
+ isLoging: false,
+ autoList: true
};
},
mounted() {
this.initData();
- this.updateLooper = setInterval(this.initData, 1000);
+ if (this.autoList) {
+ this.updateLooper = setInterval(this.initData, 5000);
+ }
+
},
destroyed() {
this.$destroy('videojs');
@@ -147,11 +153,10 @@
},
getDeviceChannelList: function () {
let that = this;
- console.log(this.currentPage - 1)
this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
params: {
- page: that.currentPage - 1,
+ page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
@@ -175,16 +180,15 @@
//閫氱煡璁惧涓婁紶濯掍綋娴�
sendDevicePush: function (itemData) {
- console.log(itemData)
+ console.log(itemData);
let deviceId = this.deviceId;
this.isLoging = true;
let channelId = itemData.channelId;
- let getEncoding = itemData.hasAudio ? '1' : '0'
- console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId + ":" + getEncoding);
+ console.log("閫氱煡璁惧鎺ㄦ祦1锛�" + deviceId + " : " + channelId );
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/' + deviceId + '/' + channelId + '?getEncoding=' + getEncoding
+ url: '/api/play/' + deviceId + '/' + channelId
}).then(function (res) {
console.log(res.data)
let streamId = res.data.streamId;
@@ -249,7 +253,7 @@
this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
params: {
- page: that.currentPage - 1,
+ page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
@@ -258,7 +262,7 @@
})
.then(function (res) {
that.total = res.data.total;
- that.deviceChannelList = res.data.data;
+ that.deviceChannelList = res.data.list;
// 闃叉鍑虹幇琛ㄦ牸閿欎綅
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
@@ -283,6 +287,13 @@
}).then(function (res) {
console.log(JSON.stringify(res));
});
+ },
+ autoListChange: function () {
+ if (this.autoList) {
+ this.updateLooper = setInterval(this.initData, 1500);
+ }else{
+ window.clearInterval(this.updateLooper);
+ }
}
}
--
Gitblit v1.8.0