From 935c2d700fd13083c624451870995dbfa6820733 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 23 Dec 2020 18:04:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E8=BF=9E=E7=BA=BF=E5=88=A4=E6=96=AD=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

---
 .../src/components/common/bottomBox/tabs/panelTab.vue    | 1 +
 nezha-fronted/src/components/common/exportXLSX.vue       | 5 +++--
 nezha-fronted/src/components/common/project/addLine.vue  | 9 +++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index bac6f28d4..37df6ed1b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -41,6 +41,7 @@
           }"
           @afterImport="dateChange"
           v-if="$route.path==='/asset' || $route.path==='/model'"
+          :showCur="false"
         >
           <template slot="optionZone">
             <button :title="$t('overall.createChart')" @click="addChart" v-has="['model_chart_toAdd', 'asset_chart_toAdd']" v-if="from != $CONSTANTS.fromRoute.rule && from != $CONSTANTS.fromRoute.endpoint"
diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue
index 868eb23c1..86eacbecf 100644
--- a/nezha-fronted/src/components/common/exportXLSX.vue
+++ b/nezha-fronted/src/components/common/exportXLSX.vue
@@ -107,7 +107,8 @@
       exportFileName:{type:String},
       importUrl: {type:String,required:true},
       link:{type:Object},
-      permissions: {type: Object}
+      permissions: {type: Object},
+      showCur:{type:Boolean,default:true}
     },
     data:function(){
       return {
@@ -290,7 +291,7 @@
       showImportBox:function(type){
         this.importBox.show=true;
         this.importBox.type=type;
-        if(type == 2&&(this.$route.path==='/model')){
+        if(type == 2&&(!this.showCur)){
           this.exportCur()
           return
         }
diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index 97bf1eb48..00c3a5110 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -2,7 +2,7 @@
   <div class="mc" @click.self="clickOutside">
     <div class="right-box right-box-edit-endpoint">
       <!-- begin--顶部按钮-->
-      <div class="right-box-top-btns right-box-form-delete" v-if="lineData.lineId">
+      <div class="right-box-top-btns right-box-form-delete" v-if="lineData.id">
         <button id="edit-ep-del" type="button" @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien">
         <span class="right-box-top-btn-icon"><i class="nz-icon nz-icon-delete"></i></span>
         <span class="right-box-top-btn-txt">{{$t('overall.delete')}}</span>
@@ -11,11 +11,11 @@
       <!-- end--顶部按钮-->
 
       <!-- begin--标题-->
-      <div class="right-box-title" v-if="!lineData.lineId">
+      <div class="right-box-title" v-if="!lineData.id">
         {{$t('project.topology.addLine')}}
       </div>
-      <div class="right-box-title" v-if="lineData.lineId">
-        {{$t("project.topology.editLine") + "  ID：" + lineData.lineId}}
+      <div class="right-box-title" v-if="lineData.id">
+        {{$t("project.topology.editLine")}}
       </div>
       <!-- end--标题-->
 
@@ -283,6 +283,7 @@
     watch:{
       lineData:{
         handler(n){
+          console.log(n);
           this.form={
             arrows:n.arrows,
             color:n.color,