Merge remote-tracking branch 'origin/master'

mes-ui/mes-ui-admin-vue3/src/views/Login/components/LoginForm.vue

@@ -35,7 +35,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px;margin-top:3px;">
         <el-form-item prop="password">
           <el-input
             v-model="loginData.loginForm.password"
@@ -49,7 +49,7 @@
       </el-col>
       <el-col
         :span="24"
-        style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
+        style="padding-right: 10px; padding-left: 10px; margin-top: -7px; margin-bottom: -20px"
       >
         <el-form-item>
           <el-row justify="space-between" style="width: 100%">

mes-ui/mes-ui-admin-vue3/src/views/Login/components/LoginFormTitle.vue

@@ -1,7 +1,7 @@
 <template>
-  <h2 class="enter-x mb-3 text-center text-2xl font-bold xl:text-center xl:text-3xl">
+  <p class="text-center" style="font-size:24px !important;  font-weight: 600;">
         {{ getFormTitle }}
-  </h2>
+  </p>
 </template>
 <script lang="ts" setup>
 import { LoginStateEnum, useLoginState } from './useLogin'