Browse Source

[新增]预警框完善

beijing
邵佳豪 1 year ago
parent
commit
7287fd7df2
  1. 13
      src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

13
src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts

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

Loading…
Cancel
Save