Browse Source

Merge branch 'release' of gitadmin/tuoheng_lc_web into master

master
zhangtao 1 year ago
parent
commit
b4a7e8354b
9 changed files with 26 additions and 18 deletions
  1. BIN
      src/assets/images/smoke.png
  2. +1
    -1
      src/components/BaseMap/BaseMap.vue
  3. +1
    -1
      src/components/PositionMsg/index.vue
  4. +4
    -0
      src/views/dashboard/components/FireAlarm.vue
  5. +5
    -0
      src/views/dashboard/components/OneMap.vue
  6. +12
    -13
      src/views/dashboard/components/WarningDrawer.vue
  7. +1
    -1
      src/views/task-manage/all-task/components/BaseMap.vue
  8. +1
    -1
      src/views/task-manage/all-task/components/DemandDrawer.vue
  9. +1
    -1
      src/views/task-manage/all-task/components/LiveDrawer.vue

BIN
src/assets/images/smoke.png View File

Before After
Width: 32  |  Height: 32  |  Size: 1003B Width: 32  |  Height: 32  |  Size: 1.3KB

+ 1
- 1
src/components/BaseMap/BaseMap.vue View File

new Tile({ new Tile({
visible: true, visible: true,
source: new XYZ({ source: new XYZ({
url: 'https://tianditu.t-aaron.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
url: 'https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
}) })
}) })
] ]

+ 1
- 1
src/components/PositionMsg/index.vue View File

new Tile({ new Tile({
visible: true, visible: true,
source: new XYZ({ source: new XYZ({
url: 'https://tianditu.t-aaron.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
url: 'https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
}) })
}) })
] ]

+ 4
- 0
src/views/dashboard/components/FireAlarm.vue View File

} }


const executeNow = async() => { const executeNow = async() => {
if (data.airportId === null) {
$message.warning('当前无在线机场!')
return
}
var airportName = '' var airportName = ''
data.airpotOptions?.map((item) => { data.airpotOptions?.map((item) => {
if (item.value === data.airportId) { if (item.value === data.airportId) {

+ 5
- 0
src/views/dashboard/components/OneMap.vue View File

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

+ 12
- 13
src/views/dashboard/components/WarningDrawer.vue View File

</template> </template>


<script> <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 Underlay from './Underlay.vue'
import ControlPanel from './ControlPanel.vue' import ControlPanel from './ControlPanel.vue'
import SpeedChart from './SpeedChart.vue' import SpeedChart from './SpeedChart.vue'
} }


const clearTimer = () => { 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) { function handleVideoStatus(status) {
clearTimer() clearTimer()
}) })


onUnmounted(() => {
clearInterval(data.failTimer)
data.failTimer = null
})

return { return {
containerRef, containerRef,
sideRef, sideRef,

+ 1
- 1
src/views/task-manage/all-task/components/BaseMap.vue View File

new Tile({ new Tile({
visible: true, visible: true,
source: new XYZ({ source: new XYZ({
url: 'https://tianditu.t-aaron.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
url: 'https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
}) })
}) })
] ]

+ 1
- 1
src/views/task-manage/all-task/components/DemandDrawer.vue View File

new Tile({ new Tile({
visible: true, visible: true,
source: new XYZ({ source: new XYZ({
url: 'https://tianditu.t-aaron.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
url: 'https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
}) })
}) })
] ]

+ 1
- 1
src/views/task-manage/all-task/components/LiveDrawer.vue View File

new Tile({ new Tile({
visible: true, visible: true,
source: new XYZ({ source: new XYZ({
url: 'https://tianditu.t-aaron.com/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
url: 'https://t0.tianditu.gov.cn/DataServer?T=img_w&x={x}&y={y}&l={z}&tk=f634525a82da65f715d168d7ba1899c0'
}) })
}) })
] ]

Loading…
Cancel
Save