From 2ba35dcc9246ed90fc3ec77d53aa4cf20945c964 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Thu, 4 Jul 2024 15:48:01 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E8=B4=A8=E9=87=8F=20=E6=95=B4=E6=94=B9=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E8=AF=A6=E6=83=85=20=E6=B2=A1=E6=9C=89=E6=82=AC?= =?UTF-8?q?=E6=B5=AE=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectFront/quality/inspectionLedger.vue | 508 ++++++------------ .../quality/inspectionLedgerag.vue | 6 +- .../safeSame/inspectionLedger.vue | 6 +- .../safeSame/inspectionLedgerag.vue | 6 +- 4 files changed, 187 insertions(+), 339 deletions(-) diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index c7d45076..2c503b1b 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -19,9 +19,7 @@ > {{ $t("message.quality.extendedPeriodNotClosed") }}: - {{ - statisticsValue.overdueNotCloseNum - }}{{ statisticsValue.overdueNotCloseNum }} {{ $t("message.quality.afterRectification") }}: @@ -38,21 +36,13 @@ 整改率: - {{ statisticsValue.rectificationRatio }}%{{ statisticsValue.rectificationRatio }}% 闭合率: - {{ statisticsValue.completeRatio }}%闭合率: {{ statisticsValue.completeRatio }}% - + - - - + + + @@ -172,18 +153,9 @@ :placeholder="$t('message.quality.urgencyDegree')" > - - - + + + @@ -204,12 +176,24 @@ {{ $t("message.quality.flush") }} - + 新增 - + 导出 @@ -269,9 +253,7 @@ align="center" prop="inspectManName" :label=" - $t('message.quality.rummager') + - '/' + - $t('message.quality.inspectionTime') + $t('message.quality.rummager') + '/' + $t('message.quality.inspectionTime') " width="180" > @@ -330,7 +312,10 @@
- + {{ $t("message.alarmValueSet.edit") }}
- + {{ $t("message.alarmValueSet.delete") }}
@@ -411,9 +391,7 @@ >{{ $t("message.quality.recordsOfTheFebruary") }} -
+
- + @@ -505,8 +479,7 @@ type="textarea" style="width: 400px" :placeholder=" - $t('message.quality.pleaseEnter') + - $t('message.quality.content') + $t('message.quality.pleaseEnter') + $t('message.quality.content') " v-model="addForm1.remark" > @@ -518,10 +491,7 @@ prop="routineId" v-if="routineList.length > 0" > - + - + - - {{ - $t("message.quality.stair") - }} - {{ - $t("message.quality.second") - }} - {{ - $t("message.quality.three") - }} - {{ - $t("message.quality.four") - }} + + {{ $t("message.quality.stair") }} + {{ $t("message.quality.second") }} + {{ $t("message.quality.three") }} + {{ $t("message.quality.four") }} - {{ - $t("message.quality.ordinary") - }} - {{ - $t("message.quality.severity") - }} - {{ - $t("message.quality.critical") - }} + {{ $t("message.quality.ordinary") }} + {{ $t("message.quality.severity") }} + {{ $t("message.quality.critical") }} @@ -782,10 +731,7 @@ - + --> - + --> - + - + @@ -897,21 +835,16 @@ :action="uploadUrl" :on-success="(file) => handleSuccess(file, 2)" :on-error="(file) => handleError(file, 2)" - :on-remove=" - (file, fileList) => handleRemove(file, fileList, 2) - " + :on-remove="(file, fileList) => handleRemove(file, fileList, 2)" :on-preview="(file) => handlePreview(file, 2)" :limit="1" :file-list="fileList2" :before-upload="(file) => beforeUpload(file, 2)" name="files" > - {{ $t("message.quality.uploadAttachment") }} + {{ + $t("message.quality.uploadAttachment") + }}
{{ $t("message.quality.uploadHint2") }} @@ -970,9 +903,7 @@ -->
-
+
- + - + @@ -1098,10 +1021,7 @@ prop="routineId" v-if="routineList.length > 0" > - + - + - + {{ $t("message.quality.uploadHint") }} @@ -1209,9 +1123,7 @@ :action="uploadUrl" :on-success="(file) => handleSuccess(file, 4)" :on-error="(file) => handleError(file, 4)" - :on-remove=" - (file, fileList) => handleRemove(file, fileList, 4) - " + :on-remove="(file, fileList) => handleRemove(file, fileList, 4)" :on-preview="(file) => handlePreview(file, 4)" :limit="1" :on-exceed="handleExceed" @@ -1219,12 +1131,9 @@ :before-upload="(file) => beforeUpload(file, 4)" name="files" > - {{ $t("message.quality.uploadAttachment") }} + {{ + $t("message.quality.uploadAttachment") + }}
{{ $t("message.quality.uploadHint2") }}
@@ -1267,9 +1176,7 @@ --> -
+
{{ - $t("message.personnelPosition.mapManage.delete") - }}{{ $t("message.personnelPosition.mapManage.delete") }}

@@ -1488,9 +1389,7 @@ @@ -1551,13 +1450,7 @@
超期整改
@@ -1568,9 +1461,7 @@ {{ - detailData.recordType == 1 ? "质量问题" : "排查记录" - }}{{ detailData.recordType == 1 ? "质量问题" : "排查记录" }}
@@ -1674,9 +1565,7 @@
- 检查人: + 检查人: {{ detailData.inspectManName }} @@ -1685,7 +1574,7 @@
补充说明: - + {{ detailData.dangerDesc }}
@@ -1713,9 +1602,7 @@
- 核验人: + 核验人: {{ detailData.verifyManName }} @@ -1749,7 +1636,7 @@
事件描述: - + {{ detailData.addedDescription }}
@@ -1802,9 +1689,7 @@
- 责任人: + 责任人: {{ detailData.changeName }} @@ -1832,16 +1717,14 @@
问题描述: - + {{ detailData.problemDescription }}
- 复查人: + 复查人: {{ detailData.reviewName }} @@ -1860,9 +1743,7 @@ -->
- 现场视频: + 现场视频:
现场照片: - + -
+
{{ detailData.status == 2 @@ -2005,10 +1882,7 @@
- + {{ detailData.status == 2 @@ -2061,7 +1935,8 @@
{{ detailData.status == 2 ? "整改照片:" @@ -2082,17 +1957,14 @@ :before-upload="(file) => beforeUpload(file, 5)" :on-success="(file) => handleSuccess(file, 5)" :on-error="(file) => handleError(file, 5)" - :on-remove=" - (file, fileList) => handleRemove(file, fileList, 5) - " + :on-remove="(file, fileList) => handleRemove(file, fileList, 5)" :on-preview="(file) => handlePreview(file, 5)" name="files" :file-list="fileListRectification" accept="image/jpeg,image/jpg,image/png" required - > - + @@ -2110,7 +1982,10 @@ size="medium" type="danger" @click.stop="rectifAdd(detailData.id, detailData.status, 3)" - v-permission="{key: 'inspectionLedger_back', menuPath: '/project/quality/inspectionLedger'}" + v-permission="{ + key: 'inspectionLedger_back', + menuPath: '/project/quality/inspectionLedger', + }" >驳回 通过 0) { this.addForm1.notifyPerson = []; } - this.addForm1.notifyPerson.push( - Number(data.intendanceIds.split(",")[j]) - ); + this.addForm1.notifyPerson.push(Number(data.intendanceIds.split(",")[j])); } } this.addForm1.notifyPerson = data.intendanceIds @@ -2879,8 +2740,7 @@ export default { } else if (this.recordType == 2) { this.addForm2.enterpriseSn = ""; this.addForm2.enterpriseName = ""; - let pathLabels = - this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels; + let pathLabels = this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels; let data = this.$refs["addFormRegion2"].getCheckedNodes()[0].data; let text = ""; for (let i = 0; i < pathLabels.length; i++) { @@ -2902,7 +2762,7 @@ export default { }, editChangeRegion() { // console.log(val,this.checkPointList,this.$refs['formRegion1'].getCheckedNodes()[0]) - if(this.recordType == 1){ + if (this.recordType == 1) { if (this.$refs["formRegion1"].getCheckedNodes().length == 0) { this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseName = ""; @@ -2921,18 +2781,14 @@ export default { } } if (this.recordType == 1) { - let pathLabels = - this.$refs["formRegion1"].getCheckedNodes()[0].pathLabels; + let pathLabels = this.$refs["formRegion1"].getCheckedNodes()[0].pathLabels; let data = this.$refs["formRegion1"].getCheckedNodes()[0].data; this.areaData = data; const newArr = []; console.log(this.areaData, 777999333); if (this.areaData.systemUsers) { this.areaData.systemUsers.filter((item) => { - if ( - item.userId && - item.enterpriseId == this.addForm1.enterpriseId - ) { + if (item.userId && item.enterpriseId == this.addForm1.enterpriseId) { newArr.push(item); } }); @@ -2961,9 +2817,7 @@ export default { if (this.addForm1.notifyPerson > 0) { this.addForm1.notifyPerson = []; } - this.addForm1.notifyPerson.push( - Number(data.intendanceIds.split(",")[j]) - ); + this.addForm1.notifyPerson.push(Number(data.intendanceIds.split(",")[j])); } } this.addForm1.notifyPerson = data.intendanceIds @@ -2976,8 +2830,7 @@ export default { this.subcontractList = data.enterpriseInfos; this.crewUpdateList = []; } else if (this.recordType == 2) { - let pathLabels = - this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels; + let pathLabels = this.$refs["addFormRegion2"].getCheckedNodes()[0].pathLabels; let data = this.$refs["addFormRegion2"].getCheckedNodes()[0].data; let text = ""; for (let i = 0; i < pathLabels.length; i++) { @@ -3151,13 +3004,11 @@ export default { if (type == 1) { this.type = "detail"; this.addTitle = - this.$t("message.quality.inspectionRecord") + - this.$t("message.quality.detail"); + this.$t("message.quality.inspectionRecord") + this.$t("message.quality.detail"); } else { this.type = "add"; this.addTitle = - this.$t("message.quality.new") + - this.$t("message.quality.inspectionRecord"); + this.$t("message.quality.new") + this.$t("message.quality.inspectionRecord"); this.fileList1 = []; @@ -3265,7 +3116,7 @@ export default { let data = { projectSn: this.projectSn, enterpriseId: this.unitEnterpriseId, - qualityRegionId: this.unitRegionId + qualityRegionId: this.unitRegionId, }; getProjectChilderSystemUserListApi(data).then((res) => { if (res.code == 200) { @@ -3284,17 +3135,16 @@ export default { // } if (this.recordType == 1 && pathLabels.length > 0) { //只有问题描述有三级时才查询问题等级 - if ( - this.$refs["cascaderAddr"].getCheckedNodes()[0].pathLabels.length >= - 3 - ) { - this.addForm1.level = - this.$refs["cascaderAddr"].getCheckedNodes()[0].data.level; + if (this.$refs["cascaderAddr"].getCheckedNodes()[0].pathLabels.length >= 3) { + this.addForm1.level = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.level; } else { this.addForm1.level = ""; } - this.addForm1.remark = - this.$refs["cascaderAddr"].getCheckedNodes()[0].data.remark; + this.addForm1.remark = this.$refs[ + "cascaderAddr" + ].getCheckedNodes()[0].data.remark; this.addForm1.dangerItemContent = pathLabels[0].pathLabels .map((item) => { @@ -3310,8 +3160,9 @@ export default { } else { // this.addForm2.level = // this.$refs['cascaderAddr2'].getCheckedNodes()[0].data.level - this.addForm2.remark = - this.$refs["cascaderAddr2"].getCheckedNodes()[0].data.remark; + this.addForm2.remark = this.$refs[ + "cascaderAddr2" + ].getCheckedNodes()[0].data.remark; this.addForm2.dangerItemContent = pathLabels2[0].pathLabels .map((item) => { @@ -3387,11 +3238,15 @@ export default { beforeUpload(file, type) { if (type == 1 || type == 3 || type == 5) { // console.log(this.fileList1.length) - if(this.fileList1.length >= 5 || this.fileList3.length >= 5 || this.fileListRectification .length >= 5){ + if ( + this.fileList1.length >= 5 || + this.fileList3.length >= 5 || + this.fileListRectification.length >= 5 + ) { this.$message.warning("最多只能上传5张图片"); return false; } - return true + return true; } if (type == 2 || type == 4) { const fileType = file.type; @@ -3416,7 +3271,7 @@ export default { // this.$message.warning("最多只能上传5张图片"); // return false; // } else { - + // } this.fileList1.push(data); } else if (type == 2) { @@ -3435,7 +3290,7 @@ export default { // this.$message.warning("最多只能上传5张图片"); // return false; // } else { - + // } this.fileList3.push(data); } else if (type == 4) { @@ -3498,10 +3353,8 @@ export default { //获取鼠标位置 getMousePos(event) { var e = event || window.event; - var scrollX = - document.documentElement.scrollLeft || document.body.scrollLeft; - var scrollY = - document.documentElement.scrollTop || document.body.scrollTop; + var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft; + var scrollY = document.documentElement.scrollTop || document.body.scrollTop; var x = e.pageX || e.clientX + scrollX; var y = e.pageY || e.clientY + scrollY; // console.log("x: " + x + "\ny: " + y); @@ -3562,8 +3415,7 @@ export default { if (res.data.status == "SUCCESS") { console.log(_this.$store.state.FILEURL); console.log(res.data); - _this.mapUrl = - _this.$store.state.FILEURL + res.data.data[0].imageUrl; + _this.mapUrl = _this.$store.state.FILEURL + res.data.data[0].imageUrl; _this.cropperDialog = false; console.log(_this.$store.state.FILEURL, res.data.data); _this.$nextTick(() => { @@ -3639,15 +3491,14 @@ export default { this.addForm1.regionId.length > 1 ? this.addForm1.regionId[this.addForm1.regionId.length - 1] : this.addForm1.regionId[0]; - data.dangerItemId = - this.addForm1.dangerItemId[this.addForm1.dangerItemId.length - 1]; + data.dangerItemId = this.addForm1.dangerItemId[ + this.addForm1.dangerItemId.length - 1 + ]; data.dangerTypeId = this.addForm1.dangerItemId[0]; let pointArr = []; for (let i = 0; i < this.pointList.length; i++) { let obj = - this.pointList[i].coordinateX + - "*" + - this.pointList[i].coordinateY; + this.pointList[i].coordinateX + "*" + this.pointList[i].coordinateY; pointArr.push(obj); } let imgUrl = []; @@ -3674,8 +3525,9 @@ export default { this.addForm2.regionId.length > 1 ? this.addForm2.regionId[this.addForm2.regionId.length - 1] : this.addForm2.regionId[0]; - data.dangerItemId = - this.addForm2.dangerItemId[this.addForm2.dangerItemId.length - 1]; + data.dangerItemId = this.addForm2.dangerItemId[ + this.addForm2.dangerItemId.length - 1 + ]; data.dangerTypeId = this.addForm2.dangerItemId[0]; // data.regionId = this.addForm2.regionId // ? this.addForm2.regionId.pop() @@ -3747,18 +3599,15 @@ export default { : this.addForm1.regionId[0]; } if (Array.isArray(data.dangerItemId)) { - data.dangerItemId = - this.addForm1.dangerItemId[ - this.addForm1.dangerItemId.length - 1 - ]; + data.dangerItemId = this.addForm1.dangerItemId[ + this.addForm1.dangerItemId.length - 1 + ]; data.dangerTypeId = this.addForm1.dangerItemId[0]; } let pointArr = []; for (let i = 0; i < this.pointList.length; i++) { let obj = - this.pointList[i].coordinateX + - "*" + - this.pointList[i].coordinateY; + this.pointList[i].coordinateX + "*" + this.pointList[i].coordinateY; pointArr.push(obj); } let imgUrl = []; @@ -3793,10 +3642,9 @@ export default { : this.addForm2.regionId[0]; } if (Array.isArray(data.dangerItemId)) { - data.dangerItemId = - this.addForm2.dangerItemId[ - this.addForm2.dangerItemId.length - 1 - ]; + data.dangerItemId = this.addForm2.dangerItemId[ + this.addForm2.dangerItemId.length - 1 + ]; data.dangerTypeId = this.addForm2.dangerItemId[0]; } // data.regionId = this.addForm2.regionId diff --git a/src/views/projectFront/quality/inspectionLedgerag.vue b/src/views/projectFront/quality/inspectionLedgerag.vue index 213c3493..d23e62b5 100644 --- a/src/views/projectFront/quality/inspectionLedgerag.vue +++ b/src/views/projectFront/quality/inspectionLedgerag.vue @@ -1604,7 +1604,7 @@
补充说明: - + {{ detailData.dangerDesc }}
@@ -1668,7 +1668,7 @@
事件描述: - + {{ detailData.addedDescription }}
@@ -1749,7 +1749,7 @@
问题描述: - + {{ detailData.problemDescription }}
diff --git a/src/views/projectFront/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index ec03d574..43a25d12 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -1669,7 +1669,7 @@
补充说明: - + {{ detailData.dangerDesc }}
@@ -1733,7 +1733,7 @@
事件描述: - + {{ detailData.addedDescription }}
@@ -1816,7 +1816,7 @@
问题描述: - + {{ detailData.problemDescription }}
diff --git a/src/views/projectFront/safeSame/inspectionLedgerag.vue b/src/views/projectFront/safeSame/inspectionLedgerag.vue index 24a4285b..f11d0574 100644 --- a/src/views/projectFront/safeSame/inspectionLedgerag.vue +++ b/src/views/projectFront/safeSame/inspectionLedgerag.vue @@ -1604,7 +1604,7 @@
补充说明: - + {{ detailData.dangerDesc }}
@@ -1668,7 +1668,7 @@
事件描述: - + {{ detailData.addedDescription }}
@@ -1749,7 +1749,7 @@
问题描述: - + {{ detailData.problemDescription }}