From 0c59fd703144b0bcfbc66bd88db8e7cb0faaf5e9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Thu, 17 Sep 2020 14:20:18 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A4=84=E7=90=86yopology=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=E9=94=80=E6=AF=81=E5=90=8E=20=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E5=99=A8=E6=9C=AA=E8=A2=AB=E6=B8=85=E9=99=A4=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/common/pickTime.vue            | 2 +-
 .../src/components/common/project/popData/Info.vue          | 6 +++---
 nezha-fronted/src/components/common/project/visNetwork.vue  | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/nezha-fronted/src/components/common/pickTime.vue b/nezha-fronted/src/components/common/pickTime.vue
index fee4975d3..48926c1ce 100644
--- a/nezha-fronted/src/components/common/pickTime.vue
+++ b/nezha-fronted/src/components/common/pickTime.vue
@@ -75,7 +75,7 @@
         this.visible = false;
         clearInterval(this.intervalTimer);
         this.interval = val;
-        if(!this.showTimePicker){
+        if(!this.showTimePicker&&val && val.value != -1){
           this.intervalTimer = setInterval(() => {
             this.$emit('change',this.searchTime)
             this.refreshDataFunc();
diff --git a/nezha-fronted/src/components/common/project/popData/Info.vue b/nezha-fronted/src/components/common/project/popData/Info.vue
index 5e754e236..9dd0fe63c 100644
--- a/nezha-fronted/src/components/common/project/popData/Info.vue
+++ b/nezha-fronted/src/components/common/project/popData/Info.vue
@@ -21,15 +21,15 @@
         </div>
         <div class="content-box">
           <span class="content-title">Port</span>
-          <span class="content-text">{{moduleInfo.port}}</span>
+          <span class="content-text">{{moduleInfo.port?moduleInfo.port:'--'}}</span>
         </div>
         <div class="content-box">
           <span class="content-title">Path</span>
-          <span class="content-text">{{moduleInfo.path}}</span>
+          <span class="content-text">{{moduleInfo.path?moduleInfo.path:'--'}}</span>
         </div>
         <div class="content-box">
           <span class="content-title">Parameter</span>
-          <span class="content-text">{{moduleInfo.seq}}</span>
+          <span class="content-text">{{moduleInfo.seq?moduleInfo.seq:'--'}}</span>
         </div>
         <div class="content-box">
           <span class="content-title">Descripsion</span>
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index a6c1128d2..5a9fac6f0 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -27,7 +27,7 @@
                 <button style="border-right: 1px solid rgba(162,162,162,0.50);margin-right: 12px" type="button" class="nz-btn nz-btn-size-normal nz-btn-style-light float-right pickTime" @click="editVisNetworkChange(true)" v-show="!editVisNetwork">
                   <i class="nz-icon nz-icon-edit"   :title="$t('project.topology.edit')"></i>
                 </button>
-                <pick-time v-show="!editVisNetwork" :showTimePicker="false" class="float-right pickTime" :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false"></pick-time>
+                <pick-time v-show="!editVisNetwork" :showTimePicker="false" class="float-right pickTime" :refresh-data-func="dateChange" v-model="searchTime" :use-chart-unit="false" ref="pickTime"></pick-time>
                 <!--<i class="nz-icon nz-icon-zoomin float-right"></i>-->
                 <!--<i class="nz-icon nz-icon-exit-full-screen float-right"></i>-->
               </div>
@@ -354,6 +354,9 @@
 
     mounted(){
       this.firstLoad = false;
+    },
+    beforeDestroy(){
+      this.$refs['pickTime'].selectInterval();
     }
 
   }