From c1bc45fe8fc898b451b52d4f9dd2fc7d01e94878 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 06 十一月 2023 15:13:58 +0800
Subject: [PATCH] 修复点播接口状态判断错误
---
web_src/src/components/service/DeviceService.js | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 insertions(+), 4 deletions(-)
diff --git a/web_src/src/components/service/DeviceService.js b/web_src/src/components/service/DeviceService.js
old mode 100644
new mode 100755
index 4700e79..85d36f8
--- a/web_src/src/components/service/DeviceService.js
+++ b/web_src/src/components/service/DeviceService.js
@@ -21,6 +21,19 @@
if (typeof (errorCallback) == "function") errorCallback(error)
});
}
+
+ 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;
@@ -30,10 +43,10 @@
getAllDeviceListIteration(deviceList, currentPage, count, callback, endCallback, errorCallback) {
this.getDeviceList(currentPage, count, (data) => {
- if (data.list) {
- if (typeof (callback) == "function") callback(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, endCallback, errorCallback)
}else {
@@ -120,6 +133,45 @@
if (typeof (callback) == "function") callback(res.data)
}).catch(errorCallback);
}
+
+ getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
+ let currentPage = 1;
+ let count = 100;
+ let catalogList = []
+ this.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
+ }
+
+ 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.getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback)
+ }else {
+ if (typeof (endCallback) == "function") endCallback(catalogList)
+ }
+ }
+ }, 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/tree/${deviceId}`,
+ params:{
+ page: currentPage,
+ count: count,
+ parentId: parentId,
+ onlyCatalog: onlyCatalog
+ }
+ }).then((res) =>{
+ if (typeof (callback) == "function") callback(res.data)
+ }).catch(errorCallback);
+ }
}
export default DeviceService;
--
Gitblit v1.8.0