diff --git a/src/views/pqs/supervise/technology/components/alarm.vue b/src/views/pqs/supervise/technology/components/alarm.vue index 2a7a8f5f..2ae87219 100644 --- a/src/views/pqs/supervise/technology/components/alarm.vue +++ b/src/views/pqs/supervise/technology/components/alarm.vue @@ -286,7 +286,7 @@ const tableStore = new TableStore({ }, click: row => { feedbackPopup.value.open( - '填报反馈单', + '填报告警反馈单', row.id, row.status, row.issueDetail, @@ -324,7 +324,7 @@ const tableStore = new TableStore({ }, click: row => { feedbackPopup.value.open( - '编辑', + '编辑告警反馈单', row.id, row.status, row.issueDetail, @@ -349,7 +349,7 @@ const tableStore = new TableStore({ click: row => { // deviceQuitPopup.value.open('重新发起', row) feedbackPopup.value.open( - '重新发起告警单', + '重新填报告警反馈单', row.id, row.status, row.issueDetail, @@ -448,7 +448,7 @@ const handleAudit = (instanceId: any, historyInstanceId: any) => { }) } -const props = defineProps({id: {type: String, default: 'null'}}) +const props = defineProps(['id','businessKey']) watch(() => props.id, async (newValue, oldValue) => { if (newValue === 'null') return // 直接返回,避免后续逻辑执行 const fullId = newValue.split('@')[0] @@ -457,18 +457,33 @@ watch(() => props.id, async (newValue, oldValue) => { if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms,则不执行 await getById(fullId).then(res => { if (res && res.code == 'A0000') { - feedbackPopup.value.open( - '重新发起告警单', - res.data.id, - res.data.status, - res.data.issueDetail, - res.data.problemPath, - res.data.supervisionReport, - res.data.reformAdvice, - res.data.takeStep, - res.data.reportPath, - res.data.reformAdvice - ) + if (res && res.code == 'A0000') { + if(props.businessKey == '3'){ + feedbackPopup.value.open( + '填报告警反馈单', + res.data.id, + res.data.status, + res.data.issueDetail, + res.data.problemPath, + res.data.supervisionReport, + res.data.reformAdvice + ) + }else{ + feedbackPopup.value.open( + '重新填报告警反馈单', + res.data.id, + res.data.status, + res.data.issueDetail, + res.data.problemPath, + res.data.supervisionReport, + res.data.reformAdvice, + res.data.takeStep, + res.data.reportPath, + res.data.reformAdvice + ) + } + } + } }) }, {immediate: true}) diff --git a/src/views/pqs/supervise/technology/components/earlyWarn.vue b/src/views/pqs/supervise/technology/components/earlyWarn.vue index c537a07a..317c4fab 100644 --- a/src/views/pqs/supervise/technology/components/earlyWarn.vue +++ b/src/views/pqs/supervise/technology/components/earlyWarn.vue @@ -166,7 +166,7 @@ const tableStore = new TableStore({ }, click: row => { feedbackPopup.value.open( - '填报反馈单', + '填报预警反馈单', row.id, row.status, row.issueDetail, @@ -203,7 +203,7 @@ const tableStore = new TableStore({ }, click: row => { feedbackPopup.value.open( - '编辑', + '编辑预警反馈单', row.id, row.status, row.issueDetail, @@ -227,7 +227,7 @@ const tableStore = new TableStore({ click: row => { // deviceQuitPopup.value.open('重新发起', row) feedbackPopup.value.open( - '重新发起预警单', + '重新填报预警反馈单', row.id, row.status, row.issueDetail, @@ -322,7 +322,7 @@ const handleAudit = (instanceId: any, historyInstanceId: any) => { }) } -const props = defineProps({id: {type: String, default: 'null'}}) +const props = defineProps(['id','businessKey']) watch(() => props.id, async (newValue, oldValue) => { if (newValue === 'null') return // 直接返回,避免后续逻辑执行 const fullId = newValue.split('@')[0] @@ -331,17 +331,29 @@ watch(() => props.id, async (newValue, oldValue) => { if (isNaN(routeTime) || nowTime - routeTime > import.meta.env.VITE_ROUTE_TIME_OUT) return // 路由时间超过500ms,则不执行 await getById(fullId).then(res => { if (res && res.code == 'A0000') { - feedbackPopup.value.open( - '重新发起预警单', - res.data.id, - res.data.status, - res.data.issueDetail, - res.data.problemPath, - res.data.reportPath, - res.data.reformAdvice, - res.data.takeStep, - res.data.reportPath - ) + if(props.businessKey == '3'){ + feedbackPopup.value.open( + '填报预警反馈单', + res.data.id, + res.data.status, + res.data.issueDetail, + res.data.problemPath, + res.data.reportPath, + res.data.reformAdvice + ) + }else{ + feedbackPopup.value.open( + '重新填报预警反馈单', + res.data.id, + res.data.status, + res.data.issueDetail, + res.data.problemPath, + res.data.reportPath, + res.data.reformAdvice, + res.data.takeStep, + res.data.reportPath + ) + } } }) }, {immediate: true}) diff --git a/src/views/pqs/supervise/technology/index.vue b/src/views/pqs/supervise/technology/index.vue index 82521536..17422e7e 100644 --- a/src/views/pqs/supervise/technology/index.vue +++ b/src/views/pqs/supervise/technology/index.vue @@ -5,10 +5,10 @@ --> - + - + @@ -22,6 +22,7 @@ import { useRoute } from 'vue-router' import { mainHeight } from '@/utils/layout' const route = useRoute() const id = ref('') +const key = ref('') defineOptions({ name: 'supervision/supervision/manage' }) @@ -32,12 +33,13 @@ const activeName: any = ref(null) watch(() => route.query.t, async (newValue, oldValue) => { if (route.fullPath.includes('supervision/supervision/manage')) { let type = (route.query.type as string) || 'null' - if (type == 'null' || type == '0') { + if (type == 'null' || type == '0' || type == '3') { activeName.value = '3' } else { activeName.value = '4' } id.value = (route.query.id as string) || 'null' + key.value = (route.query.key as string) || 'null' id.value = id.value + '@' + route.query.t } }, {deep: true, immediate: true}) diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/form.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/form.vue index c6e0e604..566b23b8 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/form.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/form.vue @@ -1,59 +1,76 @@ - - diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue index a1b8bb48..4e0a2cf1 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/cycleDetection/index.vue @@ -1,54 +1,54 @@ - -