OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 多语言字段变更优化字典映射类型

Browse Source
This commit is contained in:
TsMask
2025-02-20 10:44:55 +08:00
parent 7322759545
commit 814bae0b94
7 changed files with 41 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/i18n/locales/en-US.ts
View File

@@ -276,8 +276,8 @@ export default {
sexPleace: "Please select the user's gender",
email: "Email",
emailPleace: "Please enter the correct e-mail address",
phonenumber: "Phone",
phonenumberPleace: "Please enter the correct cell phone number",
phone: "Phone",
phonePleace: "Please enter the correct cell phone number",
nick: "NickName",
nickPleace: "Please enter a user nickname",
nickTip: "Nicknames can only contain letters, numbers, Chinese characters and underscores, and no less than 2 digits",
@@ -338,13 +338,13 @@ export default {
headerRenderActions: "Whether to display the top navigation bar",
},
profile: {
phonenumber: "Phone",
phone: "Phone",
email: "Email",
deptName: "Department",
postGroup: "Possession of posts",
roleGroup: "Ownership",
loginIp: "Log in",
loginDate: "Login Time",
loginTime: "Login Time",
list: "Lists",
empty: "Empty State",
description: "No data yet, try refreshing",
@@ -1205,7 +1205,7 @@ export default {
dirCd: "Enter Dir",
viewAs: 'View Action',
reload: "Reload",
follow: 'Monitoring Content',
follow: 'Enable Instant Update',
tailChar: 'End Characters',
tailLines: 'End Lines',
},
@@ -1882,13 +1882,13 @@ export default {
},
dictData: {
dictType: "Dictionary name",
dictCode: "Data Code",
dictLabel: "Data Key",
dictLabelPleac: "Please enter the data key correctly",
dictValue: "Data Value",
dictValuePleac: "Please enter the data value correctly",
dictSort: "Data Sort",
status: "Status",
dataId: "Data Code",
dataLabel: "Data Key",
dataLabelPleac: "Please enter the data key correctly",
dataValue: "Data Value",
dataValuePleac: "Please enter the data value correctly",
dataSort: "Data Sort",
statusFlag: "Status",
createTime: "CreateTime",
tagType: "Tag Type",
tagTypeShow: "Tag Type Show",

22
src/i18n/locales/zh-CN.ts
View File

@@ -276,8 +276,8 @@ export default {
sexPleace: "请选择用户性别",
email: "电子邮箱",
emailPleace: "请输入正确的电子邮箱",
phonenumber: "手机号码",
phonenumberPleace: "请输入正确的手机号码",
phone: "手机号码",
phonePleace: "请输入正确的手机号码",
nick: "用户昵称",
nickPleace: "请输入用户昵称",
nickTip: "昵称少于2位",
@@ -338,13 +338,13 @@ export default {
headerRenderActions: "是否显示顶部导航栏",
},
profile: {
phonenumber: "手机号码",
phone: "手机号码",
email: "用户邮箱",
deptName: "所属部门",
postGroup: "拥有岗位",
roleGroup: "拥有角色",
loginIp: "登录地址",
loginDate: "登录时间",
loginTime: "登录时间",
list: "列表",
empty: "空状态",
description: "暂无数据，尝试刷新看看",
@@ -1882,13 +1882,13 @@ export default {
},
dictData: {
dictType: "字典名称",
dictCode: "数据代码",
dictLabel: "数据键名",
dictLabelPleac: "请正确输入数据键名",
dictValue: "数据键值",
dictValuePleac: "请正确输入数据键值",
dictSort: "数据排序",
status: "数据状态",
dataId: "数据代码",
dataLabel: "数据键名",
dataLabelPleac: "请正确输入数据键名",
dataValue: "数据键值",
dataValuePleac: "请正确输入数据键值",
dataSort: "数据排序",
statusFlag: "数据状态",
createTime: "创建时间",
tagType: "标签类型",
tagTypeShow: "回显预览",

12
src/store/modules/dict.ts
View File

@@ -30,8 +30,8 @@ const useDictStore = defineStore('dict', {
parseDataDict(data: Record<string, any>) {
return [
{
label: data.dictLabel,
value: data.dictValue,
label: data.dataLabel,
value: data.dataValue,
tagType: data.tagType,
tagClass: data.tagClass,
},
@@ -43,10 +43,10 @@ const useDictStore = defineStore('dict', {
let disct = this.dicts.get(key);
if (disct === undefined || disct.length === 0) {
const res = await getDictDataType(key);
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
const dictData: DictType[] = res.data.map(d => ({
label: d.dictLabel,
value: d.dictValue,
if (res.code === RESULT_CODE_SUCCESS) {
const dictData: DictType[] = res.data.map((d:any) => ({
label: d.dataLabel,
value: d.dataValue,
tagType: d.tagType,
tagClass: d.tagClass,
}));

6
src/store/modules/neinfo.ts
View File

@@ -61,7 +61,7 @@ const useNeInfoStore = defineStore('neinfo', {
const res = await listAllNeInfo({
bandStatus: false,
});
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
if (res.code === RESULT_CODE_SUCCESS) {
// 原始列表
this.neList = JSON.parse(JSON.stringify(res.data));
@@ -92,7 +92,7 @@ const useNeInfoStore = defineStore('neinfo', {
return { code: 1, data: this.traceInterfaceList, msg: 'success' };
}
const res = await getNeTraceInterfaceAll();
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
if (res.code === RESULT_CODE_SUCCESS) {
this.traceInterfaceList = res.data;
}
return res;
@@ -104,7 +104,7 @@ const useNeInfoStore = defineStore('neinfo', {
return { code: 1, data: this.perMeasurementList, msg: 'success' };
}
const res = await getNePerformanceList();
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
if (res.code === RESULT_CODE_SUCCESS) {
this.perMeasurementList = res.data;
}
return res;

6
src/store/modules/router.ts
View File

@@ -47,7 +47,7 @@ const useRouterStore = defineStore('router', {
*/
async generateRoutes() {
const res = await getRouters();
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
if (res.code === RESULT_CODE_SUCCESS) {
const buildRoutes = buildRouters(res.data.concat());
this.buildRouterData = buildRoutes;
return buildRoutes;
@@ -78,10 +78,6 @@ type RecordRaws = {
function buildRouters(recordRaws: RecordRaws[]): RouteRecordRaw[] {
const routers: RouteRecordRaw[] = [];
for (const item of recordRaws) {
// 过滤旧前端菜单 是layui的菜单跳过
if (['', '/page"'].includes(item.path)) {
continue;
}
// 路由页面组件
let component: RouteComponent = {};
if (item.component) {

14
src/store/modules/user.ts
View File

@@ -22,7 +22,7 @@ type UserInfo = {
/**用户昵称 */
nickName: string;
/**用户手机号 */
phonenumber: string;
phone: string;
/**用户邮箱 */
email: string;
/**用户性别 */
@@ -39,7 +39,7 @@ const useUserStore = defineStore('user', {
permissions: [],
avatar: '',
nickName: '',
phonenumber: '',
phone: '',
email: '',
sex: undefined,
profile: {},
@@ -64,7 +64,7 @@ const useUserStore = defineStore('user', {
getBaseInfo(state) {
return {
nickName: state.nickName,
phonenumber: state.phonenumber,
phone: state.phone,
email: state.email,
sex: state.sex,
};
@@ -77,7 +77,7 @@ const useUserStore = defineStore('user', {
*/
setBaseInfo(data: Record<string, any>) {
this.nickName = data.nickName;
this.phonenumber = data.phonenumber;
this.phone = data.phone;
this.email = data.email;
this.sex = data.sex;
},
@@ -119,7 +119,7 @@ const useUserStore = defineStore('user', {
this.avatar = user.avatar;
// 基础信息
this.nickName = user.nickName;
this.phonenumber = user.phonenumber;
this.phone = user.phone;
this.email = user.email;
this.sex = user.sex;
@@ -134,8 +134,8 @@ const useUserStore = defineStore('user', {
// 水印文字信息=用户昵称 手机号
// let waterMarkContent = this.userName;
// if (this.phonenumber) {
// waterMarkContent = `${this.userName} ${this.phonenumber}`;
// if (this.phone) {
// waterMarkContent = `${this.userName} ${this.phone}`;
// }
// useLayoutStore().changeWaterMark(waterMarkContent);
useLayoutStore().changeWaterMark('');

7
src/typings/request.d.ts vendored
View File

@@ -1,7 +0,0 @@
/**数据列表 */
type DataList = {
code: number;
msg: string;
total: number;
rows: Record<string, any>;
};