From d4cd7df0bd1484c31e37bcb0642e89ecdcf7ab29 Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期四, 17 九月 2020 10:55:22 +0800
Subject: [PATCH] 处理外网端口映射无法跳转的问题
---
src/Pool/TreeData.ts | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/src/Pool/TreeData.ts b/src/Pool/TreeData.ts
index 22ad3a2..a835411 100644
--- a/src/Pool/TreeData.ts
+++ b/src/Pool/TreeData.ts
@@ -96,7 +96,6 @@
}
setVideoArr(index: number, value: object, vue: any): void {
- debugger
vue.$set(this.videoArr, index, value);
this.activeForceChoose = false;
}
@@ -263,6 +262,29 @@
})
}
+ sortTreeData(node) {
+ if (!node) {
+ return
+ }
+ node.sort(function (obj1: any, obj2: any) {
+ var val1 = obj1.name;
+ var val2 = obj2.name;
+ if (val1 < val2) {
+ return -1;
+ } else if (val1 > val2) {
+ return 1;
+ } else {
+ return 0;
+ }
+ });
+
+ node.forEach(n => {
+ if (n.children && n.children.length > 0) {
+ this.sortTreeData(n.children)
+ }
+ })
+ }
+
async fetchLocalTree() {
const rsp: any = await getLocalCameraTree({
searchType: this.searchCamType,
@@ -272,17 +294,7 @@
if (rsp && rsp.success) {
this.treeData = rsp.data ? rsp.data : []
if (this.treeData && this.treeData.length > 0) {
- this.treeData.sort(function (obj1: any, obj2: any) {
- var val1 = obj1.id;
- var val2 = obj2.id;
- if (val1 < val2) {
- return -1;
- } else if (val1 > val2) {
- return 1;
- } else {
- return 0;
- }
- });
+ this.sortTreeData(this.treeData)
}
// 璁剧疆绂佹鎷栨嫿鎽勫儚鏈哄埌鎽勫儚鏈鸿妭鐐�
@@ -301,17 +313,7 @@
if (rsp && rsp.success) {
this.gb28181Data = rsp.data ? rsp.data : []
if (this.gb28181Data && this.gb28181Data.length > 0) {
- this.gb28181Data.sort(function (obj1: any, obj2: any) {
- var val1 = obj1.id;
- var val2 = obj2.id;
- if (val1 < val2) {
- return -1;
- } else if (val1 > val2) {
- return 1;
- } else {
- return 0;
- }
- });
+ this.sortTreeData(this.gb28181Data)
}
this.gb28181DataPure = JSON.parse(JSON.stringify(this.gb28181Data));
--
Gitblit v1.8.0