From 1fdb13b8aefd5630f0d854f8b1ffbc2c15282cd2 Mon Sep 17 00:00:00 2001 From: Rain_ <904416525@qq.com> Date: Sat, 27 Sep 2025 15:09:04 +0800 Subject: [PATCH] =?UTF-8?q?flx:=E6=96=B0=E5=A2=9E=E5=8D=B1=E5=A4=A7?= =?UTF-8?q?=E8=BE=A8=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/api/dangerousBigProject.js | 7 + src/components/account.vue | 2 +- .../components/identificationRecordDetail.vue | 51 +- .../newCheckTable/components/summaryList.vue | 672 ++++++++++++++++++ .../homeworkControlProcess.vue | 9 +- src/views/userCenter/layout.vue | 1 + .../componentsModule/dataListData.vue | 4 +- 7 files changed, 714 insertions(+), 32 deletions(-) diff --git a/src/assets/js/api/dangerousBigProject.js b/src/assets/js/api/dangerousBigProject.js index 29ecd234..3e16e6b3 100644 --- a/src/assets/js/api/dangerousBigProject.js +++ b/src/assets/js/api/dangerousBigProject.js @@ -181,6 +181,13 @@ export const getBigDangerRecognizeDetailPageApi = data => get('xmgl/bigDangerRec export const saveByTypeBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/saveByType', data); // 删除危大清单辨识详情信息 export const deleteBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/delete', data); +// 危大工程清单汇总 +export const getNewestListByDescribeBigDangerRecognizeDetailApi = data => post('xmgl/bigDangerRecognizeDetail/getNewestListByDescribe', data); +// 新增查看管控要点 +export const getControlContentListByDescribeIdApi = data => post('xmgl/bigDangerTypeControlContent/getControlContentListByDescribeId', data); +// 编辑查看管控要点 +export const getselectListBigDangerControlItemApi = data => post('xmgl/bigDangerControlItem/selectControlItemList', data); + // 列表查询危大工程类别信息 export const getBigDangerTypeListApi = data => post('xmgl/bigDangerType/list', data); \ No newline at end of file diff --git a/src/components/account.vue b/src/components/account.vue index 8b2c4a72..eae1165b 100644 --- a/src/components/account.vue +++ b/src/components/account.vue @@ -60,7 +60,7 @@ class="width_100" @click="goto5()" v-if=" - $route.path.indexOf('/firm/projectManage') == -1 && + $route.path.indexOf('/firm/') == -1 && ![5, 6, 10].includes($store.state.userInfo.accountType) " :title="enterpriseFront" diff --git a/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecordDetail.vue b/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecordDetail.vue index 48989531..d6a788ef 100644 --- a/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecordDetail.vue +++ b/src/views/projectFront/dangerousBigProject/newCheckTable/components/identificationRecordDetail.vue @@ -83,7 +83,7 @@ @@ -98,7 +98,6 @@ @@ -277,23 +275,6 @@ {{ scope.row.noShowName }} -
{ - this.itemDetailsData = res.result; - }); + if(this.dynamicType == 'add') { + getControlContentListByDescribeIdApi({ + describeId: item.id, + projectSn: this.projectSn, + }).then((res) => { + this.itemDetailsData = res.result; + }); + } else { + let params = { + projectSn: this.projectSn, + recognizeDetailId: item.id, + } + getselectListBigDangerControlItemApi({ + ...params, + }).then((res) => { + this.itemDetailsData = res.result; + }); + } }, // 获取字典工程类别列表 getDicProjectTypeList() { @@ -420,6 +416,7 @@ export default { getBigDangerTypeDetailList() { getBigDangerTypeListApi({ projectSn: this.projectSn, + projectClassify: this.queryParams.projectClassify, }).then((res) => { if (res.result.length > 0) { this.bigDangerTypeList = res.result; diff --git a/src/views/projectFront/dangerousBigProject/newCheckTable/components/summaryList.vue b/src/views/projectFront/dangerousBigProject/newCheckTable/components/summaryList.vue index e69de29b..b0b085a2 100644 --- a/src/views/projectFront/dangerousBigProject/newCheckTable/components/summaryList.vue +++ b/src/views/projectFront/dangerousBigProject/newCheckTable/components/summaryList.vue @@ -0,0 +1,672 @@ + + + + \ No newline at end of file diff --git a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue index a7de2532..509b9903 100644 --- a/src/views/projectFront/workTicketManage/homeworkControlProcess.vue +++ b/src/views/projectFront/workTicketManage/homeworkControlProcess.vue @@ -1390,6 +1390,7 @@ export default { } }, onExamineClick(row) { + console.log(112233, row) this.workTicketId = row.id; this.getWorkTicketQueryById(); this.getWorkTicketHistoryList(); @@ -1700,8 +1701,10 @@ export default { }); }, onChangeState(operateStatus) { + console.log(55555, this.workTicketId); + const workTicketId = this.workTicketId; let data = { - id: this.workTicketId, + id: workTicketId, projectSn: this.projectSn, operateStatus, }; @@ -1711,8 +1714,10 @@ export default { this.initWorkTicketClose(); this.getWorkTicketList(); this.getWorkTicketCountWorkTicket(); + console.log(44444, workTicketId); + this.onExamineClick({ - id: this.workTicketId, + id: workTicketId, }); } }); diff --git a/src/views/userCenter/layout.vue b/src/views/userCenter/layout.vue index 37a04b5b..a49ad647 100644 --- a/src/views/userCenter/layout.vue +++ b/src/views/userCenter/layout.vue @@ -67,6 +67,7 @@ type="primary" plain @click="backTo()" + v-if="$route.path.indexOf('/userCenter/') == -1" size="mini" style="margin-right: 30px;" >返回