|
|
|
@ -284,11 +284,11 @@ export class GetOutOfLineDetailsComponent implements OnInit {
|
|
|
|
|
this.ctx.font = "16px Verdana"; |
|
|
|
|
let name = ""; |
|
|
|
|
// ⛑️ 戴了
|
|
|
|
|
// 👷♂️ 没戴
|
|
|
|
|
// 👨🦲 没戴
|
|
|
|
|
if (this.isShowAxOtherRegion) { |
|
|
|
|
if (this.typeArr[item.id].name.indexOf("人") !== -1) { |
|
|
|
|
let icon; |
|
|
|
|
item.helmet_person ? (icon = "⛑️") : (icon = "👷♂️"); |
|
|
|
|
item.helmet_person ? (icon = "⛑️") : (icon = "👨🦲"); |
|
|
|
|
name = icon + this.typeArr[item.id].name + item.scores; |
|
|
|
|
} else { |
|
|
|
|
name = this.typeArr[item.id].name + item.scores; |
|
|
|
@ -296,7 +296,7 @@ export class GetOutOfLineDetailsComponent implements OnInit {
|
|
|
|
|
} else { |
|
|
|
|
if (this.typeArr[item.id].name.indexOf("人") !== -1) { |
|
|
|
|
let icon; |
|
|
|
|
item.helmet_person ? (icon = "⛑️") : (icon = "👷♂️"); |
|
|
|
|
item.helmet_person ? (icon = "⛑️") : (icon = "👨🦲"); |
|
|
|
|
name = icon + this.typeArr[item.id].name; |
|
|
|
|
} else { |
|
|
|
|
name = this.typeArr[item.id].name; |
|
|
|
@ -311,7 +311,6 @@ export class GetOutOfLineDetailsComponent implements OnInit {
|
|
|
|
|
); |
|
|
|
|
} else { |
|
|
|
|
if (item.error) { |
|
|
|
|
console.log("走了几遍222", this.typeArr[item.id].name); |
|
|
|
|
this.ctx.strokeStyle = this.typeArr[item.id].color; |
|
|
|
|
this.ctx.lineWidth = 3; |
|
|
|
|
this.ctx.strokeRect( |
|
|
|
@ -324,6 +323,12 @@ export class GetOutOfLineDetailsComponent implements OnInit {
|
|
|
|
|
this.ctx.fillRect(startPoint[0], startPoint[1], 10, 10); |
|
|
|
|
this.ctx.fillStyle = this.typeArr[item.id].color; |
|
|
|
|
this.ctx.font = "16px Verdana"; |
|
|
|
|
|
|
|
|
|
if (this.typeArr[item.id].name.indexOf("人") !== -1) { |
|
|
|
|
let icon; |
|
|
|
|
item.helmet_person ? (icon = "⛑️") : (icon = "👨🦲"); |
|
|
|
|
this.ctx.fillText(icon, startPoint[0], startPoint[1] - 5); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|