-
- {{ item.time }}
- {{ item.description }}
-
+
+
+
+ {{ item.time }}
+
+ {{
+ item.description
+ }}
+ {{
+ item.description
+ }}
+ {{ item.description }}
+ 耗时{{ item.diffSeconds }}
@@ -152,9 +314,12 @@ onUnmounted(() => {
}
.fail_text {
font-weight: 500;
- color: #ffffff;
- background: linear-gradient(0deg, #de4747 0%, #f12626 100%);
- -webkit-background-clip: text;
- -webkit-text-fill-color: transparent;
+ //color: #ffffff;
+ //background: linear-gradient(0deg, #de4747 0%, #f12626 100%);
+ //-webkit-background-clip: text;
+ //-webkit-text-fill-color: transparent;
+}
+.errorBox {
+ box-shadow: inset 0 0 5px 5px rgba(255, 0, 0, 0.5);
}
diff --git a/src/views/carbin/components/flying.vue b/src/views/carbin/components/flying.vue
index f473644..1519cdc 100644
--- a/src/views/carbin/components/flying.vue
+++ b/src/views/carbin/components/flying.vue
@@ -27,6 +27,9 @@ let viewMode = ref(1) //1-1/4方式 2-对半方式
let littleViewMode = ref(2) //1-舱外视频 2-舱内视频 3-无人机视频
let littleViewModeName = ref('舱内画面')
+import img_default from '@/assets/icons/state1.png'
+import img_touch from '@/assets/icons/state2.png'
+
//飞机高度
let planeAlt = 0
//已修改过小窗的视频类型
@@ -37,7 +40,7 @@ let planeStateList = reactive({
key: 'vspeed',
name: '爬升速度',
icon: 'icon-shangshengxiajiang',
- value: '-',
+ value: '0',
touch: false,
content: '爬升速度', unit: '/s', @@ -46,7 +49,7 @@ let planeStateList = reactive({ id: 2, name: '平飞速度', icon: 'icon-jiantouzuoyou', - value: '-', + value: '0', touch: false, content: '平飞
速度', unit: '/s', @@ -55,7 +58,7 @@ let planeStateList = reactive({ id: 3, name: '距离机场', icon: 'icon-H', - value: '-', + value: '0', touch: false, content: '距离
机场', unit: 'm', @@ -64,7 +67,7 @@ let planeStateList = reactive({ id: 4, name: '海拔高度', icon: 'icon-tiedijuli', - value: '-', + value: '0', touch: false, content: '海拔
高度', unit: 'm', @@ -73,7 +76,7 @@ let planeStateList = reactive({ id: 5, name: '无人机俯仰角', icon: 'icon-flight-takeoff-line', - value: '-', + value: '0', touch: false, content: '无人机
俯仰角', unit: '°', @@ -82,7 +85,7 @@ let planeStateList = reactive({ id: 6, name: '无人机偏航角', icon: 'icon-feihangqipianhangjiao', - value: '-', + value: '0', content: '无人机
偏航角', touch: false, unit: '°', @@ -91,7 +94,7 @@ let planeStateList = reactive({ id: 7, name: '云台俯仰角', icon: 'icon-pianhangjiao-1', - value: '-', + value: '0', content: '云台
俯仰角', touch: false, unit: '°', @@ -100,7 +103,7 @@ let planeStateList = reactive({ id: 8, name: '云台偏航角', icon: 'icon-pianhangjiao-1', - value: '-', + value: '0', content: '云台
偏航角', touch: false, unit: '°', @@ -208,7 +211,8 @@ airPortSocketStore.$subscribe((mutate, state) => {
-
+
+
![]()
@@ -305,7 +309,7 @@ airPortSocketStore.$subscribe((mutate, state) => {
-
{
>
![]()
常规 @@ -225,7 +229,7 @@ airPortSocketStore.$subscribe((mutate, state) => {
+
{
@mouseover="item.touch = true"
@mouseout="item.touch = false"
>
- 
+ ![]()
{{ airPortName }}
- {{
+ {{ statusList[currentAirPortStatus] }}
+ {{
statusList[currentAirPortStatus]
}}
@@ -473,12 +540,12 @@ onMounted(() => {
任务已暂停
继续
-
+
{
height: 100%;
}
:deep(.vjs-control-bar) {
- // display: none !important;
+ display: none !important;
}
:deep(.live-player-stretch-btn) {
// display: none !important;
}
+:deep(.video-js .vjs-tech) {
+ max-width: unset !important;
+ width: auto;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ margin: auto;
+ height: 120%;
+}
.rem-header {
background: linear-gradient(0deg, #051a31, #09315d);
@@ -550,18 +634,19 @@ onMounted(() => {
width: var(--leftPlaneWidth);
}
.leftPlane-area {
- height: calc(100% - 150px);
+ height: 100%;
}
.rightPlane {
--rightPlaneWidth: v-bind(rightPlaneWidth);
width: var(--rightPlaneWidth);
+ border-left: 1px solid #09315d;
}
.fullScreen {
// --rightPlaneHeight: v-bind(rightPlaneHeight);
// --rightPlaneBottom: v-bind(rightPlaneBottom);
// height: var(--rightPlaneHeight);
// bottom: var(--rightPlaneBottom);
- background: #ffffff;
+ background: #000000;
}
#virturalDrive_iframe_full {
width: 100%;
diff --git a/src/views/carbin/toolComp/planeControl.vue b/src/views/carbin/toolComp/planeControl.vue
index e58599f..d35ee4b 100644
--- a/src/views/carbin/toolComp/planeControl.vue
+++ b/src/views/carbin/toolComp/planeControl.vue
@@ -10,15 +10,15 @@ const emits = defineEmits(['droneCommandExecute'])
let items = reactive({
battery: {
label: '电池循环次数',
- value: '-',
+ value: '0',
},
version: {
label: '无人机版本',
- value: '-',
+ value: '',
},
temperature: {
label: '电池温度',
- value: '-',
+ value: '0℃',
},
})
@@ -30,9 +30,9 @@ let lastTime = ref('-')
const setCurrentData = (data) => {
// console.log(data)
//电池循环次数
- items.battery.value = data ? data.batLoopTimes : '-'
+ items.battery.value = data ? data.batLoopTimes : '0'
//电池温度
- items.temperature.value = data ? data.weather.cellTemp : '-'
+ items.temperature.value = data ? data.weather.cellTemp + '℃' : '0℃'
precent.value = data ? Number(data.battery) * 100 : '-'
lastTime.value = data ? data.allflytime : '-'
@@ -79,20 +79,23 @@ onMounted(() => {})
-
+ {
v-if="currentAirPortStatus == 2"
>
-
+
@@ -499,7 +573,7 @@ onMounted(() => {
{{ item.label }}{{ item.value }}
+
+ 
@@ -120,17 +123,19 @@ onMounted(() => {})
diff --git a/src/views/carbin/toolComp/screen.vue b/src/views/carbin/toolComp/screen.vue
index d825a29..2479639 100644
--- a/src/views/carbin/toolComp/screen.vue
+++ b/src/views/carbin/toolComp/screen.vue
@@ -39,11 +39,15 @@ const iframeLoaded = () => {
}
const setVideo = () => {
+ // let tempLive = 'http://127.0.0.1:7001/live/movie.flv'
if (showType.value == 'video_out') {
+ // LiveOptions.videoUrl = tempLive
LiveOptions.videoUrl = row.external_monitor_url
} else if (showType.value == 'video_in') {
+ // LiveOptions.videoUrl = tempLive
LiveOptions.videoUrl = row.internal_monitor_url
} else if (showType.value == 'video_plane') {
+ // LiveOptions.videoUrl = tempLive
LiveOptions.videoUrl = row.camera_url
}
// console.log(row)
@@ -66,7 +70,7 @@ watch(
-
-
+
- 电池电量
+ 电池电量
{{ precent }}%/{{ lastTime }}min
+