Commit adcf803b authored by YangAo's avatar YangAo 🇨🇳

Merge remote-tracking branch 'origin/master'

parents 677052de 0acf4300
...@@ -335,7 +335,7 @@ border-radius: 4px;color:#ffffff;padding:0.5rem;cursor:pointer;display: flex;ali ...@@ -335,7 +335,7 @@ border-radius: 4px;color:#ffffff;padding:0.5rem;cursor:pointer;display: flex;ali
<span style="padding: 0.2rem 0.3rem;background: #46CE76;opacity: 1;">畅通</span> <span style="padding: 0.2rem 0.3rem;background: #46CE76;opacity: 1;">畅通</span>
</div> </div>
<div style="height: 2rem;width: 100%;display: flex;align-items: center;justify-content: center;"> <div style="height: 2rem;width: 100%;display: flex;align-items: center;justify-content: center;">
更新时间:11 更新时间:{{ pageLoadTime }}
</div> </div>
</div> </div>
</div> </div>
...@@ -364,12 +364,19 @@ export default { ...@@ -364,12 +364,19 @@ export default {
created() { created() {
/*调用道路信息api*/ /*调用道路信息api*/
// this.queryRouterMsg() // this.queryRouterMsg()
this.navigator.form.start = this.$router.params.start this.navigator.form.start = this.$route.params.start
this.navigator.form.end = this.$router.params.end this.navigator.form.end = this.$route.params.end
console.log("现在我要取值了:", this.$router.params.start) this.direction()
/*获取当前页面刷新时间*/
const now = new Date();
const hours = now.getHours();
const minutes = now.getMinutes();
this.pageLoadTime = `${hours}:${minutes}`;
}, },
data() { data() {
return { return {
/*获取当前页面刷新时间*/
pageLoadTime: '',
show: false, show: false,
// 道路信息标点显示信息 // 道路信息标点显示信息
markInfo: { markInfo: {
...@@ -725,11 +732,11 @@ export default { ...@@ -725,11 +732,11 @@ export default {
infoWindowOpen(marker) { infoWindowOpen(marker) {
this.markInfo.content = marker.roadName this.markInfo.content = marker.roadName
this.markInfo.position = marker.position this.markInfo.position = marker.position
// TODO: 请清除该日志
console.log('marker', marker) console.log('marker', marker)
this.show = true this.show = true
this.$refs.infoWindow.redraw() this.$refs.infoWindow.redraw()
}, },
/*查询道路信息事件*/
handleEventTip(type) { handleEventTip(type) {
console.log("传进来的是1吗?", type) console.log("传进来的是1吗?", type)
return new Promise(resolve => { return new Promise(resolve => {
...@@ -989,7 +996,7 @@ export default { ...@@ -989,7 +996,7 @@ export default {
/*导航*/ /*导航*/
direction() { direction() {
const {start, end} = this.navigator.formControl const {start, end} = this.navigator.formControl
// 如果起点和终点都有了才根据当前tab进行导航 // 如果起点和终点都有了(经纬度也要有)才根据当前tab进行导航
if (_.isEmpty(start.location) || _.isEmpty(end.location)) { if (_.isEmpty(start.location) || _.isEmpty(end.location)) {
return return
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment