From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后,状态修改补上 4. 修改状态时,需校验上一步状态是否对应 5. 下发任务完成后,查看是否修改状态为2 7. 任务状态列表,数据显示不全问题修复 8. 波次列表,表格合并问题导致多订单出库问题
---
zy-asrs-admin/src/utils/localeUtils.js | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/zy-asrs-admin/src/utils/localeUtils.js b/zy-asrs-admin/src/utils/localeUtils.js
index c503c68..f9d2882 100644
--- a/zy-asrs-admin/src/utils/localeUtils.js
+++ b/zy-asrs-admin/src/utils/localeUtils.js
@@ -1,19 +1,21 @@
-import { globalState } from '../config.js'
-import enUS from '../locales/en_US.js';
-import zhCN from '../locales/zh_CN.js';
-
-export const formatMessage = (id, defaultMessage) => {
- const localesType = {
- enUS,
- zhCN,
- }
-
- const message = localesType[globalState.locale]
- if(message == null) {
- return defaultMessage;
- }
- if(message[id] == null || message[id] == undefined) {
- return defaultMessage;
- }
- return message[id];
+import { globalState } from '../config.js'
+import { post } from '@/utils/request.js'
+
+export const formatMessage = (id, defaultMessage) => {
+ const message = globalState.localeData;
+ if(message == null) {
+ return defaultMessage;
+ }
+ if(message[id] == null || message[id] == undefined) {
+ return defaultMessage;
+ }
+ return message[id];
+}
+
+export const loadData = async (locale) => {
+ let resp = await post('/api/language/json',{
+ locale: locale
+ })
+ let result = resp.data;
+ globalState.localeData = result.data;
}
\ No newline at end of file
--
Gitblit v1.9.1