From a318a76b1f91a10b614cd8bfe212e922ca3f8539 Mon Sep 17 00:00:00 2001
From: liuchen864 <23082234@qq.com>
Date: Mon, 24 Jun 2024 18:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/systemConfig.js                    | 4 +++-
 src/utils/systemParam.ts                  | 9 +++++++++
 src/views/login/components/LoginForm.vue  | 7 ++++---
 src/views/login/components/MobileForm.vue | 3 ++-
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/public/systemConfig.js b/public/systemConfig.js
index e01e65ffc..1908c7089 100644
--- a/public/systemConfig.js
+++ b/public/systemConfig.js
@@ -8,5 +8,7 @@ let systemConfig = {
   // 积木报表请求路径
   jmreportBaseUrl: 'http://172.22.32.8:90',
   // 查看质检报告环境
-  reportUrl: 'https://scp.faway-hella.com'
+  reportUrl: 'https://scp.faway-hella.com',
+  // 租户配置
+  tenant: '["成都"]'
 }
diff --git a/src/utils/systemParam.ts b/src/utils/systemParam.ts
index a219bb5db..347b564dd 100644
--- a/src/utils/systemParam.ts
+++ b/src/utils/systemParam.ts
@@ -3,6 +3,7 @@ const uploadUrl = ref(import.meta.env.VITE_UPLOAD_URL)
 const interfaceUrl = ref(import.meta.env.VITE_INTERFACE_URL)
 const jmreportBaseUrl = ref(import.meta.env.VITE_JMREPORT_BASE_URL)
 const reportUrl = ref(import.meta.env.VITE_REPORT_URL)
+const tenant = ref(import.meta.env.VITE_TENANT)
 const mode = ref(import.meta.env.MODE)
 // 获取baseUrl
 export const getBaseUrl = () => {
@@ -44,3 +45,11 @@ export const getReportUrl = () => {
     return reportUrl.value
   }
 }
+// 获取tenant
+export const getTenant = () => {
+  if(mode.value === 'prod') {
+    return systemConfig.tenant
+  } else {
+    return tenant.value
+  }
+}
diff --git a/src/views/login/components/LoginForm.vue b/src/views/login/components/LoginForm.vue
index a28e0101a..86c07cdbd 100644
--- a/src/views/login/components/LoginForm.vue
+++ b/src/views/login/components/LoginForm.vue
@@ -95,6 +95,7 @@
   import router from "@/router";
   import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
   import * as DeptApi from '@/api/system/dept'
+  import { getTenant } from '@/utils/systemParam'
 
   defineOptions({ name: 'LoginForm' })
 
@@ -116,9 +117,9 @@
 
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.LOGIN)
   // 验证码开关
-  const captchaEnabled = ref(true);
-  const codeUrl = ref("");
-  const tenantArray = JSON.parse(import.meta.env.VITE_TENANT);
+  const captchaEnabled = ref(true)
+  const codeUrl = ref("")
+  const tenantArray = JSON.parse(getTenant())
 
   const LoginRules = {
     tenantName: [required],
diff --git a/src/views/login/components/MobileForm.vue b/src/views/login/components/MobileForm.vue
index 1d7038231..3c3efa8d9 100644
--- a/src/views/login/components/MobileForm.vue
+++ b/src/views/login/components/MobileForm.vue
@@ -110,6 +110,7 @@ import { usePermissionStore } from '@/store/modules/permission'
 import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
 import LoginFormTitle from './LoginFormTitle.vue'
 import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
+import { getTenant } from '@/utils/systemParam'
 
 defineOptions({ name: 'MobileForm' })
 
@@ -125,7 +126,7 @@ const iconCircleCheck = useIcon({ icon: 'ep:circle-check' })
 const { validForm } = useFormValid(formSmsLogin)
 const { handleBackLogin, getLoginState } = useLoginState()
 const getShow = computed(() => unref(getLoginState) === LoginStateEnum.MOBILE)
-const tenantArray = JSON.parse(import.meta.env.VITE_TENANT);
+const tenantArray = JSON.parse(getTenant())
 
 const rules = {
   tenantName: [required],