From 69e6a1f93f3b47a510ea0f9670c6b4690ae87835 Mon Sep 17 00:00:00 2001 From: guanj Date: Thu, 9 Jul 2026 14:41:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../package/designer/ProcessViewer.vue | 3 +- .../penal/listeners/ElementListeners.vue | 922 +++++++------- .../online/shishishuju/index.vue | 23 +- .../task/myTask/components/ProcessViewer.vue | 1066 ++++++++--------- 4 files changed, 1001 insertions(+), 1013 deletions(-) diff --git a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue index c5295e0a..0beba774 100644 --- a/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue +++ b/src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue @@ -103,7 +103,7 @@ const highlightDiagram = async () => { let findProcessTask = false //是否已经高亮了进行中的任务 //进行中高亮之后的任务 key 集合,用于过滤掉 taskList 进行中后面的任务,避免进行中后面的数据 Hover 还有数据 let removeTaskDefinitionKeyList = [] - // debugger + // //芋道这里取值是rootElements[0].flowElements bpmnModeler.getDefinitions().rootElements[1].flowElements?.forEach((n: any) => { let activity: any = activityList.find((m: any) => m.key === n.id) // 找到对应的活动 @@ -135,7 +135,6 @@ const highlightDiagram = async () => { // 处理 outgoing 出线 const outgoing = getActivityOutgoing(activity) outgoing?.forEach((nn: any) => { - // debugger let targetActivity: any = activityList.find((m: any) => m.key === nn.targetRef.id) // 如果目标活动存在,则根据该活动是否结束,进行【bpmn:SequenceFlow】连线的高亮设置 if (targetActivity) { diff --git a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue index 2d129673..0a0c6416 100644 --- a/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue +++ b/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue @@ -1,463 +1,459 @@ - - + + diff --git a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue index 4ae5256f..69f27108 100644 --- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue +++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/shishishuju/index.vue @@ -748,6 +748,13 @@ const init = () => { console.error('WebSocket 客户端实例不存在') return } + echartsDataV1.value = initEcharts('#DAA520', 0, 'A相') + echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相') + echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相') + + echartsDataA1.value = initEcharts('#DAA520', 1, 'A相') + echartsDataA2.value = initEcharts('#2E8B57', 1, 'B相') + echartsDataA3.value = initEcharts('#A52a2a', 1, 'C相') if (monitoringPoint.state.comFlag == 0) { loading.value = false return ElMessage({ @@ -757,13 +764,7 @@ const init = () => { } loading.value = true const url = localStorage.getItem('WebSocketUrl') || 'null' //'ws://192.168.1.68:10407/api/pushMessage/' - echartsDataV1.value = initEcharts('#DAA520', 0, 'A相') - echartsDataV2.value = initEcharts('#2E8B57', 0, 'B相') - echartsDataV3.value = initEcharts('#A52a2a', 0, 'C相') - echartsDataA1.value = initEcharts('#DAA520', 1, 'A相') - echartsDataA2.value = initEcharts('#2E8B57', 1, 'B相') - echartsDataA3.value = initEcharts('#A52a2a', 1, 'C相') let pids = monitoringPoint.state.pid.split(',') dataSocket.socketServe.connect(`${url}${adminInfo.id},${monitoringPoint.state.lineId},${pids[pids.length - 2]}`) @@ -1176,16 +1177,10 @@ onBeforeUnmount(() => { } } -:deep(.view_bot) { - .vxe-table--render-default .vxe-body--column:not(.col--ellipsis), - .vxe-table--render-default .vxe-footer--column:not(.col--ellipsis), - .vxe-table--render-default .vxe-header--column:not(.col--ellipsis) { - padding: 5px !important; - } +:deep(.vxe-cell) { + - .vxe-table--body-wrapper { min-height: 32px !important; - } } ::v-deep .el-collapse-item__header { diff --git a/src/views/pqs/task/myTask/components/ProcessViewer.vue b/src/views/pqs/task/myTask/components/ProcessViewer.vue index 6ef6422e..0af3a836 100644 --- a/src/views/pqs/task/myTask/components/ProcessViewer.vue +++ b/src/views/pqs/task/myTask/components/ProcessViewer.vue @@ -1,534 +1,532 @@ - - - - - + + + + +