|
@@ -154,7 +154,14 @@ export default {
|
|
|
},
|
|
|
imageIcon(isPublic,status, isOnline) {
|
|
|
if (isPublic) {
|
|
|
- return { 1: CarGwc, 2: CarRepair, 3: CarGwcOffline}[status]
|
|
|
+ if (status === 2) {
|
|
|
+ return CarRepair
|
|
|
+ } else if (isOnline) {
|
|
|
+ return CarGwc
|
|
|
+ } else {
|
|
|
+ return CarGwcOffline
|
|
|
+ }
|
|
|
+ // return { 1: CarGwc, 2: CarRepair, 3: CarGwcOffline}[status]
|
|
|
} else {
|
|
|
return isOnline ? CarOnline : CarOffline
|
|
|
}
|
|
@@ -194,7 +201,7 @@ export default {
|
|
|
<div style='width:100%;height:40px;border-bottom: 1px solid #EFEFEF;position:relative;padding:0 12px;display:flex;align-items: center;justify-content:space-between;'>
|
|
|
<span style='font-size: 18px;font-weight: bold;margin-right:4px;'>${car.plateNumber}</span>
|
|
|
<span style='display:inline-block;font-size:12px;border: 1px solid #547CD5;border-radius: 2px;color:#547CD5;padding:1px 5px;'>${
|
|
|
- car.categoryId === 2 ? (that.dict.label.public_car_status[car.status]) : (car.onlineStatus === 1 ? '在线' : '离线')
|
|
|
+ (car.onlineStatus === 1 ? '在线' : '离线')
|
|
|
}</span>
|
|
|
</div>
|
|
|
<div style="width:100%;padding:4px 12px;">${car.depName}</div>
|
|
@@ -249,6 +256,7 @@ export default {
|
|
|
icon.size = new AMap.Size(40, 40)
|
|
|
icon.imageSize = new AMap.Size(40, 40)
|
|
|
const position = [car.lng, car.lat]
|
|
|
+
|
|
|
const marker = new AMap.Marker({
|
|
|
icon,
|
|
|
position,
|
|
@@ -259,7 +267,7 @@ export default {
|
|
|
<div style='width:100%;height:40px;border-bottom: 1px solid #EFEFEF;position:relative;padding:0 12px;display:flex;align-items: center;justify-content:space-between;'>
|
|
|
<span style='font-size: 18px;font-weight: bold;margin-right:4px;'>${car.plateNumber}</span>
|
|
|
<span style='display:inline-block;font-size:12px;border: 1px solid #547CD5;border-radius: 2px;color:#547CD5;padding:1px 5px;'>${
|
|
|
- car.categoryId === 2 ? (that.dict.label.public_car_status[car.status]) : (car.onlineStatus === 1 ? '在线' : '离线')
|
|
|
+ (car.onlineStatus === 1 ? '在线' : '离线')
|
|
|
}</span>
|
|
|
</div>
|
|
|
<div style="width:100%;padding:4px 12px;">${car.depName}</div>
|