From 10b5efefb0f22715ecf871e79a67a165ab8610a7 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期六, 13 三月 2021 16:43:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/App.vue | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 66708b1..24ecc4b 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,34 +1,34 @@
<template>
<div id="app" ref="app">
- <map-template></map-template>
+ <router-view/>
</div>
</template>
<script>
-import MapTemplate from './views/MapTemplate.vue'
export default {
name: 'App',
- components: {MapTemplate},
- mounted(){
- this.$nextTick(()=>{
- let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //娴忚鍣ㄩ珮搴�
- let topH = this.$refs.app.offsetHeight;
- console.log(h)
- this.height = (h - topH) + "px"
- })
+ mounted () {
}
}
</script>
-<style>
-#app {
- font-family: Avenir, Helvetica, Arial, sans-serif;
- -webkit-font-smoothing: antialiased;
- -moz-osx-font-smoothing: grayscale;
- text-align: center;
- color: #2c3e50;
- padding: 0px;
- margin: 0px;
+<style lang="less">
+@import '@assets/css/map/_map-variable';
+html, body, #app{
+ color: @color;
+ height: 100vh;
+ width: 100vw;
+ margin: 0;
+ padding: 0;
+ overflow: hidden;
}
+body .el-scrollbar__wrap {
+ overflow-x: hidden;
+}
+body{
+ -ms-overflow-style: none;
+ font-size: 12px;
+}
+
</style>
--
Gitblit v1.8.0