From aa28c455b663ce5306adb375a3389b4afd694c8f Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Sat, 10 Oct 2020 13:31:12 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9topology=E7=9A=84?=
 =?UTF-8?q?loading=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/projectFacade.vue         | 1 +
 nezha-fronted/src/components/common/project/visNetwork.vue  | 4 ++--
 .../src/components/page/dashboard/overview/chart.vue        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/projectFacade.vue b/nezha-fronted/src/components/common/project/projectFacade.vue
index d91e7b5de..9eaec3583 100644
--- a/nezha-fronted/src/components/common/project/projectFacade.vue
+++ b/nezha-fronted/src/components/common/project/projectFacade.vue
@@ -132,6 +132,7 @@
 		  getProjectData(n){
 		    //获取projectInfo
         this.projectInfo.loading=true;
+        this.$refs['visNetwork'].topologyLoading=true;
         this.$get('project/info', {id:n.id}).then(response => {
           if (response.code === 200) {
             this.projectInfo.loading=false;
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 0f951b70e..d4cf874b9 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -179,7 +179,7 @@
         dragTitleShow:false,
         dropdownMenuShow:false,
         editVisNetwork:false,
-        topologyLoading:false,
+        topologyLoading:true,
         total:1,
         searchTime: bus.getTimezontDateRange(),
         screenX:window.screen.width,
@@ -208,7 +208,7 @@
             setTimeout(()=>{
               this.topologyLoading=false;
               this.$refs['topology'].setData();
-            },500)
+            },100)
           }
           this.$refs['topology'].viewsCenter=res.data.topo.viewsCenter?res.data.topo.viewsCenter:{x:0,y:0};
           this.$refs['topology'].zoom=res.data.topo.zoom?(res.data.topo.zoom*this.screenX/1920):1;
diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
index 122c9bd18..da7ae54d1 100644
--- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue
+++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue
@@ -172,7 +172,7 @@
           this.noData=false;
           this.chart.clear();
           this.optionSeriesAll=[...this.option.series];
-          console.log( this.optionSeriesAll);
+          // console.log( this.optionSeriesAll);
           if(this.option.series instanceof Array){
             this.option.series=this.option.series.filter((item,index)=>index<this.dataSize);
           }
@@ -401,7 +401,7 @@
         let option={
           series:this.optionSeriesAll
         };
-        console.log(option);
+        // console.log(option);
         this.chart.setOption(option);
         this.chart.resize()
       },
@@ -461,7 +461,7 @@
     mounted() {
       this.chartInit();
       EleResize.on(this.$el, this.resize, this.chartType);
-      console.log(this.chartType)
+      // console.log(this.chartType)
     },
     watch:{