u

src/views/pages/OpticalStoragePage/index.vue

@@ -812,6 +812,7 @@ let handleAnimate = async (result: any) => {
       "c0557047-c0e7-4df4-a36b-a4fe4dbdd879",
     ];
     if (arr.includes(item.sec_id)) {
+<<<<<<< HEAD
       console.log(item.sec_id, "item.sec_id");
 
       let dom = draw.findOne("#ZQ_" + item.sec_id);
@@ -828,11 +829,30 @@ let handleAnimate = async (result: any) => {
         showTextArr.includes(item.sec_id)
           ? handleLineText2(polyineArray, item, dom)
           : "";
+=======
+      console.log(item.sec_id, 'item.sec_id')
+
+      let dom = draw.findOne('#ZQ_' + item.sec_id)
+
+      if (dom) {
+        const polyine = dom.findOne('polyline')
+        const polyineArray = polyine.array()
+        const width = polyine.attr('stroke-width')
+        let polyineArray2 = polyine.array()
+        let pathDate = 'M' + polyineArray2.join(' L')
+        if (item.Flow_Direction_Flag === '-1') {
+          handlePolyineAnimate2(polyineArray, pathDate, dom, item)
+        } else {
+          handlePolyineAnimate(polyineArray, pathDate, dom, item)
+        }
+        showTextArr.includes(item.sec_id) ? handleLineText2(polyineArray, item, dom) : ''
+>>>>>>> d6fa074348d5d29043b154f986ca07e76526ac94
       }
     } else {
       let dom = draw.findOne("#ZQ_" + item.sec_id);
 
       if (dom) {
+<<<<<<< HEAD
         const polyine = dom.findOne("polyline");
         const polyineArray = polyine.array();
         const width = polyine.attr("stroke-width");
@@ -840,6 +860,21 @@ let handleAnimate = async (result: any) => {
         let pathDate = "M" + polyineArray2.join(" L");
         console.log(polyine, "polyine");
         handlePolyineAnimate(polyineArray, pathDate, dom, item);
+=======
+        const polyine = dom.findOne('polyline')
+        const polyineArray = polyine.array()
+        const width = polyine.attr('stroke-width')
+        let polyineArray2 = polyine.array()
+        let pathDate = 'M' + polyineArray2.join(' L')
+        if (item.sec_id === 'SBID000000FFC30DB26FDC45A0A911E9D2E1BEB0BD') {
+          console.log(polyineArray, 'polyine222')
+        }
+        if (item.Flow_Direction_Flag === '-1') {
+          handlePolyineAnimate2(polyineArray, pathDate, dom, item)
+        } else {
+          handlePolyineAnimate(polyineArray, pathDate, dom, item)
+        }
+>>>>>>> d6fa074348d5d29043b154f986ca07e76526ac94
 
         showTextArr.includes(item.sec_id)
           ? handleLineText2(polyineArray, item, dom)

src/views/pages/homePage/runListenPage.vue

@@ -536,7 +536,6 @@ const getStatInfo = async () => {
     nextTick(() => {
       if (resPonse) {
         // 成功获取到数据，进行后续处理
-        console.log('接口数据：', resPonse)
         let statInfo: any = JSON.parse(JSON.stringify(resPonse))
         // SourcePv_unit  分布式光伏数据
         SourcePv_unit.value = statInfo.data.photo_voltaic_unit as any
@@ -662,11 +661,9 @@ const alertInfo = () => {
   alert_api({
     orgID: '8af8470a47aad8e20147aad92e400335'
   }).then(res => {
-    console.log(res, '88888889999')
     if (res?.data.length > 0) {
       alertdata.alertArr = res.data
       tableData.tdate = res.data
-      console.log(alertdata.alertArr, '0')
     } else {
       console.log('没有数据')
     }
@@ -921,8 +918,12 @@ const handleThree = val => {
 //
 //
 // 获取运行监视---重过载告警统计
+let networkSonData = reactive<any>({
+  lineData: [],
+  zoneAreaData: [ ]
+})
 let getRunAlarm = () => {
-  alert_api({
+  runAlarm_api({
     orgID: '8af8470a47aad8e20147aad92e400335'
   }).then(res => {
     console.log(res, '88888889999')