Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
耿迪迪
gassafety
Commits
5322aae5
Commit
5322aae5
authored
Apr 03, 2023
by
纪泽龙
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop_jzl'
parents
13556055
1c9a6a14
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
2 deletions
+2
-2
fmj.gif
gassafety-web/src/assets/images/fmj.gif
+0
-0
tyx.gif
gassafety-web/src/assets/images/tyx.gif
+0
-0
index.vue
gassafety-web/src/views/enterprise/mapView/index.vue
+2
-2
No files found.
gassafety-web/src/assets/images/fmj.gif
0 → 100644
View file @
5322aae5
1.39 KB
gassafety-web/src/assets/images/tyx.gif
0 → 100644
View file @
5322aae5
1.49 KB
gassafety-web/src/views/enterprise/mapView/index.vue
View file @
5322aae5
...
@@ -934,7 +934,7 @@ export default {
...
@@ -934,7 +934,7 @@ export default {
}
else
{
}
else
{
this
.
gaoMap
.
changeMarkIcon
(
this
.
gaoMap
.
changeMarkIcon
(
device
,
device
,
require
(
`@/assets/images/
ylb
.gif`
)
require
(
`@/assets/images/
tyx
.gif`
)
);
);
}
}
}
else
if
(
device
.
getExtData
().
deviceType
==
2
)
{
}
else
if
(
device
.
getExtData
().
deviceType
==
2
)
{
...
@@ -946,7 +946,7 @@ export default {
...
@@ -946,7 +946,7 @@ export default {
}
else
{
}
else
{
this
.
gaoMap
.
changeMarkIcon
(
this
.
gaoMap
.
changeMarkIcon
(
device
,
device
,
require
(
`@/assets/images/
ylb
.gif`
)
require
(
`@/assets/images/
fmj
.gif`
)
);
);
}
}
}
}
...
...
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