From b5dcd8765482f4d6edad0b10f3eb600d1e849c07 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Thu, 28 Aug 2025 10:24:57 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=BA=8C=E7=BA=A7=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E6=8A=A5=E9=94=99bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 2 +- pages/projectEnd/qualityManage/addIssue.vue | 4 +++- pages/projectEnd/qualityManage/editIssue.vue | 8 ++++++-- .../projectEnd/safeManage/riskRanking/addRiskRanking.vue | 4 +++- .../safeManage/riskRanking/oldaddRiskRanking.vue | 4 +++- pages/projectEnd/safeSame/addIssue.vue | 2 +- pages/projectEnd/safeSame/addIssueOld.vue | 4 +++- pages/projectEnd/safeSame/details.vue | 4 ++-- pages/projectEnd/safeSame/editIssue.vue | 4 +++- pages/projectEnd/safeSame/editlssueOld.vue | 8 ++++++-- .../addHazardousWorkDistribution.vue | 4 +++- 11 files changed, 34 insertions(+), 14 deletions(-) diff --git a/main.js b/main.js index c2d7b4c9..8ce64388 100644 --- a/main.js +++ b/main.js @@ -55,7 +55,7 @@ if (process.env.NODE_ENV === 'development') { // Vue.prototype.url_config = 'http://jxj.zhgdyun.com:61212/' //杰哥内网穿透地址 // Vue.prototype.url_config = 'http://192.168.34.221:28890/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.221:28888/' //郭圣雄本地 - Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 + // Vue.prototype.url_config = 'http://192.168.34.221:8111/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.221:19112/' //郭圣雄本地 // Vue.prototype.url_config = 'http://182.90.224.237:51234/' //郭圣雄本地 // Vue.prototype.url_config = 'http://192.168.34.155:19111/' //彭洁本地 diff --git a/pages/projectEnd/qualityManage/addIssue.vue b/pages/projectEnd/qualityManage/addIssue.vue index 5d1453ee..5d034984 100644 --- a/pages/projectEnd/qualityManage/addIssue.vue +++ b/pages/projectEnd/qualityManage/addIssue.vue @@ -843,7 +843,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/qualityManage/editIssue.vue b/pages/projectEnd/qualityManage/editIssue.vue index 099f9152..eeabf390 100644 --- a/pages/projectEnd/qualityManage/editIssue.vue +++ b/pages/projectEnd/qualityManage/editIssue.vue @@ -900,7 +900,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } @@ -966,7 +968,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue b/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue index 0acb8aa8..1761e6d8 100644 --- a/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue +++ b/pages/projectEnd/safeManage/riskRanking/addRiskRanking.vue @@ -1139,7 +1139,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeManage/riskRanking/oldaddRiskRanking.vue b/pages/projectEnd/safeManage/riskRanking/oldaddRiskRanking.vue index c1a171c2..89e709eb 100644 --- a/pages/projectEnd/safeManage/riskRanking/oldaddRiskRanking.vue +++ b/pages/projectEnd/safeManage/riskRanking/oldaddRiskRanking.vue @@ -897,7 +897,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeSame/addIssue.vue b/pages/projectEnd/safeSame/addIssue.vue index 3354b71e..d36359bb 100644 --- a/pages/projectEnd/safeSame/addIssue.vue +++ b/pages/projectEnd/safeSame/addIssue.vue @@ -1126,7 +1126,7 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeSame/addIssueOld.vue b/pages/projectEnd/safeSame/addIssueOld.vue index ed5ac14d..fc76f854 100644 --- a/pages/projectEnd/safeSame/addIssueOld.vue +++ b/pages/projectEnd/safeSame/addIssueOld.vue @@ -871,7 +871,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeSame/details.vue b/pages/projectEnd/safeSame/details.vue index 0105b524..773225db 100644 --- a/pages/projectEnd/safeSame/details.vue +++ b/pages/projectEnd/safeSame/details.vue @@ -522,9 +522,9 @@ if (eItem.originalFieldName == "责任区域") { return row.regionNames || row.regionName || '--'; } else if (eItem.originalFieldName == "问题描述") { - return row.dangerItemContent || '--'; - } else if (eItem.originalFieldName == "问题分类") { return row.problemDescription || '--'; + } else if (eItem.originalFieldName == "问题分类") { + return row.dangerItemContent || '--'; } else if (eItem.originalFieldName == "问题等级") { const levelList = ["一级", "二级", "三级", "四级"]; return levelList[row.level - 1]; diff --git a/pages/projectEnd/safeSame/editIssue.vue b/pages/projectEnd/safeSame/editIssue.vue index 8d4287be..6ae01206 100644 --- a/pages/projectEnd/safeSame/editIssue.vue +++ b/pages/projectEnd/safeSame/editIssue.vue @@ -1213,7 +1213,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeSame/editlssueOld.vue b/pages/projectEnd/safeSame/editlssueOld.vue index be771aa5..51f00f7f 100644 --- a/pages/projectEnd/safeSame/editlssueOld.vue +++ b/pages/projectEnd/safeSame/editlssueOld.vue @@ -899,7 +899,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } @@ -965,7 +967,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName } diff --git a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue index 1655e59f..542fc6dd 100644 --- a/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue +++ b/pages/projectEnd/safeSame/hiddenTroubleComponents/addHazardousWorkDistribution.vue @@ -1195,7 +1195,9 @@ this.issueName = val[0].dangerName; } else { this.form.dangerTypeId = val[0].parents[0].id; - this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // this.issueName = val[0].parents[0].dangerName + '/' + val[0].parents[1].dangerName + '/' + val[0] + // .dangerName; + this.issueName = val[0].parents.map(item => item.dangerName).join('/') + '/' + val[0] .dangerName; this.form.dangerName = val[0].dangerName }