部分问题优化

src/views/left/comp/dispose/CaseHandling.vue

@@ -48,7 +48,7 @@
             </div>
             <div class="risk_bg_info_item">
               <img src="../../../../assets/img/risk_info_icon-7.png" alt="" />
-              <span>发生地址</span>
+              <span>发生地区</span>
               <div>长宁区</div>
             </div>
           </div>
@@ -60,7 +60,7 @@
             </div>
             <div class="risk_bg_info_item">
               <img src="../../../../assets/img/risk_info_icon-9.png" alt="" />
-              <span>详细地址</span>
+              <span>地址</span>
               <div>武夷路528号</div>
             </div>
           </div>
@@ -114,7 +114,7 @@
         </div>
         <div calss="basic_information_info_unit">
           <div>
-            <span>现住址</span>
+            <span>现住地</span>
             <div>华阳街道</div>
           </div>
           <div>

src/views/left/comp/dispose/RiskProfile.vue

@@ -55,7 +55,7 @@
             </div>
             <div class="risk_bg_info_item">
               <img src="../../../../assets/img/risk_info_icon-7.png" alt="" />
-              <span>发生地址</span>
+              <span>发生地区</span>
               <div>长宁区</div>
             </div>
           </div>
@@ -67,7 +67,7 @@
             </div>
             <div class="risk_bg_info_item">
               <img src="../../../../assets/img/risk_info_icon-9.png" alt="" />
-              <span>详细地址</span>
+              <span>地址</span>
               <div>武夷路528号</div>
             </div>
           </div>
@@ -143,7 +143,7 @@
         <div class="risk_personnel_header">
           <TowLevelTitle :title="'风险人员'" class="risk_personnel_bg"></TowLevelTitle>
           <div class="risk_personnel_tag">
-            已流调：
+            累计：
             <span>13</span>
           </div>
         </div>
@@ -174,7 +174,7 @@
 
     <!-- 7.检测情况 -->
     <div class="test_situation">
-      <TowLevelTitle :title="'检测情况'" :buttons="testBottons"></TowLevelTitle>
+      <TowLevelTitle :title="'检测情况'" :buttons="testBottons" :openDialog="true" @openDialog="openTestResDialogHandle"></TowLevelTitle>
       <div class="risk_bg_color test_situation_body">
         <div v-for="(item, index) in testData" :key="item.lable" class="test_situation_item">
           <div class="test_situation_name">
@@ -188,6 +188,9 @@
 
     <!-- 动态评估 弹窗 -->
     <AiPublicRiskDialog v-if="dialogStore.riskAIDialogOpen2"></AiPublicRiskDialog>
+
+      <!-- 检测结果 弹窗 -->
+    <DetectionResultDialog v-if="dialogStore.riskTestResDialogOpen"></DetectionResultDialog>
   </div>
 </template>
 <script setup>
@@ -197,6 +200,8 @@ import HeaderBoxContent from './common/HeaderBoxContent'
 import * as echarts from 'echarts'
 import { ref, watch, computed, reactive, toRefs, onBeforeMount, onMounted } from 'vue'
 import TowLevelTitle from '@/components/TowLevelTitle'
+import DetectionResultDialog from './dialog/DetectionResultDialog'
+
 import { useDialogStore } from '@/store/dialog'
 let dialogStore = useDialogStore()
 
@@ -227,7 +232,7 @@ const infoList2 = ref([
 ])
 
 const timeButtons = ref([
-  { id: 1, name: '发布时间', active: false },
+  { id: 1, name: '发病时间', active: false },
   { id: 2, name: '报告时间', active: true }
 ])
 
@@ -297,6 +302,12 @@ const testData = ref([
   { lable: '检测中', value: 0 }
 ])
 
+
+function openTestResDialogHandle() {
+  dialogStore.closeAllDialog()
+  dialogStore.setRiskTestResDialogOpen(true)
+}
+
 // 在组件挂载后初始化 ECharts
 onMounted(() => {
   initTimeChart()

src/views/left/comp/dispose/echarts/echartsOption.js

@@ -5,22 +5,38 @@ import "echarts-wordcloud";
 export const getRiskTimeEchartsOption = () => {
   return {
     tooltip: { trigger: 'axis' },
-    grid: { left: '10%', right: '5%', top: '15%', bottom: '18%' }, // 调整四周距离
+    grid: { left: '8%', right: '2%', top: '10%', bottom: '18%' }, // 调整四周距离
     xAxis: {
       type: 'category',
       data: ['12/04', '12/05', '12/06', '12/07', '12/08', '12/09', '12/10'],
-      axisLine: { lineStyle: { color: '#4A90E2' } } // X 轴颜色
+      axisLine: {
+        lineStyle: {
+          color: '#3FA7B6',
+          width: 2, // 线宽
+          dashOffset: 0, // 可能影响虚线样式，通常设为 0
+        }
+      }, // X 轴颜色
+      axisTick: { show: false }, // 隐藏刻度线
+      axisLabel: { color: '#9da8b8' } // X 轴文字颜色
     },
     yAxis: {
       type: 'value',
       axisLine: { lineStyle: { color: '#4A90E2' } }, // Y 轴颜色
-      splitLine: { lineStyle: { type: 'dashed', color: '#ccc' } } // Y 轴背景横线虚线
+      axisLabel: { color: '#7d8ba0' }, // Y 轴刻度值颜色
+      splitLine: {
+        lineStyle: {
+          type: 'dashed', // 虚线
+          color: '#3FA7B6',
+          width: 1.5, // 线宽
+          dashOffset: 0, // 可能影响虚线样式，通常设为 0
+        }
+      } // Y 轴背景横线虚线
     },
     series: [
       {
         type: 'bar',
         data: [3, 6, 2, 9, 5, 8, 10],
-        barWidth: 30,
+        barWidth: 17,
         itemStyle: {
           color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
             { offset: 0, color: 'rgba(63, 174, 253, 0)' },
@@ -36,22 +52,35 @@ export const getRiskTimeEchartsOption = () => {
 export const getRiskAreaEchartsOption = () => {
   return {
     tooltip: { trigger: 'axis' },
-    grid: { left: '10%', right: '5%', top: '15%', bottom: '18%' }, // 调整四周距离
+    grid: { left: '10%', right: '5%', top: '10%', bottom: '18%' }, // 调整四周距离
     xAxis: {
       type: 'category',
       data: ['长宁区', '闵行区'],
-      axisLine: { lineStyle: { color: '#FBA541' } } // X 轴颜色
+      axisLine: {
+        lineStyle: {
+          color: '#3FA7B6',
+          width: 2, // 线宽
+          dashOffset: 0, // 可能影响虚线样式，通常设为 0
+        }
+      }, // X 轴颜色
+      axisLabel: { color: '#9da8b8' } // X 轴文字颜色
     },
     yAxis: {
       type: 'value',
-      axisLine: { lineStyle: { color: '#FBA541' } }, // Y 轴颜色
-      splitLine: { lineStyle: { type: 'dashed', color: '#ccc' } } // Y 轴背景横线虚线
+      axisLine: { lineStyle: { color: '#ccc' } }, // Y 轴颜色
+      splitLine: {
+        lineStyle: {
+          type: 'dashed', // 虚线
+          color: '#3FA7B6',
+          width: 1.5, // 线宽
+          dashOffset: 0, // 可能影响虚线样式，通常设为 0
+        } } // Y 轴背景横线虚线
     },
     series: [
       {
         type: 'bar',
         data: [5, 9],
-        barWidth: 30,
+        barWidth: 17,
         itemStyle: {
           color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [
             { offset: 0, color: 'rgba(251,165,65,0)' },

src/views/left/dialog/components/DisposalProgressContent copy 6.vue

@@ -0,0 +1,433 @@
+<template>
+  <div class="container">
+    <div id="graph_container" ref="graphRef"></div>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+import { Graph } from '@antv/x6'
+import { register } from '@antv/x6-vue-shape'
+import ProgressNode from './common/ProgressNode.vue'
+import ProgressChildrenNode from './common/ProgressChildrenNode.vue'
+import imgIcon from '../../../../assets/img/节点连线箭头.png'
+
+// **注册 Vue 组件节点**
+register({
+  shape: 'custom-vue-node',
+  width: 136,
+  height: 60,
+  component: ProgressNode,
+  getComponent(node) {
+    return {
+      component: ProgressNode,
+      props: {
+        label: node.getData().label,
+        state: node.getData().state
+      }
+    }
+  }
+})
+
+register({
+  shape: 'custom-vue-children-node',
+  width: 121,
+  height: 46,
+  component: ProgressChildrenNode,
+  getComponent(node) {
+    return {
+      component: ProgressChildrenNode,
+      props: {
+        label: node.getData().label,
+        state: node.getData().state
+      }
+    }
+  }
+})
+
+
+
+// **画布**
+const graphRef = ref(null)
+let graph = null
+
+// **数据**
+const NodeData = {
+  dagNode: [
+    {
+      level: 1,
+      fId: 1,
+      nodeId: 1,
+      nodeName: '发现报告',
+      state: '已完成',
+      x: 10,
+      y: 80
+    },
+    {
+      level: 2,
+      nodeId: '1-1',
+      nodeName: '信息接报',
+      state: '已完成',
+      x: 220,
+      y: 0
+    },
+    {
+      level: 2,
+      nodeId: '1-2',
+      nodeName: '信息核实',
+      state: '已完成',
+      x: 220,
+      y: 55
+    },
+    {
+      level: 2,
+      nodeId: '1-3',
+      nodeName: '快速评估',
+      state: '已完成',
+      x: 220,
+      y: 110
+    },
+    {
+      level: 2,
+      nodeId: '1-4',
+      nodeName: '信息上报',
+      state: '已完成',
+      x: 220,
+      y: 165
+    },
+    {
+      level: 1,
+      fId: 2,
+      nodeId: 2,
+      nodeName: '个案调查处置',
+      state: '进行中',
+      x: 10,
+      y: 295
+    },
+    {
+      level: 2,
+      twoFId: '2-1',
+      nodeId: '2-1',
+      nodeName: '李梦康',
+      state: '已完成',
+      x: 220,
+      y: 240
+    },
+    {
+      level: 2,
+      twoFId: '2-2',
+      nodeId: '2-2',
+
+      nodeName: '毛超',
+      state: '已完成',
+      x: 220,
+      y: 295
+    },
+    {
+      level: 2,
+      twoFId: '2-3',
+      nodeId: '2-3',
+      nodeName: '贾子敏',
+      state: '进行中',
+      x: 220,
+      y: 350
+    },
+    {
+      level: 3,
+      nodeId: '2-2-1',
+      nodeName: '病例管理',
+      state: '已完成',
+      x: 440,
+      y: 210
+    },
+    {
+      level: 3,
+      nodeId: '2-2-2',
+      nodeName: '流行病学调查',
+      state: '已完成',
+      x: 440,
+      y: 265
+    },
+    {
+      level: 3,
+      nodeId: '2-2-3',
+      nodeName: '实验室检测',
+      state: '已完成',
+      x: 440,
+      y: 320
+    },
+    {
+      level: 3,
+      nodeId: '2-2-4',
+      nodeName: '风险评估',
+      state: '已完成',
+      x: 440,
+      y: 375
+    },
+    {
+      level: 1,
+      fId: 3,
+      nodeId: 3,
+      nodeName: '风险人员和环境排查管控',
+      state: '进行中',
+      x: 10,
+      y: 480
+    },
+
+    {
+      level: 2,
+      twoFId: '3-1',
+      nodeId: '3-1',
+      nodeName: '段伟',
+      state: '已完成',
+      x: 220,
+      y: 420
+    },
+    {
+      level: 2,
+      twoFId: '3-2',
+      nodeId: '3-2',
+      nodeName: '陆成奇',
+      state: '已完成',
+      x: 220,
+      y: 475
+    },
+    {
+      level: 2,
+      twoFId: '3-3',
+      nodeId: '3-3',
+      nodeName: '曾强',
+      state: '进行中',
+      x: 220,
+      y: 530
+    },
+
+    {
+      level: 3,
+      twoFId: '3-3-1',
+      nodeId: '3-3-1',
+      nodeName: '病例管理',
+      state: '已完成',
+      x: 440,
+      y: 450
+    },
+    {
+      level: 3,
+      twoFId: '3-3-2',
+      nodeId: '3-3-2',
+      nodeName: '流行病学调查',
+      state: '已完成',
+      x: 440,
+      y: 505
+    },
+    {
+      level: 3,
+      twoFId: '3-3-2',
+      nodeId: '3-3-3',
+      nodeName: '实验室检测',
+      state: '进行中',
+      x: 440,
+      y: 560
+    },
+    {
+      level: 3,
+      twoFId: '3-3-3',
+      nodeId: '3-3-4',
+      nodeName: '风险人员管控',
+      state: '进行中',
+      x: 440,
+      y: 615
+    },
+    {
+      level: 3,
+      twoFId: '3-3-4',
+      nodeId: '3-3-5',
+      nodeName: '风险场所管控',
+      state: '进行中',
+      x: 440,
+      y: 670
+    },
+
+    { level: 1, fId: 4, nodeId: 4, nodeName: '区域风险排查管控', state: '未开始', x: 10, y: 620 },
+    { level: 1, fId: 5, nodeId: 5, nodeName: '结案', x: 10, y: 740 }
+  ],
+  dagLine: [
+    { from: 1, to: 2 },
+    { from: 2, to: 3 },
+    { from: 3, to: 4 },
+    { from: 4, to: 5 },
+    { from: 1, to: '1-1' },
+    { from: 1, to: '1-2' },
+    { from: 1, to: '1-3' },
+    { from: 1, to: '1-4' },
+    { from: 2, to: '2-1' },
+    { from: 2, to: '2-2' },
+    { from: 2, to: '2-3' },
+    { from: '2-2', to: '2-2-1' },
+    { from: '2-2', to: '2-2-2' },
+    { from: '2-2', to: '2-2-3' },
+    { from: '2-2', to: '2-2-4' },
+    { from: 3, to: '3-1' },
+    { from: 3, to: '3-2' },
+    { from: 3, to: '3-3' },
+    { from: '3-3', to: '3-3-1' },
+    { from: '3-3', to: '3-3-2' },
+    { from: '3-3', to: '3-3-3' },
+    { from: '3-3', to: '3-3-4' },
+    { from: '3-3', to: '3-3-5' }
+  ]
+}
+
+// **自动合并多条连线**
+// const mergeConnections = edges => {
+//   const targetMap = {}
+
+//   // 统计指向同一 target 的 source
+//   edges.forEach(edge => {
+//     if (!targetMap[edge.to]) {
+//       targetMap[edge.to] = []
+//     }
+//     targetMap[edge.to].push(edge.from)
+//   })
+
+//   const newEdges = []
+//   Object.keys(targetMap).forEach(target => {
+//     const sources = targetMap[target]
+//     if (sources.length > 1) {
+//       // 1. 创建“合并节点”
+//       const mergeNodeId = `merge_${target}`
+//       newEdges.push(...sources.map(src => ({ from: src, to: mergeNodeId })))
+//       newEdges.push({ from: mergeNodeId, to: target })
+//     } else {
+//       newEdges.push({ from: sources[0], to: target })
+//     }
+//   })
+
+//   return newEdges
+// }
+
+const mergeConnections = edges => {
+  const targetMap = {}
+  const mergeNodePositions = {} // 存储合并节点位置
+
+  // 统计指向同一 target 的 source
+  edges.forEach(edge => {
+    if (!targetMap[edge.to]) {
+      targetMap[edge.to] = []
+    }
+    targetMap[edge.to].push(edge.from)
+  })
+
+  const newEdges = []
+  Object.keys(targetMap).forEach(target => {
+    const sources = targetMap[target]
+    if (sources.length > 1) {
+      const mergeNodeId = `merge_${target}`
+
+      const targetNode = NodeData.dagNode.find(n => n.nodeId === target)
+      const sourceNodes = sources.map(src => NodeData.dagNode.find(n => n.nodeId === src)).filter(n => n)
+
+      if (targetNode && sourceNodes.length > 0) {
+        const maxSourceX = Math.max(...sourceNodes.map(n => n.x))
+        const mergeNodeX = (maxSourceX + targetNode.x) / 2
+        const mergeNodeY = targetNode.y
+
+        mergeNodePositions[mergeNodeId] = { x: mergeNodeX, y: mergeNodeY }
+      }
+
+      newEdges.push(...sources.map(src => ({ from: src, to: mergeNodeId })))
+      newEdges.push({ from: mergeNodeId, to: target })
+    } else {
+      newEdges.push({ from: sources[0], to: target })
+    }
+  })
+
+  // 添加合并节点到 NodeData
+  Object.keys(mergeNodePositions).forEach(mergeNodeId => {
+    NodeData.dagNode.push({
+      nodeId: mergeNodeId,
+      nodeName: '', // 合并节点不显示文本
+      state: '',
+      x: mergeNodePositions[mergeNodeId].x,
+      y: mergeNodePositions[mergeNodeId].y,
+      width: 10, // 使合并节点尽量小
+      height: 10
+    })
+  })
+
+  return newEdges
+}
+
+onMounted(() => {
+  graph = new Graph({
+    container: graphRef.value,
+    width: 580,
+    height: 801,
+    connecting: {
+      router: 'orth' // 自动优化连线
+      // connector: 'smooth', // 平滑曲线
+      // anchor: 'center',
+      // connectionPoint: 'anchor',
+      // allowBlank: false,
+      // snap: true
+    }
+  })
+
+  // const nodePositions = computeLayout()
+
+  // **添加节点**
+  NodeData.dagNode.forEach(node => {
+    graph.addNode({
+      id: node.nodeId,
+      shape: node.level === 1 ? 'custom-vue-node' : 'custom-vue-children-node',
+      x: node.x,
+      y: node.y,
+      data: {
+        label: node.nodeName,
+        state: node.state
+      }
+    })
+  })
+
+  // **处理合并连线**
+  const mergedEdges = mergeConnections(NodeData.dagLine)
+
+  // **添加合并后的连线**
+  mergedEdges.forEach(edge => {
+    graph.addEdge({
+      source: String(edge.from),
+      target: String(edge.to),
+      attrs: {
+        line: {
+          stroke: '#5B8FF9',
+          strokeDasharray: '5 5',
+          strokeWidth: 2,
+          targetMarker: {
+            tagName: 'image',
+            'xlink:href': imgIcon,
+            width: 24,
+            height: 24,
+            y: -12,
+            x: -24,
+            transform: 'rotate(0)' // 旋转箭头图片
+          }
+        }
+      },
+      router: { name: 'manhattan' }, // 自动贴合边缘
+      connector: { name: 'rounded' } // 让线条更圆滑
+    })
+  })
+})
+</script>
+
+<style scoped lang="scss">
+.container {
+  width: 100%;
+  height: 100%;
+}
+
+#graph_container {
+  width: 100%;
+  height: 100%;
+}
+</style>

src/views/left/dialog/components/DisposalProgressContent.vue

@@ -45,6 +45,8 @@ register({
   }
 })
 
+
+
 // **画布**
 const graphRef = ref(null)
 let graph = null
@@ -66,7 +68,7 @@ const NodeData = {
       nodeId: '1-1',
       nodeName: '信息接报',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 0
     },
     {
@@ -74,7 +76,7 @@ const NodeData = {
       nodeId: '1-2',
       nodeName: '信息核实',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 55
     },
     {
@@ -82,7 +84,7 @@ const NodeData = {
       nodeId: '1-3',
       nodeName: '快速评估',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 110
     },
     {
@@ -90,7 +92,7 @@ const NodeData = {
       nodeId: '1-4',
       nodeName: '信息上报',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 165
     },
     {
@@ -108,7 +110,7 @@ const NodeData = {
       nodeId: '2-1',
       nodeName: '李梦康',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 240
     },
     {
@@ -118,7 +120,7 @@ const NodeData = {
 
       nodeName: '毛超',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 295
     },
     {
@@ -127,7 +129,7 @@ const NodeData = {
       nodeId: '2-3',
       nodeName: '贾子敏',
       state: '进行中',
-      x: 240,
+      x: 220,
       y: 350
     },
     {
@@ -135,7 +137,7 @@ const NodeData = {
       nodeId: '2-2-1',
       nodeName: '病例管理',
       state: '已完成',
-      x: 420,
+      x: 440,
       y: 210
     },
     {
@@ -143,7 +145,7 @@ const NodeData = {
       nodeId: '2-2-2',
       nodeName: '流行病学调查',
       state: '已完成',
-      x: 420,
+      x: 440,
       y: 265
     },
     {
@@ -151,7 +153,7 @@ const NodeData = {
       nodeId: '2-2-3',
       nodeName: '实验室检测',
       state: '已完成',
-      x: 420,
+      x: 440,
       y: 320
     },
     {
@@ -159,7 +161,7 @@ const NodeData = {
       nodeId: '2-2-4',
       nodeName: '风险评估',
       state: '已完成',
-      x: 420,
+      x: 440,
       y: 375
     },
     {
@@ -178,7 +180,7 @@ const NodeData = {
       nodeId: '3-1',
       nodeName: '段伟',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 420
     },
     {
@@ -187,7 +189,7 @@ const NodeData = {
       nodeId: '3-2',
       nodeName: '陆成奇',
       state: '已完成',
-      x: 240,
+      x: 220,
       y: 475
     },
     {
@@ -196,7 +198,7 @@ const NodeData = {
       nodeId: '3-3',
       nodeName: '曾强',
       state: '进行中',
-      x: 240,
+      x: 220,
       y: 530
     },
 
@@ -206,8 +208,8 @@ const NodeData = {
       nodeId: '3-3-1',
       nodeName: '病例管理',
       state: '已完成',
-       x: 420,
-       y:450
+      x: 440,
+      y: 450
     },
     {
       level: 3,
@@ -215,8 +217,8 @@ const NodeData = {
       nodeId: '3-3-2',
       nodeName: '流行病学调查',
       state: '已完成',
-       x: 420,
-       y:505
+      x: 440,
+      y: 505
     },
     {
       level: 3,
@@ -224,8 +226,8 @@ const NodeData = {
       nodeId: '3-3-3',
       nodeName: '实验室检测',
       state: '进行中',
-       x: 420,
-       y:560
+      x: 440,
+      y: 560
     },
     {
       level: 3,
@@ -233,8 +235,8 @@ const NodeData = {
       nodeId: '3-3-4',
       nodeName: '风险人员管控',
       state: '进行中',
-       x: 420,
-       y:615
+      x: 440,
+      y: 615
     },
     {
       level: 3,
@@ -242,12 +244,12 @@ const NodeData = {
       nodeId: '3-3-5',
       nodeName: '风险场所管控',
       state: '进行中',
-       x: 420,
-       y:670
+      x: 440,
+      y: 670
     },
 
     { level: 1, fId: 4, nodeId: 4, nodeName: '区域风险排查管控', state: '未开始', x: 10, y: 620 },
-    { level: 1, fId: 5, nodeId: 5, nodeName: '结案', x: 10, y: 720 }
+    { level: 1, fId: 5, nodeId: 5, nodeName: '结案', x: 10, y: 740 }
   ],
   dagLine: [
     { from: 1, to: 2 },
@@ -272,76 +274,95 @@ const NodeData = {
     { from: '3-3', to: '3-3-2' },
     { from: '3-3', to: '3-3-3' },
     { from: '3-3', to: '3-3-4' },
-    { from: '3-3', to: '3-3-5' },
+    { from: '3-3', to: '3-3-5' }
   ]
 }
 
 // **自动合并多条连线**
-const mergeConnections = edges => {
-  const targetMap = {}
+// const mergeConnections = edges => {
+//   const targetMap = {}
 
-  // 统计指向同一 target 的 source
-  edges.forEach(edge => {
-    if (!targetMap[edge.to]) {
-      targetMap[edge.to] = []
-    }
-    targetMap[edge.to].push(edge.from)
-  })
+//   // 统计指向同一 target 的 source
+//   edges.forEach(edge => {
+//     if (!targetMap[edge.to]) {
+//       targetMap[edge.to] = []
+//     }
+//     targetMap[edge.to].push(edge.from)
+//   })
 
-  const newEdges = []
-  Object.keys(targetMap).forEach(target => {
-    const sources = targetMap[target]
-    if (sources.length > 1) {
-      // 1. 创建“合并节点”
-      const mergeNodeId = `merge_${target}`
-      newEdges.push(...sources.map(src => ({ from: src, to: mergeNodeId })))
-      newEdges.push({ from: mergeNodeId, to: target })
-    } else {
-      newEdges.push({ from: sources[0], to: target })
-    }
-  })
+//   const newEdges = []
+//   Object.keys(targetMap).forEach(target => {
+//     const sources = targetMap[target]
+//     if (sources.length > 1) {
+//       // 1. 创建“合并节点”
+//       const mergeNodeId = `merge_${target}`
+//       newEdges.push(...sources.map(src => ({ from: src, to: mergeNodeId })))
+//       newEdges.push({ from: mergeNodeId, to: target })
+//     } else {
+//       newEdges.push({ from: sources[0], to: target })
+//     }
+//   })
 
-  return newEdges
-}
+//   return newEdges
+// }
 
-// **计算竖排三列布局**
-// const computeLayout = () => {
-//   const levels = {}
-//   const columnSpacing = 160 // 列间距
-//   const rowSpacing = 72 // 行间距
+// const mergeConnections = edges => {
+//   const targetMap = {}
+//   const mergeNodePositions = {} // 存储合并节点位置
 
-//   // **按 level 存储节点**
-//   NodeData.dagNode.forEach(node => {
-//     if (!levels[node.level]) {
-//       levels[node.level] = []
+//   // 统计指向同一 target 的 source
+//   edges.forEach(edge => {
+//     if (!targetMap[edge.to]) {
+//       targetMap[edge.to] = []
 //     }
-//     levels[node.level].push(node)
+//     targetMap[edge.to].push(edge.from)
 //   })
 
-//   const nodePositions = {}
-//   let x = 50 // 第一列的 x 轴位置
+//   const newEdges = []
+//   Object.keys(targetMap).forEach(target => {
+//     const sources = targetMap[target]
+//     if (sources.length > 1) {
+//       const mergeNodeId = `merge_${target}`
 
-//   Object.keys(levels).forEach(level => {
-//     let y = 50 // 第一行 y 轴初始位置
-//     const nodes = levels[level]
+//       const targetNode = NodeData.dagNode.find(n => n.nodeId === target)
+//       const sourceNodes = sources.map(src => NodeData.dagNode.find(n => n.nodeId === src)).filter(n => n)
 
-//     nodes.forEach(node => {
-//       nodePositions[node.nodeId] = { x, y }
-//       y += rowSpacing // **每个节点往下排列**
-//     })
+//       if (targetNode && sourceNodes.length > 0) {
+//         const maxSourceX = Math.max(...sourceNodes.map(n => n.x))
+//         const mergeNodeX = (maxSourceX + targetNode.x) / 2
+//         const mergeNodeY = targetNode.y
+
+//         mergeNodePositions[mergeNodeId] = { x: mergeNodeX, y: mergeNodeY }
+//       }
 
-//     x += columnSpacing // **每列向右移动**
+//       newEdges.push(...sources.map(src => ({ from: src, to: mergeNodeId })))
+//       newEdges.push({ from: mergeNodeId, to: target })
+//     } else {
+//       newEdges.push({ from: sources[0], to: target })
+//     }
+//   })
+
+//   // 添加合并节点到 NodeData
+//   Object.keys(mergeNodePositions).forEach(mergeNodeId => {
+//     NodeData.dagNode.push({
+//       nodeId: mergeNodeId,
+//       nodeName: '', // 合并节点不显示文本
+//       state: '',
+//       x: mergeNodePositions[mergeNodeId].x,
+//       y: mergeNodePositions[mergeNodeId].y,
+//       width: 100, // 使合并节点尽量小
+//       height: 100
+//     })
 //   })
 
-//   return nodePositions
+//   return newEdges
 // }
 
-// **初始化 X6 画布**
 onMounted(() => {
   graph = new Graph({
     container: graphRef.value,
     width: 580,
-    height: 801,
+    height: 1200,
     connecting: {
       router: 'orth' // 自动优化连线
       // connector: 'smooth', // 平滑曲线
@@ -369,10 +390,10 @@ onMounted(() => {
   })
 
   // **处理合并连线**
-  const mergedEdges = mergeConnections(NodeData.dagLine)
+  // const mergedEdges = mergeConnections(NodeData.dagLine)
 
   // **添加合并后的连线**
-  mergedEdges.forEach(edge => {
+  NodeData.dagLine.forEach(edge => {
     graph.addEdge({
       source: String(edge.from),
       target: String(edge.to),
@@ -387,13 +408,13 @@ onMounted(() => {
             width: 24,
             height: 24,
             y: -12,
-            x:-10,
-             transform: 'rotate(0)' // 旋转箭头图片
+            x: -24,
+            transform: 'rotate(0)' // 旋转箭头图片
           }
         }
       },
       router: { name: 'manhattan' }, // 自动贴合边缘
-      connector: { name: 'rounded' } // 让线条更圆滑
+      connector: { name: 'rounded' }, // 让线条更圆滑
     })
   })
 })
@@ -403,6 +424,7 @@ onMounted(() => {
 .container {
   width: 100%;
   height: 100%;
+  overflow: auto;
 }
 
 #graph_container {

src/views/left/modules/common/RiskTableContent.vue

@@ -180,7 +180,7 @@ onMounted(() => {})
     // font-weight: bold;
     color: #f6f9fe;
     font-style: italic;
-    text-shadow: 0px 0px 7px rgba(75, 180, 229, 0.25), 0px 2px 8px rgba(5, 28, 55, 0.42);
+    // text-shadow: 0px 0px 7px rgba(75, 180, 229, 0.25), 0px 2px 8px rgba(5, 28, 55, 0.42);
     text-align: left;
     text-transform: none;
     background: linear-gradient(to bottom, #ffffff 4%, #49ffff 100%);