Merge branch 'master' of http://120.26.64.82:10880/BFFE/dz2.1

src/layout/components/Navbar.vue

@@ -5,9 +5,13 @@
     <div class="navbar_top">
       <div class="nav_left">
         <div class="log_img">
-          <el-avatar :size="40" :src="imgSrc">
+          <!-- <el-avatar :size="40" :src="imgSrc">
             <img src="@/assets/logo/error.png">
-          </el-avatar>
+          </el-avatar> -->
+          <el-image
+            style="max-width: 90px"
+            :src="imgSrc">
+          </el-image>
         </div>
         <div class="log_name">{{ pageTitle }}</div>
       </div>

src/views/login/index.vue

@@ -2,9 +2,13 @@
   <div :style="{'backgroundImage':backgroundImg ? 'url('+backgroundImg+')' :'url('+defaultBgImg+')'}" class="login-container">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on" label-position="left">
       <div class="title-container flex-wrap">
-        <el-avatar :size="36" :src="imgSrc" @error="errorHandler">
+        <!-- <el-avatar :size="36" :src="imgSrc" @error="errorHandler">
           <img src="@/assets/logo/error.png">
-        </el-avatar>
+        </el-avatar> -->
+        <el-image
+            style="max-width: 90px"
+            :src="imgSrc">
+        </el-image>
         <!-- <el-divider direction="vertical"></el-divider> -->
         <div class="content-box">
           <div class="title">{{ pageTitle }}</div>