|
|
@@ -5,27 +5,32 @@
|
|
|
<a-tabs
|
|
|
:activeKey="customActiveKey"
|
|
|
:tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
|
|
|
- @change="handleTabClick">
|
|
|
+ @change="handleTabClick"
|
|
|
+ >
|
|
|
<!-- 账户名 -->
|
|
|
<a-tab-pane key="tab1" tab="账号密码登录">
|
|
|
<a-form-item>
|
|
|
<a-input
|
|
|
size="large"
|
|
|
- v-decorator="['username',validatorRules.username,{ validator: this.handleUsernameOrEmail }]"
|
|
|
+ v-decorator="['username', validatorRules.username, { validator: this.handleUsernameOrEmail }]"
|
|
|
type="text"
|
|
|
- placeholder="请输入帐户名 / admin">
|
|
|
- <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
+ placeholder="请输入帐户名"
|
|
|
+ >
|
|
|
+ <!-- / admin-->
|
|
|
+ <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }" />
|
|
|
</a-input>
|
|
|
</a-form-item>
|
|
|
|
|
|
<a-form-item>
|
|
|
<a-input
|
|
|
- v-decorator="['password',validatorRules.password]"
|
|
|
+ v-decorator="['password', validatorRules.password]"
|
|
|
size="large"
|
|
|
type="password"
|
|
|
autocomplete="false"
|
|
|
- placeholder="密码 / 123456">
|
|
|
- <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
|
|
|
+ placeholder="密码 "
|
|
|
+ >
|
|
|
+ <!-- / 123456 -->
|
|
|
+ <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }" />
|
|
|
</a-input>
|
|
|
</a-form-item>
|
|
|
|
|
|
@@ -49,14 +54,12 @@
|
|
|
<img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
|
|
|
<!–<j-graphic-code @success="generateCode" ref="jgraphicCodeRef" style="float: right" remote></j-graphic-code>–>
|
|
|
</a-col>-->
|
|
|
-
|
|
|
+
|
|
|
<!-- <a-col :span="24">
|
|
|
<j-slider @onSuccess="sliderSuccess"></j-slider>
|
|
|
<span style="color: red;">{{slideredMsg}}</span>
|
|
|
</a-col> -->
|
|
|
-
|
|
|
</a-row>
|
|
|
-
|
|
|
</a-tab-pane>
|
|
|
|
|
|
<!--todo 暂无短信服务-->
|
|
|
@@ -97,7 +100,7 @@
|
|
|
|
|
|
<!-- 自动登录 -->
|
|
|
<a-form-item>
|
|
|
- <a-checkbox v-decorator="['rememberMe', {initialValue: true, valuePropName: 'checked'}]" >自动登录</a-checkbox>
|
|
|
+ <a-checkbox v-decorator="['rememberMe', { initialValue: true, valuePropName: 'checked' }]">自动登录</a-checkbox>
|
|
|
<!-- <router-link :disabled="true" :to="{ name: 'alteration'}" class="forge-password" style="float: right;">
|
|
|
忘记密码(暂无短信服务，不可用)
|
|
|
</router-link>
|
|
|
@@ -115,11 +118,12 @@
|
|
|
class="login-button"
|
|
|
:loading="loginBtn"
|
|
|
@click.stop.prevent="handleSubmit"
|
|
|
- :disabled="loginBtn">确定
|
|
|
+ :disabled="loginBtn"
|
|
|
+ >确定
|
|
|
</a-button>
|
|
|
</a-form-item>
|
|
|
|
|
|
- <!---------------------------------------------------------------
|
|
|
+ <!---------------------------------------------------------------
|
|
|
<div class="user-login-other">
|
|
|
<span>其他登陆方式</span>
|
|
|
<a><a-icon class="item-icon" type="alipay-circle"></a-icon></a>
|
|
|
@@ -136,15 +140,10 @@
|
|
|
v-if="requiredTwoStepCaptcha"
|
|
|
:visible="stepCaptchaVisible"
|
|
|
@success="stepCaptchaSuccess"
|
|
|
- @cancel="stepCaptchaCancel"></two-step-captcha>
|
|
|
-
|
|
|
- <a-modal
|
|
|
- title="登录公司选择"
|
|
|
- :width="450"
|
|
|
- :visible="departVisible"
|
|
|
- :closable="false"
|
|
|
- :maskClosable="false">
|
|
|
+ @cancel="stepCaptchaCancel"
|
|
|
+ ></two-step-captcha>
|
|
|
|
|
|
+ <a-modal title="登录公司选择" :width="450" :visible="departVisible" :closable="false" :maskClosable="false">
|
|
|
<template slot="footer">
|
|
|
<a-button type="primary" @click="departOk">确认</a-button>
|
|
|
</template>
|
|
|
@@ -172,381 +171,387 @@
|
|
|
</a-select>
|
|
|
</a-form-item> -->
|
|
|
<a-form-item
|
|
|
- :labelCol="{span:4}"
|
|
|
- :wrapperCol="{span:20}"
|
|
|
+ :labelCol="{ span: 4 }"
|
|
|
+ :wrapperCol="{ span: 20 }"
|
|
|
style="margin-bottom:10px"
|
|
|
- :validate-status="validate_status">
|
|
|
- <a-tooltip placement="topLeft" >
|
|
|
+ :validate-status="validate_status"
|
|
|
+ >
|
|
|
+ <a-tooltip placement="topLeft">
|
|
|
<template slot="title">
|
|
|
<span>您隶属于多公司，请选择登录公司</span>
|
|
|
</template>
|
|
|
<a-avatar style="backgroundColor:#87d068" icon="gold" />
|
|
|
</a-tooltip>
|
|
|
- <a-select @change="departChange" :class="{'valid-error':validate_status=='error'}" placeholder="请选择登录公司" style="margin-left:10px;width: 80%">
|
|
|
+ <a-select
|
|
|
+ @change="departChange"
|
|
|
+ :class="{ 'valid-error': validate_status == 'error' }"
|
|
|
+ placeholder="请选择登录公司"
|
|
|
+ style="margin-left:10px;width: 80%"
|
|
|
+ >
|
|
|
<a-icon slot="suffixIcon" type="gold" />
|
|
|
- <a-select-option
|
|
|
- v-for="d in orgList"
|
|
|
- :key="d.id"
|
|
|
- :value="d.id">
|
|
|
+ <a-select-option v-for="d in orgList" :key="d.id" :value="d.id">
|
|
|
{{ d.departName }}
|
|
|
</a-select-option>
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-form>
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
</a-modal>
|
|
|
-
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
- //import md5 from "md5"
|
|
|
- import api from '@/api'
|
|
|
- import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
|
|
|
- import { mapActions } from "vuex"
|
|
|
- import { timeFix } from "@/utils/util"
|
|
|
- import Vue from 'vue'
|
|
|
- import { ACCESS_TOKEN ,ENCRYPTED_STRING} from "@/store/mutation-types"
|
|
|
- import JGraphicCode from '@/components/jeecg/JGraphicCode'
|
|
|
- import { putAction,postAction,getAction } from '@/api/manage'
|
|
|
- import { encryption , getEncryptedString } from '@/utils/encryption/aesEncrypt'
|
|
|
- import store from '@/store/'
|
|
|
- import { USER_INFO } from "@/store/mutation-types"
|
|
|
- import JSlider from '@/components/jeecg/JSlider'
|
|
|
-
|
|
|
- export default {
|
|
|
+// import md5 from "md5"
|
|
|
+import api from '@/api'
|
|
|
+import TwoStepCaptcha from '@/components/tools/TwoStepCaptcha'
|
|
|
+import { mapActions } from 'vuex'
|
|
|
+import { timeFix } from '@/utils/util'
|
|
|
+import Vue from 'vue'
|
|
|
+import { ACCESS_TOKEN, ENCRYPTED_STRING, USER_INFO } from '@/store/mutation-types'
|
|
|
+import JGraphicCode from '@/components/jeecg/JGraphicCode'
|
|
|
+import { putAction, postAction, getAction } from '@/api/manage'
|
|
|
+import { encryption, getEncryptedString } from '@/utils/encryption/aesEncrypt'
|
|
|
+import store from '@/store/'
|
|
|
+
|
|
|
+import JSlider from '@/components/jeecg/JSlider'
|
|
|
+
|
|
|
+export default {
|
|
|
components: {
|
|
|
- TwoStepCaptcha,JSlider,
|
|
|
- JGraphicCode
|
|
|
+ TwoStepCaptcha,
|
|
|
+ JSlider,
|
|
|
+ JGraphicCode
|
|
|
},
|
|
|
data () {
|
|
|
- return {
|
|
|
- customActiveKey: "tab1",
|
|
|
- loginBtn: false,
|
|
|
- // login type: 0 email, 1 username, 2 telephone
|
|
|
- loginType: 0,
|
|
|
- requiredTwoStepCaptcha: false,
|
|
|
- stepCaptchaVisible: false,
|
|
|
- form: this.$form.createForm(this),
|
|
|
- encryptedString:{
|
|
|
- key:"",
|
|
|
- iv:"",
|
|
|
- },
|
|
|
- state: {
|
|
|
- time: 60,
|
|
|
- smsSendBtn: false,
|
|
|
- },
|
|
|
- validatorRules:{
|
|
|
- username:{rules: [{ required: true, message: '请输入用户名!'},{validator: this.handleUsernameOrEmail}]},
|
|
|
- password:{rules: [{ required: true, message: '请输入密码!',validator: 'click'}]},
|
|
|
- mobile:{rules: [{validator:this.validateMobile}]},
|
|
|
- captcha:{rule: [{ required: true, message: '请输入验证码!'}]},
|
|
|
- inputCode:{rules: [{ required: true, message: '请输入验证码!'}]}
|
|
|
- },
|
|
|
- verifiedCode:"",
|
|
|
- inputCodeContent:"",
|
|
|
- inputCodeNull:true,
|
|
|
-
|
|
|
- departList:[],
|
|
|
- departVisible:false,
|
|
|
- departSelected:"",
|
|
|
- currentUsername:"",
|
|
|
- validate_status:"",
|
|
|
- currdatetime:'',
|
|
|
- randCodeImage:'',
|
|
|
- requestCodeSuccess:false,
|
|
|
- slidered: false,
|
|
|
- slideredMsg: '',
|
|
|
- orgList:[]
|
|
|
- }
|
|
|
+ return {
|
|
|
+ customActiveKey: 'tab1',
|
|
|
+ loginBtn: false,
|
|
|
+ // login type: 0 email, 1 username, 2 telephone
|
|
|
+ loginType: 0,
|
|
|
+ requiredTwoStepCaptcha: false,
|
|
|
+ stepCaptchaVisible: false,
|
|
|
+ form: this.$form.createForm(this),
|
|
|
+ encryptedString: {
|
|
|
+ key: '',
|
|
|
+ iv: ''
|
|
|
+ },
|
|
|
+ state: {
|
|
|
+ time: 60,
|
|
|
+ smsSendBtn: false
|
|
|
+ },
|
|
|
+ validatorRules: {
|
|
|
+ username: { rules: [{ required: true, message: '请输入用户名!' }, { validator: this.handleUsernameOrEmail }] },
|
|
|
+ password: { rules: [{ required: true, message: '请输入密码!', validator: 'click' }] },
|
|
|
+ mobile: { rules: [{ validator: this.validateMobile }] },
|
|
|
+ captcha: { rule: [{ required: true, message: '请输入验证码!' }] },
|
|
|
+ inputCode: { rules: [{ required: true, message: '请输入验证码!' }] }
|
|
|
+ },
|
|
|
+ verifiedCode: '',
|
|
|
+ inputCodeContent: '',
|
|
|
+ inputCodeNull: true,
|
|
|
+
|
|
|
+ departList: [],
|
|
|
+ departVisible: false,
|
|
|
+ departSelected: '',
|
|
|
+ currentUsername: '',
|
|
|
+ validate_status: '',
|
|
|
+ currdatetime: '',
|
|
|
+ randCodeImage: '',
|
|
|
+ requestCodeSuccess: false,
|
|
|
+ slidered: false,
|
|
|
+ slideredMsg: '',
|
|
|
+ orgList: []
|
|
|
+ }
|
|
|
},
|
|
|
created () {
|
|
|
- this.currdatetime = new Date().getTime();
|
|
|
- Vue.ls.remove(ACCESS_TOKEN)
|
|
|
- this.getRouterData();
|
|
|
- this.handleChangeCheckCode();
|
|
|
- // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
- //this.getEncrypte();
|
|
|
- // update-end- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
+ this.currdatetime = new Date().getTime()
|
|
|
+ Vue.ls.remove(ACCESS_TOKEN)
|
|
|
+ this.getRouterData()
|
|
|
+ this.handleChangeCheckCode()
|
|
|
+ // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
+ // this.getEncrypte();
|
|
|
+ // update-end- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
},
|
|
|
methods: {
|
|
|
- ...mapActions([ "Login", "Logout","PhoneLogin" ]),
|
|
|
- // handler
|
|
|
- handleUsernameOrEmail (rule, value, callback) {
|
|
|
- const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
|
|
|
- if (regex.test(value)) {
|
|
|
- this.loginType = 0
|
|
|
- } else {
|
|
|
- this.loginType = 1
|
|
|
- }
|
|
|
- callback()
|
|
|
- },
|
|
|
- handleTabClick (key) {
|
|
|
- this.customActiveKey = key
|
|
|
- // this.form.resetFields()
|
|
|
- },
|
|
|
- handleSubmit () {
|
|
|
- let that = this
|
|
|
- that.slidered=true;
|
|
|
- // if (!that.slidered){
|
|
|
- // this.slideredMsg = '请拖动滑块！';
|
|
|
- // }
|
|
|
- let loginParams = {};
|
|
|
- that.loginBtn = true;
|
|
|
- // 使用账户密码登陆
|
|
|
- if (that.customActiveKey === 'tab1') {
|
|
|
- that.form.validateFields([ 'username', 'password',/*'inputCode',*/ 'rememberMe' ], { force: true }, (err, values) => {
|
|
|
- if (!err) {
|
|
|
- loginParams.username = values.username
|
|
|
- // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
- //loginParams.password = md5(values.password)
|
|
|
- //loginParams.password = encryption(values.password,that.encryptedString.key,that.encryptedString.iv)
|
|
|
- loginParams.password = values.password
|
|
|
- loginParams.remember_me = values.rememberMe
|
|
|
- // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
- loginParams.captcha = that.inputCodeContent
|
|
|
- loginParams.slidered = that.slidered
|
|
|
- loginParams.checkKey = that.currdatetime
|
|
|
- console.log("登录参数",loginParams)
|
|
|
- that.Login(loginParams).then((res) => {
|
|
|
- this.departConfirm(res)
|
|
|
- }).catch((err) => {
|
|
|
- that.requestFailed(err);
|
|
|
- });
|
|
|
-
|
|
|
-
|
|
|
- }else {
|
|
|
- that.loginBtn = false;
|
|
|
+ ...mapActions(['Login', 'Logout', 'PhoneLogin']),
|
|
|
+ // handler
|
|
|
+ handleUsernameOrEmail (rule, value, callback) {
|
|
|
+ const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
|
|
|
+ if (regex.test(value)) {
|
|
|
+ this.loginType = 0
|
|
|
+ } else {
|
|
|
+ this.loginType = 1
|
|
|
}
|
|
|
- })
|
|
|
- // 使用手机号登陆
|
|
|
- } else {
|
|
|
- that.form.validateFields([ 'mobile', 'captcha', 'rememberMe' ], { force: true }, (err, values) => {
|
|
|
- if (!err) {
|
|
|
- loginParams.mobile = values.mobile
|
|
|
- loginParams.captcha = values.captcha
|
|
|
- loginParams.remember_me = values.rememberMe
|
|
|
- that.PhoneLogin(loginParams).then((res) => {
|
|
|
- console.log(res.result);
|
|
|
- this.departConfirm(res)
|
|
|
- }).catch((err) => {
|
|
|
- that.requestFailed(err);
|
|
|
- })
|
|
|
-
|
|
|
+ callback()
|
|
|
+ },
|
|
|
+ handleTabClick (key) {
|
|
|
+ this.customActiveKey = key
|
|
|
+ // this.form.resetFields()
|
|
|
+ },
|
|
|
+ handleSubmit () {
|
|
|
+ let that = this
|
|
|
+ that.slidered = true
|
|
|
+ // if (!that.slidered){
|
|
|
+ // this.slideredMsg = '请拖动滑块！';
|
|
|
+ // }
|
|
|
+ let loginParams = {}
|
|
|
+ that.loginBtn = true
|
|
|
+ // 使用账户密码登陆
|
|
|
+ if (that.customActiveKey === 'tab1') {
|
|
|
+ that.form.validateFields(
|
|
|
+ ['username', 'password', /* 'inputCode', */ 'rememberMe'],
|
|
|
+ { force: true },
|
|
|
+ (err, values) => {
|
|
|
+ if (!err) {
|
|
|
+ loginParams.username = values.username
|
|
|
+ // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
+ // loginParams.password = md5(values.password)
|
|
|
+ // loginParams.password = encryption(values.password,that.encryptedString.key,that.encryptedString.iv)
|
|
|
+ loginParams.password = values.password
|
|
|
+ loginParams.remember_me = values.rememberMe
|
|
|
+ // update-begin- --- author:scott ------ date:20190805 ---- for:密码加密逻辑暂时注释掉，有点问题
|
|
|
+ loginParams.captcha = that.inputCodeContent
|
|
|
+ loginParams.slidered = that.slidered
|
|
|
+ loginParams.checkKey = that.currdatetime
|
|
|
+ console.log('登录参数', loginParams)
|
|
|
+ that
|
|
|
+ .Login(loginParams)
|
|
|
+ .then(res => {
|
|
|
+ this.departConfirm(res)
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ that.requestFailed(err)
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ that.loginBtn = false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ )
|
|
|
+ // 使用手机号登陆
|
|
|
+ } else {
|
|
|
+ that.form.validateFields(['mobile', 'captcha', 'rememberMe'], { force: true }, (err, values) => {
|
|
|
+ if (!err) {
|
|
|
+ loginParams.mobile = values.mobile
|
|
|
+ loginParams.captcha = values.captcha
|
|
|
+ loginParams.remember_me = values.rememberMe
|
|
|
+ that
|
|
|
+ .PhoneLogin(loginParams)
|
|
|
+ .then(res => {
|
|
|
+ console.log(res.result)
|
|
|
+ this.departConfirm(res)
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ that.requestFailed(err)
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
- })
|
|
|
- }
|
|
|
- },
|
|
|
- getCaptcha (e) {
|
|
|
- e.preventDefault();
|
|
|
- let that = this;
|
|
|
- this.form.validateFields([ 'mobile' ], { force: true },(err,values) => {
|
|
|
- if(!values.mobile){
|
|
|
- that.cmsFailed("请输入手机号");
|
|
|
- }else if (!err) {
|
|
|
- this.state.smsSendBtn = true;
|
|
|
- let interval = window.setInterval(() => {
|
|
|
- if (that.state.time-- <= 0) {
|
|
|
- that.state.time = 60;
|
|
|
- that.state.smsSendBtn = false;
|
|
|
- window.clearInterval(interval);
|
|
|
+ },
|
|
|
+ getCaptcha (e) {
|
|
|
+ e.preventDefault()
|
|
|
+ let that = this
|
|
|
+ this.form.validateFields(['mobile'], { force: true }, (err, values) => {
|
|
|
+ if (!values.mobile) {
|
|
|
+ that.cmsFailed('请输入手机号')
|
|
|
+ } else if (!err) {
|
|
|
+ this.state.smsSendBtn = true
|
|
|
+ let interval = window.setInterval(() => {
|
|
|
+ if (that.state.time-- <= 0) {
|
|
|
+ that.state.time = 60
|
|
|
+ that.state.smsSendBtn = false
|
|
|
+ window.clearInterval(interval)
|
|
|
+ }
|
|
|
+ }, 1000)
|
|
|
+
|
|
|
+ const hide = this.$message.loading('验证码发送中..', 0)
|
|
|
+ let smsParams = {}
|
|
|
+ smsParams.mobile = values.mobile
|
|
|
+ smsParams.smsmode = '0'
|
|
|
+ postAction('/sys/sms', smsParams)
|
|
|
+ .then(res => {
|
|
|
+ if (!res.success) {
|
|
|
+ setTimeout(hide, 0)
|
|
|
+ this.cmsFailed(res.message)
|
|
|
+ }
|
|
|
+ console.log(res)
|
|
|
+ setTimeout(hide, 500)
|
|
|
+ })
|
|
|
+ .catch(err => {
|
|
|
+ setTimeout(hide, 1)
|
|
|
+ clearInterval(interval)
|
|
|
+ that.state.time = 60
|
|
|
+ that.state.smsSendBtn = false
|
|
|
+ this.requestFailed(err)
|
|
|
+ })
|
|
|
}
|
|
|
- }, 1000);
|
|
|
-
|
|
|
- const hide = this.$message.loading('验证码发送中..', 0);
|
|
|
- let smsParams = {};
|
|
|
- smsParams.mobile=values.mobile;
|
|
|
- smsParams.smsmode="0";
|
|
|
- postAction("/sys/sms",smsParams)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ stepCaptchaSuccess () {
|
|
|
+ this.loginSuccess()
|
|
|
+ },
|
|
|
+ stepCaptchaCancel () {
|
|
|
+ this.Logout().then(() => {
|
|
|
+ this.loginBtn = false
|
|
|
+ this.stepCaptchaVisible = false
|
|
|
+ })
|
|
|
+ },
|
|
|
+ handleChangeCheckCode () {
|
|
|
+ this.currdatetime = new Date().getTime()
|
|
|
+ getAction(`/sys/randomImage/${this.currdatetime}`)
|
|
|
.then(res => {
|
|
|
- if(!res.success){
|
|
|
- setTimeout(hide, 0);
|
|
|
- this.cmsFailed(res.message);
|
|
|
- }
|
|
|
- console.log(res);
|
|
|
- setTimeout(hide, 500);
|
|
|
+ if (res.success) {
|
|
|
+ this.randCodeImage = res.result
|
|
|
+ this.requestCodeSuccess = true
|
|
|
+ } else {
|
|
|
+ this.$message.error(res.message)
|
|
|
+ this.requestCodeSuccess = false
|
|
|
+ }
|
|
|
+ })
|
|
|
+ .catch(() => {
|
|
|
+ this.requestCodeSuccess = false
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
- setTimeout(hide, 1);
|
|
|
- clearInterval(interval);
|
|
|
- that.state.time = 60;
|
|
|
- that.state.smsSendBtn = false;
|
|
|
- this.requestFailed(err);
|
|
|
- });
|
|
|
+ },
|
|
|
+ loginSuccess () {
|
|
|
+ // update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
|
|
|
+ // this.loginBtn = false
|
|
|
+ // update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
|
|
|
+ this.$router.push({ name: 'dashboard' })
|
|
|
+ this.$notification.success({
|
|
|
+ message: '欢迎',
|
|
|
+ description: `${timeFix()}，欢迎回来`
|
|
|
+ })
|
|
|
+ },
|
|
|
+ cmsFailed (err) {
|
|
|
+ this.$notification['error']({
|
|
|
+ message: '登录失败',
|
|
|
+ description: err,
|
|
|
+ duration: 4
|
|
|
+ })
|
|
|
+ },
|
|
|
+ requestFailed (err) {
|
|
|
+ this.$notification['error']({
|
|
|
+ message: '登录失败',
|
|
|
+ description: ((err.response || {}).data || {}).message || err.message || '请求出现错误，请稍后再试',
|
|
|
+ duration: 4
|
|
|
+ })
|
|
|
+ this.loginBtn = false
|
|
|
+ },
|
|
|
+ validateMobile (rule, value, callback) {
|
|
|
+ if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)) {
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ callback('您的手机号码格式不正确!')
|
|
|
}
|
|
|
- }
|
|
|
- );
|
|
|
- },
|
|
|
- stepCaptchaSuccess () {
|
|
|
- this.loginSuccess()
|
|
|
- },
|
|
|
- stepCaptchaCancel () {
|
|
|
- this.Logout().then(() => {
|
|
|
- this.loginBtn = false
|
|
|
- this.stepCaptchaVisible = false
|
|
|
- })
|
|
|
- },
|
|
|
- handleChangeCheckCode(){
|
|
|
- this.currdatetime = new Date().getTime();
|
|
|
- getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
|
|
|
- if(res.success){
|
|
|
- this.randCodeImage = res.result
|
|
|
- this.requestCodeSuccess=true
|
|
|
- }else{
|
|
|
- this.$message.error(res.message)
|
|
|
- this.requestCodeSuccess=false
|
|
|
- }
|
|
|
- }).catch(()=>{
|
|
|
- this.requestCodeSuccess=false
|
|
|
- })
|
|
|
- },
|
|
|
- loginSuccess () {
|
|
|
- // update-begin- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
|
|
|
- // this.loginBtn = false
|
|
|
- // update-end- author:sunjianlei --- date:20190812 --- for: 登录成功后不解除禁用按钮，防止多次点击
|
|
|
- this.$router.push({ name: "dashboard" })
|
|
|
- this.$notification.success({
|
|
|
- message: '欢迎',
|
|
|
- description: `${timeFix()}，欢迎回来`,
|
|
|
- });
|
|
|
- },
|
|
|
- cmsFailed(err){
|
|
|
- this.$notification[ 'error' ]({
|
|
|
- message: "登录失败",
|
|
|
- description:err,
|
|
|
- duration: 4,
|
|
|
- });
|
|
|
- },
|
|
|
- requestFailed (err) {
|
|
|
- this.$notification[ 'error' ]({
|
|
|
- message: '登录失败',
|
|
|
- description: ((err.response || {}).data || {}).message || err.message || "请求出现错误，请稍后再试",
|
|
|
- duration: 4,
|
|
|
- });
|
|
|
- this.loginBtn = false;
|
|
|
- },
|
|
|
- validateMobile(rule,value,callback){
|
|
|
- if (!value || new RegExp(/^1([38][0-9]|4[579]|5[0-3,5-9]|6[6]|7[0135678]|9[89])\d{8}$/).test(value)){
|
|
|
- callback();
|
|
|
- }else{
|
|
|
- callback("您的手机号码格式不正确!");
|
|
|
- }
|
|
|
-
|
|
|
- },
|
|
|
- validateInputCode(rule,value,callback){
|
|
|
- if(!value || this.verifiedCode==this.inputCodeContent){
|
|
|
- callback();
|
|
|
- }else{
|
|
|
- callback("您输入的验证码不正确!");
|
|
|
- }
|
|
|
- },
|
|
|
- generateCode(value){
|
|
|
- this.verifiedCode = value.toLowerCase()
|
|
|
- },
|
|
|
- inputCodeChange(e){
|
|
|
- this.inputCodeContent = e.target.value
|
|
|
- },
|
|
|
- departConfirm(res){
|
|
|
- if(res.success){
|
|
|
- console.log("用户信息",res)
|
|
|
- let multi_depart = res.result.multi_depart
|
|
|
- //0:无部门 1:一个部门 2:多个部门
|
|
|
- if(multi_depart==0){
|
|
|
- this.loginSuccess()
|
|
|
- this.$notification.warn({
|
|
|
- message: '提示',
|
|
|
- // description: `您尚未归属部门,请确认账号信息`,
|
|
|
- description: `您尚未归属公司,请确认账号信息`,
|
|
|
- duration:3
|
|
|
- });
|
|
|
- }else if(multi_depart==2){
|
|
|
- this.departVisible=true
|
|
|
- this.currentUsername=this.form.getFieldValue("username")
|
|
|
- this.departList = res.result.departs
|
|
|
- this.orgList=res.result.orgList
|
|
|
- }else {
|
|
|
- console.log("登录")
|
|
|
- const userInfo = res.result.userInfo;
|
|
|
- Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000);
|
|
|
- store.commit('SET_INFO', userInfo);
|
|
|
- this.loginSuccess()
|
|
|
- }
|
|
|
- }else{
|
|
|
- this.requestFailed(res)
|
|
|
- this.Logout();
|
|
|
- }
|
|
|
- },
|
|
|
- departOk(){
|
|
|
- if(!this.departSelected){
|
|
|
- this.validate_status='error'
|
|
|
- return false
|
|
|
- }
|
|
|
- let obj = {
|
|
|
- orgCode:this.departSelected,
|
|
|
- username:this.form.getFieldValue("username")
|
|
|
- }
|
|
|
- putAction("/sys/selectDepart",obj).then(res=>{
|
|
|
- if(res.success){
|
|
|
- const userInfo = res.result.userInfo;
|
|
|
- Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000);
|
|
|
- store.commit('SET_INFO', userInfo);
|
|
|
- //console.log("---切换组织机构---userInfo-------",store.getters.userInfo.orgCode);
|
|
|
- this.departClear()
|
|
|
- this.loginSuccess()
|
|
|
- }else{
|
|
|
- this.requestFailed(res)
|
|
|
- this.Logout().then(()=>{
|
|
|
- this.departClear()
|
|
|
- });
|
|
|
- }
|
|
|
- })
|
|
|
- },
|
|
|
- departClear(){
|
|
|
- this.departList=[]
|
|
|
- this.departSelected=""
|
|
|
- this.currentUsername=""
|
|
|
- this.departVisible=false
|
|
|
- this.validate_status=''
|
|
|
- this.orgList=[]
|
|
|
- },
|
|
|
- departChange(value){
|
|
|
- this.validate_status='success'
|
|
|
- this.departSelected = value
|
|
|
- },
|
|
|
- getRouterData(){
|
|
|
- this.$nextTick(() => {
|
|
|
- if (this.$route.params.username) {
|
|
|
- this.form.setFieldsValue({
|
|
|
- 'username': this.$route.params.username
|
|
|
- });
|
|
|
+ },
|
|
|
+ validateInputCode (rule, value, callback) {
|
|
|
+ if (!value || this.verifiedCode == this.inputCodeContent) {
|
|
|
+ callback()
|
|
|
+ } else {
|
|
|
+ callback('您输入的验证码不正确!')
|
|
|
+ }
|
|
|
+ },
|
|
|
+ generateCode (value) {
|
|
|
+ this.verifiedCode = value.toLowerCase()
|
|
|
+ },
|
|
|
+ inputCodeChange (e) {
|
|
|
+ this.inputCodeContent = e.target.value
|
|
|
+ },
|
|
|
+ departConfirm (res) {
|
|
|
+ if (res.success) {
|
|
|
+ console.log('用户信息', res)
|
|
|
+ let multi_depart = res.result.multi_depart
|
|
|
+ // 0:无部门 1:一个部门 2:多个部门
|
|
|
+ if (multi_depart == 0) {
|
|
|
+ this.loginSuccess()
|
|
|
+ this.$notification.warn({
|
|
|
+ message: '提示',
|
|
|
+ // description: `您尚未归属部门,请确认账号信息`,
|
|
|
+ description: `您尚未归属公司,请确认账号信息`,
|
|
|
+ duration: 3
|
|
|
+ })
|
|
|
+ } else if (multi_depart == 2) {
|
|
|
+ this.departVisible = true
|
|
|
+ this.currentUsername = this.form.getFieldValue('username')
|
|
|
+ this.departList = res.result.departs
|
|
|
+ this.orgList = res.result.orgList
|
|
|
+ } else {
|
|
|
+ console.log('登录')
|
|
|
+ const userInfo = res.result.userInfo
|
|
|
+ Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
|
|
|
+ store.commit('SET_INFO', userInfo)
|
|
|
+ this.loginSuccess()
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ this.requestFailed(res)
|
|
|
+ this.Logout()
|
|
|
+ }
|
|
|
+ },
|
|
|
+ departOk () {
|
|
|
+ if (!this.departSelected) {
|
|
|
+ this.validate_status = 'error'
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ let obj = {
|
|
|
+ orgCode: this.departSelected,
|
|
|
+ username: this.form.getFieldValue('username')
|
|
|
+ }
|
|
|
+ putAction('/sys/selectDepart', obj).then(res => {
|
|
|
+ if (res.success) {
|
|
|
+ const userInfo = res.result.userInfo
|
|
|
+ Vue.ls.set(USER_INFO, userInfo, 7 * 24 * 60 * 60 * 1000)
|
|
|
+ store.commit('SET_INFO', userInfo)
|
|
|
+ // console.log("---切换组织机构---userInfo-------",store.getters.userInfo.orgCode);
|
|
|
+ this.departClear()
|
|
|
+ this.loginSuccess()
|
|
|
+ } else {
|
|
|
+ this.requestFailed(res)
|
|
|
+ this.Logout().then(() => {
|
|
|
+ this.departClear()
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ departClear () {
|
|
|
+ this.departList = []
|
|
|
+ this.departSelected = ''
|
|
|
+ this.currentUsername = ''
|
|
|
+ this.departVisible = false
|
|
|
+ this.validate_status = ''
|
|
|
+ this.orgList = []
|
|
|
+ },
|
|
|
+ departChange (value) {
|
|
|
+ this.validate_status = 'success'
|
|
|
+ this.departSelected = value
|
|
|
+ },
|
|
|
+ getRouterData () {
|
|
|
+ this.$nextTick(() => {
|
|
|
+ if (this.$route.params.username) {
|
|
|
+ this.form.setFieldsValue({
|
|
|
+ username: this.$route.params.username
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
+ // 获取密码加密规则
|
|
|
+ getEncrypte () {
|
|
|
+ var encryptedString = Vue.ls.get(ENCRYPTED_STRING)
|
|
|
+ if (encryptedString == null) {
|
|
|
+ getEncryptedString().then(data => {
|
|
|
+ this.encryptedString = data
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ this.encryptedString = encryptedString
|
|
|
+ }
|
|
|
+ } /* 滑块验证 */,
|
|
|
+ sliderSuccess () {
|
|
|
+ this.slidered = true
|
|
|
+ this.slideredMsg = ''
|
|
|
}
|
|
|
- })
|
|
|
- },
|
|
|
- //获取密码加密规则
|
|
|
- getEncrypte(){
|
|
|
- var encryptedString = Vue.ls.get(ENCRYPTED_STRING);
|
|
|
- if(encryptedString == null){
|
|
|
- getEncryptedString().then((data) => {
|
|
|
- this.encryptedString = data
|
|
|
- });
|
|
|
- }else{
|
|
|
- this.encryptedString = encryptedString;
|
|
|
- }
|
|
|
- },/*滑块验证*/
|
|
|
- sliderSuccess() {
|
|
|
- this.slidered = true;
|
|
|
- this.slideredMsg = "";
|
|
|
- }
|
|
|
}
|
|
|
- }
|
|
|
+}
|
|
|
</script>
|
|
|
|
|
|
<style lang="less" scoped>
|
|
|
-
|
|
|
- #formLogin {
|
|
|
- // 欢迎登录
|
|
|
+#formLogin {
|
|
|
+ // 欢迎登录
|
|
|
h6 {
|
|
|
text-align: center;
|
|
|
font-size: 30px;
|
|
|
@@ -554,7 +559,7 @@
|
|
|
color: #00a0e9;
|
|
|
font-weight: 700;
|
|
|
}
|
|
|
- .login-button {
|
|
|
+ .login-button {
|
|
|
width: 100%;
|
|
|
background: linear-gradient(-90deg, #67eafd 0%, #3ea4fd 100%);
|
|
|
border-radius: 8px;
|
|
|
@@ -565,54 +570,53 @@
|
|
|
#sliderBox {
|
|
|
margin-bottom: 20px;
|
|
|
}
|
|
|
- // label {
|
|
|
- // font-size: 14px;
|
|
|
- // }
|
|
|
-
|
|
|
- // .getCaptcha {
|
|
|
- // display: block;
|
|
|
- // width: 100%;
|
|
|
- // height: 40px;
|
|
|
- // }
|
|
|
-
|
|
|
- // .forge-password {
|
|
|
- // font-size: 14px;
|
|
|
- // }
|
|
|
-
|
|
|
- // button.login-button {
|
|
|
- // padding: 0 15px;
|
|
|
- // font-size: 16px;
|
|
|
- // height: 40px;
|
|
|
- // width: 100%;
|
|
|
- // }
|
|
|
-
|
|
|
- // .user-login-other {
|
|
|
- // text-align: left;
|
|
|
- // margin-top: 24px;
|
|
|
- // line-height: 22px;
|
|
|
-
|
|
|
- // .item-icon {
|
|
|
- // font-size: 24px;
|
|
|
- // color: rgba(0,0,0,.2);
|
|
|
- // margin-left: 16px;
|
|
|
- // vertical-align: middle;
|
|
|
- // cursor: pointer;
|
|
|
- // transition: color .3s;
|
|
|
-
|
|
|
- // &:hover {
|
|
|
- // color: #1890ff;
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // .register {
|
|
|
- // float: right;
|
|
|
- // }
|
|
|
- // }
|
|
|
- }
|
|
|
-
|
|
|
+ // label {
|
|
|
+ // font-size: 14px;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // .getCaptcha {
|
|
|
+ // display: block;
|
|
|
+ // width: 100%;
|
|
|
+ // height: 40px;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // .forge-password {
|
|
|
+ // font-size: 14px;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // button.login-button {
|
|
|
+ // padding: 0 15px;
|
|
|
+ // font-size: 16px;
|
|
|
+ // height: 40px;
|
|
|
+ // width: 100%;
|
|
|
+ // }
|
|
|
+
|
|
|
+ // .user-login-other {
|
|
|
+ // text-align: left;
|
|
|
+ // margin-top: 24px;
|
|
|
+ // line-height: 22px;
|
|
|
+
|
|
|
+ // .item-icon {
|
|
|
+ // font-size: 24px;
|
|
|
+ // color: rgba(0,0,0,.2);
|
|
|
+ // margin-left: 16px;
|
|
|
+ // vertical-align: middle;
|
|
|
+ // cursor: pointer;
|
|
|
+ // transition: color .3s;
|
|
|
+
|
|
|
+ // &:hover {
|
|
|
+ // color: #1890ff;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+
|
|
|
+ // .register {
|
|
|
+ // float: right;
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+}
|
|
|
</style>
|
|
|
<style>
|
|
|
- /* .valid-error .ant-select-selection__placeholder{
|
|
|
+/* .valid-error .ant-select-selection__placeholder{
|
|
|
color: #f5222d;
|
|
|
} */
|
|
|
-</style>
|
|
|
+</style>
|
liangyan0105