Commit 72b6847e authored by zhengjiangtao's avatar zhengjiangtao

CSFAS-945 【消防指挥】实景监控>全景模式,点击风险点后无法正确显示详情(附图)

parent 98de95a9
...@@ -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={dialogId} />; obj = <RiskWarnModal riskSourceId={originId} />;
break; break;
case 'video': case 'video':
obj = <FireEquipmentModal type="video" dialogId={dialogId} />; obj = <FireEquipmentModal type="video" dialogId={dialogId} />;
......
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