zpy

c3f239e5 · zhaopanyu · 02d06a7d · c3f239e5 · c3f239e5 · c3f239e5
Commit c3f239e5 authored Oct 12, 2024 by zhaopanyu
Showing with 51 additions and 72 deletions

src/views/benchmarkVoting/index.vue
+0 -0

src/views/login.vue
+23 -33

src/views/register.vue
+21 -32

src/views/system/user/index.vue
+0 -0

src/views/system/user/profile/resetPwd.vue
+7 -7

No files found.
--- a/src/views/benchmarkVoting/index.vue
+++ b/src/views/benchmarkVoting/index.vue
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -3,49 +3,29 @@
    <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
      <h3 class="title">若依后台管理系统</h3>
      <el-form-item prop="username">
-        <el-input
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码"
-          v-model="loginForm.password"
+          @keyup.enter.native="handleLogin">
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
+        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-          v-model="loginForm.code"
+          @keyup.enter.native="handleLogin">
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
        </el-input>
        <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          <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 style="width:100%;">
-        <el-button
+        <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
-          :loading="loading"
+          @click.native.prevent="handleLogin">
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
          <span v-if="!loading">登 录</span>
          <span v-else>登 录 中...</span>
        </el-button>
@@ -72,8 +52,8 @@ export default {
    return {
      codeUrl: "",
      loginForm: {
-        username: "admin",
+        // username: "admin",
-        password: "admin123",
+        // password: "admin123",
        rememberMe: false,
        code: "",
        uuid: ""
@@ -83,7 +63,8 @@ export default {
          { required: true, trigger: "blur", message: "请输入您的账号" }
        ],
        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&])\S{6,20}$/, message: '用户密码长度为 6 到 20 个字符，且必须包含字母、数字以及特殊符号', trigger: 'blur' }
        ],
        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
      },
@@ -97,7 +78,7 @@ export default {
  },
  watch: {
    $route: {
-      handler: function(route) {
+      handler: function (route) {
        this.redirect = route.query && route.query.redirect;
      },
      immediate: true
@@ -141,7 +122,7 @@ export default {
            Cookies.remove('rememberMe');
          }
          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
+            this.$router.push({ path: this.redirect || "/" }).catch(() => { });
          }).catch(() => {
            this.loading = false;
            if (this.captchaEnabled) {
@@ -164,6 +145,7 @@ export default {
  background-image: url("../assets/images/login-background.jpg");
  background-size: cover;
 }
 .title {
  margin: 0px auto 30px auto;
  text-align: center;
@@ -175,32 +157,39 @@ export default {
  background: #ffffff;
  width: 400px;
  padding: 25px 25px 5px 25px;
  .el-input {
    height: 38px;
    input {
      height: 38px;
    }
  }
  .input-icon {
    height: 39px;
    width: 14px;
    margin-left: 2px;
  }
 }
 .login-tip {
  font-size: 13px;
  text-align: center;
  color: #bfbfbf;
 }
 .login-code {
  width: 33%;
  height: 38px;
  float: right;
  img {
    cursor: pointer;
    vertical-align: middle;
  }
 }
 .el-login-footer {
  height: 40px;
  line-height: 40px;
@@ -213,6 +202,7 @@ export default {
  font-size: 12px;
  letter-spacing: 1px;
 }
 .login-code-img {
  height: 38px;
 }

--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -8,49 +8,29 @@
        </el-input>
      </el-form-item>
      <el-form-item prop="password">
-        <el-input
+        <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码"
-          v-model="registerForm.password"
+          @keyup.enter.native="handleRegister">
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleRegister"
-        >
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <el-form-item prop="confirmPassword">
-        <el-input
+        <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码"
-          v-model="registerForm.confirmPassword"
+          @keyup.enter.native="handleRegister">
-          type="password"
-          auto-complete="off"
-          placeholder="确认密码"
-          @keyup.enter.native="handleRegister"
-        >
          <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
      <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
+        <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-          v-model="registerForm.code"
+          @keyup.enter.native="handleRegister">
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleRegister"
-        >
          <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
        </el-input>
        <div class="register-code">
-          <img :src="codeUrl" @click="getCode" class="register-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="register-code-img" />
        </div>
      </el-form-item>
      <el-form-item style="width:100%;">
-        <el-button
+        <el-button :loading="loading" size="medium" type="primary" style="width:100%;"
-          :loading="loading"
+          @click.native.prevent="handleRegister">
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleRegister"
-        >
          <span v-if="!loading">注 册</span>
          <span v-else>注 册 中...</span>
        </el-button>
@@ -95,8 +75,8 @@ export default {
        ],
        password: [
          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&])\S{6,20}$/, message: '用户密码长度为 6 到 20 个字符，且必须包含字母、数字以及特殊符号', trigger: 'blur' }
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          // { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
        ],
        confirmPassword: [
          { required: true, trigger: "blur", message: "请再次输入您的密码" },
@@ -132,7 +112,7 @@ export default {
              type: 'success'
            }).then(() => {
              this.$router.push("/login");
-            }).catch(() => {});
+            }).catch(() => { });
          }).catch(() => {
            this.loading = false;
            if (this.captchaEnabled) {
@@ -155,6 +135,7 @@ export default {
  background-image: url("../assets/images/login-background.jpg");
  background-size: cover;
 }
 .title {
  margin: 0px auto 30px auto;
  text-align: center;
@@ -166,32 +147,39 @@ export default {
  background: #ffffff;
  width: 400px;
  padding: 25px 25px 5px 25px;
  .el-input {
    height: 38px;
    input {
      height: 38px;
    }
  }
  .input-icon {
    height: 39px;
    width: 14px;
    margin-left: 2px;
  }
 }
 .register-tip {
  font-size: 13px;
  text-align: center;
  color: #bfbfbf;
 }
 .register-code {
  width: 33%;
  height: 38px;
  float: right;
  img {
    cursor: pointer;
    vertical-align: middle;
  }
 }
 .el-register-footer {
  height: 40px;
  line-height: 40px;
@@ -204,6 +192,7 @@ export default {
  font-size: 12px;
  letter-spacing: 1px;
 }
 .register-code-img {
  height: 38px;
 }

--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
--- a/src/views/system/user/profile/resetPwd.vue
+++ b/src/views/system/user/profile/resetPwd.vue
 <template>
  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
+      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
    </el-form-item>
    <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
+      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
    </el-form-item>
    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password/>
+      <el-input v-model="user.confirmPassword" placeholder="请确认新密码" type="password" show-password />
    </el-form-item>
    <el-form-item>
      <el-button type="primary" size="mini" @click="submit">保存</el-button>
@@ -37,16 +37,16 @@ export default {
      // 表单校验
      rules: {
        oldPassword: [
-          { required: true, message: "旧密码不能为空", trigger: "blur" }
+          { required: true, message: "旧密码不能为空", trigger: "blur" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&])\S{6,20}$/, message: '用户密码长度为 6 到 20 个字符，且必须包含字母、数字以及特殊符号', trigger: 'blur' }
        ],
        newPassword: [
          { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&])\S{6,20}$/, message: '用户密码长度为 6 到 20 个字符，且必须包含字母、数字以及特殊符号', trigger: 'blur' }
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
        ],
        confirmPassword: [
          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*?&])\S{6,20}$/, message: '用户密码长度为 6 到 20 个字符，且必须包含字母、数字以及特殊符号', trigger: 'blur' }
        ]
      }
    };