调整

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) {

src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue

@@ -318,7 +318,6 @@ const resetListenersList = () => {
 }
 // 打开 监听器详情 侧边栏
 const openListenerForm = (listener, index?) => {
-  // debugger
   if (listener) {
     listenerForm.value = initListenerForm(listener)
     editingListenerIndex.value = index
@@ -356,7 +355,6 @@ const openListenerFieldForm = (field, index?) => {
 }
 // 保存监听器注入字段
 const saveListenerFiled = async () => {
-  // debugger
   let validateStatus = await listenerFieldFormRef.value.validate()
   if (!validateStatus) return // 验证不通过直接返回
   if (editingListenerFieldIndex.value === -1) {
@@ -373,7 +371,6 @@ const saveListenerFiled = async () => {
 }
 // 移除监听器字段
 const removeListenerField = (index) => {
-  // debugger
   ElMessageBox.confirm('确认移除该字段吗？', '提示', {
     confirmButtonText: '确 认',
     cancelButtonText: '取 消'
@@ -402,7 +399,6 @@ const removeListener = (index) => {
 }
 // 保存监听器配置
 const saveListenerConfig = async () => {
-  // debugger
   let validateStatus = await listenerFormRef.value.validate()
   if (!validateStatus) return // 验证不通过直接返回
   const listenerObject = createListenerObject(listenerForm.value, false, prefix)

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) {
+:deep(.vxe-cell) {
-    .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;
-    }
 
-    .vxe-table--body-wrapper {
         min-height: 32px !important;
-    }
 }
 
 ::v-deep .el-collapse-item__header {

src/views/pqs/task/myTask/components/ProcessViewer.vue

@@ -90,7 +90,6 @@ const highlightDiagram = async () => {
     let findProcessTask = false //是否已经高亮了进行中的任务
     //进行中高亮之后的任务 key 集合，用于过滤掉 taskList 进行中后面的任务，避免进行中后面的数据 Hover 还有数据
     let removeTaskDefinitionKeyList: any = []
-    // debugger
     bpmnModeler.getDefinitions().rootElements[0].flowElements?.forEach((n: any) => {
         let activity: any = activityList.find((m: any) => m.key === n.id) // 找到对应的活动
         if (!activity) {
@@ -121,7 +120,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) {