From 064c508cca844175c77781a00a83f38bd8c734e4 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Wed, 26 Aug 2020 09:50:09 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=8D=B8=E8=BD=BDvis-network?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/package-lock.json               |   5 ---
 nezha-fronted/package.json                    |   1 -
 .../src/components/common/project/addLine.vue |  16 ++++----
 .../src/components/common/project/addNode.vue |  36 ++++++++++--------
 .../common/project/{ => image}/LRArrow.png    | Bin
 .../common/project/{ => image}/a.png          | Bin
 .../common/project/{ => image}/b.png          | Bin
 .../common/project/{ => image}/c.png          | Bin
 .../common/project/{ => image}/d.png          | Bin
 .../common/project/{ => image}/e.png          | Bin
 .../common/project/{ => image}/emptyData.png  | Bin
 .../common/project/{ => image}/f.png          | Bin
 .../common/project/{ => image}/leftArrow.png  | Bin
 .../common/project/{ => image}/noArrow.png    | Bin
 .../common/project/{ => image}/rightArrow.png | Bin
 .../components/common/project/topology.vue    |   2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)
 rename nezha-fronted/src/components/common/project/{ => image}/LRArrow.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/a.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/b.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/c.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/d.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/e.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/emptyData.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/f.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/leftArrow.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/noArrow.png (100%)
 rename nezha-fronted/src/components/common/project/{ => image}/rightArrow.png (100%)

diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json
index aeb4e0641..4e5def9c3 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -12436,11 +12436,6 @@
         "propagating-hammerjs": "^1.4.6"
       }
     },
-    "vis-network": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/vis-network/-/vis-network-8.1.0.tgz",
-      "integrity": "sha512-h8uMYKKBLDGD20kGzxqCmT2X94rB0oP2OLbBBqG/4sAZXJ4Vhbe+dQQurRg54Xz4wb8R33H719ldEizhWE/NkQ=="
-    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
diff --git a/nezha-fronted/package.json b/nezha-fronted/package.json
index e8406ef25..111eb9ba5 100644
--- a/nezha-fronted/package.json
+++ b/nezha-fronted/package.json
@@ -19,7 +19,6 @@
     "pl-table": "^2.5.8",
     "quill": "^1.3.7",
     "vis": "^4.21.0-EOL",
-    "vis-network": "^8.1.0",
     "vue": "^2.5.2",
     "vue-countupjs": "^1.0.0",
     "vue-i18n": "^8.15.1",
diff --git a/nezha-fronted/src/components/common/project/addLine.vue b/nezha-fronted/src/components/common/project/addLine.vue
index 8af9af35c..7954ae3fe 100644
--- a/nezha-fronted/src/components/common/project/addLine.vue
+++ b/nezha-fronted/src/components/common/project/addLine.vue
@@ -44,15 +44,15 @@
           <el-form-item label="箭头方向" prop="arrows" class="arrows">
             <el-select v-model="form.arrows" placeholder="" :popper-append-to-body="false">
               <div slot="prefix">
-                <img v-if="form.arrows=='from'" src="./leftArrow.png" />
-                <img v-if="form.arrows=='to'" src="./rightArrow.png" />
-                <img v-if="form.arrows=='from;to'" src="./LRArrow.png" />
-                <img v-if="form.arrows=='0'" src="./noArrow.png" />
+                <img v-if="form.arrows=='from'" src="./image/leftArrow.png" />
+                <img v-if="form.arrows=='to'" src="./image/rightArrow.png" />
+                <img v-if="form.arrows=='from;to'" src="./image/LRArrow.png" />
+                <img v-if="form.arrows=='0'" src="./image/noArrow.png" />
               </div>
-              <el-option label="from" value="from"><img src="./leftArrow.png" /></el-option>
-              <el-option label="to" value="to"><img src="./rightArrow.png" /></el-option>
-              <el-option label="from;to" value="from;to"><img src="./LRArrow.png" /></el-option>
-              <el-option label="" value="0"><img src="./noArrow.png" /></el-option>
+              <el-option label="from" value="from"><img src="./image/leftArrow.png" /></el-option>
+              <el-option label="to" value="to"><img src="./image/rightArrow.png" /></el-option>
+              <el-option label="from;to" value="from;to"><img src="./image/LRArrow.png" /></el-option>
+              <el-option label="" value="0"><img src="./image/noArrow.png" /></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="color" class="color">
diff --git a/nezha-fronted/src/components/common/project/addNode.vue b/nezha-fronted/src/components/common/project/addNode.vue
index cd44c3598..9b0278b78 100644
--- a/nezha-fronted/src/components/common/project/addNode.vue
+++ b/nezha-fronted/src/components/common/project/addNode.vue
@@ -129,12 +129,12 @@
   import promqlInput from "@/components/page/dashboard/explore/promqlInput";
   import chartDataFormat from "@/components/charts/chartDataFormat";
   import {getUUID,resetZIndex} from "@/components/common/js/common";
-  import  a from './a.png'
-  import  b from './b.png'
-  import  c from './c.png'
-  import  d from './d.png'
-  import  e from './e.png'
-  import  f from './f.png'
+  import  a from './image/a.png'
+  import  b from './image/b.png'
+  import  c from './image/c.png'
+  import  d from './image/d.png'
+  import  e from './image/e.png'
+  import  f from './image/f.png'
   var rz = {
     methods: {
       rz(e) {
@@ -283,15 +283,17 @@
           this.$message.error('上传头像图片大小不能超过 2MB!');
         }
         console.log(file);
-        this.getBase64(file).then(res => {
-          const params = res.split(',')
-          console.log(params, 'params')
-          if (params.length > 0) {
-            this.strimagebase64 = params[1]
-            console.log(this.strimagebase64);
-          }
-        });
-        return isJPG && isLt2M;
+        if(isJPG && isLt2M){
+          this.getBase64(file).then(res => {
+            const params = res.split(',')
+            console.log(params, 'params')
+            if (params.length > 0) {
+              this.strimagebase64 = params[1]
+              console.log(this.strimagebase64);
+            }
+          });
+        }
+        return false;
       },
       handleAvatarSuccess(file){
 
@@ -328,6 +330,10 @@
 </script>
 
 <style scoped>
+  /deep/ .avatar-uploader{
+    display: inline-block;
+    color: #1989fa;
+  }
   /deep/.right-box-form .icon  .el-select{
     width: 60%;
   }
diff --git a/nezha-fronted/src/components/common/project/LRArrow.png b/nezha-fronted/src/components/common/project/image/LRArrow.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/LRArrow.png
rename to nezha-fronted/src/components/common/project/image/LRArrow.png
diff --git a/nezha-fronted/src/components/common/project/a.png b/nezha-fronted/src/components/common/project/image/a.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/a.png
rename to nezha-fronted/src/components/common/project/image/a.png
diff --git a/nezha-fronted/src/components/common/project/b.png b/nezha-fronted/src/components/common/project/image/b.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/b.png
rename to nezha-fronted/src/components/common/project/image/b.png
diff --git a/nezha-fronted/src/components/common/project/c.png b/nezha-fronted/src/components/common/project/image/c.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/c.png
rename to nezha-fronted/src/components/common/project/image/c.png
diff --git a/nezha-fronted/src/components/common/project/d.png b/nezha-fronted/src/components/common/project/image/d.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/d.png
rename to nezha-fronted/src/components/common/project/image/d.png
diff --git a/nezha-fronted/src/components/common/project/e.png b/nezha-fronted/src/components/common/project/image/e.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/e.png
rename to nezha-fronted/src/components/common/project/image/e.png
diff --git a/nezha-fronted/src/components/common/project/emptyData.png b/nezha-fronted/src/components/common/project/image/emptyData.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/emptyData.png
rename to nezha-fronted/src/components/common/project/image/emptyData.png
diff --git a/nezha-fronted/src/components/common/project/f.png b/nezha-fronted/src/components/common/project/image/f.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/f.png
rename to nezha-fronted/src/components/common/project/image/f.png
diff --git a/nezha-fronted/src/components/common/project/leftArrow.png b/nezha-fronted/src/components/common/project/image/leftArrow.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/leftArrow.png
rename to nezha-fronted/src/components/common/project/image/leftArrow.png
diff --git a/nezha-fronted/src/components/common/project/noArrow.png b/nezha-fronted/src/components/common/project/image/noArrow.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/noArrow.png
rename to nezha-fronted/src/components/common/project/image/noArrow.png
diff --git a/nezha-fronted/src/components/common/project/rightArrow.png b/nezha-fronted/src/components/common/project/image/rightArrow.png
similarity index 100%
rename from nezha-fronted/src/components/common/project/rightArrow.png
rename to nezha-fronted/src/components/common/project/image/rightArrow.png
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index 7c327a25a..87a1c6cd4 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -22,7 +22,7 @@
       <!--空拓扑图-->
       <div class="network-null" v-if="nodesArray.length===0">
         <i class="nz-icon nz-icon-add-node" @click="addModelShow"></i>
-        <img  src="./emptyData.png" width="303px" height="184px"/>
+        <img src="./image/emptyData.png" width="303px" height="184px"/>
       </div>
       <!--拓扑图工具-->
       <div