Merge branch 'lixin' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/ControlPanel.vue

@@ -154,7 +154,7 @@ export default defineComponent({
 </script>
 <style scoped lang='scss'>
 .control__container{
-  position: relative;
+  position: absolute;
   z-index: 99;
   height: 220px;
   background: rgba(0, 0, 0, 1);

src/views/dashboard/components/FireAlarm.vue

@@ -124,7 +124,8 @@ export default {
       airValue: 0,
       warningPic: null,
       recoedList: [],
-      warningShow: false
+      warningShow: false,
+      missionId: null
     })
 
     watch(() => props.data, (value) => {
@@ -149,7 +150,10 @@ export default {
 
       Promise.all([await getWarningInfo(value.id), await getWarningRecord({ warningId: value.id })])
         .then(([info, record]) => {
-          data.warningPic = info?.data?.fileMarkerUrl
+          // 分析后的图片
+          data.warningPic = info?.data?.fileMarkerUrl || null
+          // 任务id
+          data.missionId = info?.data?.missionId || null
           showUsableAirport(info)
           showWarningRecord(record)
         })
@@ -219,6 +223,7 @@ export default {
 
     const test = () => {
       handleExecute()
+      console.log(data.warningInfo)
     }
 
     // 忽略预警

src/views/dashboard/components/WarningDrawer.vue

@@ -123,6 +123,7 @@ export default defineComponent({
         sideRef.value?.appendChild(videoRef.value)
       }
       data.hasChanged = !data.hasChanged
+      window.dispatchEvent(new Event('resize'))
     }
 
     watch(() => props.visible, (value) => {