From 420197914a6a836f963504cac980d587e6d32ac9 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Fri, 28 Nov 2025 16:16:30 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bodyWornCamera/equipmentMonitor.vue | 4066 ++++++++--------- .../safeSame/hiddenDangerManage.vue | 20 + .../homeworkControlProcess.vue | 90 +- 3 files changed, 2072 insertions(+), 2104 deletions(-) diff --git a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue index 2dba5de3..15c18838 100644 --- a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue +++ b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue @@ -1,156 +1,179 @@ diff --git a/src/views/projectFront/safeSame/hiddenDangerManage.vue b/src/views/projectFront/safeSame/hiddenDangerManage.vue index 3203fe3c..1e492a4c 100644 --- a/src/views/projectFront/safeSame/hiddenDangerManage.vue +++ b/src/views/projectFront/safeSame/hiddenDangerManage.vue @@ -115,6 +115,26 @@ export default { activeIndex: "1", }; }, + created() { + const find = this.$store.state.menuList.find( + (item) => item.path == "/project/safeSame/inspectionLedger" + ); + if (find) { + const findAction = [ + "inspectionLedger_rectificationRecord", + "inspectionLedger_myToDoList", + "inspectionLedger_pendingReview", + "inspectionLedger_myHiddenTrouble", + "inspectionLedger_hazardousWorkDistribution", + "inspectionLedger_hiddenDangerAnalysis", + ]; + const findIndex = findAction.findIndex((item) => + find.actionList.some((i) => i.actionCode == item) + ); + this.activeIndex = `${findIndex + 1}`; + console.log(447788, find.actionList, findIndex); + } + }, methods: { handleSelect(key, keyPath) { // console.log(key, keyPath); diff --git a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue index 75592c64..5c17fdb9 100644 --- a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue +++ b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue @@ -69,6 +69,12 @@ + + + + + + + + + - + > --> - + @@ -956,9 +982,16 @@
作业人员
{{ workTicketDetail.operator }}
-
+ +
+
施工时间
+
+ {{ workTicketDetail.constructionTimeBegin }} - + {{ workTicketDetail.constructionTimeEnd }} +
@@ -978,13 +1011,6 @@
申请时间
{{ workTicketDetail.applicationTime }}
-
-
施工时间
-
- {{ workTicketDetail.constructionTimeBegin }} - - {{ workTicketDetail.constructionTimeEnd }} -
-
作业内容
@@ -1400,6 +1426,7 @@ export default { typeId: "", constructionTime: [], workTicketNumber: "", + riskType: "", status: "", operator: "", constructionAreas: "", @@ -1459,7 +1486,9 @@ export default { videoItemList: [], videoConfig: { enableNotPlugin: 1, - }, + }, + imageNumber:0, + uploadList: [], }; }, created() { @@ -1723,12 +1752,36 @@ export default { handleExceed(file, fileList) { this.$message.warning("上传图片超出限制个数！"); }, + beforeAvatarUpload(file) { + this.imageNumber++; + }, handleSuccess(res, file, type) { + console.log(res, file, type); if (res.status == "SUCCESS") { const obj = { 1: "workTicketAttachment", 2: "otherAttachment", }; + if(type == 1) { + this.uploadList.push({ + name: file.name, + url: + this.$store.state.FILEURL + + file.response.data[0].imageUrl, + newUrl: file.response.data[0].imageUrl, + }) + if(this.imageNumber == this.uploadList.length){ + this.workTicketForm.workTicketAttachment = this.workTicketForm.workTicketAttachment.concat(this.uploadList) + this.uploadList = [] + this.imageNumber = 0 + } + this.$refs.workTicketForm && this.$refs.workTicketForm.clearValidate( + "workTicketAttachment" + ); + return + } + + this.workTicketForm[obj[type]].push({ name: file.name, url: @@ -1736,11 +1789,6 @@ export default { file.response.data[0].imageUrl, newUrl: file.response.data[0].imageUrl, }); - if (type == 1) { - this.$refs.workTicketForm.clearValidate( - "workTicketAttachment" - ); - } } }, handleQuery() { @@ -1752,6 +1800,7 @@ export default { this.queryParams.typeId = ""; this.queryParams.constructionTime = []; this.queryParams.workTicketNumber = ""; + this.queryParams.riskType = ""; this.queryParams.status = ""; this.queryParams.operator = ""; this.queryParams.constructionAreas = ""; @@ -1820,6 +1869,7 @@ export default { ? this.queryParams.constructionTime[1] : "", workTicketNumber: this.queryParams.workTicketNumber, + riskType: this.queryParams.riskType, status: this.queryParams.status, operator: this.queryParams.operator, constructionAreas: this.queryParams.constructionAreas, @@ -3000,6 +3050,10 @@ export default { border-radius: 2px; border: 1px solid #f1f1f1; } +.gfx_active { + background-color: #ff0000; + color: #ffffff; +} .wks_active { background-color: #898989; color: #1a1a1a;