From 81da03d981d0f08a2e8b46d7a2a9874eef02f671 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 14 二月 2023 14:47:07 +0800
Subject: [PATCH] Merge pull request #743 from zhulangren/patch-1
---
web_src/src/components/service/DeviceService.js | 122 +++++++++++++++++++++++++++++-----------
1 files changed, 88 insertions(+), 34 deletions(-)
diff --git a/web_src/src/components/service/DeviceService.js b/web_src/src/components/service/DeviceService.js
index 6149579..61314fe 100644
--- a/web_src/src/components/service/DeviceService.js
+++ b/web_src/src/components/service/DeviceService.js
@@ -9,7 +9,7 @@
getDeviceList(currentPage, count, callback, errorCallback){
this.$axios({
method: 'get',
- url:`/api/device/query/devices`,
+ url:`./api/device/query/devices`,
params: {
page: currentPage,
count: count
@@ -21,55 +21,107 @@
if (typeof (errorCallback) == "function") errorCallback(error)
});
}
- getAllDeviceList(callback, errorCallback) {
+
+ getDevice(deviceId, callback, errorCallback){
+ this.$axios({
+ method: 'get',
+ url:`./api/device/query/devices/${deviceId}`,
+ }).then((res) => {
+ if (typeof (callback) == "function") callback(res.data)
+ }).catch((error) => {
+ console.log(error);
+ if (typeof (errorCallback) == "function") errorCallback(error)
+ });
+ }
+
+ getAllDeviceList(callback,endCallback, errorCallback) {
let currentPage = 1;
let count = 100;
let deviceList = []
- this.getAllDeviceListIteration(deviceList, currentPage, count, (data) => {
- if (typeof (callback) == "function") callback(data)
- }, errorCallback)
+ this.getAllDeviceListIteration(deviceList, currentPage, count, callback, endCallback, errorCallback)
}
- getAllDeviceListIteration(deviceList, currentPage, count, callback, errorCallback) {
+ getAllDeviceListIteration(deviceList, currentPage, count, callback, endCallback, errorCallback) {
this.getDeviceList(currentPage, count, (data) => {
- if (data.list) {
- deviceList = deviceList.concat(data.list);
- if (deviceList.length < data.total) {
+ if (data.code === 0 && data.data.list) {
+ if (typeof (callback) == "function") callback(data.data.list)
+ deviceList = deviceList.concat(data.data.list);
+ if (deviceList.length < data.data.total) {
currentPage ++
- this.getAllDeviceListIteration(deviceList, currentPage, count, callback, errorCallback)
+ this.getAllDeviceListIteration(deviceList, currentPage, count, callback, endCallback, errorCallback)
}else {
- if (typeof (callback) == "function") callback(deviceList)
+ if (typeof (endCallback) == "function") endCallback(deviceList)
}
}
}, errorCallback)
}
- getAllChannel(isCatalog, deviceId, callback, errorCallback) {
+ getAllChannel(isCatalog, catalogUnderDevice, deviceId, callback, endCallback, 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, endCallback, errorCallback)
}
- getAllChannelIteration(isCatalog, deviceId, catalogList, currentPage, count, callback, errorCallback) {
- this.getChanel(isCatalog, deviceId, currentPage, count, (data) => {
+ getAllChannelIteration(isCatalog, catalogUnderDevice, deviceId, catalogList, currentPage, count, callback, endCallback, errorCallback) {
+ this.getChanel(isCatalog, catalogUnderDevice, deviceId, currentPage, count, (data) => {
if (data.list) {
+ if (typeof (callback) == "function") callback(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(1)
- if (typeof (callback) == "function") callback(catalogList)
+ if (typeof (endCallback) == "function") endCallback(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`,
+ url: `./api/device/query/devices/${deviceId}/channels`,
+ params:{
+ page: currentPage,
+ count: count,
+ query: "",
+ online: "",
+ channelType: isCatalog,
+ catalogUnderDevice: catalogUnderDevice
+ }
+ }).then((res) =>{
+ if (typeof (callback) == "function") callback(res.data)
+ }).catch(errorCallback);
+ }
+
+
+ getAllSubChannel(isCatalog, deviceId, channelId, callback, endCallback, errorCallback) {
+ let currentPage = 1;
+ let count = 100;
+ let catalogList = []
+ this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, endCallback, errorCallback)
+ }
+
+ getAllSubChannelIteration(isCatalog, deviceId,channelId, catalogList, currentPage, count, callback, endCallback, errorCallback) {
+ this.getSubChannel(isCatalog, deviceId, channelId, currentPage, count, (data) => {
+ if (data.list) {
+ if (typeof (callback) == "function") callback(data.list)
+ catalogList = catalogList.concat(data.list);
+ if (catalogList.length < data.total) {
+ currentPage ++
+ this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, endCallback, errorCallback)
+ }else {
+ if (typeof (endCallback) == "function") endCallback(catalogList)
+ }
+ }
+ }, errorCallback)
+ }
+ getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
+ this.$axios({
+ method: 'get',
+ url: `./api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
params:{
page: currentPage,
count: count,
@@ -82,37 +134,39 @@
}).catch(errorCallback);
}
-
- getAllSubChannel(isCatalog, deviceId, channelId, callback, errorCallback) {
+ getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
let currentPage = 1;
let count = 100;
let catalogList = []
- this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, errorCallback)
+ this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
}
- getAllSubChannelIteration(isCatalog, deviceId,channelId, catalogList, currentPage, count, callback, errorCallback) {
- this.getSubChannel(isCatalog, deviceId, channelId, currentPage, count, (data) => {
- if (data.list) {
- catalogList = catalogList.concat(data.list);
- if (catalogList.length < data.total) {
+ getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback) {
+ this.getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, (data) => {
+ if (data.code === 0 && data.data.list) {
+ if (typeof (callback) == "function") callback(data.data.list)
+ catalogList = catalogList.concat(data.data.list);
+ if (catalogList.length < data.data.total) {
currentPage ++
- this.getAllSubChannelIteration(isCatalog, deviceId, channelId, catalogList, currentPage, count, callback, errorCallback)
+ this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
}else {
- if (typeof (callback) == "function") callback(catalogList)
+ if (typeof (endCallback) == "function") endCallback(catalogList)
}
}
}, errorCallback)
}
- getSubChannel(isCatalog, deviceId, channelId, currentPage, count, callback, errorCallback) {
+ getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, callback, errorCallback) {
+ if (onlyCatalog == null || typeof onlyCatalog === "undefined") {
+ onlyCatalog = false;
+ }
this.$axios({
method: 'get',
- url: `/api/device/query/sub_channels/${deviceId}/${channelId}/channels`,
+ url: `./api/device/query/tree/${deviceId}`,
params:{
page: currentPage,
count: count,
- query: "",
- online: "",
- channelType: isCatalog
+ parentId: parentId,
+ onlyCatalog: onlyCatalog
}
}).then((res) =>{
if (typeof (callback) == "function") callback(res.data)
--
Gitblit v1.8.0