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/project_list/index.vue | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/src/pages/page-web/projects/project_list/index.vue b/src/pages/page-web/projects/project_list/index.vue
index cb5aa9e..43c5940 100644
--- a/src/pages/page-web/projects/project_list/index.vue
+++ b/src/pages/page-web/projects/project_list/index.vue
@@ -7,12 +7,23 @@
<div class="map">
<Map />
</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 setup lang="ts">
import Map from '/@/components/cesiumMap/cesium.vue'
+import MediaPanel from '/@/components/MediaPanel.vue'
+import TaskPanel from '/@/components/task/TaskPanel.vue'
+import { EBizCode, ERouterName } from '/@/types'
+import { getRoot } from '/@/root'
+const root = getRoot()
</script>
<style scoped lang="scss">
@@ -23,20 +34,31 @@
width: 100%;
.left_content {
- width: 335px;
- min-height: 100vh;
+ width: 370px;
+ max-height: 100vh;
background-color: black;
- color:$text-white-basic;
+ color: $text-white-basic;
}
.right_content {
position: relative;
- flex:1;
+ flex: 1;
.map {
width: 100%;
height: 100%;
}
+
+ .media-wrapper,
+ .task-wrapper {
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 100;
+ background: #f6f8fa;
+ }
}
}
</style>
--
Gitblit v1.9.3