Merge branch 'main' of http://123.132.248.154:10000/gitY/DiKongGanZhiPingTai

src/views/demo/workmanagement/projecthome/Map/index.vue

@@ -1,22 +0,0 @@
-<template>
-  <div id="mapContainer" class="mars3d-container"></div>
-</template>
-
-<script setup lang="ts">
-import { onMounted, onBeforeUnmount, ref } from 'vue'
-import * as mars3d from 'mars3d'
-
-
-
-onMounted(() => {
-
-})
-</script>
-
-<style lang="scss" scoped>
-.mars3d-container {
-  width: 100%;
-  height: 100%;
-  background-color: rgba(255, 255, 255, 1);
-}
-</style>

src/views/demo/workmanagement/projecthome/index.vue

@@ -1,6 +1,8 @@
 <template>
   <div class="home-page">
-    <Map />
+    <div style="width: 100%;height: calc(100vh - 80px);">
+      <Map />
+    </div>
     <div ref="leftComponentRef" style="position: absolute;top: 0px;left: 0px;">
       <!-- 项目列表 -->
       <ProjectList />
@@ -17,7 +19,7 @@
 </template>
 
 <script setup lang="ts">
-import Map from './Map/index.vue'
+import Map from '@/views/demo/workmanagement/workplan/components/map.vue'
 import ProjectList from './ProjectList/index.vue'
 import Info from './Info/index.vue'
 import Inspection from './Inspection/index.vue'
@@ -58,7 +60,6 @@ onBeforeUnmount(() => {
   position: relative;
   width: 100%;
   height: 100%;
-  background-color: red;
 }
 
 </style>