Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
K
karname-ui
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
Reza Sahebgharan
karname-ui
Commits
3d0020e1
Commit
3d0020e1
authored
Dec 29, 2019
by
Reza Sahebgharan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(fix bug Devicemap ): correct if statement for hislink array
parent
f8a7123a
Pipeline
#794
passed with stages
in 53 minutes and 7 seconds
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
.gitlab-ci.yml
.gitlab-ci.yml
+2
-0
DeviceMap.vue
client/components/DeviceMap.vue
+1
-1
No files found.
.gitlab-ci.yml
View file @
3d0020e1
...
@@ -68,6 +68,8 @@ build_in_devel_windows:
...
@@ -68,6 +68,8 @@ build_in_devel_windows:
allow_failure
:
true
allow_failure
:
true
only
:
only
:
-
devel-windows
-
devel-windows
# only:
# - /^staging_.*/
build_in_master
:
build_in_master
:
before_script
:
before_script
:
...
...
client/components/DeviceMap.vue
View file @
3d0020e1
...
@@ -167,7 +167,7 @@ export default {
...
@@ -167,7 +167,7 @@ export default {
{
_id
:
devicemap
.
HisLinkId
},
{
_id
:
devicemap
.
HisLinkId
},
{
fields
:
{
Name
:
1
}
}
{
fields
:
{
Name
:
1
}
}
).
fetch
();
).
fetch
();
if
(
hislink
)
if
(
hislink
.
length
>
0
)
currentDevicemap
.
push
({
...
devicemap
,
HisName
:
hislink
[
0
].
Name
});
currentDevicemap
.
push
({
...
devicemap
,
HisName
:
hislink
[
0
].
Name
});
}
}
...
...
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