Merge branch 'dev' of https://gogs.tjp.com.cn/maoming/yjhtgl-web into dev

src/api/login.ts

@@ -96,7 +96,7 @@ export function getInfo(): AxiosPromise<UserInfo> {
 }
 
 // 获取租户列表
-export function getTenantList(): AxiosPromise<TenantInfo> {
+/*export function getTenantList(): AxiosPromise<TenantInfo> {
   return request({
     url: '/auth/tenant/list',
     headers: {
@@ -104,4 +104,4 @@ export function getTenantList(): AxiosPromise<TenantInfo> {
     },
     method: 'get'
   });
-}
+}*/

src/layout/components/Navbar.vue

@@ -87,7 +87,7 @@ import useAppStore from '@/store/modules/app';
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
 import useNoticeStore from '@/store/modules/notice';
-import { getTenantList } from '@/api/login';
+// import { getTenantList } from '@/api/login';
 import { dynamicClear, dynamicTenant } from '@/api/system/tenant';
 import { TenantVO } from '@/api/types';
 import notice from './notice/index.vue';

src/views/login.vue

@@ -64,7 +64,8 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, getTenantList } from '@/api/login';
+// import { getCodeImg, getTenantList } from '@/api/login';
+import { getCodeImg } from '@/api/login';
 import { authBinding } from '@/api/system/social/auth';
 import { useUserStore } from '@/store/modules/user';
 import { LoginData, TenantVO } from '@/api/types';
@@ -177,7 +178,7 @@ const getLoginData = () => {
 /**
  * 获取租户列表
  */
-const initTenantList = async () => {
+/*const initTenantList = async () => {
   const { data } = await getTenantList();
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
@@ -186,7 +187,7 @@ const initTenantList = async () => {
       loginForm.value.tenantId = tenantList.value[0].tenantId;
     }
   }
-};
+};*/
 
 /**
  * 第三方登录
@@ -205,7 +206,7 @@ const doSocialLogin = (type: string) => {
 
 onMounted(() => {
   getCode();
-  initTenantList();
+  // initTenantList();
   getLoginData();
 });
 </script>

src/views/register.vue

@@ -56,7 +56,8 @@
 </template>
 
 <script setup lang="ts">
-import { getCodeImg, register, getTenantList } from '@/api/login';
+// import { getCodeImg, register, getTenantList } from '@/api/login';
+import { getCodeImg, register } from '@/api/login';
 import { RegisterForm, TenantVO } from '@/api/types';
 import { to } from 'await-to-js';
 
@@ -139,7 +140,8 @@ const getCode = async () => {
   }
 };
 
-const initTenantList = async () => {
+// 初始化租户列表
+/*const initTenantList = async () => {
   const { data } = await getTenantList();
   tenantEnabled.value = data.tenantEnabled === undefined ? true : data.tenantEnabled;
   if (tenantEnabled.value) {
@@ -148,11 +150,11 @@ const initTenantList = async () => {
       registerForm.value.tenantId = tenantList.value[0].tenantId;
     }
   }
-};
+};*/
 
 onMounted(() => {
   getCode();
-  initTenantList();
+  // initTenantList();
 });
 </script>
 

src/views/system/dict/data.vue

@@ -188,7 +188,9 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询字典类型详细 */
 const getTypes = async (dictId: string | number) => {
   const { data } = await getType(dictId);
+  console.log('获取dictType:', data.dictType); // 打印获取的字典类型
   queryParams.value.dictType = data.dictType;
+  console.log('更新queryParams.dictType:', queryParams.value.dictType); // 打印更新后的字典类型
   defaultDictType.value = data.dictType;
   getList();
 };