lph 1 år sedan
förälder
incheckning
919b282c41
3 ändrade filer med 14 tillägg och 12 borttagningar
  1. BIN
      zkqy-ui/public/favicon.ico
  2. 5 4
      zkqy-ui/src/layout/index.vue
  3. 9 8
      zkqy-ui/src/views/login.vue

BIN
zkqy-ui/public/favicon.ico


+ 5 - 4
zkqy-ui/src/layout/index.vue

@@ -179,8 +179,8 @@ export default {
       if (logo) {
         this.logo = process.env.VUE_APP_BASE_API + logo;
       } else {
-        this.logo = mes412;
-        // this.logo = mecLogoLogin;
+        // this.logo = mes412;
+        this.logo = mecLogoLogin;
         // this.logo = comp;
       }
     },
@@ -291,9 +291,10 @@ export default {
 
 .imgg {
   /* width: 553px; */
+
   width: 270px;
   height: 80px;
-  float: left;
+  // float: left;
   margin-top: 7px;
   margin-bottom: 8px;
 
@@ -307,7 +308,7 @@ export default {
 
   .title {
     flex: 1;
-    margin-left: -35px;
+    margin-left: 10px;
     margin-top: 10px;
     display: block;
 

+ 9 - 8
zkqy-ui/src/views/login.vue

@@ -14,8 +14,8 @@
         <el-col :span="12" class="comlogo"></el-col>
         <el-col :span="12">
           <div class="grid-content bg-purple-dark title">
-            <!-- · 生产协同管理系统 -->
-            · 智能制造平台
+            · 生产协同管理系统
+            <!-- · 智能制造平台 -->
           </div>
         </el-col>
       </el-row>
@@ -430,15 +430,16 @@ export default {
   margin-top: 49px;
   width: 200px;
   height: 70px;
-  // background: url(../assets/images/mecos-logo1.jpg);
-  background: url(../assets/images/mes412.png);
+  background: url(../assets/images/mecos-logo1.jpg);
+  // background: url(../assets/images/mes412.png); //工联院
   /* background: url(../assets/images/comp.png); */
   /* box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.25); */
   opacity: 1;
-  // background-size: cover;
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center;
+  background-size: cover;
+  // 工联院  样式
+  // background-size: contain;
+  // background-repeat: no-repeat;
+  // background-position: center;
 }
 
 .login {