diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue index d5132de5..c5fc80dc 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/programReview.vue @@ -198,7 +198,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return row.createBy != adminInfo.$state.id || !(row.status == 3 || row.status == 4) + return row.createBy != adminInfo.$state.id || !(row.status == 4) }, click: row => { dialogVisible.value = true diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue index 0780ad37..758adfda 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue @@ -320,7 +320,7 @@ - +
@@ -579,14 +579,18 @@ const getProviteData = async () => { if (detailData.value.netInReport.length > 0) { netInReportList.value = [] detailData.value.netInReport.forEach((item: any) => { - getFileNamePath(item, 'netInReport') + if (item != null) { + getFileNamePath(item, 'netInReport') + } }) } // 治理评估告" if (detailData.value.governReport.length > 0) { governReportList.value = [] detailData.value.governReport.forEach((item: any) => { - getFileNamePath(item, 'governReport') + if (item != null) { + getFileNamePath(item, 'governReport') + } }) } } diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index b59489c6..9e8ec713 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -136,7 +136,7 @@ const tableStore = new TableStore({ icon: 'el-icon-Open', render: 'basicButton', disabled: row => { - return !row.problemId + return !row.problemId || row.problemType != 1 }, click: async row => { dialogVisible.value = true @@ -248,10 +248,16 @@ const tableStore = new TableStore({ icon: 'el-icon-EditPen', render: 'basicButton', disabled: row => { - return row.problemType != 2 + return !(row.problemType == 2 || row.problemType == 4) }, click: row => { - window.open(row.filePath) + if (row.problemType == 2) { + window.open(row.filePath) + } else { + getFileNameAndFilePath({ filePath: row.reportPath }).then(res => { + window.open(res.data.url) + }) + } } }, { diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue index 30b6d9fd..f03d10e2 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/monitorpoint/detail.vue @@ -116,7 +116,7 @@ - + {{ detailData?.mainWiringDiagram.name }}