From d36b0818a2a05f2c4ebfc8eb9d838295e608f71a Mon Sep 17 00:00:00 2001
From: panyuyi <panyuyi@datametatech.com>
Date: Tue, 18 Mar 2025 16:03:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/axios/axiosCancel.ts                        |  1 +
 src/views/Main/Dike/components/DataStatistics.vue   | 12 ++++++------
 .../Main/Reservoir/components/DataStatistics.vue    | 13 +++++++------
 src/views/Main/Sluice/components/DataStatistics.vue | 12 ++++++------
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/api/axios/axiosCancel.ts b/src/api/axios/axiosCancel.ts
index 05180b3..8de2716 100644
--- a/src/api/axios/axiosCancel.ts
+++ b/src/api/axios/axiosCancel.ts
@@ -22,6 +22,7 @@ export class AxiosCanceler {
     if (url.indexOf('preview/capture') > 0) return; // 忽略 重复请求获取预览取流地址
     if (url.indexOf('/sy-engine-backer/cameraInfo/') > 0) return; // 忽略 重复请求获取预览取流地址
     if (url.indexOf('/run/statistic/chart') > 0) return;
+    if (url.indexOf('/monitor/chart') > 0) return;
     
     // 上传接口忽略重复请求
     if (!url.includes('oss')) {
diff --git a/src/views/Main/Dike/components/DataStatistics.vue b/src/views/Main/Dike/components/DataStatistics.vue
index d6d097e..e761459 100644
--- a/src/views/Main/Dike/components/DataStatistics.vue
+++ b/src/views/Main/Dike/components/DataStatistics.vue
@@ -270,8 +270,8 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "C_SEEPAGE_FLOW",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart1, echartsRef1.value);
+    if (res) {
+      initChart(res, echart1, echartsRef1.value);
     }
   });
   // 渗流监测
@@ -282,8 +282,8 @@ function getEchartsData() {
     stcd: cascaderArr.value[0] || "",
     elementType: "C_DISPLACEMENT",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart2, echartsRef2.value);
+    if (res) {
+      initChart(res, echart2, echartsRef2.value);
     }
   });
   // 堤围工程堤段表面变形信息统计
@@ -294,8 +294,8 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "DF_WATER_LEVEL",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart3, echartsRef3.value);
+    if (res) {
+      initChart(res, echart3, echartsRef3.value);
     }
   });
 }
diff --git a/src/views/Main/Reservoir/components/DataStatistics.vue b/src/views/Main/Reservoir/components/DataStatistics.vue
index 57058d1..efc147c 100644
--- a/src/views/Main/Reservoir/components/DataStatistics.vue
+++ b/src/views/Main/Reservoir/components/DataStatistics.vue
@@ -276,8 +276,9 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "WATER_LEVEL",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart1, echartsRef1.value);
+    console.log("res >>>>>  ", res);
+    if (res) {
+      initChart(res, echart1, echartsRef1.value);
     }
   });
   // 环境情况
@@ -288,8 +289,8 @@ function getEchartsData() {
     stcd: cascaderArr.value[0] || "",
     elementType: "ENV",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart2, echartsRef2.value);
+    if (res) {
+      initChart(res, echart2, echartsRef2.value);
     }
   });
   // 应变应力
@@ -300,8 +301,8 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "C_STRESS",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart3, echartsRef3.value);
+    if (res) {
+      initChart(res, echart3, echartsRef3.value);
     }
   });
   // 渗流压力情况-没数据
diff --git a/src/views/Main/Sluice/components/DataStatistics.vue b/src/views/Main/Sluice/components/DataStatistics.vue
index e3832cc..7f14408 100644
--- a/src/views/Main/Sluice/components/DataStatistics.vue
+++ b/src/views/Main/Sluice/components/DataStatistics.vue
@@ -270,8 +270,8 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "SZ_SEEPAGE_AROUND",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart1, echartsRef1.value);
+    if (res) {
+      initChart(res, echart1, echartsRef1.value);
     }
   });
   // 雨情分析
@@ -282,8 +282,8 @@ function getEchartsData() {
     stcd: cascaderArr.value[0] || "",
     elementType: "SZ_WATER_LEVEL",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart2, echartsRef2.value);
+    if (res) {
+      initChart(res, echart2, echartsRef2.value);
     }
   });
   // 裂缝开合度分析
@@ -294,8 +294,8 @@ function getEchartsData() {
     mpcd: cascaderArr.value[1] || "",
     elementType: "SZ_DISPLACEMENT",
   }).then((res) => {
-    if (res.data) {
-      initChart(res.data, echart3, echartsRef3.value);
+    if (res) {
+      initChart(res, echart3, echartsRef3.value);
     }
   });
 }