Merge branch 'develop' of gitadmin/tuoheng_lc_web into release

src/views/dashboard/components/FireAlarm.vue

@@ -270,6 +270,10 @@ export default {
     }
 
     const executeNow = async() => {
+      if (data.airportId === null) {
+        $message.warning('当前无在线机场!')
+        return
+      }
       var airportName = ''
       data.airpotOptions?.map((item) => {
         if (item.value === data.airportId) {

src/views/dashboard/components/OneMap.vue

@@ -35,6 +35,7 @@ import { Tile, Vector as VectorLayer } from 'ol/layer'
 import { transform, fromLonLat } from 'ol/proj'
 import { Style, Icon, Text, Fill, Circle } from 'ol/style'
 import * as control from 'ol/control'
+import * as interaction from 'ol/interaction'
 import uav_icon from '@/assets/images/airport.png'
 import warningIcon from '@/assets/gis/images/fire.png'
 import warningSelectIcon from '@/assets/gis/images/fire_select.png'
@@ -205,6 +206,10 @@ export default {
           attribution: false,
           rotate: false,
           zoom: false
+        }),
+        interactions: interaction.defaults({
+          // 禁止地图双击放大事件
+          doubleClickZoom: false
         })
       })
       data.map.addLayer(wmsSource)

src/views/dashboard/components/WarningDrawer.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { defineComponent, ref, reactive, toRefs, computed, watch, nextTick, onBeforeUnmount, onMounted } from 'vue'
+import { defineComponent, ref, reactive, toRefs, computed, watch, nextTick, onBeforeUnmount, onMounted, onUnmounted } from 'vue'
 import Underlay from './Underlay.vue'
 import ControlPanel from './ControlPanel.vue'
 import SpeedChart from './SpeedChart.vue'
@@ -373,18 +373,12 @@ export default defineComponent({
     }
 
     const clearTimer = () => {
-      if (data.chartTimer) {
-        clearInterval(data.chartTimer)
-        data.chartTimer = null
-      }
-      if (data.liveTimer) {
-        clearInterval(data.liveTimer)
-        data.liveTimer = null
-      }
-      if (data.failTimer) {
-        clearInterval(data.failTimer)
-        data.failTimer = null
-      }
+      clearInterval(data.chartTimer)
+      data.chartTimer = null
+      clearInterval(data.liveTimer)
+      data.liveTimer = null
+      clearInterval(data.failTimer)
+      data.failTimer = null
     }
 
     function handleVideoStatus(status) {
@@ -405,6 +399,11 @@ export default defineComponent({
       clearTimer()
     })
 
+    onUnmounted(() => {
+      clearInterval(data.failTimer)
+      data.failTimer = null
+    })
+
     return {
       containerRef,
       sideRef,