From d9e0d8f77f29c00b14925f8398bc526682c9dd38 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 23 七月 2024 16:56:48 +0800
Subject: [PATCH] 增加系统配置项VITE_GLOB_SYS_TYPE， WMS/MES
---
src/utils/env.ts | 6 +++---
types/global.d.ts | 2 +-
src/hooks/setting/index.ts | 4 ++--
.env.production | 10 +++++-----
types/config.d.ts | 2 +-
5 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.env.production b/.env.production
index 686cc2a..fe4f16b 100644
--- a/.env.production
+++ b/.env.production
@@ -4,7 +4,7 @@
# @version:
# @Date: 2024-06-17 14:51:25
# @LastEditors: Ben Lin
- # @LastEditTime: 2024-07-19 17:42:40
+ # @LastEditTime: 2024-07-23 16:55:36
###
# Whether to open mock
VITE_USE_MOCK = false
@@ -19,9 +19,9 @@
# Basic interface address SPA
-VITE_GLOB_API_URL=http://47.115.28.255:9633/api
-VITE_GLOB_SYS_API_URL=http://47.115.28.255:9633
-VITE_GLOB_TSK_API_URL=http://47.115.28.255:9633/api
+VITE_GLOB_API_URL=http://localhost:9527/api
+VITE_GLOB_SYS_API_URL=http://localhost:9527
+VITE_GLOB_TSK_API_URL=http://localhost:9633/api
# File upload address锛� optional
# It can be forwarded by nginx or write the actual address directly
@@ -34,4 +34,4 @@
VITE_GLOB_MAP_KEY = 4I4BZ-HLFC4-WRLUP-XXYTX-FFHY2-DQFH4
VITE_USE_ORG = 'N'
#systm type WMS/MES
-VITE_APP_TYPE = WMS
+VITE_GLOB_SYS_TYPE = MES
diff --git a/src/hooks/setting/index.ts b/src/hooks/setting/index.ts
index bfa8ff4..d5645b1 100644
--- a/src/hooks/setting/index.ts
+++ b/src/hooks/setting/index.ts
@@ -20,7 +20,7 @@
VITE_GLOB_MAP_KEY,
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
- VITE_APP_TYPE,
+ VITE_GLOB_SYS_TYPE,
VITE_USE_ORG,
} = getAppEnvConfig();
@@ -36,7 +36,7 @@
mapKey: VITE_GLOB_MAP_KEY,
downloadUrl: VITE_GLOB_DOWNLOAD_URL,
useOrg: VITE_USE_ORG,
- systemType: VITE_APP_TYPE,
+ systemType: VITE_GLOB_SYS_TYPE,
};
return glob as Readonly<GlobConfig>;
};
diff --git a/src/utils/env.ts b/src/utils/env.ts
index ab6b850..1f893a6 100644
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -4,7 +4,7 @@
* @version:
* @Date: 2024-06-17 14:51:26
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-19 17:10:02
+ * @LastEditTime: 2024-07-23 16:33:54
*/
import type { GlobEnvConfig } from '#/config';
import pkg from '../../package.json';
@@ -46,7 +46,7 @@
VITE_GLOB_MAP_KEY,
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
- VITE_APP_TYPE,
+ VITE_GLOB_SYS_TYPE,
VITE_USE_ORG,
} = ENV;
let { VITE_GLOB_API_URL } = ENV;
@@ -64,7 +64,7 @@
VITE_GLOB_TSK_API_URL,
VITE_GLOB_DOWNLOAD_URL,
VITE_USE_ORG,
- VITE_APP_TYPE,
+ VITE_GLOB_SYS_TYPE,
};
}
diff --git a/types/config.d.ts b/types/config.d.ts
index 6993f4b..5f1340b 100644
--- a/types/config.d.ts
+++ b/types/config.d.ts
@@ -170,5 +170,5 @@
VITE_GLOB_MAP_KEY: string;
VITE_GLOB_DOWNLOAD_URL: string;
VITE_USE_ORG: boolean;
- VITE_APP_TYPE: string;
+ VITE_GLOB_SYS_TYPE: string;
}
diff --git a/types/global.d.ts b/types/global.d.ts
index 850f933..5ca6c62 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -75,7 +75,7 @@
VITE_USE_MOCK: boolean;
VITE_PUBLIC_PATH: string;
VITE_GLOB_APP_TITLE: string;
- VITE_APP_TYPE: string;
+ VITE_GLOB_APP_TYPE: string;
VITE_BUILD_COMPRESS: 'gzip' | 'brotli' | 'none';
}
--
Gitblit v1.9.3