From e6790d88fc5b1ac33d239c0d90ce6cdea666b821 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期一, 16 五月 2022 10:14:24 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' of https://github.com/mk1990/wvp-GB28181-pro into wvp-28181-2.0
---
web_src/src/components/service/DeviceService.js | 30 +++++++++---------------------
1 files changed, 9 insertions(+), 21 deletions(-)
diff --git a/web_src/src/components/service/DeviceService.js b/web_src/src/components/service/DeviceService.js
index aae0418..dbe10d1 100644
--- a/web_src/src/components/service/DeviceService.js
+++ b/web_src/src/components/service/DeviceService.js
@@ -32,7 +32,6 @@
getAllDeviceListIteration(deviceList, currentPage, count, callback, errorCallback) {
this.getDeviceList(currentPage, count, (data) => {
- console.log(data)
if (data.list) {
deviceList = deviceList.concat(data.list);
if (deviceList.length < data.total) {
@@ -46,29 +45,28 @@
}
- getAllChannel(isCatalog, deviceId, callback, errorCallback) {
+ getAllChannel(isCatalog, catalogUnderDevice, deviceId, callback, errorCallback) {
let currentPage = 1;
let count = 100;
let catalogList = []
- this.getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback)
+ this.getAllChannelIteration(isCatalog, catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, errorCallback)
}
- getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback) {
- this.getChanel(isCatalog, deviceId, currentPage, count, (data) => {
- console.log(data)
+ getAllChannelIteration(isCatalog, catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, errorCallback) {
+ this.getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, (data) => {
if (data.list) {
catalogList = catalogList.concat(data.list);
if (catalogList.length < data.total) {
currentPage ++
- this.getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback)
+ this.getAllChannelIteration(isCatalog,catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, errorCallback)
}else {
- console.log(2222)
+ console.log(1)
if (typeof (callback) == "function") callback(catalogList)
}
}
}, errorCallback)
}
- getChanel(isCatalog, deviceId, currentPage, count, callback, errorCallback) {
+ getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, callback, errorCallback) {
this.$axios({
method: 'get',
url: `/api/device/query/devices/${deviceId}/channels`,
@@ -77,7 +75,8 @@
count: count,
query: "",
online: "",
- channelType: isCatalog
+ channelType: isCatalog,
+ catalogUnderDevice: catalogUnderDevice
}
}).then((res) =>{
if (typeof (callback) == "function") callback(res.data)
@@ -94,7 +93,6 @@
getAllSubChannelIteration(isCatalog, deviceId,channelId, catalogList, currentPage, count, callback, errorCallback) {
this.getSubChannel(isCatalog, deviceId, channelId, currentPage, count, (data) => {
- console.log(data)
if (data.list) {
catalogList = catalogList.concat(data.list);
if (catalogList.length < data.total) {
@@ -119,16 +117,6 @@
}
}).then((res) =>{
if (typeof (callback) == "function") callback(res.data)
- }).catch(errorCallback);
- }
- getDeviceTree(deviceId, callback, errorCallback){
- this.$axios({
- method: 'get',
- url: `/api/device/query/${deviceId}/tree`,
- params:{}
- }).then((res) =>{
- console.log(res.data)
- if (typeof (callback) == "function") callback(res.data.data)
}).catch(errorCallback);
}
}
--
Gitblit v1.8.0