From 3667807a7b7418efc090ee3fa6a6b734bc3080bf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 13 Sep 2023 20:36:29 +0800
Subject: [PATCH] Merge branch 'develop' of http://s16s652780.51mypc.cn:49896/r/yskj/iot_drone_web into develop
---
src/pages/page-web/projects/workspace.vue | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/pages/page-web/projects/workspace.vue b/src/pages/page-web/projects/workspace.vue
index 4d965f0..f0bc3d3 100644
--- a/src/pages/page-web/projects/workspace.vue
+++ b/src/pages/page-web/projects/workspace.vue
@@ -6,17 +6,17 @@
<router-view />
</div>
</div>
- <div class="right">
- <div class="map-wrapper">
+ <!-- <div class="right"> -->
+ <!-- <div class="map-wrapper">
<GMap />
- </div>
- <div class="media-wrapper" v-if="root.$route.name === ERouterName.MEDIA">
- <MediaPanel />
- </div>
- <div class="task-wrapper" v-if="root.$route.name === ERouterName.TASK">
- <TaskPanel />
- </div>
- </div>
+ </div> -->
+ <!-- <div class="media-wrapper" v-if="root.$route.name === ERouterName.MEDIA"> -->
+ <!-- <MediaPanel /> -->
+ <!-- </div> -->
+ <!-- <div class="task-wrapper" v-if="root.$route.name === ERouterName.TASK"> -->
+ <!-- <TaskPanel /> -->
+ <!-- </div> -->
+ <!-- </div> -->
</div>
</template>
<script lang="ts" setup>
@@ -100,13 +100,22 @@
})
break
}
+ case EBizCode.ControlSourceChange:
+ case EBizCode.FlyToPointProgress:
+ case EBizCode.TakeoffToPointProgress:
+ case EBizCode.JoystickInvalidNotify:
+ case EBizCode.DrcStatusNotify:
+ {
+ EventBus.emit('droneControlWs', payload)
+ break
+ }
default:
break
}
}
// 监听ws 消息
-useConnectWebSocket(messageHandler)
+// useConnectWebSocket(messageHandler)
</script>
<style lang="scss" scoped>
@@ -120,13 +129,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;
+ width: 285px;
}
}
--
Gitblit v1.9.3