From 3b77ed11a56c7f6ccc52caa293df2232e678f59b Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 5 Aug 2024 10:37:55 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E5=AE=89=E5=85=A8/=E8=B4=A8?= =?UTF-8?q?=E9=87=8F=E6=8F=90=E4=BA=A4=E8=B4=A3=E4=BB=BB=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projectFront/quality/inspectionLedger.vue | 620 ++++++++++++------ .../safeSame/inspectionLedger.vue | 57 +- 2 files changed, 473 insertions(+), 204 deletions(-) diff --git a/src/views/projectFront/quality/inspectionLedger.vue b/src/views/projectFront/quality/inspectionLedger.vue index 47427795..c9afa45a 100644 --- a/src/views/projectFront/quality/inspectionLedger.vue +++ b/src/views/projectFront/quality/inspectionLedger.vue @@ -19,7 +19,9 @@ > {{ $t("message.quality.extendedPeriodNotClosed") }}: - {{ statisticsValue.overdueNotCloseNum }}{{ + statisticsValue.overdueNotCloseNum + }} {{ $t("message.quality.afterRectification") }}: @@ -36,37 +38,46 @@ 整改率: - {{ statisticsValue.rectificationRatio }}%{{ statisticsValue.rectificationRatio }}% 闭合率: {{ statisticsValue.completeRatio }}%闭合率: + {{ statisticsValue.completeRatio }}% - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +
-
+ + + + + + + {{ $t("message.quality.inquire") @@ -273,7 +320,9 @@ align="center" prop="inspectManName" :label=" - $t('message.quality.rummager') + '/' + $t('message.quality.inspectionTime') + $t('message.quality.rummager') + + '/' + + $t('message.quality.inspectionTime') " width="180" > @@ -351,7 +400,11 @@ " @click="editRow(scope.row)" > - + {{ $t("message.alarmValueSet.edit") }}
- + {{ $t("message.alarmValueSet.delete") }}
@@ -411,7 +468,9 @@ >{{ $t("message.quality.recordsOfTheFebruary") }} -
+
- + @@ -500,7 +562,8 @@ 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" > @@ -512,7 +575,10 @@ 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") + }} @@ -752,7 +839,10 @@ - + --> - + --> - + - {{ - $t("message.quality.uploadAttachment") - }} + {{ $t("message.quality.uploadAttachment") }}
{{ $t("message.quality.uploadHint2") }} @@ -924,7 +1027,9 @@ -->
-
+
- + - + @@ -1042,7 +1155,10 @@ prop="routineId" v-if="routineList.length > 0" > - + - + - {{ - $t("message.quality.uploadAttachment") - }} + {{ $t("message.quality.uploadAttachment") }}
{{ $t("message.quality.uploadHint2") }}
@@ -1197,7 +1323,9 @@ --> -
+
{{ $t("message.personnelPosition.mapManage.delete") }}{{ + $t("message.personnelPosition.mapManage.delete") + }}

@@ -1410,7 +1544,9 @@ @@ -1471,9 +1607,15 @@
- 超期 + 超期
@@ -1483,7 +1625,9 @@ {{ detailData.recordType == 1 ? "质量问题" : "排查记录" }}{{ + detailData.recordType == 1 ? "质量问题" : "排查记录" + }}
@@ -1587,7 +1731,9 @@
- 检查人： + 检查人： {{ detailData.inspectManName }} @@ -1624,7 +1770,9 @@
- 核验人： + 核验人： {{ detailData.verifyManName }} @@ -1711,7 +1859,9 @@
- 责任人： + 责任人： {{ detailData.changeName }} @@ -1746,7 +1896,9 @@
- 复查人： + 复查人： {{ detailData.reviewName }} @@ -1765,7 +1917,9 @@ -->
- 现场视频： + 现场视频：
-
超期
-
用时：{{ item.takeTime }}
+
+ 超期 +
+
+ 用时：{{ item.takeTime }} +

{{ @@ -1888,7 +2048,11 @@ -

+
{{ detailData.status == 2 @@ -1912,7 +2081,10 @@
- + * {{ detailData.status == 2 @@ -2019,7 +2191,9 @@ :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" @@ -2118,7 +2292,10 @@ import { deleteRectifyRecordListApi, backRectifyRecordListApi, } from "@/assets/js/api/quality.js"; -import { getProjectChilderSystemUserListApi } from "@/assets/js/api/configManage.js"; +import { + getProjectChilderSystemUserListApi, + getEnterpriseInfoListApi, +} from "@/assets/js/api/configManage.js"; import { VueCropper } from "vue-cropper"; import { getSubdivisionProjectApi, //所有分部分项工程， 以父子节点形式呈现 @@ -2164,6 +2341,7 @@ export default { urgentLevel: "", regionId: "", dangerInfoId: "", + enterpriseId: "", }, type: "add", pageNo: 1, @@ -2186,7 +2364,8 @@ export default { recordType: 1, //新增数据 1质量问题，2排查记录 addDialog: false, addTitle: - this.$t("message.quality.new") + this.$t("message.quality.inspectionRecord"), + this.$t("message.quality.new") + + this.$t("message.quality.inspectionRecord"), addForm1: { regionId: "", regionName: "", @@ -2286,6 +2465,7 @@ export default { videoName: "", unitEnterpriseId: "", unitRegionId: "", + enterpriseList: [], }; }, created() { @@ -2299,6 +2479,7 @@ export default { this.getProgressListData(); this.getPositionList(); this.getDescribeClassifyList(); + this.getUpdateUnitListFn(); }, computed: { isJSON() { @@ -2346,14 +2527,26 @@ export default { }, mounted() {}, methods: { + getUpdateUnitListFn() { + getEnterpriseInfoListApi({ projectSn: this.projectSn }).then((res) => { + console.log(res); + if (res.code == 200) { + this.enterpriseList = res.result; + } + }); + }, backQuestion(obj) { console.log("删除", obj); this.$confirm( "确定撤回该条记录?", this.$t("message.personnelPosition.beaconManage.table.Tips"), { - confirmButtonText: this.$t("message.personnelPosition.confirmButtonText"), - cancelButtonText: this.$t("message.personnelPosition.cancelButtonText"), + confirmButtonText: this.$t( + "message.personnelPosition.confirmButtonText" + ), + cancelButtonText: this.$t( + "message.personnelPosition.cancelButtonText" + ), type: "warning", } ) @@ -2459,8 +2652,12 @@ export default { "确定删除该条记录?", this.$t("message.personnelPosition.beaconManage.table.Tips"), { - confirmButtonText: this.$t("message.personnelPosition.confirmButtonText"), - cancelButtonText: this.$t("message.personnelPosition.cancelButtonText"), + confirmButtonText: this.$t( + "message.personnelPosition.confirmButtonText" + ), + cancelButtonText: this.$t( + "message.personnelPosition.cancelButtonText" + ), type: "warning", } ) @@ -2475,7 +2672,12 @@ export default { .catch(() => {}); }, statusCondition(data) { - console.log(data, "我爱我爱", data.changeId, this.$store.state.userInfo.userId); + console.log( + data, + "我爱我爱", + data.changeId, + this.$store.state.userInfo.userId + ); console.log(data.reviewId == this.$store.state.userInfo.userId); if (data.status == 2) { if (data.changeId == this.$store.state.userInfo.userId) { @@ -2676,9 +2878,12 @@ export default { this.pageSize; } else { const data = {}; - if(this.formInline.dangerInfoId.length > 0){ + if (this.formInline.dangerInfoId.length > 0) { data.dangerInfoLevel = this.formInline.dangerInfoId.length; - data.dangerInfoId = this.formInline.dangerInfoId[this.formInline.dangerInfoId.length - 1]; + data.dangerInfoId = + this.formInline.dangerInfoId[ + this.formInline.dangerInfoId.length - 1 + ]; } else { data.dangerInfoLevel = ""; data.dangerInfoId = ""; @@ -2705,8 +2910,10 @@ export default { this.pageSize + "&dangerInfoId=" + data.dangerInfoId + - "&dangerInfoLevel =" + - data.dangerInfoLevel; + "&dangerInfoLevel=" + + data.dangerInfoLevel+ + "&enterpriseId=" + + this.formInline.enterpriseId; } }, openImg(src) { @@ -2752,8 +2959,10 @@ export default { //remark整改要求 level等级 if (e.length) { console.log(this.$refs["formRegion2"].getCheckedNodes()[0].data); - this.addForm1.level = this.$refs["formRegion2"].getCheckedNodes()[0].data.level; - this.addForm1.remark = this.$refs["formRegion2"].getCheckedNodes()[0].data.remark; + this.addForm1.level = + this.$refs["formRegion2"].getCheckedNodes()[0].data.level; + this.addForm1.remark = + this.$refs["formRegion2"].getCheckedNodes()[0].data.remark; } else { this.addForm1.level = ""; this.addForm1.remark = ""; @@ -2783,7 +2992,8 @@ export default { this.addForm1.enterpriseSn = ""; this.addForm1.enterpriseName = ""; this.addForm1.changeId = ""; - 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; console.log(data, 666); @@ -2812,7 +3022,9 @@ 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 @@ -2827,7 +3039,8 @@ 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++) { @@ -2869,14 +3082,18 @@ 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); } }); @@ -2905,7 +3122,9 @@ 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 @@ -2918,7 +3137,8 @@ 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++) { @@ -3065,7 +3285,8 @@ export default { status: "", urgentLevel: "", regionId: "", - dangerInfoId:"" + dangerInfoId: "", + enterpriseId: "", }; this.pageNo = 1; this.pageSize = 10; @@ -3074,8 +3295,8 @@ export default { //查询按钮 分页列表查询 onSubmit() { - let data = {...this.formInline}; - if(data.dangerInfoId.length > 0){ + let data = { ...this.formInline }; + if (data.dangerInfoId.length > 0) { data.dangerInfoLevel = data.dangerInfoId.length; data.dangerInfoId = data.dangerInfoId[data.dangerInfoId.length - 1]; } else { @@ -3101,11 +3322,13 @@ 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 = []; @@ -3191,7 +3414,9 @@ export default { projectSn: this.projectSn, // enterpriseTypeId: 7, qualityRegionId: - regionId instanceof Array ? regionId[regionId.length - 1].toString() : regionId, + regionId instanceof Array + ? regionId[regionId.length - 1].toString() + : regionId, // qualityRegionId: regionId.toString(), qualityRegionBindType: 2, isSupervisingRoleName: 1, @@ -3237,16 +3462,17 @@ 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) => { @@ -3262,9 +3488,8 @@ 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) => { @@ -3455,8 +3680,10 @@ 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); @@ -3517,7 +3744,8 @@ 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(() => { @@ -3593,14 +3821,15 @@ 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 = []; @@ -3627,9 +3856,8 @@ 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() @@ -3701,15 +3929,18 @@ 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 = []; @@ -3744,9 +3975,10 @@ 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/safeSame/inspectionLedger.vue b/src/views/projectFront/safeSame/inspectionLedger.vue index 3309fdbf..b926d789 100644 --- a/src/views/projectFront/safeSame/inspectionLedger.vue +++ b/src/views/projectFront/safeSame/inspectionLedger.vue @@ -220,6 +220,24 @@ >
+ + + + + +
0){ + if (this.formInline.dangerInfoId.length > 0) { data.dangerInfoLevel = this.formInline.dangerInfoId.length; - data.dangerInfoId = this.formInline.dangerInfoId[this.formInline.dangerInfoId.length - 1]; + data.dangerInfoId = + this.formInline.dangerInfoId[ + this.formInline.dangerInfoId.length - 1 + ]; } else { data.dangerInfoLevel = ""; data.dangerInfoId = ""; } + console.log(this.formInline.enterpriseId) window.location.href = this.$http.defaults.baseURL + "xmgl/download/exportExcelXzSecurityQualityInspectionRecord?projectSn=" + @@ -2861,11 +2886,13 @@ export default { "&pageNo=" + this.pageNo + "&pageSize=" + - this.pageSize+ + this.pageSize + "&dangerInfoId=" + - data.dangerInfoId+ - "&dangerInfoLevel =" + - data.dangerInfoLevel ; + data.dangerInfoId + + "&dangerInfoLevel=" + + data.dangerInfoLevel+ + "&enterpriseId=" + + this.formInline.enterpriseId; } }, openImg(src) { @@ -3240,7 +3267,8 @@ export default { status: "", urgentLevel: "", regionId: "", - dangerInfoId:"" + dangerInfoId: "", + enterpriseId: "", }; this.pageNo = 1; this.pageSize = 10; @@ -3249,9 +3277,9 @@ export default { //查询按钮 分页列表查询 onSubmit() { - let data = {...this.formInline}; + let data = { ...this.formInline }; console.log(data.dangerInfoId); - if(data.dangerInfoId.length > 0){ + if (data.dangerInfoId.length > 0) { data.dangerInfoLevel = data.dangerInfoId.length; data.dangerInfoId = data.dangerInfoId[data.dangerInfoId.length - 1]; } else { @@ -3475,6 +3503,15 @@ export default { } }); }, + getUpdateUnitListFn() { + getEnterpriseInfoListApi({ projectSn: this.projectSn }).then((res) => { + console.log(res); + if (res.code == 200) { + this.enterpriseList = res.result; + } + }); + }, + //获取分包单位 getEnterprise(type) { if (type != 1) {