瀏覽代碼

1、修改登录界面

周兴 2 年之前
父節點
當前提交
2c96b2c5be
共有 5 個文件被更改,包括 138 次插入122 次删除
  1. 12 0
      src/config/index.js
  2. 0 11
      src/main.js
  3. 13 4
      src/view/login/login-form.vue
  4. 101 101
      src/view/login/login.less
  5. 12 6
      src/view/login/login.vue

+ 12 - 0
src/config/index.js

@@ -4,6 +4,18 @@ export default {
    */
   title: '东科MES系统',
   /**
+   * @desc   : 登录界面的副标题
+   * @author : 周兴
+   * @date   : 2023/7/17 17:08
+   */
+  loginSubTitle:'东科智能业务运行支撑系统·厂商云',
+  /**
+   * @desc   : 权限
+   * @author : 周兴
+   * @date   : 2023/7/17 17:09
+   */
+  loginDkRight:'©2021 东科软件 All rights reserved',
+  /**
    * @description token在Cookie中存储的天数,默认1天
    */
   cookieExpires: 1,

+ 0 - 11
src/main.js

@@ -36,17 +36,6 @@ if (fontSize === '14') {
 } else {
   import  ('./font-less/font-12.less')
 }
-//手机端的字体的样式全局文件
-let fontAppSize = localRead('fontAppSize');
-// console.log('fontAppSize',fontAppSize)
-// 根据字体读取不同的字体样式文件
-if (fontAppSize === 'large') {
-  import  ('./font-less/font-large.less')
-} else if(fontAppSize === 'middle'){
-  import  ('./font-less/font-middle.less')
-}  else {
-  import ('./font-less/font-normal.less')
-}
 // 实际打包时应该不引入mock
 /* eslint-disable */
 //iview 4.0

+ 13 - 4
src/view/login/login-form.vue

@@ -24,7 +24,7 @@
       </Input>
     </FormItem>
     <Checkbox v-model="rememberMe">&nbsp;&nbsp;记住工厂/用户名</Checkbox>
-    <FormItem style="padding-top: 8px">
+    <FormItem style="padding-top: 4px;margin-bottom: 10px !important;">
       <Button class="login-class" @click="handleSubmit" size="large" type="primary" long :disabled="loading">
         <span v-if="!loading">{{ $t('login') }}</span>
         <span v-else>loading...</span>
@@ -195,9 +195,9 @@ export default {
 
 
 /deep/ .ivu-input {
-  border: 1px solid #1B365D;
-  border-radius: 8px !important;
-  font-size: 15px !important;
+  border-radius: 4px !important;
+  height: 32px !important;
+  font-size: 14px !important;
   color: #1B365D !important;
 }
 
@@ -213,4 +213,13 @@ export default {
   line-height: 40px;
 }
 
+/deep/.ivu-form-item-error-tip{
+  padding-top: 4px !important;
+}
+
+/deep/.ivu-input-wrapper-large .ivu-input-prefix i{
+  font-size: 16px;
+  line-height: 32px;
+}
+
 </style>

+ 101 - 101
src/view/login/login.less

@@ -7,113 +7,113 @@
   float: left;
 }
 .login{
-    width: 100%;
-    height: 100%;
-    background: #f0f2f5;
-    position: fixed;
-    min-height: 100%;
-    background-image: url('../../assets/images/background.png') ;
-    background-repeat: no-repeat;
-    //background-size: cover;
-    background-size: 100% 100%;
-    background-position: center;
-    min-width: 1220px;
-    &-con{
+  width: 100%;
+  height: 100%;
+  background: #f0f2f5;
+  position: fixed;
+  min-height: 100%;
+  background-image: url('../../assets/images/background.png') ;
+  background-repeat: no-repeat;
+  //background-size: cover;
+  background-size: 100% 100%;
+  background-position: center;
+  min-width: 1220px;
+  &-con{
 
-        &-header{
-            font-size: 16px;
-            font-weight: 300;
-            text-align: center;
-            padding: 30px 0;
-        }
-        .form-con{
-          position: absolute;
-          //top: 23vh;
-          //left: 57vw;
-          //width: 32vw;
-          //height: 62vh;
-          //top: 20%;
-          //left: 38%;
-          //width: 30%;
-          //height: 55%;
-          top:50%;
-          left: 50%;
-          width: 500px;
-          height: 480px;
-          margin-top: -250px;
-          margin-left: -230px;
-          //min-width: 460px;
-          //min-height: 480px;
-          background: linear-gradient(181.51deg, rgba(255, 255, 255, 0.5) -0.89%, rgba(255, 255, 255, 0.5) 41.59%);
-          mix-blend-mode: normal;
-          backdrop-filter: blur(50px);
-          /* Note: backdrop-filter has minimal browser support */
-          border-radius: 15px;
-
-          .hj-logo{
-            padding-top: 30px;
-            display: flex;
-            justify-content: center;
-          }
-          .tab-class{
-            width: 60%;
-            margin-left: 20%;
-            padding-top: 15px;
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
+    &-header{
+      font-size: 16px;
+      font-weight: 300;
+      text-align: center;
+      padding: 30px 0;
+    }
+    .form-con{
+      position: absolute;
+      //top: 23vh;
+      //left: 57vw;
+      //width: 32vw;
+      //height: 62vh;
+      //top: 20%;
+      //left: 38%;
+      //width: 30%;
+      //height: 55%;
+      top:50%;
+      left: 50%;
+      width: 400px;
+      height: 380px;
+      margin-top: -250px;
+      margin-left: -230px;
+      //min-width: 460px;
+      //min-height: 480px;
+      background: linear-gradient(181.51deg, rgba(255, 255, 255, 0.5) -0.89%, rgba(255, 255, 255, 0.5) 41.59%);
+      mix-blend-mode: normal;
+      backdrop-filter: blur(50px);
+      /* Note: backdrop-filter has minimal browser support */
+      border-radius: 5px;
 
-            .btn-class{
-              cursor: pointer;
-              font-weight: 500;
-              font-size: 26px;
-              line-height: 40px;
-              display: flex;
-              align-items: center;
-              color: #1B365D;
-            }
-            .btn-active-class{
-              cursor: pointer;
-              font-weight: 500;
-              text-decoration: underline;
-              text-underline-offset: 10px;
-              font-size: 26px;
-              line-height: 40px;
-              display: flex;
-              align-items: center;
-              color: #1B365D;
-            }
-          }
-          .content{
-            padding-top: 18px;
-            width: 66%;
-            margin-left: 17%;
-            justify-content: center;
-            align-items: center;
-          }
-          .scan{
-            //padding-top: 6%;
-            width: 70%;
-            height: 296px;
-            margin-left: 15%;
-            justify-content: center;
-            align-items: center;
-            display: flex;
+      .hj-logo{
+        padding-top: 20px;
+        display: flex;
+        justify-content: center;
+      }
+      .tab-class{
+        width: 60%;
+        margin-left: 20%;
+        padding-top: 15px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
 
-            .scan-image{
-              width: 150px;
-              height: 150px;
-              border: 1px solid #1B365D;
-              border-radius: 8px;
-            }
-          }
+        .btn-class{
+          cursor: pointer;
+          font-weight: 500;
+          font-size: 20px;
+          line-height: 40px;
+          display: flex;
+          align-items: center;
+          color: #1B365D;
         }
-        .login-tip{
-            font-size: 16px;
-            text-align: center;
-            color: #c3c3c3;
+        .btn-active-class{
+          cursor: pointer;
+          font-weight: 500;
+          text-decoration: underline;
+          text-underline-offset: 10px;
+          font-size: 20px;
+          line-height: 40px;
+          display: flex;
+          align-items: center;
+          color: #1B365D;
         }
+      }
+      .content{
+        padding-top: 25px;
+        width: 66%;
+        margin-left: 17%;
+        justify-content: center;
+        align-items: center;
+      }
+      .scan{
+        //padding-top: 6%;
+        width: 70%;
+        height: 296px;
+        margin-left: 15%;
+        justify-content: center;
+        align-items: center;
+        display: flex;
+
+        .scan-image{
+          width: 150px;
+          height: 150px;
+          border: 1px solid #1B365D;
+          border-radius: 8px;
+        }
+      }
+    }
+    .login-tip{
+      font-size: 16px;
+      text-align: center;
+      color: #c3c3c3;
     }
+  }
 }
 
 //.title{

+ 12 - 6
src/view/login/login.vue

@@ -35,12 +35,12 @@
           </div>
         </div>
         <div style="width: 90%;display: flex;justify-content: end">
-          东科智能业务运行支撑系统·厂商云
-        </div>
-        <div class="tab-class">
-          <div :class="active == 0? 'btn-active-class':'btn-class' " id="user" @click="changeMode">密码登录</div>
-          <div :class="active == 1? 'btn-active-class':'btn-class' " id="scan" @click="changeMode">扫码登录</div>
+          {{$t('loginSubTitle') }}
         </div>
+<!--        <div class="tab-class">-->
+<!--          <div :class="active == 0? 'btn-active-class':'btn-class' " id="user" @click="changeMode">密码登录</div>-->
+<!--          <div :class="active == 1? 'btn-active-class':'btn-class' " id="scan" @click="changeMode">扫码登录</div>-->
+<!--        </div>-->
         <div v-show="active == 0" class="content">
           <login-form @on-success-valid="handleSubmit" :loading="loading"></login-form>
         </div>
@@ -50,7 +50,7 @@
           <!--          <div style="padding-top: 5px"><b>只支持集团企微扫描登录</b></div>-->
         </div>
 
-        <div style="display: flex;justify-content: end;width: 98%">
+        <div style="display: flex !important;justify-content: end;width: 98%">
           ©2021 东科软件 All rights reserved
         </div>
         <!--                <Card>-->
@@ -234,5 +234,11 @@ export default {
   bottom: 50px;
 }
 
+/deep/.ivu-btn-primary{
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
 
 </style>