From 0110b78419d98e114c59fa9fb6f69663fbdc3c98 Mon Sep 17 00:00:00 2001
From: 陈泽平 <chenzeping>
Date: 星期日, 30 五月 2021 19:37:35 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/App.vue | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 010714e..1e6c2a3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,36 +1,37 @@
<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>
-html,body,#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;
-
- text-align: left;
+<style lang="less">
+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;
+}
+.popoverBoxStyle{
+ border: 0.00521rem solid #00fff6;
+ box-shadow: 0 0 0.03rem #00fff6;
+ background-color: rgba(0, 16, 30, 0.8) !important;
}
</style>
--
Gitblit v1.8.0