diff --git a/src/api/supervision-boot/jointDebugList/index.ts b/src/api/supervision-boot/jointDebugList/index.ts index fa08864c..002de82b 100644 --- a/src/api/supervision-boot/jointDebugList/index.ts +++ b/src/api/supervision-boot/jointDebugList/index.ts @@ -15,6 +15,29 @@ export const addMointorPointTempLinedebug = (data: any) => { }) } +/** + * 重新发起监测点联调表单数据 + */ +export const updateMointorPointTempLinedebug = (data: any) => { + return createAxios({ + url: '/supervision-boot/tempLinedebug/update', + method: 'POST', + data: data + }) +} + +/** + * 取消发起监测点联调表单数据 + */ +export const cancelMointorPointTempLinedebug = (data: any) => { + return createAxios({ + url: '/supervision-boot/tempLinedebug/cancel', + method: 'POST', + data: data + }) +} + + /** * 根据id获取监测点联调的详细数据 */ diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 36e6595f..b526d9e8 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -2,14 +2,14 @@
- + @@ -47,6 +47,7 @@ import Area from '@/components/form/area/index.vue' import { mainHeight } from '@/utils/layout' import { useDictData } from '@/stores/dictData' import { Search, RefreshLeft } from '@element-plus/icons-vue' +import { defineProps } from 'vue' const tableStore = inject('tableStore') as TableStore const tableHeader = ref() diff --git a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue index 95e48160..cbf61185 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/planTest.vue @@ -6,6 +6,7 @@ :rules='rules' label-width='auto' class='form-one' + scroll-to-error > @@ -95,7 +96,6 @@ const form: any = ref({ planEndTime: '', planName: '', substationName: '', - completeTime: '', completeBy: '', testReport: '', diff --git a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue index b29972e2..166e3ab2 100644 --- a/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue +++ b/src/views/pqs/supervise/harmonicSurvey/components/testManage.vue @@ -114,7 +114,7 @@ const tableStore = new TableStore({ }, click: row => { // planTestRef.value.open('查看计划', row) - handleAudit(row.processInstanceId) + handleAudit(row.processInstanceId,row.historyInstanceId) } }, { @@ -203,11 +203,12 @@ const cancelLeave = async (row: any) => { /** 处理审批按钮 */ -const handleAudit = (instanceId: any) => { +const handleAudit = (instanceId: any,historyInstanceId:any) => { push({ name: 'BpmProcessInstanceDetail', - query: { - id: instanceId + state: { + id: instanceId, + historyInstanceId } }) } diff --git a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue index 557c6c70..8b80f8df 100644 --- a/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue +++ b/src/views/pqs/supervise/interfere/components/normalizationManager/addForm.vue @@ -46,7 +46,7 @@ :disabled="openType == 'detail'" /> - + - + - + - + - - + - - diff --git a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/detail.vue b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/detail.vue deleted file mode 100644 index 3c881d19..00000000 --- a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/detail.vue +++ /dev/null @@ -1,349 +0,0 @@ - - - diff --git a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue b/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue deleted file mode 100644 index e008811f..00000000 --- a/src/views/pqs/supervise/interfere/components/terminalNetworkDetection/index.vue +++ /dev/null @@ -1,217 +0,0 @@ - - - - - diff --git a/src/views/pqs/supervise/plan/components/effectProblem/index.vue b/src/views/pqs/supervise/plan/components/effectProblem/index.vue index b3dfc712..fa714640 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/index.vue +++ b/src/views/pqs/supervise/plan/components/effectProblem/index.vue @@ -11,7 +11,7 @@ custom-class="fixed-dialog" @closed="close" > --> - + + + + - - - - - - - - - - + + + + - + - diff --git a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue index 19cc3aad..0c4327ef 100644 --- a/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue +++ b/src/views/pqs/supervise/terminal/components/sensitiveUserTable.vue @@ -1,35 +1,34 @@ - diff --git a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue index 98b76ecc..b4189f4d 100644 --- a/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue +++ b/src/views/pqs/supervise/terminalNetworkDetection/components/jointDebugList/debug.vue @@ -1,7 +1,7 @@