From bdc375c177dfff0d940560d83d5e3741a23fcda8 Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Mon, 09 Oct 2023 10:19:45 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
public/index.html | 4 ++--
src/views/UVA/index.vue | 27 ++++++++++++++++++++++++++-
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/public/index.html b/public/index.html
index 35c8df7..6215bc1 100644
--- a/public/index.html
+++ b/public/index.html
@@ -14,8 +14,8 @@
<!-- <link rel="stylesheet" href="https://a.amap.com/jsapi_demos/static/demo-center/css/demo-center.css" />-->
<!-- <script src="https://cdn.bootcss.com/jquery/3.5.0/jquery.js"></script>-->
<script type="text/javascript"
- src="http://api.map.baidu.com/api?type=webgl&v=2.0&ak=U2SoSp52BoVW6bAEMsxQ7Zfe0tuB6VDp"></script>
- <script src="http://api.map.baidu.com/api?v=3.0&ak=U2SoSp52BoVW6bAEMsxQ7Zfe0tuB6VDp"></script>
+ src="https://api.map.baidu.com/api?type=webgl&v=2.0&ak=U2SoSp52BoVW6bAEMsxQ7Zfe0tuB6VDp"></script>
+ <script src="https://api.map.baidu.com/api?v=3.0&ak=U2SoSp52BoVW6bAEMsxQ7Zfe0tuB6VDp"></script>
<script src="https://mapv.baidu.com/build/mapv.min.js"></script>
<script type="text/javascript" src="https://mapv.baidu.com/gl/examples/static/common.js"></script>
<!-- <script src="https://cdn.jsdelivr.net/npm/echarts/map/js/china.js?v=1598903772045"></script> -->
diff --git a/src/views/UVA/index.vue b/src/views/UVA/index.vue
index bd88988..d064739 100644
--- a/src/views/UVA/index.vue
+++ b/src/views/UVA/index.vue
@@ -881,6 +881,16 @@
deep: true,
immediate: true
},
+
+ mounted() {
+ this.$nextTick(() => {
+ this.initStart()
+ })
+
+ // this.$refs.datePick.focus()
+ // this.getDate()
+ // this.flyData()
+ },
created() {
this.newTime(this.timeValue)
this.newDate()
@@ -1994,7 +2004,22 @@
}
</script>
-<style lang="scss" >
+<style lang="scss" scoped>
+.main-container {
+ display: -webkit-box;
+ display: -ms-flexbox;
+ display: flex;
+ -webkit-box-orient: vertical;
+ -webkit-box-direction: normal;
+ -ms-flex-flow: column;
+ flex-flow: column;
+ min-height: 100%;
+ -webkit-transition: margin-left .28s;
+ transition: margin-left .28s;
+ margin-left: 210px;
+ position: relative;
+ height: 100%;
+}
/deep/.BMap_cpyCtrl {
display: none;
}
--
Gitblit v1.8.0