admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 解决冲突

Browse Source
This commit is contained in:
kun 2024-06-04 11:27:48 +08:00
commit af72b5bc31
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/store/index.js
View File

@ -67,7 +67,7 @@ export default new Vuex.Store({
// FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境
// // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用)
// // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用)
// // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址
// WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址
//--------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------
// BASEURL: baseUrl // BASEURL: baseUrl

7
src/views/projectFront/specialWork/fireWork.vue
View File

@ -674,6 +674,7 @@ export default {
if (res.result) { if (res.result) {
console.log(res.result.records, 1); console.log(res.result.records, 1);
this.tableData = res.result.records.map((item) => { this.tableData = res.result.records.map((item) => {
if(item.firemanAndCertificateNo){
const firemanAndCertificateNo = const firemanAndCertificateNo =
item.firemanAndCertificateNo.includes("[") && item.firemanAndCertificateNo.includes("[") &&
item.firemanAndCertificateNo.includes("]") item.firemanAndCertificateNo.includes("]")
@ -683,6 +684,12 @@ export default {
...item, ...item,
firemanAndCertificateNo, firemanAndCertificateNo,
}; };
}else{
return {
...item,
firemanAndCertificateNo: ''
}
}
}); });
this.total = res.result.total; this.total = res.result.total;
} }