From d712f683b36bf67315f3fd1696792781db3e8c23 Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Mon, 27 Oct 2025 13:34:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=97=AA=E7=83=81=E7=82=B9=E9=A2=9C?=
 =?UTF-8?q?=E8=89=B2=E6=94=B9=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/eventStatistics/index.vue      |  4 +--
 src/views/SagTraceResult_WX/index.vue         | 31 +++++--------------
 2 files changed, 9 insertions(+), 26 deletions(-)

diff --git a/src/views/SagTraceResult_WX/components/eventStatistics/index.vue b/src/views/SagTraceResult_WX/components/eventStatistics/index.vue
index 0df4a86..2e22aa2 100644
--- a/src/views/SagTraceResult_WX/components/eventStatistics/index.vue
+++ b/src/views/SagTraceResult_WX/components/eventStatistics/index.vue
@@ -857,7 +857,7 @@ const analysisClick = (row: any) => {
 
         const dataObject = {
           eventList: [...eventList.value],
-          color: "#1dd1a1",
+          color: "#03de6d",
           maxResponsibilityMonitorId: [...maxResponsibilityMonitorId.value],
           maxColor: "#f9065b",
         };
@@ -1186,7 +1186,7 @@ const callHarmOneImageApi = (row: any, selectedTime: string) => {
       const dataObject = {
         eventListAll: [JSON.parse(JSON.stringify(eventListAll.value))],
         eventList: [...eventList.value],
-        color: "#09ee06",
+        color: "#cf552d",
         maxResponsibilityMonitorId: [...maxResponsibilityMonitorId.value],
         maxColor: "#c708fe",
         backgroundPointId: [...backgroundPoint.value],
diff --git a/src/views/SagTraceResult_WX/index.vue b/src/views/SagTraceResult_WX/index.vue
index 3e30ec5..1d302fd 100644
--- a/src/views/SagTraceResult_WX/index.vue
+++ b/src/views/SagTraceResult_WX/index.vue
@@ -108,7 +108,7 @@
               />
               <!-- 图元颜色提示框 -->
               <div
-                v-if="!showDetail"
+                v-if="!store.state.showMap && !showDetail"
                 style="
                   position: absolute;
                   left: 0px;
@@ -124,42 +124,27 @@
                   <span class="iconfont blink-basic" style="color: #375db4"
                     >&#xe67a;</span
                   >
-                  <!-- <img
-                    src="@/assets/icon/传输设备 (3).png"
-                    style="width: 20px; height: 20px"
-                    class="blink-basic"
-                  /> -->
                   <div style="margin-left: 10px; font-size: 12px">
                     暂降发生测点
                   </div>
                 </div>
                 <div style="display: flex" v-if="currentFlag == 1">
-                  <!-- <img
-                    src="@/assets/icon/传输设备 (4).png"
-                    style="width: 20px; height: 20px"
-                    class="blink-basic"
-                  /> -->
-                  <span class="iconfont blink-basic" style="color:#0936f4"
+                  <span class="iconfont blink-basic" style="color: #0936f4"
                     >&#xe67a;</span
                   >
                   <div style="margin-left: 10px; font-size: 12px">背景测点</div>
                 </div>
                 <div style="display: flex">
-                  <!-- <img
-                    src="@/assets/icon/传输设备 (2).png"
-                    style="width: 20px; height: 20px"
-                    class="blink-basic"
-                  /> -->
                   <span
                     v-if="currentFlag == 0"
                     class="iconfont blink-basic"
-                    style="color: #1dd1a1"
+                    style="color: #03de6d"
                     >&#xe67a;</span
                   >
                   <span
                     v-if="currentFlag == 1"
                     class="iconfont blink-basic"
-                    style="color: #09ee06"
+                    style="color: #cf552d"
                     >&#xe67a;</span
                   >
                   <span
@@ -175,11 +160,6 @@
                   </div>
                 </div>
                 <div style="display: flex" v-if="currentFlag != 2">
-                  <!-- <img
-                    src="@/assets/icon/传输设备 (1).png"
-                    style="width: 20px; height: 20px"
-                    class="blink-basic"
-                  /> -->
                   <span
                     v-if="currentFlag == 0"
                     class="iconfont blink-basic"
@@ -243,6 +223,9 @@ import datePicker from "@/components/datePicker/index.vue";
 import Management from "./components/manage/index.vue";
 import SecurityDetail from "./components/manage/securityDetail.vue";
 import IframeDia from "./components/manage/iframeDia.vue";
+import { useStore } from "vuex";
+
+const store = useStore();
 
 // 传给iframe页面的参数
 const currentProject = ref<{ id: string; name: string } | null>(null);

From cff1867dae5c6e077f6c648ccdfe90917c9208fd Mon Sep 17 00:00:00 2001
From: stt <email>
Date: Mon, 27 Oct 2025 13:55:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0z-index?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/SagTraceResult_WX/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/SagTraceResult_WX/index.vue b/src/views/SagTraceResult_WX/index.vue
index 1d302fd..b079704 100644
--- a/src/views/SagTraceResult_WX/index.vue
+++ b/src/views/SagTraceResult_WX/index.vue
@@ -104,7 +104,7 @@
               />
               <IframeDia
                 :event-list="eventListData as []"
-                style="position: absolute; top: 0px; right: 0px; left: 0px"
+                style="position: absolute; top: 0px; right: 0px; left: 0px;z-index: 10;"
               />
               <!-- 图元颜色提示框 -->
               <div