Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/ztzh/zttj-web

GuLiMmo

2023-12-23 07fafa15a5d6f556977115214ac769441e83df15

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/ztzh/zttj-web

 src/config/website.js

@@ -2,7 +2,7 @@
 * 全局配置文件
 */
export default {
  title: 'saber',
  title: '',
  logo: 'S',
  key: 'saber', //配置主键,目前用于存储
  indexTitle: 'Saber Admin',
@@ -10,7 +10,7 @@
  clientSecret: 'saber_secret', // 客户端密钥
  tenantMode: true, // 是否开启租户模式
  tenantId: '000000', // 管理组租户编号
  captchaMode: true, // 是否开启验证码模式
  captchaMode: false, // 是否开启验证码模式
  switchMode: false, // 是否开启部门切换模式
  lockPage: '/lock',
  tokenTime: 3000,

 src/lang/en.js

@@ -78,7 +78,7 @@
  },
  login: {
    title: 'Login ',
    info: 'BladeX Development Platform',
    info: '中图铜镜后台管理系统',
    tenantId: 'Please input tenantId',
    username: 'Please input username',
    password: 'Please input a password',

 src/lang/zh.js

@@ -1,5 +1,5 @@
export default {
  title: 'Saber企业管理平台',
  title: '中图铜镜后台管理平台',
  logoutTip: '退出系统, 是否继续?',
  submitText: '确定',
  cancelText: '取消',
@@ -78,7 +78,7 @@
  },
  login: {
    title: '登录 ',
    info: 'BladeX 企业级开发平台',
    info: '中图铜镜后台管理平台',
    tenantId: '请输入租户ID',
    username: '请输入账号',
    password: '请输入密码',

 src/page/login/index.vue

@@ -6,27 +6,27 @@
          {{ time }}
        </div>
        <p class="title">{{ $t('login.info') }}</p>
        <div style="font-size: 15px">
          <span>----------------------------------------------</span>
          <br />
          <span>管理租户编号：000000</span>
          <br />
          <span>超级管理员账号: admin / admin</span>
          <br />
          <span>人事账号: hr / hr</span>
          <br />
          <span>经理账号: manager / manager</span>
          <br />
          <span>老板账号: boss / boss</span>
          <br />
          <span>----------------------------------------------</span>
          <br />
          <span>普通租户编号：详见租户管理模块</span>
          <br />
          <span>租户管理员账号: admin / admin</span>
          <br />
          <span>----------------------------------------------</span>
        </div>
<!--        <div style="font-size: 15px">-->
<!--          <span>&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</span>-->
<!--          <br />-->
<!--          <span>管理租户编号：000000</span>-->
<!--          <br />-->
<!--          <span>超级管理员账号: admin / admin</span>-->
<!--          <br />-->
<!--          <span>人事账号: hr / hr</span>-->
<!--          <br />-->
<!--          <span>经理账号: manager / manager</span>-->
<!--          <br />-->
<!--          <span>老板账号: boss / boss</span>-->
<!--          <br />-->
<!--          <span>&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</span>-->
<!--          <br />-->
<!--          <span>普通租户编号：详见租户管理模块</span>-->
<!--          <br />-->
<!--          <span>租户管理员账号: admin / admin</span>-->
<!--          <br />-->
<!--          <span>&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;</span>-->
<!--        </div>-->
        <!--<img class="img" src="/img/logo.png" alt="">-->
      </div>
      <div class="login-border">
@@ -38,12 +38,12 @@
          <userLogin v-if="activeName === 'user'"></userLogin>
          <codeLogin v-else-if="activeName === 'code'"></codeLogin>
          <thirdLogin v-else-if="activeName === 'third'"></thirdLogin>
          <div class="login-menu">
            <a href="#" @click.stop="activeName = 'user'">{{ $t('login.userLogin') }}</a>
            <!--<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>-->
            <a href="#" @click.stop="activeName = 'third'">{{ $t('login.thirdLogin') }}</a>
            <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>
          </div>
<!--          <div class="login-menu">-->
<!--            <a href="#" @click.stop="activeName = 'user'">{{ $t('login.userLogin') }}</a>-->
<!--            &lt;!&ndash;<a href="#" @click.stop="activeName='code'">{{ $t('login.phoneLogin') }}</a>&ndash;&gt;-->
<!--            <a href="#" @click.stop="activeName = 'third'">{{ $t('login.thirdLogin') }}</a>-->
<!--            <a :href="website.ssoUrl + website.redirectUri">{{ $t('login.ssoLogin') }}</a>-->
<!--          </div>-->
        </div>
      </div>
    </div>

 src/page/login/userlogin.vue

@@ -7,18 +7,18 @@
    :model="loginForm"
    label-width="0"
  >
    <el-form-item v-if="tenantMode" prop="tenantId">
      <el-input
        @keyup.enter="handleLogin"
        v-model="loginForm.tenantId"
        auto-complete="off"
        :placeholder="$t('login.tenantId')"
      >
        <template #prefix>
          <i class="icon-quanxian" />
        </template>
      </el-input>
    </el-form-item>
<!--    <el-form-item v-if="tenantMode" prop="tenantId">-->
<!--      <el-input-->
<!--        @keyup.enter="handleLogin"-->
<!--        v-model="loginForm.tenantId"-->
<!--        auto-complete="off"-->
<!--        :placeholder="$t('login.tenantId')"-->
<!--      >-->
<!--        <template #prefix>-->
<!--          <i class="icon-quanxian" />-->
<!--        </template>-->
<!--      </el-input>-->
<!--    </el-form-item>-->
    <el-form-item prop="username">
      <el-input
        @keyup.enter="handleLogin"
@@ -98,9 +98,9 @@
        //角色ID
        roleId: '',
        //用户名
        username: 'admin',
        username: '',
        //密码
        password: 'admin',
        password: '',
        //账号类型
        type: 'account',
        //验证码的值