Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

9 小时以前 f7a2fcdda7f1120498c5c5f75c5a99955fc54b43

 north-glass-erp/northglass-erp/src/views/LoginView.vue

@@ -122,99 +122,94 @@
</script>

<template>
  <div class="mainDiv" >
  <div class="mainDiv1" >
    <div id="main-login">
      <el-row style="height: 60vh;width: 70vw;" :gutter="50">
        <el-col :span="14">
          <div id="img-div">
            <img id="img-pic" src="@/assets/img.png" alt="">
          </div>
        </el-col>
        <el-col :span="10">
          <div id="div-login">
            <el-select
                @change="changeLanguage"
                v-model="language"
                placeholder=" "
                style="float: right;width: 6rem">
              <el-option value="zh-CN"  label="中文" />
              <el-option value="en-US"  label="English" />
              <el-option value="ru"  label="Русский язык" />
              <el-option value="ar"  label="بالعربية" />
              <el-option value="ko-KR"  label="한국어" />
            </el-select>
            <h2>{{$t('login.SysName')}}</h2>
            <el-form
                @submit.native.prevent
                ref="ruleFormRef"
                :model="userForm"
                status-icon
                :rules="rules"
            >
              <el-form-item :label="$t('login.user')+':'" prop="userId">
                <el-input
                    v-model="userForm.userId"
                    type="text"
                    autocomplete="off"
                    :prefix-icon="Avatar"
                    :placeholder="$t('login.userErr')"
                />
              </el-form-item>
              <el-form-item :label="$t('login.password')+':'" prop="pass">
                <el-input
                    v-model="userForm.pass"
                    @blur="changeRegister"
                    type="password"
                    autocomplete="off"
                    :prefix-icon="Lock"
                    :placeholder="$t('login.pwErr')"
                />
              </el-form-item>
              <el-form-item id="submitForm">
                <el-button
                    :loading="registerLoadings"
                    :disabled="registerState"
                    type="primary"
                    @click="register"
                >{{$t('login.register')}}
                </el-button>
                <el-button
                    :loading="loginLoadings"
                    type="primary"
                    native-type="submit"
                    @click="submitForm(ruleFormRef)"
                    @keyup.enter.native="keyDown(e)"
                >{{$t('login.login')}}
                </el-button>
      <div id="img-div">
        <img id="img-pic" src="@/assets/img.png" alt="">
      </div>
      <div id="div-login">
        <el-select
            @change="changeLanguage"
            v-model="language"
            placeholder=" "
            style="float: right;width: 6rem">
          <el-option value="zh-CN"  label="中文" />
          <el-option value="en-US"  label="English" />
          <el-option value="ru"  label="Русский язык" />
          <el-option value="ar"  label="بالعربية" />
          <el-option value="ko-KR"  label="한국어" />
        </el-select>
        <h2>{{$t('login.SysName')}}</h2>
        <el-form
            @submit.native.prevent
            ref="ruleFormRef"
            :model="userForm"
            status-icon
            :rules="rules"
        >
          <el-form-item :label="$t('login.user')+':'" prop="userId">
            <el-input
                v-model="userForm.userId"
                type="text"
                autocomplete="off"
                :prefix-icon="Avatar"
                :placeholder="$t('login.userErr')"
            />
          </el-form-item>
          <el-form-item :label="$t('login.password')+':'" prop="pass">
            <el-input
                v-model="userForm.pass"
                @blur="changeRegister"
                type="password"
                autocomplete="off"
                :prefix-icon="Lock"
                :placeholder="$t('login.pwErr')"
            />
          </el-form-item>
          <el-form-item id="submitForm">
            <el-button
                :loading="registerLoadings"
                :disabled="registerState"
                type="primary"
                @click="register"
            >{{$t('login.register')}}
            </el-button>
            <el-button
                :loading="loginLoadings"
                type="primary"
                native-type="submit"
                @click="submitForm(ruleFormRef)"
                @keyup.enter.native="keyDown(e)"
            >{{$t('login.login')}}
            </el-button>

              </el-form-item>
            </el-form>
          </div>
        </el-col>
      </el-row>


          </el-form-item>
        </el-form>
      </div>
    </div>

  </div>
</template>

<style scoped>
.mainDiv{
  //background-color: #1890FF;
  overflow: hidden;
  /*width: 100%;
  height: 100%;*/

.mainDiv1{
//background-color: #1890FF;
  //overflow: hidden;
  width: 100vw;
  height: 100vh;

  display: grid;
  place-items: center; /* 同时水平和垂直居中 */
}
#main-login{
  margin: 150px auto 0 auto;
  height: 60vh;
  width: 70vw;
  height: 60%;
  width: 70%;

  //background-color: #f2f2f2;
//background-color: #f2f2f2;
}
#img-div{
  width: 100%;
  width: 55%;
  height: 100%;
  display: flex;
  justify-content: center;
@@ -225,15 +220,26 @@
  max-height: 90%;
  max-width: 100%;
}

@media (max-width: 1030px) {
  #img-div {
    display: none;
  }
  #main-login{
    display: flex;
    justify-content: center;
  }
}

#div-login{
  margin-top: 5%;
  background-color: #fff;
  float: right;
  width: 100%;
  width: 40%;
  height: 80%;
  border-radius: 12px;
  min-width: 318px;
  min-height: 318px;
  min-height: 300px;
  box-shadow: 0 8px 16px 0 rgba(0,0,0,0), 0 6px 5px 0 rgba(0,0,0,0.19);
}
h2{