From a37e33d7d85d347aa77d02d595cb33d8e70cce42 Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 18 Nov 2024 15:05:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/EmergencyResponseManage.vue | 37 +++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/pages/EmergencyResponseManage.vue b/src/pages/EmergencyResponseManage.vue
index b9d5888..7f99ce4 100644
--- a/src/pages/EmergencyResponseManage.vue
+++ b/src/pages/EmergencyResponseManage.vue
@@ -338,24 +338,27 @@ function handleSelectFaultType() {
   let allType = '';
   searchOptionsFaultType.value = [{ label: '全部', value: '' }];
   for (let i = 0; i < allOptionsFaultType.length; i++) {
-    allOptionsFaultType[i].fts.forEach((item) => {
-      if (
-        (tab.value == 'GUIDE' &&
-          item.faultType.includes('FAULT_EMERGENCY_GUIDE')) ||
-        (tab.value == 'SERVICE' &&
-          item.faultType.includes('FAULT_EXIT_SERVICE'))
-      ) {
-        searchOptionsFaultType.value.push({
-          label: item.typeName,
-          value: item.faultType,
-        });
-        if (allType == '') {
-          allType = item.faultType;
-        } else {
-          allType = allType + ',' + item.faultType;
+    if (allOptionsFaultType[i].lineId == filter.lineId) {
+      allOptionsFaultType[i].fts.forEach((item) => {
+        if (
+          (tab.value == 'GUIDE' &&
+            item.faultType.includes('FAULT_EMERGENCY_GUIDE')) ||
+          (tab.value == 'SERVICE' &&
+            item.faultType.includes('FAULT_EXIT_SERVICE'))
+        ) {
+          searchOptionsFaultType.value.push({
+            label: item.typeName,
+            value: item.faultType,
+          });
+          if (allType == '') {
+            allType = item.faultType;
+          } else {
+            allType = allType + ',' + item.faultType;
+          }
         }
-      }
-    });
+      });
+      break;
+    }
   }
   filter.faultType = allType;
   searchOptionsFaultType.value[0].value = allType;

From 1cd4cb815cd84e39ea212f6ac04394274189bc1c Mon Sep 17 00:00:00 2001
From: joylink_zhaoerwei <Bob_Engineer@163.com>
Date: Mon, 18 Nov 2024 15:50:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=BC=B9=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/MainLayout.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index c76c2d0..57e79fd 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -119,7 +119,7 @@
       </q-scroll-area>
     </q-page-container>
   </q-layout>
-  <commonAlarm v-if="route.path.includes('alarmRecord')" />
+  <commonAlarm v-if="route.path.includes('alarmInfo')" />
 </template>
 
 <script setup lang="ts">