Source/plt-web/plt-web-ui/src/page/login/userlogin.vue
@@ -7,17 +7,6 @@
           status-icon
  >
    <!--      <el-form-item prop="selectInput">-->
    <!--        <el-select v-model="loginForm.value" placeholder="请选择组织" style="width: 326px" @change="selectchange">-->
    <!--          <i slot="prefix" class="el-icon-s-operation"/>-->
    <!--          <el-option-->
    <!--            v-for="(item,index) in loginForm.region"-->
    <!--            :key="index"-->
    <!--            :label="item.TENANT_NAME"-->
    <!--            :value="item.TENANT_ID">-->
    <!--          </el-option>-->
    <!--        </el-select>-->
    <!--      </el-form-item>-->
    <el-form-item prop="username">
      <el-input v-model="loginForm.username"
                :placeholder="$t('login.username')"
@@ -71,7 +60,7 @@
  name: "userlogin",
  data() {
    return {
      userName:'',
      userName: '',
      passwordVisible: false,
      passwordForm: {},
      passwordOption: {
@@ -223,6 +212,10 @@
      done();
    },
    handleLogin() {
      if (!this.loginForm.username) {
        this.$message.error('请输入用户名');
        return;
      }
      if (!this.loginForm.password) {
        this.$message.error('请输入密码');
        return;
@@ -237,8 +230,20 @@
          });
          this.$store.dispatch("LoginByUsername", this.loginForm).then((data) => {
            if (data.obj.failCode !== 'loginSuccess') {
              // console.log('data', data);
              if (data.obj.failCode === 'passwordRemainDay') {
                this.$message.warning(data.obj.passwordInfo);
                this.$router.push({path: this.tagWel.value});
                loading.close();
                return;
              }
              if (data.obj.failCode === 'userIsLocked') {
                this.$message.error(`登录错误次数过多,账号被锁定【${data.obj.failMsgArray[0]}】分钟`);
                loading.close();
                return;
              }
              this.$message.error(data.msg);
              if (data.obj.mustChangePassword) {
                this.passwordVisible = true;
              }
@@ -256,7 +261,9 @@
                });
                return false;
              }
            };
            }
            ;
            this.$router.push({path: this.tagWel.value});
            loading.close();
          }).catch((err) => {
@@ -293,8 +300,8 @@
          this.$message.success('修改成功,即将跳转到首页');
          this.passwordVisible = false;
          this.$refs.changeForm.resetFields();
          this.$store.dispatch("LoginByUsername",{...this.loginForm,password:form.confirmPassword}).then(data => {
            if (data.obj.failCode !== 'loginSuccess') {
          this.$store.dispatch("LoginByUsername", {...this.loginForm, password: form.confirmPassword}).then(data => {
            if (data.obj.failCode !== 'loginSuccess' && data.obj.failCode !== 'passwordRemainDay') {
              this.$message.error(data.msg);
            }
            this.$router.push({path: this.tagWel.value});