Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

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) {

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>

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);