Skip to content

B
binhai-people
Commit 7b48419e authored by 高滢's avatar 高滢
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b1a35919 c20b41a0
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 32 deletions
src/views/mobilityServices/index.vue
View file @ 7b48419e
......@@ -25,7 +25,11 @@ border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1re
</bm-marker>
<bm-info-window v-if="operationTypeName === 'roadInformation'" ref="infoWindow" :show="show"
:position="markInfo.position">
{{ markInfo.content }}
<div style="margin:0rem 0.5rem 1rem 0.5rem; display: flex;flex-direction: column;">
<span>{{ markInfo.roadName }} </span>
<span> 路况分类: {{ markInfo.typeName }} </span>
<span> 描述: {{ markInfo.content }}</span></div>
</bm-info-window>
<bm-control class="map__control" @wheel.native.stop>
<el-tabs class="tab-pane-style" type="border-card" v-model="operationTypeName"
......@@ -376,25 +380,7 @@ export default {
window.addEventListener('load', () => {
setPageLoadTime(); // 在页面加载时更新页面加载时间
});
/*调用道路信息api*/
// this.queryRouterMsg()
/*输入框赋值*/
this.navigator.form.start = this.$route.params.start
/*输入框赋值*/
this.navigator.form.end = this.$route.params.end
/*起始经纬度赋值*/
this.navigator.formControl.start.location = [this.$route.params.stratLocation.lat, this.$route.params.stratLocation.lng]
/*目的地经纬度赋值*/
this.navigator.formControl.end.location = [this.$route.params.endLocation.lat, this.$route.params.endLocation.lng]
console.log("起始点传进来的经纬度", this.navigator.formControl.start.location)
console.log("目的地传进来的经纬度", this.navigator.formControl.end.location)
/*调用选择路线方法*/
this.direction()/*
/!*获取当前页面刷新时间*!/
const now = new Date();
const hours = now.getHours();
const minutes = now.getMinutes();
this.pageLoadTime = `${hours}:${minutes}`;*/
if (this.checkEvent && this.checkStop && this.checkManage) {
this.handleEventTip(2)
}
......@@ -433,7 +419,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -451,7 +437,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -469,7 +455,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -487,7 +473,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -523,7 +509,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -541,7 +527,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -559,7 +545,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -577,7 +563,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -595,7 +581,7 @@ export default {
{
cityCode: "332",
cityName: "天津",
content: "",
content: "12:01，第一大街存在积水，请途经此处的驾驶员注意提前绕行。",
directionName: "西向东",
id: "1782500570450432",
lane: "",
......@@ -758,7 +744,9 @@ export default {
this.show = false
},
infoWindowOpen(marker) {
this.markInfo.content = marker.roadName
this.markInfo.roadName = marker.roadName
this.markInfo.typeName = marker.typeName
this.markInfo.content = marker.content
this.markInfo.position = marker.position
console.log('marker', marker)
this.show = true
......@@ -771,7 +759,7 @@ export default {
// 清空 AllLocationList 数组
this.AllLocationList = [];
/*计数器*/
console.log("计数器",this.numberCheck)
console.log("计数器", this.numberCheck)
// 根据复选框的值进行查询逻辑
// 如果所有复选框都没有勾选，则清空 AllLocationList 数组
if (!this.checkEvent && !this.checkStop && !this.checkManage) {
......@@ -925,6 +913,17 @@ export default {
},
/*地图加载完成*/
mapReady({BMap, map}) {
/*输入框赋值*/
this.navigator.form.start = this.$route.params.start
/*输入框赋值*/
this.navigator.form.end = this.$route.params.end
/*起始经纬度赋值*/
this.navigator.formControl.start.location = [this.$route.params.stratLocation.lat, this.$route.params.stratLocation.lng]
/*目的地经纬度赋值*/
this.navigator.formControl.end.location = [this.$route.params.endLocation.lat, this.$route.params.endLocation.lng]
console.log("起始点传进来的经纬度", this.navigator.formControl.start.location)
console.log("目的地传进来的经纬度", this.navigator.formControl.end.location)
this.direction()
this.BMap = BMap
this.map = map
// 加载事故点
......
src/views/passengerTransport/index.vue
View file @ 7b48419e
......@@ -103,7 +103,7 @@ border: 1px solid #CCCCCC;border-radius:0.3rem;padding: 0.25rem 1rem 0.25rem 1re
{{ this.dispatchTitle.endStation }}
</div>
</div>
<div class="rectangle" v-show="vehicleTime">数据更新时间：2023/03/04</div>
<div class="rectangle" v-show="vehicleTime">数据更新时间:{{dispatchList[0].createTime}}</div>
</div>
<el-table
:data="dispatchList"
......
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