diff --git a/src/views/projectFront/progressManagementAg/divisionSubManage.vue b/src/views/projectFront/progressManagementAg/divisionSubManage.vue index e422ba86..56809ea6 100644 --- a/src/views/projectFront/progressManagementAg/divisionSubManage.vue +++ b/src/views/projectFront/progressManagementAg/divisionSubManage.vue @@ -195,6 +195,13 @@ + + --> -
+
进度记录
+
+ 开始任务 + 上报进度 + b - a)[0]; + const maxCount = data.map(item => item).sort((a,b) => b - a)[0]; + // console.log('~~~~~~~~~~~~~',this.examineInfo2,data); let option = { legend: { icon: 'roundRect', diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 95ff0840..9d2a9fbb 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -2634,6 +2634,7 @@ export default { }, //导出 exportData() { + if (this.COMPANY == "zjwj") { window.location.href = this.$http.defaults.baseURL + @@ -2654,9 +2655,10 @@ export default { "&pageSize=" + this.pageSize; } else { + // xmgl/download/exporExcelQualityInspectionRecord window.location.href = this.$http.defaults.baseURL + - "xmgl/download/exporExcelQualityInspectionRecord?projectSn=" + + "xmgl/download/exportExcelXzSecurityQualityInspectionRecord?projectSn=" + this.$store.state.projectSn + "&recordType=" + this.formInline.recordType + diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue index a5a7c5ef..2daa2a57 100644 --- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue +++ b/src/views/projectFront/safetyEducation/safetyAnalysis.vue @@ -507,7 +507,8 @@ export default { this.examineInfo2.rectificationNum, this.examineInfo2.reviewNum, this.examineInfo2.verificationNum]; - const maxCount = data.sort((a,b) => b - a)[0]; + const maxCount = data.map(item => item).sort((a,b) => b - a)[0]; + // console.log('~~~~~~~~~~~~~',this.examineInfo2,data); let option = { legend: { icon: 'roundRect', diff --git a/src/views/projectFront/specialWork/blindPlugWork.vue b/src/views/projectFront/specialWork/blindPlugWork.vue index c88bdb4b..2ec26c68 100644 --- a/src/views/projectFront/specialWork/blindPlugWork.vue +++ b/src/views/projectFront/specialWork/blindPlugWork.vue @@ -246,7 +246,7 @@ {{ workDetail.safetyWorkTicketCode }} --> - diff --git a/src/views/projectFront/specialWork/fireWork.vue b/src/views/projectFront/specialWork/fireWork.vue index b7549f6c..ca43a79f 100644 --- a/src/views/projectFront/specialWork/fireWork.vue +++ b/src/views/projectFront/specialWork/fireWork.vue @@ -368,7 +368,7 @@ {{ workDetail.certificateNo }} --> -