调整图片、再次查询未渲染问题
This commit is contained in:
parent
d7f01a3069
commit
b7378267cf
@ -142,7 +142,7 @@
|
|||||||
onLoad(option) {
|
onLoad(option) {
|
||||||
this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
|
this.OrgId = option.OrgId // 'B043B28B-BBC3-C452-6052-4FBA1457ABFA'
|
||||||
// const orgId = uni.getStorageSync('orgId')
|
// const orgId = uni.getStorageSync('orgId')
|
||||||
this.fetchEnums(['SKEvaluateLevelEnum','SKProductionUnit']);
|
this.fetchEnums(['SKEvaluateLevelEnum', 'SKProductionUnit']);
|
||||||
},
|
},
|
||||||
// onReady() {
|
// onReady() {
|
||||||
// //如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
|
// //如果需要兼容微信小程序,并且校验规则中含有方法等,只能通过setRules方法设置规则。
|
||||||
@ -198,10 +198,10 @@
|
|||||||
if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
|
if (item.Nav_Librarys && item.Nav_Librarys.length > 0) {
|
||||||
item.Nav_Librarys.map(item1 => {
|
item.Nav_Librarys.map(item1 => {
|
||||||
item1.EVALUATE_LEVELName = item1.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === item1.EVALUATE_LEVEL).name : '';
|
item1.EVALUATE_LEVELName = item1.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === item1.EVALUATE_LEVEL).name : '';
|
||||||
if(!item1.MINE_NAME){
|
if (!item1.MINE_NAME) {
|
||||||
item1.MINE_NAME = item1.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === item1.MineType).name : '';
|
item1.MINE_NAME = item1.MineType !== undefined ? this.enumsData['SKProductionUnit'].find(item => item.code === item1.MineType).name : '';
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@ -278,13 +278,15 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
filterData() {
|
filterData() {
|
||||||
|
this.checkedItems = []
|
||||||
this.allData.map(item => {
|
this.allData.map(item => {
|
||||||
if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
|
if (item.DEPARTMENT_ID == this.model.DEPARTMENT_ID && item.POST_NAME == this.model.Nav_Post.NAME) {
|
||||||
this.filterDatas = item
|
this.$set(this, 'filterDatas', item);
|
||||||
//默认全选
|
this.$nextTick(() => { // 等待 DOM 渲染新数据后再全选
|
||||||
const allIds= this.filterDatas.Nav_Librarys.map(item => item.ID);
|
const allIds = this.filterDatas.Nav_Librarys.map(item1 => item1.ID);
|
||||||
this.checkedItems = ['all', ...allIds];
|
this.checkedItems = ['all', ...allIds];
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
@ -316,21 +318,21 @@
|
|||||||
}, {});
|
}, {});
|
||||||
//
|
//
|
||||||
// 1. 按 RISK_NAME 分组,收集所有对应的 RISK_DESCRIPTION
|
// 1. 按 RISK_NAME 分组,收集所有对应的 RISK_DESCRIPTION
|
||||||
|
|
||||||
const allPhotos = [];
|
const allPhotos = [];
|
||||||
const photoNames = new Set(); // 用于记录已添加的图片name,实现去重
|
const photoNames = new Set(); // 用于记录已添加的图片name,实现去重
|
||||||
|
|
||||||
arr.forEach(item => {
|
arr.forEach(item => {
|
||||||
// 确保当前对象存在 Nav_Photo 且是数组,避免报错
|
// 确保当前对象存在 Nav_Photo 且是数组,避免报错
|
||||||
if (Array.isArray(item.Nav_Photo)) {
|
if (Array.isArray(item.Nav_Photo)) {
|
||||||
item.Nav_Photo.forEach(photo => {
|
item.Nav_Photo.forEach(photo => {
|
||||||
// 判断图片name是否已存在,不存在则添加
|
// 判断图片name是否已存在,不存在则添加
|
||||||
if (!photoNames.has(photo.name)) {
|
if (!photoNames.has(photo.NAME)) {
|
||||||
allPhotos.push(photo);
|
allPhotos.push(photo);
|
||||||
photoNames.add(photo.name);
|
photoNames.add(photo.NAME);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
// 此时 allPhotos 已包含所有 Nav_Photo 中的图片对象
|
// 此时 allPhotos 已包含所有 Nav_Photo 中的图片对象
|
||||||
let newarr = {
|
let newarr = {
|
||||||
@ -363,34 +365,34 @@
|
|||||||
`\n${riskName}:\n ${measuresList}`;
|
`\n${riskName}:\n ${measuresList}`;
|
||||||
})
|
})
|
||||||
.join(''),
|
.join(''),
|
||||||
RISK_DESCRIPTION: this.handleData(arr,'RISK_DESCRIPTION'),
|
RISK_DESCRIPTION: this.handleData(arr, 'RISK_DESCRIPTION'),
|
||||||
EMERGENCY: this.handleData(arr,'EMERGENCY'),
|
EMERGENCY: this.handleData(arr, 'EMERGENCY'),
|
||||||
Nav_Photo:allPhotos
|
Nav_Photo: allPhotos
|
||||||
}
|
}
|
||||||
uni.setStorageSync('detailData', newarr);
|
uni.setStorageSync('detailData', newarr);
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
url: '/pages/apply/jobRiskShow'
|
url: '/pages/apply/jobRiskShow'
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleData(arr,namekey){
|
handleData(arr, namekey) {
|
||||||
const oneData = {};
|
const oneData = {};
|
||||||
arr.forEach(item => {
|
arr.forEach(item => {
|
||||||
const name = item.RISK_NAME;
|
const name = item.RISK_NAME;
|
||||||
const desc = item[namekey];
|
const desc = item[namekey];
|
||||||
// 若该名称已存在,追加描述;否则新建键值对
|
// 若该名称已存在,追加描述;否则新建键值对
|
||||||
if (oneData[name]) {
|
if (oneData[name]) {
|
||||||
oneData[name].add(desc);
|
oneData[name].add(desc);
|
||||||
} else {
|
} else {
|
||||||
oneData[name] = new Set([desc]);
|
oneData[name] = new Set([desc]);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
const resultArr = [];
|
const resultArr = [];
|
||||||
for (const [name, descList] of Object.entries(oneData)) {
|
for (const [name, descList] of Object.entries(oneData)) {
|
||||||
// Set 转数组,再拼接为 “名称:描述1;描述2” 格式
|
// Set 转数组,再拼接为 “名称:描述1;描述2” 格式
|
||||||
const descStr = Array.from(descList).join(';');
|
const descStr = Array.from(descList).join(';');
|
||||||
resultArr.push(`${name}:${descStr}`);
|
resultArr.push(`${name}:${descStr}`);
|
||||||
}
|
}
|
||||||
|
|
||||||
// 3. 所有名称的拼接结果用 “\n” 连接,得到最终字符串
|
// 3. 所有名称的拼接结果用 “\n” 连接,得到最终字符串
|
||||||
const finalResult = resultArr.join('\n');
|
const finalResult = resultArr.join('\n');
|
||||||
return finalResult
|
return finalResult
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user