Merge branch 'yufei' of gitadmin/tuoheng_lc_web into develop

src/views/dashboard/components/AirCard.vue

@@ -85,10 +85,10 @@ export default {
         const parm = res.data.wth?.parm || []
         data.weatherList = parm.length !== 0 ? [
           // { 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()
         nextTick(() => {
@@ -111,7 +111,7 @@ export default {
       const options = {
         width: '100%',
         height: '100%',
-        source: row?.externalMonitorUrl,
+        source: row?.flvExternalMonitorUrl,
         isLive: true
       }
       videoRef.value?.init(options)

src/views/task-manage/all-task/components/TaskModal.vue

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