From 042b28b2d62860db912b254420fb4172880aafab Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 22 八月 2022 16:17:28 +0800
Subject: [PATCH] 支持全局异常和统一返回结果
---
web_src/src/components/service/DeviceService.js | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/web_src/src/components/service/DeviceService.js b/web_src/src/components/service/DeviceService.js
index 45d4ac2..85d36f8 100644
--- a/web_src/src/components/service/DeviceService.js
+++ b/web_src/src/components/service/DeviceService.js
@@ -43,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 {
@@ -134,10 +134,6 @@
}).catch(errorCallback);
}
- getTree(deviceId, id, param3, param4) {
-
- }
-
getTree(deviceId, parentId, onlyCatalog, callback, endCallback, errorCallback) {
let currentPage = 1;
let count = 100;
@@ -147,10 +143,10 @@
getTreeIteration(deviceId, parentId, onlyCatalog, catalogList, currentPage, count, callback, endCallback, errorCallback) {
this.getTreeInfo(deviceId, parentId, onlyCatalog, currentPage, count, (data) => {
- if (data.list) {
- if (typeof (callback) == "function") callback(data.list)
- catalogList = catalogList.concat(data.list);
- if (catalogList.length < data.total) {
+ 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 {
--
Gitblit v1.8.0