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

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

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,
}));

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;

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;
@@ -77,11 +77,7 @@ type RecordRaws = {
*/
function buildRouters(recordRaws: RecordRaws[]): RouteRecordRaw[] {
const routers: RouteRecordRaw[] = [];
for (const item of recordRaws) {
// 过滤旧前端菜单 是layui的菜单跳过
if (['', '/page"'].includes(item.path)) {
continue;
}
for (const item of recordRaws) {
// 路由页面组件
let component: RouteComponent = {};
if (item.component) {

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('');