liangyan0105 3 年 前
コミット
6b6501709f

BIN
src/assets/bg.png


BIN
src/assets/logo-blue.png


BIN
src/assets/white-bg.png


+ 150 - 0
src/components/layouts/OldUserLayout.vue

@@ -0,0 +1,150 @@
+<template>
+  <div id="userLayout" :class="['user-layout-wrapper', device]">
+    <div class="container">
+      <div class="top">
+        <div class="header">
+          <a href="/">
+            <img src="~@/assets/logo-cd.png" class="logo" alt="logo">
+            <span class="title">上海萃颠信息科技有限公司</span>
+          </a>
+        </div>
+        <div class="desc">
+          <!-- Jeecg Boot 是中国最具影响力的 企业级 快速开发平台 -->
+        </div>
+      </div>
+
+      <route-view></route-view>
+
+      <div class="footer">
+        <div class="links">
+          <a href="http://doc.jeecg.com" target="_blank">帮助</a>
+          <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">隐私</a>
+          <a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
+        </div>
+        <div class="copyright">
+          Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import RouteView from '@/components/layouts/RouteView'
+import { mixinDevice } from '@/utils/mixin.js'
+
+export default {
+    name: 'UserLayout',
+    components: { RouteView },
+    mixins: [mixinDevice],
+    data () {
+        return {}
+    },
+    mounted () {
+        document.body.classList.add('userLayout')
+    },
+    beforeDestroy () {
+        document.body.classList.remove('userLayout')
+    }
+}
+</script>
+
+<style lang="less" scoped>
+  #userLayout.user-layout-wrapper {
+    height: 100%;
+
+    &.mobile {
+      .container {
+        .main {
+          max-width: 368px;
+          width: 98%;
+        }
+      }
+    }
+
+    .container {
+      width: 100%;
+      min-height: 100%;
+      background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
+      background-size: 100%;
+      padding: 110px 0 144px;
+      position: relative;
+
+      a {
+        text-decoration: none;
+      }
+
+      .top {
+        text-align: center;
+
+        .header {
+          height: 44px;
+          line-height: 44px;
+
+          .badge {
+            position: absolute;
+            display: inline-block;
+            line-height: 1;
+            vertical-align: middle;
+            margin-left: -12px;
+            margin-top: -10px;
+            opacity: 0.8;
+          }
+
+          .logo {
+            height: 44px;
+            vertical-align: top;
+            margin-right: 16px;
+            border-style: none;
+          }
+
+          .title {
+            font-size: 33px;
+            color: rgba(0, 0, 0, .85);
+            font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
+            font-weight: 600;
+            position: relative;
+            top: 2px;
+          }
+        }
+        .desc {
+          font-size: 14px;
+          color: rgba(0, 0, 0, 0.45);
+          margin-top: 12px;
+          margin-bottom: 40px;
+        }
+      }
+
+      .main {
+        min-width: 260px;
+        width: 368px;
+        margin: 0 auto;
+      }
+
+      .footer {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+        padding: 0 16px;
+        margin: 48px 0 24px;
+        text-align: center;
+
+        .links {
+          margin-bottom: 8px;
+          font-size: 14px;
+          a {
+            color: rgba(0, 0, 0, 0.45);
+            transition: all 0.3s;
+            &:not(:last-child) {
+              margin-right: 40px;
+            }
+          }
+        }
+        .copyright {
+          color: rgba(0, 0, 0, 0.45);
+          font-size: 14px;
+        }
+      }
+    }
+  }
+</style>

+ 55 - 120
src/components/layouts/UserLayout.vue

@@ -1,150 +1,85 @@
 <template>
   <div id="userLayout" :class="['user-layout-wrapper', device]">
     <div class="container">
-      <div class="top">
-        <div class="header">
-          <a href="/">
-            <img src="~@/assets/logo-cd.png" class="logo" alt="logo">
-            <span class="title">上海萃颠信息科技有限公司</span>
-          </a>
-        </div>
-        <div class="desc">
-          <!-- Jeecg Boot 是中国最具影响力的 企业级 快速开发平台 -->
-        </div>
+      <!-- 萃颠logo -->
+      <div class="logo">
+        <img src="../../assets/logo-blue.png" alt="" />
       </div>
 
-      <route-view></route-view>
-
-      <div class="footer">
-        <div class="links">
-          <a href="http://doc.jeecg.com" target="_blank">帮助</a>
-          <a href="https://github.com/zhangdaiscott/jeecg-boot" target="_blank">隐私</a>
-          <a href="https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE" target="_blank">条款</a>
-        </div>
-        <div class="copyright">
-          Copyright &copy; 2019 <a href="http://www.jeecg.com" target="_blank">JEECG开源社区</a> 出品
-        </div>
+      <!-- 放表单的盒子 -->
+      <div class="formBox">
+        <img src="../../assets/white-bg.png" alt="" />
+        <route-view></route-view>
       </div>
     </div>
   </div>
 </template>
 
 <script>
-  import RouteView from "@/components/layouts/RouteView"
-  import { mixinDevice } from '@/utils/mixin.js'
+import RouteView from '@/components/layouts/RouteView'
+import { mixinDevice } from '@/utils/mixin.js'
 
-  export default {
-    name: "UserLayout",
+export default {
+    name: 'UserLayout',
     components: { RouteView },
     mixins: [mixinDevice],
     data () {
-      return {}
+        return {}
     },
     mounted () {
-      document.body.classList.add('userLayout')
+        document.body.classList.add('userLayout')
     },
     beforeDestroy () {
-      document.body.classList.remove('userLayout')
-    },
-  }
+        document.body.classList.remove('userLayout')
+    }
+}
 </script>
 
 <style lang="less" scoped>
-  #userLayout.user-layout-wrapper {
-    height: 100%;
-
-    &.mobile {
-      .container {
-        .main {
-          max-width: 368px;
-          width: 98%;
-        }
-      }
-    }
+#userLayout.user-layout-wrapper {
+  height: 100%;
 
+  &.mobile {
     .container {
-      width: 100%;
-      min-height: 100%;
-      background: #f0f2f5 url(~@/assets/background.svg) no-repeat 50%;
-      background-size: 100%;
-      padding: 110px 0 144px;
-      position: relative;
-
-      a {
-        text-decoration: none;
-      }
-
-      .top {
-        text-align: center;
-
-        .header {
-          height: 44px;
-          line-height: 44px;
-
-          .badge {
-            position: absolute;
-            display: inline-block;
-            line-height: 1;
-            vertical-align: middle;
-            margin-left: -12px;
-            margin-top: -10px;
-            opacity: 0.8;
-          }
-
-          .logo {
-            height: 44px;
-            vertical-align: top;
-            margin-right: 16px;
-            border-style: none;
-          }
-
-          .title {
-            font-size: 33px;
-            color: rgba(0, 0, 0, .85);
-            font-family: "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
-            font-weight: 600;
-            position: relative;
-            top: 2px;
-          }
-        }
-        .desc {
-          font-size: 14px;
-          color: rgba(0, 0, 0, 0.45);
-          margin-top: 12px;
-          margin-bottom: 40px;
-        }
-      }
-
       .main {
-        min-width: 260px;
-        width: 368px;
-        margin: 0 auto;
+        max-width: 368px;
+        width: 98%;
       }
+    }
+  }
 
-      .footer {
-        position: absolute;
-        width: 100%;
-        bottom: 0;
-        padding: 0 16px;
-        margin: 48px 0 24px;
-        text-align: center;
+  .container {
+    width: 100%;
+    min-height: 100%;
+    background-image: url('../../assets/bg.png');
+    padding: 110px 0 144px;
+    position: relative;
+    .main {
+      position: absolute;
+      top: 20%;
+      left: 58%;
+    }
+    .logo {
+      position: absolute;
+      top: 18px;
+      left: 42px;
+      z-index: 88888;
+    }
+    // 放表单的背景
+    .formBox {
+      position: absolute;
+      left: 50%;
+      top: 50%;
+      transform: translate(-50%, -50%);
+    }
 
-        .links {
-          margin-bottom: 8px;
-          font-size: 14px;
-          a {
-            color: rgba(0, 0, 0, 0.45);
-            transition: all 0.3s;
-            &:not(:last-child) {
-              margin-right: 40px;
-            }
-          }
-        }
-        .copyright {
-          color: rgba(0, 0, 0, 0.45);
-          font-size: 14px;
-        }
-      }
+    a {
+      text-decoration: none;
+    }
+    .main {
+      min-width: 260px;
+      width: 368px;
     }
   }
-</style>
+}
+</style>

+ 205 - 530
src/views/user/Login.vue

@@ -1,560 +1,235 @@
 <template>
-  <div class="main">
-    <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
-      <a-tabs
-        :activeKey="customActiveKey"
-        :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
-        @change="handleTabClick">
-        <a-tab-pane key="tab1" tab="账号密码登陆">
-          <a-form-item>
-            <a-input
-              size="large"
-              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)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-form-item>
-            <a-input
-              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)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-row :gutter="0">
-            <!--换滑块-->
-            <!--<a-col :span="16">
-              <a-form-item>
-                <a-input
-                  v-decorator="['inputCode',validatorRules.inputCode]"
-                  size="large"
-                  type="text"
-                  @change="inputCodeChange"
-                  placeholder="请输入验证码">
-                  <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col :span="8" style="text-align: right">
-              <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
-              <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
-              &lt;!&ndash;<j-graphic-code @success="generateCode" ref="jgraphicCodeRef" style="float: right" remote></j-graphic-code>&ndash;&gt;
-            </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 暂无短信服务-->
-        <!--<a-tab-pane key="tab2" tab="手机号登陆">
-          <a-form-item>
-            <a-input
-              v-decorator="['mobile',validatorRules.mobile]"
-              size="large"
-              type="text"
-              placeholder="手机号">
-              <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-            </a-input>
-          </a-form-item>
-
-          <a-row :gutter="16">
-            <a-col class="gutter-row" :span="16">
-              <a-form-item>
-                <a-input
-                  v-decorator="['captcha',validatorRules.captcha]"
-                  size="large"
-                  type="text"
-                  placeholder="请输入验证码">
-                  <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-                </a-input>
-              </a-form-item>
-            </a-col>
-            <a-col class="gutter-row" :span="8">
-              <a-button
-                class="getCaptcha"
-                tabindex="-1"
-                :disabled="state.smsSendBtn"
-                @click.stop.prevent="getCaptcha"
-                v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>
-            </a-col>
-          </a-row>
-        </a-tab-pane>-->
-      </a-tabs>
-
-      <a-form-item>
-        <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>
-       <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
-          注册账户
-        </router-link> -->
-      </a-form-item>
-
-      <a-form-item style="margin-top:24px">
-        <a-button
-          size="large"
-          type="primary"
-          htmlType="submit"
-          class="login-button"
-          :loading="loginBtn"
-          @click.stop.prevent="handleSubmit"
-          :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>
-        <a><a-icon class="item-icon" type="taobao-circle"></a-icon></a>
-        <a><a-icon class="item-icon" type="weibo-circle"></a-icon></a>
-        <router-link class="register" :to="{ name: 'register' }">
-          注册账户
-        </router-link>
-      </div>-->
-    </a-form>
-
-    <two-step-captcha
-      v-if="requiredTwoStepCaptcha"
-      :visible="stepCaptchaVisible"
-      @success="stepCaptchaSuccess"
-      @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>
-
-      <a-form>
-        <a-form-item
-          :labelCol="{span:4}"
-          :wrapperCol="{span:20}"
-          style="margin-bottom:10px"
-          :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-icon slot="suffixIcon" type="gold" />
-            <a-select-option
-              v-for="d in departList"
-              :key="d.id"
-              :value="d.orgCode">
-              {{ d.departName }}
-            </a-select-option>
-          </a-select>
-        </a-form-item>
-      </a-form>
-
-
-
-    </a-modal>
-
-  </div>
+  <!-- 修改后的登录页,简洁版。    更全面功能,参照 OldLogin.vue文件 -->
+  <!-- 登录表单 -->
+  <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
+    <h6>欢迎登录</h6>
+    <!-- 账户名 -->
+    <a-form-item>
+      <a-input
+        size="large"
+        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)' }" />
+      </a-input>
+    </a-form-item>
+
+    <!-- 密码 -->
+    <a-form-item>
+      <a-input
+        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)' }" />
+      </a-input>
+    </a-form-item>
+
+    <!-- 滑块验证-->
+    <a-row :gutter="0" id="sliderBox">
+      <a-col :span="24">
+        <j-slider @onSuccess="sliderSuccess"></j-slider>
+        <span style="color: red;">{{ slideredMsg }}</span>
+      </a-col>
+    </a-row>
+
+    <!-- 自动登录 -->
+    <a-form-item style="text-align: left;">
+      <a-checkbox style="color:#C1C1C1;" v-decorator="['rememberMe', { initialValue: true, valuePropName: 'checked' }]"
+        >自动登录</a-checkbox
+      >
+    </a-form-item>
+
+    <!-- 确定 -->
+    <a-form-item style="margin-top:30px">
+      <a-button
+        size="large"
+        type="primary"
+        htmlType="submit"
+        class="login-button"
+        :loading="loginBtn"
+        @click.stop.prevent="handleSubmit"
+        :disabled="loginBtn"
+        >登录
+      </a-button>
+    </a-form-item>
+  </a-form>
 </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'
+import Vue from 'vue'
+import JSlider from '@/components/jeecg/JSlider'
+import { mapActions } from 'vuex'
+import { ACCESS_TOKEN, ENCRYPTED_STRING } from '@/store/mutation-types'
+import { timeFix } from '@/utils/util'
+
+export default {
+  components: {
+    JSlider //滑动
+  },
+  data() {
+    return {
+      customActiveKey: 'tab1', //默认显示 张海迷们登录
+      loginBtn: false, //默认显示 确定按钮
+      slidered: false, //滑动
+      slideredMsg: '', //滑动信息
+      form: this.$form.createForm(this),
+      validatorRules: {
+        username: { rules: [{ required: true, message: '请输入用户名!' }, { validator: this.handleUsernameOrEmail }] },
+        password: { rules: [{ required: true, message: '请输入密码!', validator: 'click' }] }
+      }
+    }
+  },
+  created() {
+    Vue.ls.remove(ACCESS_TOKEN)
+    this.getRouterData()
+  },
+  methods: {
+    ...mapActions(['Login', 'Logout', 'PhoneLogin']),
+    //拿到
+    getRouterData() {
+      this.$nextTick(() => {
+        if (this.$route.params.username) {
+          this.form.setFieldsValue({
+            username: this.$route.params.username
+          })
+        }
+      })
+    },
 
-  export default {
-    components: {
-      TwoStepCaptcha,JSlider,
-      JGraphicCode
+    /*滑块验证*/
+    sliderSuccess() {
+      this.slidered = true
+      this.slideredMsg = ''
     },
-    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: ''
+    //“确定” 按钮,验证表单
+    handleSubmit() {
+      let that = this
+      if (!that.slidered) {
+        this.slideredMsg = '请拖动滑块!'
       }
-    },
-    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:密码加密逻辑暂时注释掉,有点问题
-    },
-    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
-        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) => {
+      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.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);
-                }
-              }, 1000);
-
-              const hide = this.$message.loading('验证码发送中..', 0);
-              let smsParams = {};
-                  smsParams.mobile=values.mobile;
-                  smsParams.smsmode="0";
-              postAction("/sys/sms",smsParams)
+              console.log('登录参数', loginParams)
+              that
+                .Login(loginParams)
                 .then(res => {
-                  if(!res.success){
-                    setTimeout(hide, 0);
-                    this.cmsFailed(res.message);
-                  }
-                  console.log(res);
-                  setTimeout(hide, 500);
+                  this.departConfirm(res)
                 })
                 .catch(err => {
-                  setTimeout(hide, 1);
-                  clearInterval(interval);
-                  that.state.time = 60;
-                  that.state.smsSendBtn = false;
-                  this.requestFailed(err);
-                });
+                  that.requestFailed(err)
+                })
+            } else {
+              that.loginBtn = false
             }
           }
-        );
-      },
-      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){
-          let multi_depart = res.result.multi_depart
-          //0:无部门 1:一个部门 2:多个部门
-          if(multi_depart==0){
-            this.loginSuccess()
-            this.$notification.warn({
-              message: '提示',
-              description: `您尚未归属部门,请确认账号信息`,
-              duration:3
-            });
-          }else if(multi_depart==2){
-            this.departVisible=true
-            this.currentUsername=this.form.getFieldValue("username")
-            this.departList = res.result.departs
-          }else {
-            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=''
-      },
-      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 = "";
+        )
       }
-    }
-  }
-</script>
-
-<style lang="less" scoped>
-
-  .user-layout-login {
-    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%;
-    }
+    //邮箱是账户名
+    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()
+    },
 
-    .user-login-other {
-      text-align: left;
-      margin-top: 24px;
-      line-height: 22px;
+    //登录成功
+    loginSuccess() {
+      this.$router.push({ name: 'dashboard' }) //仪表盘
+      this.$notification.success({
+        message: '欢迎',
+        description: `${timeFix()},欢迎回来`
+      })
+    },
+    //失败
+    cmsFailed(err) {
+      this.$notification['error']({
+        message: '登录失败',
+        description: err,
+        duration: 4
+      })
+    },
 
-      .item-icon {
-        font-size: 24px;
-        color: rgba(0,0,0,.2);
-        margin-left: 16px;
-        vertical-align: middle;
-        cursor: pointer;
-        transition: color .3s;
+    //登录失败的提示
+    requestFailed(err) {
+      this.$notification['error']({
+        message: '登录失败',
+        description: ((err.response || {}).data || {}).message || err.message || '请求出现错误,请稍后再试',
+        duration: 4
+      })
+      this.loginBtn = false
+    },
 
-        &:hover {
-          color: #1890ff;
+    //部门确认 todo  为啥要有这个????
+    departConfirm(res) {
+      if (res.success) {
+        let multi_depart = res.result.multi_depart
+        //0:无部门 1:一个部门 2:多个部门
+        if (multi_depart == 0) {
+          this.loginSuccess()
+          this.$notification.warn({
+            message: '提示',
+            description: `您尚未归属部门,请确认账号信息`,
+            duration: 3
+          })
+        } else if (multi_depart == 2) {
+          this.departVisible = true
+          this.currentUsername = this.form.getFieldValue('username')
+          this.departList = res.result.departs
+        } else {
+          this.loginSuccess()
         }
-      }
-
-      .register {
-        float: right;
+      } else {
+        this.requestFailed(res)
+        this.Logout()
       }
     }
   }
+}
+</script>
 
-</style>
-<style>
-  .valid-error .ant-select-selection__placeholder{
-    color: #f5222d;
+<style lang="less" scoped>
+#formLogin {
+  // 欢迎登录
+  h6 {
+    text-align: center;
+    font-size: 30px;
+    font-family: 'Microsoft YaHei';
+    color: #00a0e9;
+    font-weight: 700;
+  }
+  .login-button {
+    width: 100%;
+    background: linear-gradient(-90deg, #67eafd 0%, #3ea4fd 100%);
+    border-radius: 8px;
+    border: none;
+    font-size: 22px;
+    font-weight: 700;
   }
-</style>
+  #sliderBox {
+    margin-bottom: 20px;
+  }
+}
+</style>

+ 560 - 0
src/views/user/OldLogin.vue

@@ -0,0 +1,560 @@
+<template>
+  <div class="main">
+    <a-form :form="form" class="user-layout-login" ref="formLogin" id="formLogin">
+      <a-tabs
+        :activeKey="customActiveKey"
+        :tabBarStyle="{ textAlign: 'center', borderBottom: 'unset' }"
+        @change="handleTabClick">
+        <a-tab-pane key="tab1" tab="账号密码登陆">
+          <a-form-item>
+            <a-input
+              size="large"
+              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)' }"/>
+            </a-input>
+          </a-form-item>
+
+          <a-form-item>
+            <a-input
+              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)' }"/>
+            </a-input>
+          </a-form-item>
+
+          <a-row :gutter="0">
+            <!--换滑块-->
+            <!--<a-col :span="16">
+              <a-form-item>
+                <a-input
+                  v-decorator="['inputCode',validatorRules.inputCode]"
+                  size="large"
+                  type="text"
+                  @change="inputCodeChange"
+                  placeholder="请输入验证码">
+                  <a-icon slot="prefix" type="smile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :span="8" style="text-align: right">
+              <img v-if="requestCodeSuccess" style="margin-top: 2px;" :src="randCodeImage" @click="handleChangeCheckCode"/>
+              <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
+              &lt;!&ndash;<j-graphic-code @success="generateCode" ref="jgraphicCodeRef" style="float: right" remote></j-graphic-code>&ndash;&gt;
+            </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 暂无短信服务-->
+        <!--<a-tab-pane key="tab2" tab="手机号登陆">
+          <a-form-item>
+            <a-input
+              v-decorator="['mobile',validatorRules.mobile]"
+              size="large"
+              type="text"
+              placeholder="手机号">
+              <a-icon slot="prefix" type="mobile" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+            </a-input>
+          </a-form-item>
+
+          <a-row :gutter="16">
+            <a-col class="gutter-row" :span="16">
+              <a-form-item>
+                <a-input
+                  v-decorator="['captcha',validatorRules.captcha]"
+                  size="large"
+                  type="text"
+                  placeholder="请输入验证码">
+                  <a-icon slot="prefix" type="mail" :style="{ color: 'rgba(0,0,0,.25)' }"/>
+                </a-input>
+              </a-form-item>
+            </a-col>
+            <a-col class="gutter-row" :span="8">
+              <a-button
+                class="getCaptcha"
+                tabindex="-1"
+                :disabled="state.smsSendBtn"
+                @click.stop.prevent="getCaptcha"
+                v-text="!state.smsSendBtn && '获取验证码' || (state.time+' s')"></a-button>
+            </a-col>
+          </a-row>
+        </a-tab-pane>-->
+      </a-tabs>
+
+      <a-form-item>
+        <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>
+       <router-link :to="{ name: 'register'}" class="forge-password" style="float: right;margin-right: 10px" >
+          注册账户
+        </router-link> -->
+      </a-form-item>
+
+      <a-form-item style="margin-top:24px">
+        <a-button
+          size="large"
+          type="primary"
+          htmlType="submit"
+          class="login-button"
+          :loading="loginBtn"
+          @click.stop.prevent="handleSubmit"
+          :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>
+        <a><a-icon class="item-icon" type="taobao-circle"></a-icon></a>
+        <a><a-icon class="item-icon" type="weibo-circle"></a-icon></a>
+        <router-link class="register" :to="{ name: 'register' }">
+          注册账户
+        </router-link>
+      </div>-->
+    </a-form>
+
+    <two-step-captcha
+      v-if="requiredTwoStepCaptcha"
+      :visible="stepCaptchaVisible"
+      @success="stepCaptchaSuccess"
+      @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>
+
+      <a-form>
+        <a-form-item
+          :labelCol="{span:4}"
+          :wrapperCol="{span:20}"
+          style="margin-bottom:10px"
+          :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-icon slot="suffixIcon" type="gold" />
+            <a-select-option
+              v-for="d in departList"
+              :key="d.id"
+              :value="d.orgCode">
+              {{ 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 {
+    components: {
+      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: ''
+      }
+    },
+    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:密码加密逻辑暂时注释掉,有点问题
+    },
+    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
+        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);
+                }
+              }, 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);
+                });
+            }
+          }
+        );
+      },
+      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){
+          let multi_depart = res.result.multi_depart
+          //0:无部门 1:一个部门 2:多个部门
+          if(multi_depart==0){
+            this.loginSuccess()
+            this.$notification.warn({
+              message: '提示',
+              description: `您尚未归属部门,请确认账号信息`,
+              duration:3
+            });
+          }else if(multi_depart==2){
+            this.departVisible=true
+            this.currentUsername=this.form.getFieldValue("username")
+            this.departList = res.result.departs
+          }else {
+            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=''
+      },
+      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 = "";
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+
+  .user-layout-login {
+    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{
+    color: #f5222d;
+  }
+</style>