Merge branch 'developer' of http://172.16.10.76/station/amos-station-module-view into developer

mods/components/3dviewConvertor/styles/view/panoramic/statistical.scss

@@ -159,6 +159,7 @@
           padding-top: 7px;
           cursor: pointer;
           border-bottom: 1px solid rgba(196, 86, 86, 0.3);
+          user-select: none;
         }
       }
     }

mods/components/3dviewConvertor/view/View3D.js

@@ -23,7 +23,8 @@ import {
   tirggerTransTopic,
   cacheObjsSave,
   flyToSubView,
-  convertMarkerType
+  convertMarkerType,
+  showSelectMarkerPoint
 } from './dataProcessor';
 import {
   dealTroubleMarkers,
@@ -260,7 +261,6 @@ class View3D extends Component {
   }
 
   _registerEvents = () => {
-
     this.r3d.on('dbclick', evt => {
       if (evt.button !== 0) {
         return;
@@ -305,7 +305,6 @@ class View3D extends Component {
       if (isControllerEvent(topic)) {
         executeView3dCMD(this, topic, data);
       } else if (isManualOperate(topic)) {
-
         parseManual(this, topic, data);
       } else if (topic === eventTopics.show_fire_equip) {
         this.asyncLoadMarkerData('fireResource');
@@ -313,6 +312,8 @@ class View3D extends Component {
         this.viewFreshInit();
       } else if (topic === eventTopics.exceptionAreas_fresh) {
         this.initExceptionAreasData();
+      } else if (topic === eventTopics.safety_db_select) {
+        showSelectMarkerPoint(this,data.target);
       }
     });
   };
@@ -1889,7 +1890,7 @@ class View3D extends Component {
           >
             {startAsyncLoad && this.multLoadWorkerObjContent(asyncModels)}
             {isEditMode && pageType === 'region' ? '' :
-            isOutterView && <PointsPool showRightPanelOnclick={this.showRightPanelOnclick} markers={markers} isEditMode={isEditMode} selectPoints={selectPoints} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot}  positionCtl={this.positionCtl} addMarker={this.addMarker} ref={node => this.pointsPool = node} />}
+            isOutterView && <PointsPool showRightPanelOnclick={this.showRightPanelOnclick} markers={markers} isEditMode={isEditMode} selectPoints={selectPoints} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot}  positionCtl={this.positionCtl} addMarker={this.addMarker} focusObject={this.focusObject} />}
             {fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />}
             <FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} />
             {isEditMode && this.renderAreas()}