From f70e4b398fa9b6a283fcda8ccea50fff58efabcd Mon Sep 17 00:00:00 2001
From: wangwenrui <wangwenrui@zdjizhi.com>
Date: Mon, 14 Sep 2020 17:20:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9header-?=
 =?UTF-8?q?asset-dc=E5=90=8E=E5=A4=9A=E6=AC=A1=E8=AF=B7=E6=B1=82=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=EF=BC=8C=E5=8F=8A=E4=B8=8D=E6=AD=A3=E7=A1=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/header.vue    |  1 +
 nezha-fronted/src/components/common/leftMenu.vue  |  4 ++--
 nezha-fronted/src/components/page/asset/asset.vue | 10 ++++++++--
 nezha-fronted/src/store/index.js                  |  4 ++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index 05925cedb..fb1d2ed57 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -360,6 +360,7 @@
       jumpToAsset(dc) {
         if (dc) {
           this.activeItemIndex = dc.id;
+          this.$store.commit('setCurrentDc',dc.id)
           bus.$emit("header-dc-change", dc.id); //发送给leftMenu，顶部dc条件改变了
         } else {
           this.activeItemIndex = "";
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index b754696d9..3c7f1f554 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -241,7 +241,7 @@
         },
         dcCheckList: {
           deep: true,
-          immediate: true,
+          immediate:true,
           handler(n) {
             bus.$emit("asset-filter-change", "idcIds", n.join(","));
           }
@@ -398,7 +398,7 @@
           });*/
           bus.$on("header-dc-change", dcId => {
             this.dcCheckList = [dcId];
-            bus.$emit("asset-filter-change", "idcIds", dcId);
+            // bus.$emit("asset-filter-change", "idcIds", dcId);
           });
           bus.$on("clear-asset-filter", dcId => {
             this.dcCheckList = [];
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 543f1c764..bb88f35ac 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -368,6 +368,11 @@
         tagKeys:[],
       }
     },
+    computed:{
+      headerCurrentDc:function(){
+        return this.$store.state.currentDc;
+      }
+    },
     watch: {
       'bottomBox.showSubList': function(n) {
         let vm = this;
@@ -682,11 +687,9 @@
 
       },
       filterTags:function(scope){
-        console.log(scope)
         let tag=scope.column.label.split(' [Tag]')[0]
         let tagVals=scope.row.tags
         if(tagVals){
-          console.log('tags',tagVals,tag)
           let showTag=tagVals.find(item=>{return item.tag == tag})
           if(showTag){
             return showTag.value
@@ -729,6 +732,9 @@
 
       //初始化数据
       this.getUserData();
+
+      this.pageObj.idcId=this.headerCurrentDc;
+
       this.getTableData();
       //是否存在分页缓存
       let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId);
diff --git a/nezha-fronted/src/store/index.js b/nezha-fronted/src/store/index.js
index 4987450cc..3754e2d74 100644
--- a/nezha-fronted/src/store/index.js
+++ b/nezha-fronted/src/store/index.js
@@ -6,6 +6,7 @@ const store = new Vuex.Store({
   state: {
     /* 监听对象变化，用于顶部菜单与底部内容的同步 */
     currentProject: {id: "", name: "", remark: ""},
+    currentDc:null,
     projectListChange: 0,
     reloadFacade:true,//重新加载project
     showPanel:{
@@ -94,6 +95,9 @@ const store = new Vuex.Store({
         state.reloadFacade=true;
       })
     },
+    setCurrentDc(state,data){
+      state.currentDc = data
+    }
   },
   actions: {
   }