Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-station-module-view
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
station
amos-station-module-view
Commits
72b6847e
Commit
72b6847e
authored
Sep 22, 2020
by
zhengjiangtao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CSFAS-945 【消防指挥】实景监控>全景模式,点击风险点后无法正确显示详情(附图)
parent
98de95a9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
PointDialog.js
mods/components/3dviewConvertor/view/points/PointDialog.js
+5
-5
No files found.
mods/components/3dviewConvertor/view/points/PointDialog.js
View file @
72b6847e
...
@@ -42,7 +42,7 @@ class PointDialog extends Component {
...
@@ -42,7 +42,7 @@ class PointDialog extends Component {
}
}
onOpenClick
=
marker
=>
{
onOpenClick
=
marker
=>
{
const
{
id
,
type
}
=
marker
.
extData
||
{};
const
{
id
,
type
,
originId
}
=
marker
.
extData
||
{};
// if (type === 'risk') {
// if (type === 'risk') {
if
(
type
===
'patrol'
)
{
if
(
type
===
'patrol'
)
{
this
.
setState
(
this
.
setState
(
...
@@ -51,7 +51,7 @@ class PointDialog extends Component {
...
@@ -51,7 +51,7 @@ class PointDialog extends Component {
},
},
()
=>
{
()
=>
{
pointInfoAction
(
id
,
type
).
then
(
d
=>
{
pointInfoAction
(
id
,
type
).
then
(
d
=>
{
d
.
markerExtData
=
{
dialogId
:
id
,
type
};
d
.
markerExtData
=
{
dialogId
:
id
,
type
,
originId
};
this
.
setState
({
markerData
:
d
});
this
.
setState
({
markerData
:
d
});
});
});
this
.
getTableData
(
id
);
this
.
getTableData
(
id
);
...
@@ -59,7 +59,7 @@ class PointDialog extends Component {
...
@@ -59,7 +59,7 @@ class PointDialog extends Component {
);
);
}
else
if
(
type
in
dialogEum
)
{
}
else
if
(
type
in
dialogEum
)
{
let
markerData
=
{};
let
markerData
=
{};
markerData
.
markerExtData
=
{
dialogId
:
id
,
type
};
markerData
.
markerExtData
=
{
dialogId
:
id
,
type
,
originId
};
this
.
setState
({
markerData
,
modal
:
true
});
this
.
setState
({
markerData
,
modal
:
true
});
}
else
if
(
type
in
bussinessEum
)
{
}
else
if
(
type
in
bussinessEum
)
{
this
.
tirggerTransBussiness
(
id
,
type
);
this
.
tirggerTransBussiness
(
id
,
type
);
...
@@ -120,7 +120,7 @@ class PointDialog extends Component {
...
@@ -120,7 +120,7 @@ class PointDialog extends Component {
};
};
getContext
=
markerData
=>
{
getContext
=
markerData
=>
{
const
{
type
,
dialogId
}
=
markerData
.
markerExtData
||
{};
const
{
type
,
dialogId
,
originId
}
=
markerData
.
markerExtData
||
{};
let
obj
=
{};
let
obj
=
{};
switch
(
type
)
{
switch
(
type
)
{
case
'monitorEquipment'
:
case
'monitorEquipment'
:
...
@@ -145,7 +145,7 @@ class PointDialog extends Component {
...
@@ -145,7 +145,7 @@ class PointDialog extends Component {
obj
=
<
FireDetectorModal
type
=
"fireDetection"
dialogId
=
{
dialogId
}
/>
;
obj
=
<
FireDetectorModal
type
=
"fireDetection"
dialogId
=
{
dialogId
}
/>
;
break
;
break
;
case
'riskSource'
:
case
'riskSource'
:
obj
=
<
RiskWarnModal
riskSourceId
=
{
dialog
Id
}
/>
;
obj
=
<
RiskWarnModal
riskSourceId
=
{
origin
Id
}
/>
;
break
;
break
;
case
'video'
:
case
'video'
:
obj
=
<
FireEquipmentModal
type
=
"video"
dialogId
=
{
dialogId
}
/>
;
obj
=
<
FireEquipmentModal
type
=
"video"
dialogId
=
{
dialogId
}
/>
;
...
...
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