From a451d473915dba5bd8f284aff85dc360ae2a5e6f Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Thu, 27 Aug 2020 17:05:10 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=87=8D=E7=BD=AEtopology=E5=90=8E?=
 =?UTF-8?q?=E7=BC=A9=E6=94=BE=E5=9B=9E=E5=88=B01?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/addNode.vue | 20 +++++++++++++++----
 .../components/common/project/visNetwork.vue  |  1 +
 .../src/components/page/config/system.vue     |  5 +++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/addNode.vue b/nezha-fronted/src/components/common/project/addNode.vue
index aab692303..79e1fc219 100644
--- a/nezha-fronted/src/components/common/project/addNode.vue
+++ b/nezha-fronted/src/components/common/project/addNode.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="right-box right-box-edit-endpoint" v-clickoutside="clickOutside">
+  <div class="mc" @click.self="clickOutside">
+    <div class="right-box right-box-edit-endpoint">
     <!-- begin--顶部按钮-->
     <div class="right-box-top-btns">
       <!--<button id="edit-ep-del" type="button" @click="del" class="nz-btn nz-btn-size-normal nz-btn-size-alien nz-btn-style-light ">-->
@@ -127,6 +128,7 @@
       </button>
     </div>
   </div>
+  </div>
 </template>
 
 <script>
@@ -211,7 +213,7 @@
       this.addNodeInit()
     },
     methods:{
-      addNodeInit(){
+      addNodeInit(selImageId){
         this.$get('/project/topo/icon').then(res=>{
           this.iconArray=res.data.list;
           this.iconArray.forEach((item,index)=>{
@@ -222,6 +224,9 @@
               if(index===this.iconArray.length-1){
                 setTimeout(()=>{
                   this.iconArray=[...this.iconArray];
+                  if(selImageId){
+                    this.form.iconId=selImageId;
+                  }
                 })
               }
             })
@@ -334,9 +339,8 @@
         form.append("name", fileName.substring(0, fileName.lastIndexOf(".")));
         this.$post('/project/topo/icon',form,{'Content-Type': 'multipart/form-data'}).then(res => {
           if(res.code ==  200 ){
-            this.form.iconId=res.data.id;
             this.$message({duration: 2000, type: 'success', message: this.$t("tip.saveSuccess")});
-            this.addNodeInit();
+            this.addNodeInit(res.data.id);
           }else{
             this.$message.error(res.msg);
           }
@@ -348,6 +352,14 @@
 </script>
 
 <style scoped>
+  .mc{
+    position: fixed;
+    width: 100vw;
+    height: 100vh;
+    top: 0;
+    left: 0;
+    z-index: 11;
+  }
   /deep/ .avatar-uploader{
     display: inline-block;
     color: #1989fa;
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 6453cbab2..8a41b6435 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -211,6 +211,7 @@
             },500)
           }
           this.$refs['topology'].viewsCenter={x:0,y:0};
+          this.$refs['topology'].zoom=1;
         })
       },
       formatNodesArr(arr){
diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue
index 33679d890..46a8260cd 100644
--- a/nezha-fronted/src/components/page/config/system.vue
+++ b/nezha-fronted/src/components/page/config/system.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="system">
+  <div class="system" v-scroll-bar>
     <el-tabs type="border-card" @tab-click="selectTab" v-model="activeTab" class="system-tabs" >
       <el-tab-pane :label="$t('config.system.basic.basic')" name="basic">
         <div class="system-config-form">
@@ -659,13 +659,14 @@
 <style scoped>
   .system{
     height: 100%;
+    position: relative;
   }
   .system-config-form{
     width: 61.8% !important;
     position: relative;
   }
   .linkBox{
-    max-height: calc(100vh - 300px);
+    max-height: 800px;
     width: 800px;
   }
   .scrollBox{