Merge branch 'dev_rule' into developer

mods/components/3dviewConvertor/consts/imgStatic.js

@@ -101,7 +101,7 @@ export default {
     fire: require('../assets/convertor/3dview/markers/fire.png'),
     fireDetection: require('../assets/convertor/3dview/markers/fireDetector.png'),
 
-    
+
 //重点设备模式
 impEquipmentMode_monitorEquipment: require('../assets/convertor/3dview/markers/IeqMode-monitorEquipment.png'),
 impEquipmentMode_impEquipment: require('../assets/convertor/3dview/markers/IeqMode-impEquipment.png'),
@@ -183,11 +183,11 @@ impEquipmentMode_fireCar: require('../assets/convertor/3dview/markers/IeqMode-fi
     'shapan-dianlangoutu': require('../assets/convertor/3dview/prePlan/shapan-dianlangoutu.png'),
     'jiaohuqu-yingjichuzhi': require('../assets/convertor/3dview/prePlan/jiaohuqu-yingjichuzhi.png'),
     'jiaohuqu-dianlangou': require('../assets/convertor/3dview/prePlan/jiaohuqu-dianlangou.png'),
-    blue: '/src/assets/3dview/prePlan/jiaohuqu-2anniu-lan.png',
-    yellow: '/src/assets/3dview/prePlan/jiaohuqu-2anniu-cheng.png',
-    'blue-chang': '/src/assets/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png',
-    'yellow-chang': '/src/assets/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png',
-    onlyOne: '/src/assets/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png'
+    blue: require('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan.png'),
+    yellow: require('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng.png'),
+    'blue-chang': require('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-lan-chang.png'),
+    'yellow-chang': require('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png'),
+    onlyOne: require('../assets/convertor/3dview/prePlan/jiaohuqu-2anniu-cheng-chang.png')
   },
   main: {
     user: require('../assets/convertor/main/user.png'),

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

@@ -181,7 +181,8 @@ class View3D extends Component {
   planStart = data => {
     this.setState(
       {
-        planStarted: true
+        planStarted: true,
+        editFlag: false
       },
       () => {
         this.props.trigger(eventTopics.plan_start, {
@@ -201,6 +202,7 @@ class View3D extends Component {
     removeFireAlarm2(this);
     this.cameraFactory.fitView(desigerHelperConfig.cameraEffect);
     this.quitEditMode();
+    this.handleExceptModel('out_except_model', '');
   };
 
   alarmStart = () => {
@@ -268,6 +270,7 @@ class View3D extends Component {
             this.setState({ fireEquipmentPosition });
           }
           assembleTroubleView(this, data, this.state.markers);
+          this.handleExceptModel('out_except_model');
           break;
         case 'base3d.fromws.mapArea_action1-2': //镜头切换（旋转+推进）
           changeGoodView(this, data);
@@ -1226,7 +1229,7 @@ class View3D extends Component {
     const { markers } = this.state;
     pointModelistAction(actionType).then(d =>{
       // if (markerType === 'fireResource') {
-      markers['impEquipmentMode'] = d.dataList.filter(item => item.position !== null);
+      markers['impEquipmentMode'] = d.filter(item => item.position !== null);
       // markers[markerType] = d;
       this.setState({
         markers,