diff --git a/src/views/pages/OpticalStoragePage/index.vue b/src/views/pages/OpticalStoragePage/index.vue
index 660b1d1..ce8c4b2 100644
--- a/src/views/pages/OpticalStoragePage/index.vue
+++ b/src/views/pages/OpticalStoragePage/index.vue
@@ -648,7 +648,6 @@ let handleEnter = () => {
         I: "1",
       },
       {
-<<<<<<< HEAD
         id: '555_3',
         flag: '1',
         Pi: '1',
@@ -663,14 +662,6 @@ let handleEnter = () => {
         Qi: '32.3110',
         V_b: '10.4989',
         I: '13.7123'
-=======
-        id: "556_1",
-        flag: "-1",
-        Pi: "249.3605",
-        Qi: "32.3110",
-        V_b: "10.4989",
-        I: "13.7123",
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
         id: "556_2",
@@ -681,7 +672,6 @@ let handleEnter = () => {
         I: "1",
       },
       {
-<<<<<<< HEAD
         id: '556_3',
         flag: '1',
         Pi: '1',
@@ -696,14 +686,6 @@ let handleEnter = () => {
         Qi: '14.3602',
         V_b: '10.4990',
         I: '17.8706'
-=======
-        id: "ying_31_1",
-        flag: "-1",
-        Pi: "324.9620",
-        Qi: "14.3602",
-        V_b: "10.4990",
-        I: "17.8706",
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
         id: "ying_31_2",
@@ -714,7 +696,6 @@ let handleEnter = () => {
         I: "1",
       },
       {
-<<<<<<< HEAD
         id: 'ying_31_3',
         flag: '1',
         Pi: '1',
@@ -745,22 +726,6 @@ let handleEnter = () => {
         Qi: '2',
         V_b: '3',
         I: '1'
-=======
-        id: "ying_41_1",
-        flag: "-1",
-        Pi: "110.7202",
-        Qi: "6.6579",
-        V_b: "10.4997",
-        I: "6.0088",
-      },
-      {
-        id: "ying_41_2",
-        flag: "1",
-        Pi: "1",
-        Qi: "2",
-        V_b: "3",
-        I: "1",
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
         id: "zhan_26_1",
@@ -779,7 +744,6 @@ let handleEnter = () => {
         I: "8.4072",
       },
       {
-<<<<<<< HEAD
         id: 'zhan_26_3',
         flag: '1',
         Pi: '152.8102',
@@ -794,14 +758,6 @@ let handleEnter = () => {
         Qi: '1.2095',
         V_b: '10.4993',
         I: '5.3655'
-=======
-        id: "zhan_16_1",
-        flag: "-1",
-        Pi: "97.5900",
-        Qi: "1.2095",
-        V_b: "10.4993",
-        I: "5.3655",
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       },
       {
         id: "zhan_16_2",
@@ -812,7 +768,6 @@ let handleEnter = () => {
         I: "1",
       },
       {
-<<<<<<< HEAD
         id: 'zhan_16_3',
         flag: '1',
         Pi: '1',
@@ -877,40 +832,6 @@ let handleEnter = () => {
         I: '1'
       }
     ]
-=======
-        id: "ye_31_1",
-        flag: "-1",
-        Pi: "263.1002",
-        Qi: "8.6865",
-        V_b: "10.4995",
-        I: "14.1577",
-      },
-      {
-        id: "ye_31_2",
-        flag: "1",
-        Pi: "1",
-        Qi: "2",
-        V_b: "3",
-        I: "1",
-      },
-      {
-        id: "ye_23_1",
-        flag: "-1",
-        Pi: "429.7437",
-        Qi: "10.6202",
-        V_b: "10.4991",
-        I: "23.7348",
-      },
-      {
-        id: "ye_23_2",
-        flag: "1",
-        Pi: "1",
-        Qi: "2",
-        V_b: "3",
-        I: "1",
-      },
-    ];
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
 
     // 增加一个数字4
     // 文本
@@ -924,7 +845,6 @@ let handleEnter = () => {
       .fill('#FFF')
 
     // 流向
-<<<<<<< HEAD
     const dom = draw.find('g')
     const polyline = draw.find('polyline')
 
@@ -942,23 +862,6 @@ let handleEnter = () => {
           } else {
             // 流向
             handlePolyineAnimate2(polyineArray, pathDate, item)
-=======
-    const dom = draw.find("g");
-    const polyline = draw.find("polyline");
-    dom.forEach((item) => {
-      polyline.forEach((lineIte) => {
-        if (item.node.id === lineIte.node.id) {
-          let newData = data.find((ite) => lineIte.node.id === ite.id);
-          console.log(newData);
-          const polyineArray = lineIte.array();
-          let pathDate = "M" + polyineArray.join(" L");
-          if (newData.flag === "1") {
-            // 流向
-            handlePolyineAnimate2(polyineArray, pathDate, item);
-          } else {
-            // 流向
-            handlePolyineAnimate(polyineArray, pathDate, item);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
           }
 
           // 文字
@@ -1067,7 +970,6 @@ let handleEnter = () => {
       let middleDuration = duration / num1;
 
       for (let i = 0; i < numTriangles; i++) {
-<<<<<<< HEAD
         let triangle = draw.polygon('0,-9 20,0 0,9').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
 
         let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
@@ -1084,31 +986,6 @@ let handleEnter = () => {
       }
       let rect = draw.rect(30, 30).fill('#000').move(-15, -10)
       lineDom.add(rect)
-=======
-        let triangle = draw
-          .polygon("0,-7 20,0 0,7")
-          .fill("lightgreen")
-          .stroke({ color: "lightgreen", width: 0.2 });
-
-        let triangleanimate = document.createElementNS(
-          "http://www.w3.org/2000/svg",
-          "animateMotion"
-        );
-        triangleanimate.setAttribute("path", pointsValue);
-        triangleanimate.setAttribute("dur", `${spacingDuration}s`);
-        let startTime =
-          middleDuration - (duration / numTriangles) * i - i * spacingDuration;
-        triangleanimate.setAttribute("begin", `${startTime}s`);
-        triangleanimate.setAttribute("fill", "remove");
-        triangleanimate.setAttribute("rotate", "auto");
-        triangleanimate.setAttribute("repeatCount", "indefinite");
-        triangle.node.appendChild(triangleanimate);
-
-        lineDom.add(triangle);
-      }
-      let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
-      lineDom.add(rect);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
     }
     // 反向流动
     function handlePolyineAnimate2(pointArray, pointsValue, lineDom) {
@@ -1209,7 +1086,6 @@ let handleEnter = () => {
       let duration = numTriangles / num1;
       let middleDuration = duration / num1;
       for (let i = 0; i < numTriangles; i++) {
-<<<<<<< HEAD
         let triangle = draw.polygon('0,-9 -20,0 0,9').fill('lightgreen').stroke({ color: 'lightgreen', width: 0.2 })
 
         let triangleanimate = document.createElementNS('http://www.w3.org/2000/svg', 'animateMotion')
@@ -1226,31 +1102,6 @@ let handleEnter = () => {
         triangle.node.appendChild(triangleanimate)
 
         lineDom.add(triangle)
-=======
-        let triangle = draw
-          .polygon("0,-7 -20,0 0,7")
-          .fill("lightgreen")
-          .stroke({ color: "lightgreen", width: 0.2 });
-
-        let triangleanimate = document.createElementNS(
-          "http://www.w3.org/2000/svg",
-          "animateMotion"
-        );
-        triangleanimate.setAttribute("path", pointsValue);
-        triangleanimate.setAttribute("dur", `${spacingDuration}s`);
-        let startTime =
-          middleDuration - (duration / numTriangles) * i - i * spacingDuration;
-        triangleanimate.setAttribute("begin", `${startTime}s`);
-        triangleanimate.setAttribute("fill", "remove");
-        triangleanimate.setAttribute("rotate", "auto");
-        triangleanimate.setAttribute("repeatCount", "indefinite");
-        triangleanimate.setAttribute("keyPoints", "1;0");
-        triangleanimate.setAttribute("keyTimes", "0;1");
-        triangleanimate.setAttribute("calcMode", "linear");
-        triangle.node.appendChild(triangleanimate);
-
-        lineDom.add(triangle);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       }
       let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
       lineDom.add(rect);
@@ -1260,7 +1111,6 @@ let handleEnter = () => {
       return distance;
     }
     function handleLineText2(polyineArray, Lineitem, lineDom) {
-<<<<<<< HEAD
       console.log(polyineArray, Lineitem, lineDom, 'polyineArray, Lineitem, lineDom')
       let arrData = ['555_2', '555_3', '556_2', '556_3', 'ying_31_3', 'ying_31_2', 'ying_41_1', 'ying_41_3', 'zhan_26_1', 'zhan_26_3', 'zhan_16_2', 'zhan_16_3', 'ye_13_2', 'ye_13_1', 'ye_13_3', 'ye_23_2', 'ye_23_3']
       if (arrData.includes(Lineitem.id)) return
@@ -1331,50 +1181,6 @@ let handleEnter = () => {
         endY = y + 80
         endTextX = x
         endTextY = y + 50
-=======
-      console.log(
-        polyineArray,
-        Lineitem,
-        lineDom,
-        "polyineArray, Lineitem, lineDom"
-      );
-      let arrData = [
-        "555_2",
-        "556_2",
-        "ying_31_2",
-        "ying_41_2",
-        "zhan_26_1",
-        "zhan_16_2",
-        "ye_31_2",
-        "ye_23_2",
-      ];
-      if (arrData.includes(Lineitem.id)) return;
-
-      let data = Lineitem;
-      let x = polyineArray[polyineArray.length - 1][0];
-      let y = polyineArray[polyineArray.length - 1][1];
-      let line = "";
-      let text = "";
-      let endX = x;
-      let endY = y + 40;
-      let endTextX = x - 30;
-      let endTextY = y + 50;
-
-      if (data.id === "556_1") {
-        endX = x + 20;
-        endTextX = x;
-      } else if (data.id === "zhan_16_1") {
-        endX = x - 20;
-        endY = y + 70;
-        endTextX = x - 70;
-        endTextY = y + 80;
-      } else if (data.id === "ying_31_1") {
-        endX = x - 30;
-        endTextX = x - 70;
-      } else if (data.id === "ying_41_1") {
-        endX = x + 30;
-        endTextX = x + 30;
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
       }
 
       //只要线路上有sec_id 就显示线路上的文字 p  q v i 参数
@@ -1398,15 +1204,9 @@ let handleEnter = () => {
           .attr({
             x: endTextX,
             y: endTextY,
-<<<<<<< HEAD
             id: 'load_text' + data.psrId,
             'font-size': '15',
             leading: '0.9'
-=======
-            id: "load_text" + data.psrId,
-            "font-size": "9",
-            leading: "0.9",
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
           })
           .fill("green");
       }
@@ -1420,7 +1220,6 @@ let handleEnter = () => {
       if (item.node.id) {
         console.log(item, "item");
         // 增加透明选择框
-<<<<<<< HEAD
         var backgroundRectYing31 = draw.rect(120, 60).attr({ x: 750, y: 245, id: 'ying31' }).fill('transparent').css('cursor', 'pointer')
         backgroundRectArr.push(backgroundRectYing31)
         var backgroundRectYing41 = draw.rect(120, 60).attr({ x: 1040, y: 250, id: 'ying41' }).fill('transparent').css('cursor', 'pointer')
@@ -1438,56 +1237,6 @@ let handleEnter = () => {
         var backgroundRect556 = draw.rect(120, 60).attr({ x: 210, y: 740, id: '556' }).fill('transparent').css('cursor', 'pointer')
         backgroundRectArr.push(backgroundRect556)
 
-=======
-        var backgroundRectYing31 = draw
-          .rect(120, 60)
-          .attr({ x: 570, y: 225, id: "ying31" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectYing31);
-        var backgroundRectYing41 = draw
-          .rect(120, 60)
-          .attr({ x: 905, y: 200, id: "ying41" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectYing41);
-        var backgroundRectZhan26 = draw
-          .rect(120, 60)
-          .attr({ x: 1300, y: 650, id: "zhan26" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectZhan26);
-        var backgroundRectZhan16 = draw
-          .rect(120, 60)
-          .attr({ x: 1300, y: 975, id: "zhan16" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectZhan16);
-        var backgroundRectYe23 = draw
-          .rect(120, 60)
-          .attr({ x: 600, y: 1350, id: "ye23" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectYe23);
-        var backgroundRectYe31 = draw
-          .rect(120, 60)
-          .attr({ x: 910, y: 1380, id: "ye31" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRectYe31);
-        var backgroundRect555 = draw
-          .rect(120, 60)
-          .attr({ x: 160, y: 945, id: "555" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRect555);
-        var backgroundRect556 = draw
-          .rect(120, 60)
-          .attr({ x: 160, y: 690, id: "556" })
-          .fill("transparent")
-          .css("cursor", "pointer");
-        backgroundRectArr.push(backgroundRect556);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         // 遍历点击事件
         backgroundRectArr.forEach((item: any) => {
           item.on("click", function (e) {
@@ -2097,7 +1846,6 @@ let handleAnimate = async (result: any) => {
   // 线的流向
   result.line.forEach((item) => {
     let showTextArr = [
-<<<<<<< HEAD
       '53865f4f-5564-42fd-94e6-697fa110dc58',
       'f9d98d48-f25a-4486-bf20-49895ec3e342',
       'a1096ad7-aae7-487b-ad05-1113a03cb4f8',
@@ -2357,211 +2105,6 @@ let handleAnimate = async (result: any) => {
     ]
 
     let dom = draw.findOne('#ZQ_' + item.sec_id)
-=======
-      "53865f4f-5564-42fd-94e6-697fa110dc58",
-      "f9d98d48-f25a-4486-bf20-49895ec3e342",
-      "a1096ad7-aae7-487b-ad05-1113a03cb4f8",
-      "6DDB3B85-A4AB-4595-8591-2168E8D81210-04953",
-      "95efda22-86a3-49b5-9de3-803738256461",
-      "c47a01b3-3d42-47fd-a263-6ae11b630a36",
-      "e0af5215-d781-4050-87bb-c21dafca0695",
-      "8bd342c8-9820-4bb8-85cf-105bcb8f1a03",
-      "4b00fe92-0efa-40b9-bce0-2d6598a6c357",
-      "1fd7d361-4ea0-487f-9a36-a7a5d222b66d",
-      "c70087bd-0468-4ac7-8208-db96853550b8",
-      "65c2f45a-4432-4a29-9b9e-a2ac60f83f38",
-      "c78a0a1d-f2b5-4a41-ba98-ba895a5701f5",
-      "e5698b2c-2dff-43b7-b0b1-6135f780a052",
-      "1bf76898-ea7c-47bd-8f31-14d624ac3f66",
-      "20604b66-0efd-44fc-a712-e4a534b61ffa",
-      "fe8cb836-ae9b-4ab2-8b65-a5ff405d3a9c",
-      "d5336b00-5afe-4393-9014-bcb2dc0029a1",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26520",
-      "ea04e6d3-587e-4ca0-ae6a-31997fd1fb35",
-      "7fc56aa9-3bf3-4a2b-bd03-4b6b791bc63a",
-      "c8695ee9-c277-40ac-ad1c-5c10605e4e47",
-      "9f77f5b2-c3e2-4141-be4f-df9043789813",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26480",
-      "22205de9-f4db-4626-aad5-437b17856f6d",
-      "177997cd-edc3-420d-b657-0b602a473929",
-      "1d2f708c-f0d6-4269-bcc7-db998503d9e6",
-      "ef7de3d0-8521-4f6d-81d2-c9f1705bfb9b",
-      "d3cebbd8-3ffd-48af-8979-874389f9c32a",
-      "01f825ec-9526-4239-b0cf-f9d0d473b086",
-      "513e7602-d1d5-4370-a39f-af41ef2a5eef",
-      "23ee05dc-1e5d-4eca-8fea-07210d06a579",
-      "487C8FA1-ABEC-4252-A14D-7727D4E31DAD-47360",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26525",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26530",
-      "SBID00000017083154D08541B8A57FB8B69B1B3201",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26535",
-      "013255C2-7FE7-4B28-BF7C-7EB83FC07F31-06125",
-      "AD4A0872-6474-4BD2-9646-746B0B63D24A-26465",
-      "ce4ba346-1227-416f-84ad-b8d2cde0154c",
-      "SBID0000001986642DB7C045E89813CED6BE4C13A0",
-      "87608bd7-15a2-4c9c-bd78-ccf9b58a31c0",
-      "888c9204-7897-4dc2-a247-3ab3be9a08cf",
-      "c65da884-685d-4c1b-97d8-08b50328b0ba",
-      "SBID0000001D2DEA1F390C4024B42B0C3F9E7F4EFE",
-      "90477e98-bfd8-46ab-ba4e-c58d631a1437",
-      "0746bb6a-b717-49b1-bc57-6073c4e2d2e9",
-      "5d43423c-3705-40c1-8226-db498fd35af2",
-      "aeaf5dbb-e1c9-48bb-adc6-d604fa8f1028",
-      "31e7b036-400a-4fe3-8700-30190f7f6b82",
-      "SBID000000C8642470D83E486BBB311BDA51515F35",
-      "af2d4b84-bee6-4c93-b9d4-3e1c32ad17ff",
-      "SBID0000006A6B053E31A648609F9743D97E12A49D",
-      "b78c69b4-71de-47cf-ae83-90dbd4e9e8f2",
-      "bab210a5-c289-461c-94fb-5c4afd158544",
-      "c83d5650-08e1-44d6-b8c7-822de083f36e",
-      "6374FC19-1673-43C6-AC8D-494CFFBB4C9F-85198",
-      "6374FC19-1673-43C6-AC8D-494CFFBB4C9F-85193",
-      "be9d83ac-8121-4f96-bb3a-c1c751f185d6",
-      "2ccdaa60-8958-45de-bb31-f35e7ba85a8b",
-      "a2ebae33-0efb-40ee-a097-2dacec109868",
-      "eb4fc970-2478-4bdc-aa25-bdd7ad4c5dae",
-      "644e331d-e932-4ec8-92ed-3d09e30db28f",
-      "SBID000000BE1E6FF87E7244B5BC7E1346FF0860CA",
-      "ce1df80b-9fd3-498b-9f24-a5ed6f416532",
-      "2D6FDD6A-F2D0-4EDE-8177-321A747C4D10-76308",
-      "00d1219b-a69c-4a43-b8fd-67f461b4c9f3",
-      "DCEED74F-BD86-4AF6-AE71-15C80F872877-46071",
-      "2db67071-a5bd-4c03-83bb-d4250d44b995",
-      "d63eae69-fe6c-4012-b6aa-8c5333f2dd27",
-      "b7867bdd-4203-4f03-9d25-8f5acb3caa3b",
-      "8CF95CE3-7B11-15ED-E044-001A4B099F30-00001",
-      "a12f5c38-3ad7-47be-b304-045733513143",
-      "6b046b2c-dc11-45d5-8fff-d1529fe3835a",
-      "30fe04fa-8610-4cb5-8bc8-ad1222690638",
-      "1682d60e-58f2-4716-a041-59e7ddb35ee8",
-      "a2998143-bf4a-4753-8f6a-08a519a7bd11",
-      "e95bd2eb-5c61-4993-90f9-625ada63ad04",
-      "8febc98f-8334-4de0-a163-c6c03ad0692b",
-      "93313035-093F-4346-96F4-84CEA3607C08-25598",
-      "7A414E41-2DA2-4341-91BB-250834033791-36035",
-      "SBID0000002BEFD03075CF4033878FEF9249896A21",
-      "cd4d4dd4-15a1-4154-995a-fe2431051acd",
-      "5e909114-b342-4dc1-9f32-22b268060812",
-      "629c0eb1-7af8-4893-87ab-d8feb70cdb1f",
-      "FF801E5F-FE30-4F54-B32E-28B9A46504B7-13926",
-      "DD330AD2-52B1-4581-AB75-18D80366F023-37414",
-      "7fb7a36d-2f2f-4e57-9ebb-bc43a8109e78",
-      "8f70fcb5-b59f-490a-baad-55370c5f7161",
-      "dfbf6f51-edb2-440e-b703-1325fe2695fb",
-      "0b48767a-d287-4f57-be3b-1148305b2048",
-      "629c0eb1-7af8-4893-87ab-d8feb70cdb1f",
-      "FF801E5F-FE30-4F54-B32E-28B9A46504B7-13926",
-      "DD330AD2-52B1-4581-AB75-18D80366F023-37414",
-      "7fb7a36d-2f2f-4e57-9ebb-bc43a8109e78",
-      "8f70fcb5-b59f-490a-baad-55370c5f7161",
-      "SBID000000EEED86E606694F4EACF343E96A517170",
-      "e3ad70bf-4b84-4fb3-8c95-36973433b007",
-      "dfbf6f51-edb2-440e-b703-1325fe2695fb",
-      "4e036c18-19c5-473a-a95d-481cf89c362c",
-      "4e231cf2-9f49-4a78-a534-c0b702296833",
-      "9d8e808f-5d3b-4376-97a7-58eeca042dba",
-      "SBID000000AECA5D4DF7874850A8F0AA07FCC3A705",
-      "283e025e-994f-4125-8772-4ec88fc7e321",
-      "fa4353a2-6ccb-4e12-b47a-e765b81804fa",
-      "0ffd90f0-37dd-4aa1-96a7-a29d2bd4e535",
-      "2299b109-34a7-493f-9541-c22594ba4312",
-      "cb957cab-247a-4cea-b787-cd627f9e0f7a",
-      "b7dc1c1f-5743-4905-b99e-cbc5617b660a",
-      "fbca52e8-59ef-4bc1-be38-6f60757a3579",
-      "b46aea1f-fc42-4bd4-a6b2-c5ae63c2b33b",
-      "16bb368c-104d-4ba7-934d-a44927f65444",
-      "3e43db18-8b4d-4e57-99b0-ab6521600daa",
-      "SBID0000003195CD2F53454D99BD74B97F94982AF9",
-      "8486dc26-360e-458b-976c-93ced7c82369",
-      "99da9925-a1d7-49be-89ef-adb955a06f21",
-      "3c18d284-b067-4dca-94b4-ee178410f751",
-      "9de0fd07-7169-4fcb-bb0b-789ec3644ac7",
-      "418bb7a7-f954-4505-8762-f80b1516d773",
-      "4b14e5cc-91f7-484b-b970-45297c125d8d",
-      "9df040f3-0278-4ea8-960f-0b8c9b13c759",
-      "461EC281-51EC-4913-82B0-C155B2C3EC96-38266",
-      "6ed756cb-d68c-482d-9e37-b9d55f6ba28e",
-      "1190934f-fc87-4ae0-8ffd-7ad1873342b5",
-      "64dbe8d8-13d3-434d-be7d-0a34087c9bba",
-      "8efc932e-4ee9-4898-9ce9-e074a5c3e5ae",
-      "5398db21-a148-4ec2-9e5c-27be65e83f81",
-      "eea16226-2564-41d7-b9fd-afb7fcab3086",
-      "7d0a1873-b6cf-4d91-9e3d-7cff52681768",
-      "37765eb0-b5df-4fbf-8a62-8c1af3454c9a",
-      "25d8733e-e117-4b6d-8a36-ce0bd1e6bdbb",
-      "787bf14f-e8f7-4a2c-9b35-44e1f710838d",
-      "7A414E41-2DA2-4341-91BB-250834033791-36070",
-      "f9b30774-dcf2-4e3d-a055-3b8f3951734e",
-      "791b3f34-7329-4c99-8a2f-821695a539a4",
-      "977797dc-70b8-4b5e-b8da-59d87fd54e4c",
-      "96d8e5c2-fe59-420e-b2b8-dca40760d1bb",
-      "958c21b9-c6b6-4e39-9320-6b81958d6a89",
-      "6723d52b-dd5d-4a2d-bfcd-6c86c26196ff",
-      "195947f3-4f2d-4f04-8652-62260d83896d",
-      "bd9e14ce-bdf9-4bc9-bbcc-2a33f9e1eee3",
-      "8052490e-ef04-48d8-965a-bc8e67224457",
-      "f6188f0d-93f5-44ea-a4b3-b482ab228e38",
-      "C2D0E102-F479-4163-9D19-80591BCDB1E1-49087",
-      "bcdb90ce-eefc-46f5-b62a-be92593dac23",
-      "62f47df6-646a-407c-809c-d57e0fd85829",
-      "b1a0e9eb-ed69-4761-acc4-a6cd9b345d82",
-      "9ee10651-8ee7-435e-a68e-6d4e2009cf33",
-      "3f8bf3a5-9326-4cc1-bd42-ece7b7c58acc",
-      "93c510f7-ab06-4fd5-a143-8efd373fb679",
-      "6c31a6e8-2aee-49a2-9c87-07a20168e67c",
-      "SBID000000EEE12F9BA91E41C1ABACD8C2C85A8E4D",
-      "91731803-5e37-4aee-a520-68a8590ea0b7",
-      "af2b9349-494c-4968-955c-2d5c0a5ef3b0",
-      "60773faf-fdc8-4ade-a840-1d10514056e7",
-      "2e7d953e-82b0-40e2-96ac-ed8dc53499e7",
-      "ade7eb0e-7c87-46b9-a095-9445d519042e",
-      "5a4c6345-443c-423b-88b9-af736411c7ed",
-      "6105A1DC-215A-4ADC-82F4-AA82D20B4635-15661",
-      "3e0f29af-1753-4b84-8675-5f358c9b65f4",
-      "4e00c1b4-10ec-470a-bc11-fa8a986e8df1",
-      "78cbdff3-a003-46b1-9f0c-b20ff2bebdd9",
-      "aa153f85-d7e5-42d5-81c9-a3ab942438ed",
-      "29f27fd3-ef21-4f23-8939-11d5d996bbec",
-      "D20588AB-3797-4B2C-BF86-9A2768671604-52022",
-      "5e4c71dc-119c-430a-b7f2-55898d54592b",
-      "d82f3561-9b7f-4c83-80c1-9541697c377d",
-      "e956cb7e-ad60-473e-9266-305d98d3fa79",
-      "SBID000000E22B0F1386EE4160BCC88ECC30363978",
-      "e87ee5a8-ff96-41ea-905e-fa9b311bbf58",
-      "020c37c3-faa3-4b7b-a953-5a607cf052c9",
-      "b7783c78-fd54-421a-9f40-10e94417f35c",
-      "93e2b4c4-f983-42b8-920d-bb1732ef6e3c",
-      "add38f99-955a-43bd-b906-aabc02c0ac45",
-      "b5d7c462-60dd-4e3d-959e-6f018cd13408",
-      "19159691-4689-4B1C-A59F-93B88BE04CF8-60065",
-      "d9698e64-cc16-476e-aaaa-302d84977134",
-      "0e1f3493-d65a-4cba-b0f5-4de5802f1094",
-      "aed6d852-eb97-4a36-bd6e-b6515a1fddf7",
-      "C9B5E416-235E-406E-9F10-6540B896742C-16471",
-      "316f8582-f4ef-4308-b401-0e340e913fd4",
-      "8a17350d-2a01-4fd3-8162-b49ff846dfff",
-      "43284474-a877-4c2f-ab51-c41494ce471a",
-      "d4ac29b6-d466-4260-82b4-ac9de017639d",
-      "02f3c20b-b206-4d7a-a72b-813acb818277",
-      "C9B5E416-235E-406E-9F10-6540B896742C-16441",
-      "c5877708-9737-42a2-bc7e-8c3c80ada526",
-      "7721f74c-830b-462d-9213-6a587c89ba52",
-      "SBID00000004B3ED27EB944D438AB05DE144E145B1",
-      "12ad0cff-60b7-41bc-994d-003fd1417aa6",
-      "b70aebff-33b5-404d-b010-703fc6d409f9",
-      "be8815ba-1467-4428-8deb-f6667ab74cb2",
-      "487ed7a1-fbb7-4065-93c8-fb6963a46516",
-      "eaf496e5-df1c-4c22-8e1c-0114d4e256fe",
-      "090a428c-4a90-4587-a395-cf96d492cd6f",
-      "c9c480b7-01dc-4a64-b74d-71269d9c5914",
-      "a62b1217-0381-4fa3-be3a-585ea974f5ab",
-      "efa7f59c-34b6-4f83-b998-d0979f55a290",
-      "77da5747-f38b-4aab-8506-65011a62c0f6",
-      "e380d914-65d1-48bb-813b-3b2016f399e9",
-    ];
-
-    let dom = draw.findOne("#ZQ_" + item.sec_id);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
 
     if (dom) {
       if (item.Flow_Direction_Flag === "0") return;
@@ -2608,23 +2151,12 @@ let handleAnimate = async (result: any) => {
       // 文本
       text = draw
         .text(
-<<<<<<< HEAD
           `P: ${(parseFloat(data['Pi']) * 100).toFixed(4)} kW 
               Q: ${(parseFloat(data['Qi']) * 10).toFixed(4)} kVar \nV: ${parseFloat(data['V_b']).toFixed(4)}  kV \nI: ${((parseFloat(data['Pi']) * 100) / (parseFloat(data['V_b']) * 1.732)).toFixed(4)}  A`
-=======
-          `P: ${(parseFloat(data["Pi"]) * 10).toFixed(4)} kW 
-              Q: ${(parseFloat(data["Qi"]) * 10).toFixed(
-                4
-              )} kVar \nV: ${parseFloat(data["V_b"]).toFixed(4)}  kV \nI: ${(
-            (parseFloat(data["Pi"]) * 10) /
-            (parseFloat(data["V_b"]) * 1.732)
-          ).toFixed(4)}  A`
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         )
         .attr({
           x: x - 10,
           y: y + 5,
-<<<<<<< HEAD
           id: 'load_text' + data.psrId,
           'font-size': '1'
         })
@@ -2633,16 +2165,6 @@ let handleAnimate = async (result: any) => {
       text.node.children[1].setAttribute('dy', '1')
       text.node.children[2].setAttribute('dy', '1')
       text.node.children[3].setAttribute('dy', '1')
-=======
-          id: "load_text" + data.psrId,
-          "font-size": "1",
-        })
-        .fill("green");
-      text.node.children[0].setAttribute("dy", "1");
-      text.node.children[1].setAttribute("dy", "1");
-      text.node.children[2].setAttribute("dy", "1");
-      text.node.children[3].setAttribute("dy", "1");
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
     }
 
     lineDom.add(line);
@@ -2784,13 +2306,8 @@ let handleAnimate = async (result: any) => {
 
       lineDom.add(triangle);
     }
-<<<<<<< HEAD
     let rect = draw.rect(40, 30).fill('#000').move(-30, -10)
     lineDom.add(rect)
-=======
-    let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
-    lineDom.add(rect);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
   }
   // 反向流动
   function handlePolyineAnimate2(pointArray, pointsValue, lineDom) {
@@ -2931,13 +2448,8 @@ let handleAnimate = async (result: any) => {
 
       lineDom.add(triangle);
     }
-<<<<<<< HEAD
     let rect = draw.rect(40, 30).fill('#000').move(-25, -10)
     lineDom.add(rect)
-=======
-    let rect = draw.rect(30, 30).fill("#000").move(-5, -10);
-    lineDom.add(rect);
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
   }
   function pointDistance(x1, y1, x2, y2) {
     const distance = Math.sqrt(Math.pow(x2 - x1, 2) + Math.pow(y2 - y1, 2));
@@ -2966,15 +2478,7 @@ let handleAnimate = async (result: any) => {
         .font({ size: "8" });
       // 文本
       draw
-<<<<<<< HEAD
         .text(`P: ${(parseFloat(data['Pload/phase']) * 100).toFixed(4)} kW\nQ: ${(parseFloat(data['i']) * 10).toFixed(4)} kVar`)
-=======
-        .text(
-          `P: ${(parseFloat(data["Pload/phase"]) * 10).toFixed(4)} kW\nQ: ${(
-            parseFloat(data["i"]) * 10
-          ).toFixed(4)} kVar`
-        )
->>>>>>> b21c6ec18e5dc8af31480d375134c7b3ab58f9f0
         .attr({
           x: centerX + 10,
           y: centerY - 10,