diff --git a/src/assets/i18n/langs/cn/quality.js b/src/assets/i18n/langs/cn/quality.js index 609725ae..48016996 100644 --- a/src/assets/i18n/langs/cn/quality.js +++ b/src/assets/i18n/langs/cn/quality.js @@ -143,6 +143,12 @@ export default { regionId: [ { required: true, message: "请选择检查部位", trigger: "change" }, ], + dangerItemId: [ + { required: true, message: "请选择排查分类", trigger: "change" }, + ], + enterpriseName: [ + { required: true, message: "请选择分包单位", trigger: "change" }, + ], inspectManId: [ { required: true, message: "请选择检查人", trigger: "change" }, ], diff --git a/src/views/projectFront/laborManage/personDetails.vue b/src/views/projectFront/laborManage/personDetails.vue index 8469ee1e..28532ea1 100644 --- a/src/views/projectFront/laborManage/personDetails.vue +++ b/src/views/projectFront/laborManage/personDetails.vue @@ -1941,7 +1941,7 @@ {{ scope.row.isPass == 1 ? "是" - : "否" + : scope.row.isPass == 0 ? "否" : "" }} diff --git a/src/views/projectFront/laborManage/safetyTrainManage.vue b/src/views/projectFront/laborManage/safetyTrainManage.vue index 15f61214..236d0f74 100644 --- a/src/views/projectFront/laborManage/safetyTrainManage.vue +++ b/src/views/projectFront/laborManage/safetyTrainManage.vue @@ -115,7 +115,8 @@ width="15px" height="15px" /> - 下载 + + 下载
item).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: { diff --git a/src/views/projectFront/safetyEducation/safetyAnalysis.vue b/src/views/projectFront/safetyEducation/safetyAnalysis.vue index 2daa2a57..dfcbc4d9 100644 --- a/src/views/projectFront/safetyEducation/safetyAnalysis.vue +++ b/src/views/projectFront/safetyEducation/safetyAnalysis.vue @@ -507,8 +507,8 @@ export default { this.examineInfo2.rectificationNum, this.examineInfo2.reviewNum, this.examineInfo2.verificationNum]; - const maxCount = data.map(item => item).sort((a,b) => b - a)[0]; - // console.log('~~~~~~~~~~~~~',this.examineInfo2,data); + const maxCount = [...data].map(item => item).sort((a,b) => b - a)[0]; + console.log('~~~~~~~~~~~~~',this.examineInfo2, data); let option = { legend: { icon: 'roundRect', @@ -545,7 +545,7 @@ export default { }, { name: '待核验', - max: data.sort((a,b) => b - a)[0], + max: maxCount, }, ] },