|
@@ -32,9 +32,9 @@
|
|
|
<div class="item-info">
|
|
<div class="item-info">
|
|
|
<div class="label item-info__user" style="padding-left: 0" v-if="item.truckDriverList.length > 0">
|
|
<div class="label item-info__user" style="padding-left: 0" v-if="item.truckDriverList.length > 0">
|
|
|
<div class="driver-wrap">
|
|
<div class="driver-wrap">
|
|
|
- <div v-for="(driver, driverIndex) in item.truckDriverList" :key="driverIndex" class="driver-list">{{ driver.tmpDriverName || '-' }}</div>
|
|
|
|
|
|
|
+ <div v-for="(driver, driverIndex) in item.truckDriverList" :key="driverIndex" class="driver-list">{{ truckToDriverUser(driver) }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
- <div>{{ item.truckDriverList[0].tmpDriverMobile || '-' }}</div>
|
|
|
|
|
|
|
+ <div>{{ truckToDriverMobile(item.truckDriverList[0].driverName) }}</div>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="label speed">
|
|
<div class="label speed">
|
|
|
<span>{{ item.speed || '-' }}</span>公里/小时
|
|
<span>{{ item.speed || '-' }}</span>公里/小时
|
|
@@ -114,6 +114,7 @@ export default {
|
|
|
watch: {},
|
|
watch: {},
|
|
|
computed: {},
|
|
computed: {},
|
|
|
created() {
|
|
created() {
|
|
|
|
|
+ this.queryCurrAddress(35.7127, 116.23228)
|
|
|
this.dragendPointer()
|
|
this.dragendPointer()
|
|
|
setInterval(() => {
|
|
setInterval(() => {
|
|
|
this.dragendPointer()
|
|
this.dragendPointer()
|
|
@@ -128,9 +129,7 @@ export default {
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
async queryCurrAddress(location) {
|
|
async queryCurrAddress(location) {
|
|
|
- const url = 'https://api.map.baidu.com/reverse_geocoding/v3/'
|
|
|
|
|
-
|
|
|
|
|
- const data = await axios.post(url + '?output=json&ak=Zvd6FzmertUwjhZih5Zfq0D8uTUhvqsH&coordtype=wgs84ll&location=' + location).then(response => {
|
|
|
|
|
|
|
+ const data = await axios.post(process.env.VUE_APP_BAIDU_URL + '?output=json&ak=Zvd6FzmertUwjhZih5Zfq0D8uTUhvqsH&coordtype=wgs84ll&location=' + location).then(response => {
|
|
|
return response.data
|
|
return response.data
|
|
|
})
|
|
})
|
|
|
|
|
|
|
@@ -180,14 +179,16 @@ export default {
|
|
|
mapToListEvent() {
|
|
mapToListEvent() {
|
|
|
this.showType = this.showType === 1 ? 2 : 1
|
|
this.showType = this.showType === 1 ? 2 : 1
|
|
|
},
|
|
},
|
|
|
- truckToDriverInfo(item, type = 'user') {
|
|
|
|
|
|
|
+ truckToDriverUser(driver) {
|
|
|
// 解释司机个人信息
|
|
// 解释司机个人信息
|
|
|
- if (item.hasOwnProperty('truckDriverList') && item.truckDriverList.length > 0) {
|
|
|
|
|
- item.truckDriverList.forEach(driver => {
|
|
|
|
|
- const driverUserInfo = driver.driverName ? driver.driverName.split('/') : []
|
|
|
|
|
- driver.tmpDriverName = driverUserInfo.length >= 1 ? driverUserInfo[0] : '-'
|
|
|
|
|
- driver.tmpDriverMobile = driverUserInfo.length >= 2 ? driverUserInfo[1] : '-'
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ const driverUserInfo = driver.driverName ? driver.driverName.split('/') : []
|
|
|
|
|
+ return driverUserInfo.length >= 1 ? driverUserInfo[0] : '-'
|
|
|
|
|
+ },
|
|
|
|
|
+ truckToDriverMobile(info) {
|
|
|
|
|
+ if (info.indexOf('/') !== -1) {
|
|
|
|
|
+ const userinfo = info.split('/')
|
|
|
|
|
+
|
|
|
|
|
+ return userinfo[1] || '-'
|
|
|
} else {
|
|
} else {
|
|
|
return '-'
|
|
return '-'
|
|
|
}
|
|
}
|