du
2025-05-30 65af7ba91918364ce2dea9b3ea61f0933d042816
Merge remote-tracking branch 'origin/master'
已修改2个文件
已添加2个文件
44 ■■■■■ 文件已修改
easegen-front/src/assets/imgs/bei5.png 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/assets/imgs/bei6-1.png 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/Login/Login.vue 36 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/views/Login/components/LoginForm.vue 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
easegen-front/src/assets/imgs/bei5.png
easegen-front/src/assets/imgs/bei6-1.png
easegen-front/src/views/Login/Login.vue
@@ -1,9 +1,9 @@
<template>
  <div class="bei">
      <div class="">
      <div class="BeiArea">
        <!-- 左侧图片 -->
         <div class="Left-img" >
            <img src="@/assets/imgs/bei4.png" alt=""/>
            <img src="@/assets/imgs/bei6-1.png" alt=""/>
         </div>
        <!-- 右边的登录界面 -->
        <Transition appear enter-active-class="animate__animated animate__bounceInRight">
@@ -25,7 +25,6 @@
</template>
<script lang="ts" setup>
import { underlineToHump } from '@/utils'
import { useDesign } from '@/hooks/web/useDesign'
import { useAppStore } from '@/store/modules/app'
import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
@@ -58,28 +57,27 @@
.bei{
  width: 100%;
  height: 100%;
  background-image: url('@/assets/imgs/bei3.png');
  background-size: 100% 100%;
  background-repeat: no-repeat;
  background-color: #061C43;
}
.form-box{
  width: 25%;
.bei .BeiArea{
  width: 100%;
  height: 100%;
  display: flex;
  justify-content: space-around;
  align-items: center;
}
.bei .BeiArea .form-box{
  width: 30%;
  padding: 20px;
  box-sizing: border-box;
  background: #fff;
  float: right;
  margin-top: 30vh;
  margin-right: 10vw;
}
.Left-img{
  float: left;
  width: 50%;
  margin-top: 4vh;
  margin-left: 60px;
.bei .BeiArea .Left-img{
  width: 677px; /* 这个地方的值必须用死值 */
}
.Left-img img{
.bei .BeiArea .Left-img img{
  width: 100%;
}
@@ -87,10 +85,6 @@
  .form-box{
    width: 80%;
    float: left;
    margin-left: 10%;
    margin-right: 0;
    margin-top: calc( 50vh - 100px );
  }
  .Left-img{
easegen-front/src/views/Login/components/LoginForm.vue
@@ -59,7 +59,7 @@
              </el-checkbox>
            </el-col>
            <el-col :offset="6" :span="12">
              <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link>
              <!-- <el-link style="float: right" type="primary">{{ t('login.forgetPassword') }}</el-link> -->
            </el-col>
          </el-row>
        </el-form-item>
@@ -85,13 +85,13 @@
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item>
          <el-row :gutter="5" justify="space-between" style="width: 100%">
            <el-col :span="12">
            <!-- <el-col :span="12">
              <XButton
                :title="t('login.btnMobile')"
                class="w-[100%]"
                @click="setLoginState(LoginStateEnum.MOBILE)"
              />
            </el-col>
            </el-col> -->
<!--            <el-col :span="8">-->
<!--              <XButton-->
<!--                :title="t('login.btnQRCode')"-->
@@ -99,7 +99,7 @@
<!--                @click="setLoginState(LoginStateEnum.QR_CODE)"-->
<!--              />-->
<!--            </el-col>-->
            <el-col :span="12">
            <el-col :span="24">
              <XButton
                :title="t('login.btnRegister')"
                class="w-[100%]"