Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
holo-web
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
xinkong
holo-web
Commits
631e3a2e
Commit
631e3a2e
authored
Sep 25, 2024
by
ninglx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
按需求改动超限 & 处理bug
parent
6ba2997c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
20 deletions
+21
-20
mapboxTools.js
wj-manage-web/src/utils/mapboxTools.js
+14
-13
messageBoxes.vue
wj-manage-web/src/views/situation/floatData/messageBoxes.vue
+1
-1
index.vue
wj-manage-web/src/views/situation/index.vue
+5
-5
vehicleDetail.vue
wj-manage-web/src/views/situation/mapPopup/vehicleDetail.vue
+1
-1
No files found.
wj-manage-web/src/utils/mapboxTools.js
View file @
631e3a2e
...
...
@@ -411,19 +411,20 @@ export function addOrUpdateWarningWave(map, arr, id) {
layout
:
{
'
icon-allow-overlap
'
:
true
,
'
icon-ignore-placement
'
:
true
,
"
icon-image
"
:
[
"
match
"
,
[
"
get
"
,
"
type
"
],
1
,
"
pulsingDot1
"
,
2
,
"
pulsingDot2
"
,
3
,
"
pulsingDot3
"
,
4
,
"
pulsingDot4
"
,
""
,
],
// "icon-image": [
// "match",
// ["get", "type"],
// 1,
// "pulsingDot1",
// 2,
// "pulsingDot2",
// 3,
// "pulsingDot3",
// 4,
// "pulsingDot4",
// "",
// ],
"
icon-image
"
:
"
pulsingDot0
"
,
"
icon-pitch-alignment
"
:
"
map
"
,
"
icon-rotation-alignment
"
:
"
map
"
,
},
...
...
wj-manage-web/src/views/situation/floatData/messageBoxes.vue
View file @
631e3a2e
...
...
@@ -113,7 +113,7 @@
<div
class=
'detailMsg'
>
<div><span>
车牌:
</span>
{{ item.plateNo }}
</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>
<!-- </vue-seamless-scroll>-->
...
...
wj-manage-web/src/views/situation/index.vue
View file @
631e3a2e
...
...
@@ -70,10 +70,10 @@ const AlarmPopup = Vue.extend(alarmPopup)
let
pulsingDots
=
[];
const
canvasImages
=
[
{
size
:
250
,
color
:
"
252, 1, 26
"
},
{
size
:
400
,
color
:
"
255,235,59
"
},
{
size
:
400
,
color
:
"
255, 141, 26
"
},
{
size
:
400
,
color
:
"
227, 5, 5
"
},
{
size
:
400
,
color
:
"
24, 144, 255
"
},
//
{size: 400, color: "255,235,59"},
//
{size: 400, color: "255, 141, 26"},
//
{size: 400, color: "227, 5, 5"},
//
{size: 400, color: "24, 144, 255"},
];
for
(
let
i
=
0
;
i
<
canvasImages
.
length
;
i
++
)
{
let
size
=
canvasImages
[
i
].
size
;
...
...
@@ -1131,7 +1131,7 @@ export default {
let
overArr
=
item
.
overRun
.
overType
.
split
(
'
,
'
)
let
overStr
=
''
for
(
let
t
of
overArr
)
{
overStr
+=
dict
.
overCarType
[
t
]
overStr
+=
dict
.
overCarType
[
t
]
||
t
.
toString
()
}
if
(
!
this
.
showHisVid
&&
[
'
add
'
,
'
com
'
].
includes
(
item
.
dill
))
{
this
.
$notify
({
...
...
wj-manage-web/src/views/situation/mapPopup/vehicleDetail.vue
View file @
631e3a2e
...
...
@@ -105,7 +105,7 @@ export default {
let
overArr
=
this
.
model
.
overRun
.
overType
.
split
(
'
,
'
)
let
overStr
=
''
for
(
let
t
of
overArr
)
{
overStr
+=
dict
.
overCarType
[
t
]
overStr
+=
dict
.
overCarType
[
t
]
||
t
.
toString
()
}
return
overStr
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment