Browse Source

Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop

tags/v1.0.0^2
yufei111 2 years ago
parent
commit
d9ee5915b0
2 changed files with 6 additions and 6 deletions
  1. +5
    -5
      src/views/dashboard/components/AirCard.vue
  2. +1
    -1
      src/views/task-manage/all-task/components/TaskModal.vue

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

const parm = res.data.wth?.parm || [] const parm = res.data.wth?.parm || []
data.weatherList = parm.length !== 0 ? [ data.weatherList = parm.length !== 0 ? [
// { label: '天气', value: '' }, // { label: '天气', value: '' },
{ label: '气温', value: (parm.tmp / 10) + '℃' },
{ label: '湿度', value: (parm.hum / 10) + 'RH' },
{ label: '风度', value: parm.wspd + 'm/s' },
{ label: '风向', value: parm.wdir + ' °' }
{ label: '气温', value: (parm.tmp / 10).toFixed(1) + ' ℃' },
{ label: '湿度', value: (parm.hum / 10).toFixed(1) + ' RH' },
{ label: '风度', value: (parm.wspd / 10).toFixed(1) + ' m/s' },
{ label: '风向', value: (parm.wdir).toFixed(1) + ' °' }
] : [] ] : []
videoRef.value.disposeVideo() videoRef.value.disposeVideo()
nextTick(() => { nextTick(() => {
const options = { const options = {
width: '100%', width: '100%',
height: '100%', height: '100%',
source: row?.externalMonitorUrl,
source: row?.flvExternalMonitorUrl,
isLive: true isLive: true
} }
videoRef.value?.init(options) videoRef.value?.init(options)

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

getLineOptions(props.data.droneId) getLineOptions(props.data.droneId)
if (![1, 2].includes(props.data.status)) { if (![1, 2].includes(props.data.status)) {
formItem.value = [ formItem.value = [
{ type: 'input', key: 'droneName', label: '无人机' },
{ type: 'input', key: 'droneName', label: '执飞无人机' },
{ type: 'input', key: 'flyTime', label: '飞行时间' } { type: 'input', key: 'flyTime', label: '飞行时间' }
] ]
} else { } else {

Loading…
Cancel
Save