|
|
|
@ -16,7 +16,7 @@
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
|
|
|
|
|
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
|
|
|
|
|
<!-- <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="loginData.loginForm.tenantName"
|
|
|
|
|
:placeholder="t('login.tenantNamePlaceholder')"
|
|
|
|
@ -24,7 +24,7 @@
|
|
|
|
|
link
|
|
|
|
|
type="primary"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form-item>-->
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="24" style="padding-right: 10px; padding-left: 10px">
|
|
|
|
|
<el-form-item prop="username">
|
|
|
|
@ -184,9 +184,9 @@ const loginData = reactive({
|
|
|
|
|
captchaEnable: import.meta.env.VITE_APP_CAPTCHA_ENABLE,
|
|
|
|
|
tenantEnable: import.meta.env.VITE_APP_TENANT_ENABLE,
|
|
|
|
|
loginForm: {
|
|
|
|
|
tenantName: '系统租户',
|
|
|
|
|
username: 'admin',
|
|
|
|
|
password: 'admin123',
|
|
|
|
|
tenantName: '',
|
|
|
|
|
username: '',
|
|
|
|
|
password: '',
|
|
|
|
|
captchaVerification: '',
|
|
|
|
|
rememberMe: false
|
|
|
|
|
}
|
|
|
|
@ -244,6 +244,13 @@ const loading = ref() // ElLoading.service 返回的实例
|
|
|
|
|
const handleLogin = async (params) => {
|
|
|
|
|
loginLoading.value = true
|
|
|
|
|
try {
|
|
|
|
|
// 固定租户
|
|
|
|
|
if(loginData.loginForm.username == 'admin'){
|
|
|
|
|
loginData.loginForm.tenantName = '系统租户';
|
|
|
|
|
}else{
|
|
|
|
|
loginData.loginForm.tenantName = '合立智能化系统';
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
await getTenantId()
|
|
|
|
|
const data = await validForm()
|
|
|
|
|
if (!data) {
|
|
|
|
|