Merge projectA into B with conflict resolution

This commit is contained in:
Teo
2025-09-01 14:55:09 +08:00
1894 changed files with 92477 additions and 681037 deletions

View File

@ -2,7 +2,7 @@
<div class="login">
<el-form ref="loginRef" :model="loginForm" :rules="loginRules" class="login-form">
<div class="title-box">
<h3 class="title">新能源项目管理平台</h3>
<h3 class="title">煤科建管平台</h3>
<lang-select />
</div>
<el-form-item v-if="tenantEnabled" prop="tenantId">
@ -73,7 +73,7 @@
</el-form>
<!-- 底部 -->
<div class="el-login-footer">
<span>Copyright © 2018-2024 疯狂的狮子Li All Rights Reserved.</span>
<!-- <span></span> -->
</div>
</div>
</template>
@ -86,6 +86,7 @@ import { LoginData, TenantVO } from '@/api/types';
import { to } from 'await-to-js';
import { HttpStatus } from '@/enums/RespEnum';
import { useI18n } from 'vue-i18n';
import { getAllRouters } from '@/api/system/menu';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
@ -95,8 +96,8 @@ const { t } = useI18n();
const loginForm = ref<LoginData>({
tenantId: '000000',
username: 'admin',
password: 'admin123',
username: '',
password: '',
rememberMe: false,
code: '',
uuid: ''