From aedfd334e94d4f6dc02a7538b24f50ceed6dd01f Mon Sep 17 00:00:00 2001
From: quanyawei <401863037@qq.com>
Date: Tue, 10 Oct 2023 08:40:29 +0800
Subject: [PATCH] Merge branch 'feature_1.0'
---
src/views/UVA/index.vue | 99 ++++++++++++++++++++++++++++++++-----------------
1 files changed, 64 insertions(+), 35 deletions(-)
diff --git a/src/views/UVA/index.vue b/src/views/UVA/index.vue
index bd88988..3ee6c89 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()
@@ -1212,8 +1222,8 @@
this.abc += 1
const that = this
if (!res) {
- that.map = new BMap.Map('map_container')
- console.log('BMap', BMap)
+ that.map = new BMapGL.Map('map_container')
+ console.log('BMapGL', BMapGL)
console.log('BMapGL', BMapGL)
console.log('window', window.BMapGL)
that.map.enableScrollWheelZoom(true) // ������������������������������������������������������s
@@ -1294,7 +1304,7 @@
// lat = GPS.bd_encrypt(lat, lng).lat
// lng = GPS.bd_decrypt(lat, lng).lon
// lat = GPS.bd_decrypt(lat, lng).lat
- var point = new window.BMapGL.Point(lng, lat)
+ var point = new BMapGL.Point(lng, lat)
point.a34004 = parseInt(value.a34004)
point.a34002 = parseInt(value.a34002)
point.a21026 = parseInt(value.a21026)
@@ -1405,7 +1415,7 @@
var data = point[sensor]
// ������������������������������������
var color = getColorAndLevel(sensor, data).color
- var polygon = new window.BMapGL.Polygon(
+ var polygon = new BMapGL.Polygon(
[
new BMapGL.Point(sw.lng, sw.lat), // ���������
new BMapGL.Point(ne.lng, sw.lat), // ���������
@@ -1429,20 +1439,20 @@
// ���������������������
function drawStartAndEnd() {
- var startIcon = new window.BMapGL.Icon(
+ var startIcon = new BMapGL.Icon(
require('@/assets/images/start.png'),
- new window.BMapGL.Size(48, 48)
+ new BMapGL.Size(48, 48)
)
- var startMark = new window.BMapGL.Marker(that.showPoints[0], {
+ var startMark = new BMapGL.Marker(that.showPoints[0], {
icon: startIcon,
offset: new BMapGL.Size(0, -20)
})
that.map.addOverlay(startMark)
- var endIcon = new window.BMapGL.Icon(
+ var endIcon = new BMapGL.Icon(
require('@/assets/images/end.png'),
- new window.BMapGL.Size(48, 48)
+ new BMapGL.Size(48, 48)
)
- var endMark = new window.BMapGL.Marker(
+ var endMark = new BMapGL.Marker(
that.showPoints[that.showPoints.length - 1],
{
icon: endIcon,
@@ -1526,7 +1536,7 @@
lng = (lng * 180) / Math.PI
lat = (lat * 180) / Math.PI
// console.log(lng, lat)
- return new window.BMapGL.Point(lng, lat)
+ return new BMapGL.Point(lng, lat)
}
function getGrading(sensor, type, carMac) {
@@ -1877,14 +1887,14 @@
// point���������label������
function setLabelStyle(content, point) {
- var label = new window.BMapGL.Label(
+ var label = new BMapGL.Label(
"<span class='my-maptip'>" + content + '<br /><span>', // ���lable������������
{
offset: new BMapGL.Size(-8, -10), // label������������������������label������������������������
position: point
} // label���������
)
- var offsetSize = new window.BMapGL.Size(0, 0)
+ var offsetSize = new BMapGL.Size(0, 0)
var size = '10px'
if (that.map.getZoom() <= 15.5) {
size = '0px'
@@ -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;
}
@@ -2169,20 +2194,7 @@
/deep/.inputNum {
width: 4% !important;
}
-.dateArrClass {
- position: relative;
-}
-.dateArrClass > div ::after {
- content: '';
- position: absolute;
- right: 8px;
- top: 23px;
- width: 5px;
- height: 5px;
- border-radius: 50%;
- z-index: 999;
- background-color: #f40;
-}
+
.numss {
width: 700px;
background-color: white;
@@ -2229,13 +2241,7 @@
width: 20%;
}
}
-.jlpMySelectPopper.el-picker-panel {
- width: 280px;
- height: 330px;
-}
-.jlpMySelectPopper.el-date-picker table {
- width: 88%;
-}
+
.BMap_cpyCtrl {
display: none;
}
@@ -2254,3 +2260,26 @@
overflow-x: hidden;
}
</style>
+<style >
+.jlpMySelectPopper.el-picker-panel {
+ width: 280px;
+ height: 330px;
+}
+.jlpMySelectPopper.el-date-picker table {
+ width: 88%;
+}
+.dateArrClass {
+ position: relative;
+}
+.dateArrClass > div ::after {
+ content: '';
+ position: absolute;
+ right: 8px;
+ top: 23px;
+ width: 5px;
+ height: 5px;
+ border-radius: 50%;
+ z-index: 999;
+ background-color: #f40;
+}
+</style>
--
Gitblit v1.8.0