From be2c5981d23ae0783c1566f932329af4deb024a5 Mon Sep 17 00:00:00 2001
From: zhufu <17863654727@163.com>
Date: Tue, 22 Jul 2025 16:47:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/Airport/DeviceWarning/index.vue               | 4 +++-
 src/views/demo/workmanagement/device/Airport/index.vue   | 9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/demo/workmanagement/device/Airport/DeviceWarning/index.vue b/src/views/demo/workmanagement/device/Airport/DeviceWarning/index.vue
index bf3ca42..7d11734 100644
--- a/src/views/demo/workmanagement/device/Airport/DeviceWarning/index.vue
+++ b/src/views/demo/workmanagement/device/Airport/DeviceWarning/index.vue
@@ -28,10 +28,11 @@
 </template>
 
 <script setup lang="ts">
-import {} from "vue"
+import { defineProps } from "vue"
 import { BasicTable, useTable, TableAction } from '@/components/Table';
 import { columns, searchFormSchema, levelOptions, modelOptions } from './utils'
 import { GetManageDeviceHmsList } from '@/api/demo/device'
+const props = defineProps(['deviceWarningInfo'])
 const [registerTable, { reload, expandAll, getForm}] = useTable({
   title: '告警信息',
   api: GetManageDeviceHmsList,
@@ -55,6 +56,7 @@ const [registerTable, { reload, expandAll, getForm}] = useTable({
       params.endTime = params.time[1]
     }
     params.time = null
+    params.getway = props.deviceWarningInfo.gateWay
     return params
   },
   afterFetch(data) {
diff --git a/src/views/demo/workmanagement/device/Airport/index.vue b/src/views/demo/workmanagement/device/Airport/index.vue
index 74e9708..365c1b8 100644
--- a/src/views/demo/workmanagement/device/Airport/index.vue
+++ b/src/views/demo/workmanagement/device/Airport/index.vue
@@ -25,7 +25,7 @@
               icon: 'ant-design:file-search-outlined',
               onClick: () => {
                 console.log('deviceInfoList',deviceInfoList)
-                deviceWarningDrawer = true
+                openDeviceWarningDrawer(record)
               },
             },
             {
@@ -55,7 +55,7 @@
     <FeedbackDrawer />
   </a-drawer>
   <a-drawer class="device-warning" v-model:open="deviceWarningDrawer"  title="告警信息" width="70%" :closable="false">
-    <DeviceWarning />
+    <DeviceWarning :deviceWarningInfo="deviceWarningInfo"/>
   </a-drawer>
   <a-drawer class="feedback-drawer"  title="设备运维" v-model:open="deviceControl" width="45%"  style="background:#f0f1f2" :closable="false">
     <!-- <DeviceControl :deviceInfoList="deviceInfoList" :controlSN="controlSN" :controlChildSN="controlChildSN"/> -->
@@ -136,6 +136,7 @@ const editDeviceModal = ref(false)
 const editDeviceDate = ref({})
 const controlChildSN = ref()
 const controlItemDetsils = ref()
+const deviceWarningInfo = ref()
 watch(() => [afterFetch.value, props.connected], ([newAfterFetch, newConnected], [oldAfterFetch, oldConnected]) => {
   // console.log(newAfterFetch,newConnected)
   // console.log(getDataSource())
@@ -253,6 +254,10 @@ const delDevice = (record) => {
     },
   });
 }
+const openDeviceWarningDrawer = (record) => {
+  deviceWarningInfo.value = record
+  deviceWarningDrawer.value = true
+}
 </script>
 
 <style lang="scss" scoped>

From ddf9021db7fc011f86c0f03840b2a44e7f4523df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com>
Date: Wed, 23 Jul 2025 09:35:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=97=A0=E4=BA=BA=E6=9C=BA=E7=8A=B6=E6=80=81=E7=BB=99?=
 =?UTF-8?q?=E4=B8=AA=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/workmanagement/flightoperation/src/FlightControl.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/workmanagement/flightoperation/src/FlightControl.vue b/src/views/demo/workmanagement/flightoperation/src/FlightControl.vue
index a2e88cc..155998e 100644
--- a/src/views/demo/workmanagement/flightoperation/src/FlightControl.vue
+++ b/src/views/demo/workmanagement/flightoperation/src/FlightControl.vue
@@ -194,7 +194,7 @@
   import { airPortStore } from '@/store/modules/airport';
   import { EventBus } from '@/utils/eventBus';
 
-  const uavStatus = ref();
+  const uavStatus = ref(0);
   const airPortStoreVal = airPortStore();
   const uav = airPortStoreVal.getUAV;
   const isTakeOff = ref(false);