From 1e537df7699ddb11f2a08d1116f107b160299ea6 Mon Sep 17 00:00:00 2001
From: ZhangXianQiang <1135831638@qq.com>
Date: 星期四, 11 四月 2024 09:48:18 +0800
Subject: [PATCH] fix:合并冲突问题
---
src/views/screen/components/screen-map-three/index.vue | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/views/screen/components/screen-map-three/index.vue b/src/views/screen/components/screen-map-three/index.vue
index aae98bf..a117a58 100644
--- a/src/views/screen/components/screen-map-three/index.vue
+++ b/src/views/screen/components/screen-map-three/index.vue
@@ -1,13 +1,31 @@
<template>
- <div>
- 123
+ <div class="map-container" >
+ <canvas class="world" ref="worldContainer"></canvas>
</div>
</template>
<script>
+import Experience from './experience/index';
+let world = null;
export default {
- name: 'ScreenMapThree'
+ name: 'ScreenMapThree',
+ mounted() {
+ world = new Experience(this.$refs.worldContainer);
+ }
}
</script>
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped>
+.map-container {
+ width: 100%;
+ height: 100%;
+ position: absolute;
+ left: 0;
+ top: 0;
+ z-index: 0;
+ .world {
+ width: 100%;
+ height: 100%;
+ }
+}
+</style>
\ No newline at end of file
--
Gitblit v1.8.0