Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

src/views/login.vue

@@ -7,10 +7,7 @@
       class="login-form"
     >
       <div class="container">
-        <img
-          style="width: 106px; height: 48px"
-          :src="require('/src/assets/logo/logo1.png')"
-        />
+        <img :src="logoImg" />
       </div>
       <h3 class="title">中汽研安全检测平台</h3>
       <el-form-item prop="username">
@@ -92,11 +89,13 @@
 import { getCodeImg } from '@/api/login'
 import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsencrypt'
+import logoImg from '@/assets/logo/logo1.jpg'
 
 export default {
   name: 'Login',
   data() {
     return {
+      logoImg: logoImg,
       codeUrl: '',
       loginForm: {
         username: 'admin',
@@ -203,6 +202,10 @@ export default {
     display: flex;
     justify-content: center; /* 水平居中 */
     align-items: center; /* 垂直居中 */
+    img {
+      width: 106px;
+      height: 48px;
+    }
   }
   .title {
     color: #164c8d;