From d3d48d1d0770b8a9989b5a1447aa15b37b4dbd7f Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 06 五月 2021 10:00:58 +0800
Subject: [PATCH] 添加丢失的导包
---
web_src/src/components/channelList.vue | 82 ++++++++++++++++++++--------------------
1 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue
index 943fe3a..324eef4 100644
--- a/web_src/src/components/channelList.vue
+++ b/web_src/src/components/channelList.vue
@@ -1,7 +1,6 @@
<template>
<div id="channelList">
<el-container>
-
<el-header>
<uiHeader></uiHeader>
</el-header>
@@ -75,7 +74,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 {
@@ -99,7 +98,7 @@
currentPage: parseInt(this.$route.params.page),
count: parseInt(this.$route.params.count),
total: 0,
- beforeUrl: "/videoList",
+ beforeUrl: "/deviceList",
isLoging: false,
autoList: true
};
@@ -118,7 +117,7 @@
},
methods: {
initData: function () {
- if (this.parentChannelId == "" || this.parentChannelId == 0) {
+ if (typeof (this.parentChannelId) == "undefined" || this.parentChannelId == 0) {
this.getDeviceChannelList();
} else {
this.showSubchannels();
@@ -131,7 +130,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"
}
},
@@ -153,17 +152,18 @@
},
getDeviceChannelList: function () {
let that = this;
-
- this.$axios.get(`/api/devices/${this.$route.params.deviceId}/channels`, {
- params: {
- page: that.currentPage,
+ if (typeof (this.$route.params.deviceId) == "undefined") return;
+ this.$axios({
+ method: 'get',
+ url: `/api/device/query/devices/${this.$route.params.deviceId}/channels`,
+ params:{
+ page: that.currentPage,
count: that.count,
query: that.searchSrt,
online: that.online,
channelType: that.channelType
- }
- })
- .then(function (res) {
+ }
+ }).then(function (res) {
console.log(res);
that.total = res.data.total;
that.deviceChannelList = res.data.list;
@@ -171,10 +171,10 @@
that.$nextTick(() => {
that.$refs.channelListTable.doLayout();
})
- })
- .catch(function (error) {
- console.log(error);
- });
+ }).catch(function (error) {
+ console.log(error);
+ });
+
},
@@ -188,7 +188,7 @@
let that = this;
this.$axios({
method: 'get',
- url: '/api/play/' + deviceId + '/' + channelId
+ url: '/api/play/start/' + deviceId + '/' + channelId
}).then(function (res) {
console.log(res.data)
let streamId = res.data.streamId;
@@ -215,16 +215,16 @@
console.log(itemData)
var that = this;
this.$axios({
- method: 'post',
- url: '/api/play/' + itemData.streamId + '/stop'
+ method: 'get',
+ url: '/api/play/stop/' + this.deviceId + "/" + itemData.channelId
}).then(function (res) {
console.log(JSON.stringify(res));
that.initData();
}).catch(function (error) {
- if (error.response.status == 402) { // 宸茬粡鍋滄杩�
+ if (error.response.status === 402) { // 宸茬粡鍋滄杩�
that.initData();
}else {
- console.log(e)
+ console.log(error)
}
});
},
@@ -251,26 +251,26 @@
showSubchannels: function (channelId) {
let that = this;
- this.$axios.get(`/api/subChannels/${this.deviceId}/${this.parentChannelId}/channels`, {
- params: {
- page: that.currentPage,
- count: that.count,
- query: that.searchSrt,
- online: that.online,
- channelType: that.channelType
- }
+ this.$axios({
+ method: 'get',
+ url:`/api/device/query/sub_channels/${this.deviceId}/${this.parentChannelId}/channels`,
+ params: {
+ page: that.currentPage,
+ count: that.count,
+ query: that.searchSrt,
+ online: that.online,
+ channelType: that.channelType
+ }
+ }).then(function (res) {
+ that.total = res.data.total;
+ that.deviceChannelList = res.data.list;
+ // 闃叉鍑虹幇琛ㄦ牸閿欎綅
+ that.$nextTick(() => {
+ that.$refs.channelListTable.doLayout();
})
- .then(function (res) {
- that.total = res.data.total;
- that.deviceChannelList = res.data.list;
- // 闃叉鍑虹幇琛ㄦ牸閿欎綅
- that.$nextTick(() => {
- that.$refs.channelListTable.doLayout();
- })
- })
- .catch(function (error) {
- console.log(error);
- });
+ }).catch(function (error) {
+ console.log(error);
+ });
},
search: function () {
console.log(this.searchSrt)
@@ -282,7 +282,7 @@
console.log(row)
this.$axios({
method: 'post',
- url: `/api/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