Commit 631e3a2e authored by ninglx's avatar ninglx

按需求改动超限 & 处理bug

parent 6ba2997c
...@@ -411,19 +411,20 @@ export function addOrUpdateWarningWave(map, arr, id) { ...@@ -411,19 +411,20 @@ export function addOrUpdateWarningWave(map, arr, id) {
layout: { layout: {
'icon-allow-overlap': true, 'icon-allow-overlap': true,
'icon-ignore-placement': true, 'icon-ignore-placement': true,
"icon-image": [ // "icon-image": [
"match", // "match",
["get", "type"], // ["get", "type"],
1, // 1,
"pulsingDot1", // "pulsingDot1",
2, // 2,
"pulsingDot2", // "pulsingDot2",
3, // 3,
"pulsingDot3", // "pulsingDot3",
4, // 4,
"pulsingDot4", // "pulsingDot4",
"", // "",
], // ],
"icon-image": "pulsingDot0",
"icon-pitch-alignment": "map", "icon-pitch-alignment": "map",
"icon-rotation-alignment": "map", "icon-rotation-alignment": "map",
}, },
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<div class='detailMsg'> <div class='detailMsg'>
<div><span>车牌:</span>{{ item.plateNo }}</div> <div><span>车牌:</span>{{ item.plateNo }}</div>
<div :title='item.inDirName'><span>行驶方向:</span>{{ item.inDirName }}</div> <div :title='item.inDirName'><span>行驶方向:</span>{{ item.inDirName }}</div>
<div><span>超限类型:</span>{{ dict.overCarType[item.type] }}</div> <div><span>超限类型:</span>{{ dict.overCarType[item.type] || item.type }}</div>
</div> </div>
</div> </div>
<!-- </vue-seamless-scroll>--> <!-- </vue-seamless-scroll>-->
......
...@@ -70,10 +70,10 @@ const AlarmPopup = Vue.extend(alarmPopup) ...@@ -70,10 +70,10 @@ const AlarmPopup = Vue.extend(alarmPopup)
let pulsingDots = []; let pulsingDots = [];
const canvasImages = [ const canvasImages = [
{size: 250, color: "252, 1, 26"}, {size: 250, color: "252, 1, 26"},
{size: 400, color: "255,235,59"}, // {size: 400, color: "255,235,59"},
{size: 400, color: "255, 141, 26"}, // {size: 400, color: "255, 141, 26"},
{size: 400, color: "227, 5, 5"}, // {size: 400, color: "227, 5, 5"},
{size: 400, color: "24, 144, 255"}, // {size: 400, color: "24, 144, 255"},
]; ];
for (let i = 0; i < canvasImages.length; i++) { for (let i = 0; i < canvasImages.length; i++) {
let size = canvasImages[i].size; let size = canvasImages[i].size;
...@@ -1131,7 +1131,7 @@ export default { ...@@ -1131,7 +1131,7 @@ export default {
let overArr = item.overRun.overType.split(',') let overArr = item.overRun.overType.split(',')
let overStr = '' let overStr = ''
for (let t of overArr) { for (let t of overArr) {
overStr += dict.overCarType[t] overStr += dict.overCarType[t] || t.toString()
} }
if (!this.showHisVid && ['add', 'com'].includes(item.dill)) { if (!this.showHisVid && ['add', 'com'].includes(item.dill)) {
this.$notify({ this.$notify({
......
...@@ -105,7 +105,7 @@ export default { ...@@ -105,7 +105,7 @@ export default {
let overArr = this.model.overRun.overType.split(',') let overArr = this.model.overRun.overType.split(',')
let overStr = '' let overStr = ''
for (let t of overArr) { for (let t of overArr) {
overStr += dict.overCarType[t] overStr += dict.overCarType[t]||t.toString()
} }
return overStr return overStr
} }
......
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