Merge remote-tracking branch 'origin/dev' into dev

gaoluyang

2025-05-08 fc621495bc5a887b2654cc18d0ab7511f9a8d36a

 src/views/login.vue

@@ -2,6 +2,7 @@
  <div class="login">

    <el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">

      <h3 class="title">{{ title }}</h3>

      <el-divider />

      <el-form-item prop="username">

        <el-input

          v-model="loginForm.username"

@@ -10,7 +11,7 @@
          auto-complete="off"

          placeholder="账号"

        >

          <template #prefix><svg-icon icon-class="user" class="el-input__icon input-icon" /></template>

          <template #prefix><el-icon><User /></el-icon></template>

        </el-input>

      </el-form-item>

      <el-form-item prop="password">

@@ -20,27 +21,27 @@
          size="large"

          auto-complete="off"

          placeholder="密码"

          show-password

          @keyup.enter="handleLogin"

        >

          <template #prefix><svg-icon icon-class="password" class="el-input__icon input-icon" /></template>

        </el-input>

      </el-form-item>

      <el-form-item prop="code" v-if="captchaEnabled">

        <el-input

          v-model="loginForm.code"

          size="large"

          auto-complete="off"

          placeholder="验证码"

          style="width: 63%"

          @keyup.enter="handleLogin"

        >

          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>

        </el-input>

        <div class="login-code">

          <img :src="codeUrl" @click="getCode" class="login-code-img"/>

        </div>

      </el-form-item>

      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>

<!--      <el-form-item prop="code" v-if="captchaEnabled">-->

<!--        <el-input-->

<!--          v-model="loginForm.code"-->

<!--          size="large"-->

<!--          auto-complete="off"-->

<!--          placeholder="验证码"-->

<!--          style="width: 63%"-->

<!--          @keyup.enter="handleLogin"-->

<!--        >-->

<!--          <template #prefix><svg-icon icon-class="validCode" class="el-input__icon input-icon" /></template>-->

<!--        </el-input>-->

<!--        <div class="login-code">-->

<!--          <img :src="codeUrl" @click="getCode" class="login-code-img"/>-->

<!--        </div>-->

<!--      </el-form-item>-->

      <el-form-item style="width:100%;">

        <el-button

          :loading="loading"

@@ -56,11 +57,12 @@
          <router-link class="link-type" :to="'/register'">立即注册</router-link>

        </div>

      </el-form-item>

      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>

    </el-form>

    <!--  底部  -->

    <div class="el-login-footer">

      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>

    </div>

<!--    <div class="el-login-footer">-->

<!--      <span>Copyright © 2018-2025 ruoyi.vip All Rights Reserved.</span>-->

<!--    </div>-->

  </div>

</template>



@@ -80,14 +82,14 @@
  username: "admin",

  password: "admin123",

  rememberMe: false,

  code: "",

  // code: "",

  uuid: ""

})



const loginRules = {

  username: [{ required: true, trigger: "blur", message: "请输入您的账号" }],

  password: [{ required: true, trigger: "blur", message: "请输入您的密码" }],

  code: [{ required: true, trigger: "change", message: "请输入验证码" }]

  // code: [{ required: true, trigger: "change", message: "请输入验证码" }]

}



const codeUrl = ref("")

@@ -165,24 +167,29 @@


<style lang='scss' scoped>

.login {

  display: flex;

  justify-content: center;

  align-items: center;

  height: 100%;

  background-image: url("../assets/images/login-background.jpg");

  background-size: cover;

  position: relative;

}

.title {

  margin: 0px auto 30px auto;

  margin: 20px auto 14px auto;

  text-align: center;

  color: #707070;

  color: #2C51D9;

  font-size: 28px;

  font-weight: 700;

}



.login-form {

  position: absolute;

  top: 50%;

  right: 19%;

  transform: translate(0, -50%);

  border-radius: 6px;

  background: #ffffff;

  width: 400px;

  padding: 25px 25px 5px 25px;

  width: 420px;

  height: 500px;

  padding: 40px;

  z-index: 1;

  .el-input {

    height: 40px;

@@ -226,4 +233,9 @@
  height: 40px;

  padding-left: 12px;

}

:deep() {

  .el-form-item--default {

    margin-bottom: 36px;

  }

}

</style>