From 306cc2121883d6fdaae05d1961a90784b89ae345 Mon Sep 17 00:00:00 2001 From: Vce Date: Sat, 18 May 2024 01:47:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=B9=E7=A7=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/specialWork.js | 4 +- .../specialWork/disconnectionWork.vue | 46 ++++++++++------ .../specialWork/riggingOutWork.vue | 33 +++++++----- .../specialWork/startBuildingWork.vue | 40 +++++++++----- .../specialWork/temporaryPowerWork.vue | 53 +++++++++++-------- 5 files changed, 110 insertions(+), 66 deletions(-) diff --git a/src/assets/js/api/specialWork.js b/src/assets/js/api/specialWork.js index 673b5e72..edaa09aa 100644 --- a/src/assets/js/api/specialWork.js +++ b/src/assets/js/api/specialWork.js @@ -42,4 +42,6 @@ export const getGroundSafetQueryByIdApi = data => get('xmgl/xzGroundSafet/queryB export const getGroundSafetdeleteApi = data => post('xmgl/xzGroundSafet/delete', data); //删除 // 断路作业 - +export const getOpenCircuitPageApi = data => get('xmgl/xzOpenCircuitSafe/page', data); //列表接口 +export const getOpenCircuitQueryByIdApi = data => get('xmgl/xzOpenCircuitSafe/queryById', data); //查看详情 +export const getOpenCircuitdeleteApi = data => post('xmgl/xzOpenCircuitSafe/delete', data); //删除 diff --git a/src/views/projectFront/specialWork/disconnectionWork.vue b/src/views/projectFront/specialWork/disconnectionWork.vue index 17157e55..33bb5b4f 100644 --- a/src/views/projectFront/specialWork/disconnectionWork.vue +++ b/src/views/projectFront/specialWork/disconnectionWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - + - + - + @@ -162,7 +166,14 @@ {{ workDetail.breakReason }} - {{ workDetail.breakLocationDiagram }} + + +
+ +
+ {{ workDetail.breakLocationDescription }} @@ -173,7 +184,7 @@ {{ workDetail.riskIdentificationResult }} - + {{ workDetail.otherRelatedSpecialTask }} @@ -184,9 +195,9 @@ - +
@@ -271,10 +282,10 @@ import { } from "@/assets/js/api/dangerousBigProject" import { - getGroundSafetPageApi, + getOpenCircuitPageApi, getEnterpriseInfoListApi, - getGroundSafetQueryByIdApi, - getGroundSafetdeleteApi, + getOpenCircuitQueryByIdApi, + getOpenCircuitdeleteApi, } from "@/assets/js/api/specialWork" import { getCooperatorListApi } from "@/assets/js/api/cooperationUnit"; @@ -289,8 +300,9 @@ export default { formInline: { firemanName: '', enterpriseId: '', + workTicketCode:"", }, - formLabelWidthDetail: "180px", + formLabelWidthDetail: "270px", detailData: {}, responsibilityList: [], planDate: "", @@ -422,6 +434,7 @@ export default { onRefresh() { this.formInline.enterpriseId = ""; this.formInline.firemanName = ""; + this.formInline.workTicketCode = ""; this.pageNo = 1; this.initData(); }, @@ -439,11 +452,12 @@ export default { let data = { jobApplicationUnit: this.formInline.enterpriseId, firemanName: this.formInline.firemanName, + workTicketCode: this.formInline.workTicketCode, pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn } - getGroundSafetPageApi(data).then((res) => { + getOpenCircuitPageApi(data).then((res) => { if (res.result) { console.log(res.result.records, 1) // res.result.records.forEach((item) => { @@ -680,7 +694,7 @@ export default { this.deleteDialog = true }, checkDelete() { - getGroundSafetdeleteApi({ id: this.deleteId }).then((res) => { + getOpenCircuitdeleteApi({ id: this.deleteId }).then((res) => { console.log(res) if (res.code == 200) { this.$message.success(res.message) @@ -768,7 +782,7 @@ export default { this.dialogTitle = this.$t('message.dangerousBigProject.detailed') this.detailId = val.id - getGroundSafetQueryByIdApi({ + getOpenCircuitQueryByIdApi({ id: val.id }).then((res) => { if (res.result) { diff --git a/src/views/projectFront/specialWork/riggingOutWork.vue b/src/views/projectFront/specialWork/riggingOutWork.vue index ee915c1b..ceeb9cfb 100644 --- a/src/views/projectFront/specialWork/riggingOutWork.vue +++ b/src/views/projectFront/specialWork/riggingOutWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - + - + - - + + @@ -291,8 +302,9 @@ export default { formInline: { firemanName: '', enterpriseId: '', + workTicketCode:"", }, - formLabelWidthDetail: "220px", + formLabelWidthDetail: "270px", detailData: {}, responsibilityList: [], planDate: "", @@ -424,6 +436,7 @@ export default { onRefresh() { this.formInline.enterpriseId = ""; this.formInline.firemanName = ""; + this.formInline.workTicketCode = ""; this.pageNo = 1; this.initData(); }, @@ -441,6 +454,7 @@ export default { let data = { jobApplicationUnit: this.formInline.enterpriseId, firemanName: this.formInline.firemanName, + workTicketCode: this.formInline.workTicketCode, pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn diff --git a/src/views/projectFront/specialWork/temporaryPowerWork.vue b/src/views/projectFront/specialWork/temporaryPowerWork.vue index e41bab74..aa722298 100644 --- a/src/views/projectFront/specialWork/temporaryPowerWork.vue +++ b/src/views/projectFront/specialWork/temporaryPowerWork.vue @@ -3,6 +3,10 @@
+ + + + - - + + - + - + - - - - - + + + + + @@ -183,7 +187,7 @@ {{ workDetail.guardianName }} - {{ workDetail.electricityCustomer }} + {{ workDetail.electricityCustomerName }} {{ workDetail.riskIdentificationResult }} @@ -191,16 +195,16 @@ {{ workDetail.jobPersonName }} - - {{ workDetail.electricianNum1 }} + {{ workDetail.assignmentPersonInChargeName }} - - {{ workDetail.electricianNu21 }} + + {{ workDetail.electricianNum2 }} - + {{ workDetail.otherRelatedSpecialTask }} @@ -213,9 +217,9 @@ - +
@@ -235,18 +239,18 @@ 分析人 - + - 氧气 + {{item.result}} - 12.9 + {{item.time}} - 地点 + {{workDetail.analysePlace}} - 张三 + {{workDetail.analysePerson}}
@@ -289,8 +293,9 @@ export default { formInline: { firemanName: '', enterpriseId: '', + workTicketCode:"", }, - formLabelWidthDetail: "180px", + formLabelWidthDetail: "270px", detailData: {}, responsibilityList: [], planDate: "", @@ -422,6 +427,7 @@ export default { onRefresh() { this.formInline.enterpriseId = ""; this.formInline.firemanName = ""; + this.formInline.workTicketCode = ""; this.pageNo = 1; this.initData(); }, @@ -439,6 +445,7 @@ export default { let data = { jobApplicationUnit: this.formInline.enterpriseId, firemanName: this.formInline.firemanName, + workTicketCode: this.formInline.workTicketCode, pageNo: this.pageNo, pageSize: this.pageSize, projectSn: this.projectSn