From 20dca0f6b664f6124e3492eee2e3ef6dfde80d88 Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 02 四月 2021 19:14:12 +0800
Subject: [PATCH] 增加推流转发到国标，尚不完善
---
web_src/src/components/channelList.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index a8392d0..b06ce25 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -31,6 +31,8 @@
<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>
<el-table-column prop="subCount" label="瀛愯妭鐐规暟">
@@ -73,7 +75,7 @@
</template>
<script>
-import devicePlayer from './gb28181/devicePlayer.vue'
+import devicePlayer from './dialog/devicePlayer.vue'
import uiHeader from './UiHeader.vue'
import moment from "moment";
export default {
@@ -97,7 +99,7 @@
currentPage: parseInt(this.$route.params.page),
count: parseInt(this.$route.params.count),
total: 0,
- beforeUrl: "/videoList",
+ beforeUrl: "/deviceList",
isLoging: false,
autoList: true
};
@@ -108,7 +110,7 @@
if (this.autoList) {
this.updateLooper = setInterval(this.initData, 5000);
}
-
+
},
destroyed() {
this.$destroy('videojs');
@@ -129,7 +131,7 @@
this.currentPage = parseInt(this.$route.params.page);
this.count = parseInt(this.$route.params.count);
if (this.parentChannelId == "" || this.parentChannelId == 0) {
- this.beforeUrl = "/videoList"
+ this.beforeUrl = "/deviceList"
}
},
@@ -151,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,
@@ -252,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,
--
Gitblit v1.8.0