From 837775fc6f9188764f487a3517e14595fc03b8fd Mon Sep 17 00:00:00 2001
From: hanbaoshan <hanbaoshan@aiotlink.com>
Date: 星期六, 17 十月 2020 14:59:46 +0800
Subject: [PATCH] 统计查询搜索判断应用来源动态传递搜索参数
---
src/pages/searchForCluster/index/Searching.vue | 3 ++-
src/components/serfDiagram/index.vue | 6 +++---
src/Pool/VideoPhotoData.ts | 10 ++++++----
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/Pool/VideoPhotoData.ts b/src/Pool/VideoPhotoData.ts
index 15b058c..df9742e 100644
--- a/src/Pool/VideoPhotoData.ts
+++ b/src/Pool/VideoPhotoData.ts
@@ -8,6 +8,7 @@
addToBase
} from "@/api/search";
export default class VideoPhotoData {
+ public searchForm: string = 'search';
public preCards: Array<object> = [];
public cards: Array<object> = [];
public persons: Array<object> = [];
@@ -73,7 +74,7 @@
async querySearchList() {
this.cards = []
this.preCards = []
- var param = {
+ var param:any = {
page: this.page,
size: this.size,
searchTime: this.searchTime,
@@ -81,10 +82,11 @@
inputValue: this.inputValue,
tabs: this.queryTabs,
tasks: this.queryTasks,
- treeNodes: this.treeNodes,
- isAll: true
+ treeNodes: this.treeNodes
}
-
+ if(this.searchForm == 'cluster'){
+ param.isAll = true
+ }
const rsp: any = await getSearchList(param);
if (rsp && rsp.success) {
this.cards.length = 0 // 娓呬袱娆★紝绗竴娆℃槸涓轰簡鐐瑰畬涔嬪悗涓嶄細鍑虹幇涔嬪墠鏁版嵁鐨勬畫褰憋紝杩欐鏄负浜嗛槻姝㈠洜涓哄紓姝ラ棶棰樹袱娆¤姹備細鍑虹幇鍙屽�嶆暟鎹殑闂
diff --git a/src/components/serfDiagram/index.vue b/src/components/serfDiagram/index.vue
index 4f69b58..0f5b367 100644
--- a/src/components/serfDiagram/index.vue
+++ b/src/components/serfDiagram/index.vue
@@ -40,7 +40,7 @@
toolTipStyle: {
display: "none",
height: "30px",
- width: "120px"
+ width: "150px"
}
};
},
@@ -129,7 +129,7 @@
this.toolTipStyle.display = "block";
this.toolTipStyle.top = node.y - 60 + "px";
this.toolTipStyle.left = node.x + "px";
-
+ console.log(this.members[node.id])
this.toolTipNode = this.members[node.id].nodeName;
this.toolTipAddr = this.members[node.id].Address;
},
@@ -267,7 +267,7 @@
.arrow_box p {
height: 30px;
line-height: 30px;
- width: 100px;
+ width: 100%;
overflow: hidden;
}
.arrow_box:after,
diff --git a/src/pages/searchForCluster/index/Searching.vue b/src/pages/searchForCluster/index/Searching.vue
index 68e5e41..9e7012d 100644
--- a/src/pages/searchForCluster/index/Searching.vue
+++ b/src/pages/searchForCluster/index/Searching.vue
@@ -296,7 +296,8 @@
this.searchTime = this.getDateInit();
this.VideoPhotoData.searchTime = this.getDateInit();
-
+ //璁剧疆鎼滅储鏉ユ簮(搴旂敤鍚嶇О)
+ this.VideoPhotoData.searchForm = 'cluster';
// 鏆傛椂鍏抽棴璺宠浆 20200730
// if (this.$route.query.showType === "findByPic") {
if (this.getUrlKey("showType")) {
--
Gitblit v1.8.0