From b3de47a55bb968797abb16d48cd9b4522a11a7f1 Mon Sep 17 00:00:00 2001
From: husq <931347610@qq.com>
Date: Fri, 22 Sep 2023 17:07:12 +0800
Subject: [PATCH] 视频问题部分修改提交
---
src/pages/page-web/projects/workspace.vue | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 4d965f0..7d8900d 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -6,7 +6,7 @@
<router-view />
</div>
</div>
- <div class="right">
+ <!-- <div class="right">
<div class="map-wrapper">
<GMap />
</div>
@@ -15,8 +15,8 @@
</div>
<div class="task-wrapper" v-if="root.$route.name === ERouterName.TASK">
<TaskPanel />
- </div>
- </div>
+ </div>
+ </div> -->
</div>
</template>
<script lang="ts" setup>
@@ -32,7 +32,7 @@
const root = getRoot()
const store = useMyStore()
-
+const workspace_id = computed(() => store.state.common.projectId)
const messageHandler = async (payload: any) => {
if (!payload) {
return
@@ -48,7 +48,10 @@
break
}
case EBizCode.DockOsd: {
+ // if (payload.data.sn === workspace_id.value) {
store.commit('SET_DOCK_INFO', payload.data)
+ // console.log(payload.data, 'data')
+ // }
break
}
case EBizCode.MapElementCreate: {
@@ -100,6 +103,15 @@
})
break
}
+ case EBizCode.ControlSourceChange:
+ case EBizCode.FlyToPointProgress:
+ case EBizCode.TakeoffToPointProgress:
+ case EBizCode.JoystickInvalidNotify:
+ case EBizCode.DrcStatusNotify:
+ {
+ EventBus.emit('droneControlWs', payload)
+ break
+ }
default:
break
}
@@ -120,13 +132,15 @@
.left {
display: flex;
- width: 335px;
- flex: 0 0 335px;
+ // width: 335px;
+ flex: 1;
+ // flex: 0 0 335px;
background-color: #232323;
.main-content {
flex: 1;
- color: $text-white-basic;
+ color: $text-white-basic !important;
+ width: 285px;
}
}
@@ -134,7 +148,7 @@
flex-grow: 1;
position: relative;
- .map-wrapper{
+ .map-wrapper {
width: 100%;
height: 100%;
}
--
Gitblit v1.9.3