From 62e68e44342f1b2d2b24569e2b790aef669a9b38 Mon Sep 17 00:00:00 2001 From: zhujiyan <17812234322@163.com> Date: Wed, 29 May 2024 14:04:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E6=A3=80=E6=B5=8B&=E5=B9=B2?= =?UTF-8?q?=E6=89=B0=E6=BA=90=E7=89=88=E6=9C=AC=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/designer/ProcessViewer.vue | 5 --- src/router/static.ts | 2 +- .../components/undocumented/detail.vue | 40 +++++++++---------- .../plan/components/effectProblem/addForm.vue | 28 ++++++------- .../components/terminainal/addForm.vue | 26 ++++++------ 5 files changed, 47 insertions(+), 54 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index 08c9140e..3f5216c6 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -92,7 +92,6 @@ const createNewDiagram = async (xml) => { // TODO 芋艿：如果多个 endActivity 的话，目前的逻辑可能有一定的问题。https://www.jdon.com/workflow/multi-events.html const highlightDiagram = async () => { const activityList = activityLists.value - console.log(activityLists.value,"高亮数据444455666"); if (activityList.length === 0) { return } @@ -105,10 +104,8 @@ const highlightDiagram = async () => { //进行中高亮之后的任务 key 集合，用于过滤掉 taskList 进行中后面的任务，避免进行中后面的数据 Hover 还有数据 let removeTaskDefinitionKeyList = [] // debugger - console.log(bpmnModeler.getDefinitions().rootElements,"打印bpmnModeler.getDefinitions().rootElements[0]"); //芋道这里取值是rootElements[0].flowElements bpmnModeler.getDefinitions().rootElements[1].flowElements?.forEach((n: any) => { - console.log(n,"打印nnnnnnnnnnnnnnnnn"); let activity: any = activityList.find((m: any) => m.key === n.id) // 找到对应的活动 if (!activity) { return @@ -370,7 +367,6 @@ const elementHover = (element) => { if (activity.endTime > 0) { html += `

结束时间：${formatDate(activity.endTime)}

` } - console.log(html) } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) { let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS) let dataResult = '' @@ -388,7 +384,6 @@ const elementHover = (element) => { html += `

结束时间：${formatDate(processInstance.value.endTime)}

` } } - // console.log(html, 'html111111111111111') elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, { position: { left: 0, bottom: 0 }, html: `
${html}
` diff --git a/src/router/static.ts b/src/router/static.ts index 3aa8137d..88288a9a 100644 --- a/src/router/static.ts +++ b/src/router/static.ts @@ -116,7 +116,7 @@ export const adminBaseRoute = { name: 'BpmProcessInstanceDetail', meta: { title: pageTitle('router.instanceDetail') - } + }, }, { path: 'ProgramReviewInter', diff --git a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue index 7da1e7bd..670a663b 100644 --- a/src/views/pqs/supervise/interfere/components/undocumented/detail.vue +++ b/src/views/pqs/supervise/interfere/components/undocumented/detail.vue @@ -39,9 +39,6 @@ {{ detailData.projectName }} - - {{ proviteData.agreementCapacity }} - {{ voltageLevelList.find(item => { @@ -108,12 +105,11 @@ {{ proviteData.antiInterferenceTest == 0 ? '否' : '是' }} - - - {{ proviteData?.pccPoint }} + + {{ proviteData.agreementCapacity }} - {{ - evaluationTypeList.find(item => { - return item.id == proviteData?.evaluationType - })?.name - }} - - - {{ proviteData?.evaluationChekDept }} - + {{ proviteData?.pccPoint }} + + + {{ + evaluationTypeList.find(item => { + return item.id == proviteData?.evaluationType + })?.name + }} + + + {{ proviteData?.evaluationChekDept }} + {{ industryList.find(item => { diff --git a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue index f65305aa..3ff867c6 100644 --- a/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue +++ b/src/views/pqs/supervise/plan/components/effectProblem/addForm.vue @@ -108,12 +108,6 @@ > - - - - - - - - + + - - + + - - + + - - + + + + + + + +