1.修改爆红

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

@@ -37,19 +37,16 @@ import AreaLeftTree from './moduleEditComponent/AreaLeftTree';
 import PointLeftTree from './moduleEditComponent/PointLeftTree';
 import RightEditPointPanel from './moduleEditComponent/RightEditPointPanel';
 import RightEditRegionPanel from './moduleEditComponent/RightEditRegionPanel';
-import { EVENTS_CONSTS, dispatchMouseDown } from './../consts/EventConsts';
+import { EVENTS_CONSTS } from './../consts/EventConsts';
 import ExceptionArea from './exceptionArea/ExceptionArea';
 import { exceptionRegionListAction } from './../services/panoramicService';
 
 
 const AmosConfig = endConf.AmosConfig;
 const view3dFile = AmosConfig.sysConf.convertor.view3dFile;
-let mousewheelCount = AmosConfig.sysConf.convertor.mapLevelconfig.mousewheelCount * 100;
-// const showInterval = AmosConfig.sysConf.convertor.screenSaverConf.delayTime * 1000;
 const { resizeConnect } = Connect;
 const eventConnect = UIConnect.eventConnect;
-const { BaseObjHelper } = transitionHelper;
-const { FlameFire, FlameFire2, FlameFire3 } = FireObject;
+const { FlameFire } = FireObject;
 
 const LENS_LEVEL = {
   ROOT: 'root',
@@ -104,10 +101,10 @@ class View3D extends Component {
       //编辑模式
       drawing: false,//画线状态
       selectArea: "",//选中区域
-      selectPoints:"",//选中点
+      selectPoints: "",//选中点
       treeData: [],//左树
-      pointTypeArr:[],
-      routePathData:[], //区域线位置
+      pointTypeArr: [],
+      routePathData: [], //区域线位置
       pageType: 'region', //编辑类型
       pointType: '', //筛选框点类型
       editFlag: false,//编辑模式
@@ -131,12 +128,12 @@ class View3D extends Component {
     this.drowItem = '';
     this.areas = [];
     this.areaStyles = {
-      normal:{
+      normal: {
         regionColor: '#02B00F', // 区域颜色
         lineColor: '#00FF70', // 边框颜色
         regionOpacity: 0.3
       },
-      noDrop:{
+      noDrop: {
         regionColor: '#969696', // 区域颜色
         lineColor: '#878787', // 边框颜色
         regionOpacity: 0.4
@@ -156,6 +153,7 @@ class View3D extends Component {
     this._bindRulesPubSubEvents();
     this.getExceptionAreaList();
   }
+
   genPenId = () => {
     return UUID.timeUUID('pen');
   };
@@ -323,7 +321,7 @@ class View3D extends Component {
           break;
         case 'base3d.fromws.optionArea_': //交互区推数据
           this.props.trigger(eventTopics.optionArea_view, data);
-          this.setState({contingencyPlanId:data.contingencyPlanId})
+          this.setState({ contingencyPlanId: data.contingencyPlanId })
           break;
         case eventTopics.map_bubble:
           parseBubbleMarkers(this, content); // 监控屏气泡
@@ -1213,23 +1211,23 @@ class View3D extends Component {
 
   onActionItemClick = (actionType, label, showLabel) => {
     this.clearMarkers();
-    this.props.editModelChange(false)
+    this.props.editModelChange(false);
     this.setState({
-      editFlag:false
-    })
-    if(showLabel){//进入各个模式名称设置
+      editFlag: false
+    });
+    if (showLabel){//进入各个模式名称设置
       this.setHeaderName(label);
     }
-    if(actionType === "impEquipment"){
+    if (actionType === 'impEquipment'){
       this.asyncLoadImpEquipment(actionType);
-      this.props.editModelChange(true)
+      this.props.editModelChange(true);
       this.setState({
-        editFlag:false,
+        editFlag: false,
         isShowActionBar: false, //隐藏工具栏
         startLoadExceptionArea: false,//隐藏marker
         sideControlShow: false //隐藏耳朵
       });
-    }else if(actionType === "editMode"){
+    } else if (actionType === 'editMode'){
       this.editButtonClick();
       this.props.editModelChange(true);
       this.setState({
@@ -1238,10 +1236,10 @@ class View3D extends Component {
         sideControlShow: false //隐藏耳朵
       });
     } else {
-      this.props.editModelChange(false)
+      this.props.editModelChange(false);
       this.setState({
-        editFlag:false
-      })
+        editFlag: false
+      });
     }
   }
 
@@ -1336,7 +1334,7 @@ class View3D extends Component {
       planStarted,
       alarmStarted,
       fireEquipmentPosition,
-      drawing, pageType, pointType, pointTypeArr, editFlag, showRightPanel, selectPoints, selectArea,
+      drawing, pageType, pointTypeArr, editFlag, showRightPanel, selectPoints, selectArea,
       exceptionAreas, exceptionMarkers,startLoadExceptionArea,
       sideControlShow,
       isShowActionBar,
@@ -1364,7 +1362,7 @@ class View3D extends Component {
     };
     const positionCtlProps = {
       prevProcessTarget: this.prevProcessTarget
-    }
+    };
 
     let firePosition = null;
     if (fireEquipmentPosition && fireEquipmentPosition.length > 0) {
@@ -1389,7 +1387,7 @@ class View3D extends Component {
             enableModelParser
             disabledEdit
             defaultLoading={false}
-            ref={node => (this.a3dRef = node)}
+            ref={node => this.a3dRef = node}
             baseObjs={objs}
             maskContent={
               <MaskContent
@@ -1420,7 +1418,7 @@ class View3D extends Component {
             positionCtlProps={positionCtlProps}
           >
             {startAsyncLoad && <WorkerObjContent objs={asyncModels} onWorkerMessage={this.onWorkerLoading} enableLoading afterInit={this.onAfterWorkerInit} />}
-            {editFlag && pageType == 'region'?'':<PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} />}
+            {editFlag && pageType === 'region' ? '' : <PointsPool markers={markers} updateMarker={this.updateMarker} planStarted={alarmStarted} stagePilot={this.stagePilot} />}
             {fireTruckRoute && <FatLine {...lineData.fatLineConf} linePath={JSON.parse(fireTruckRoute)} visible={showFireTruckRoute} />}
             <FlameFire position={firePosition} width={10} height={20} depth={8} sliceSpacing={1} visible={planStarted} />
             {this.renderAreas()}
@@ -1432,44 +1430,42 @@ class View3D extends Component {
         { editFlag &&
           <div>
             {
-              pageType == 'region'?
-              <AreaLeftTree
-                startDrow={this.startDrow}
-                treeData={this.state.treeData}
-                saveAreaData={this.saveAreaData}
-                selectItemChange={this.selectItemChange}
-                // stopDrowing={this.stopDrowing}
-                pageType={pageType}
-                // pointType={pointType}
-                pointTypeArr={pointTypeArr}
-                pointTypeChange={this.pointTypeChange}
-                dragItemChange={this.dragItemChange}
-                deleteAreaBind={this.deleteAreaBind}
-              />:
-              <PointLeftTree
-                treeData={this.state.treeData}
-                savePointData={this.savePointData}
-                selectPointChange={this.selectPointChange}
-                // stopDrowing={this.stopDrowing}
-                pageType={pageType}
-                // pointType={pointType}
-                pointTypeArr={pointTypeArr}
-                pointTypeChange={this.pointTypeChange}
-                dragItemChange={this.dragItemChange}
-                deletePointBind={this.deletePointBind}
-              />
-
+              pageType === 'region' ?
+                <AreaLeftTree
+                  startDrow={this.startDrow}
+                  treeData={this.state.treeData}
+                  saveAreaData={this.saveAreaData}
+                  selectItemChange={this.selectItemChange}
+                  // stopDrowing={this.stopDrowing}
+                  pageType={pageType}
+                  pointTypeArr={pointTypeArr}
+                  pointTypeChange={this.pointTypeChange}
+                  dragItemChange={this.dragItemChange}
+                  deleteAreaBind={this.deleteAreaBind}
+                /> :
+                <PointLeftTree
+                  treeData={this.state.treeData}
+                  savePointData={this.savePointData}
+                  selectPointChange={this.selectPointChange}
+                  // stopDrowing={this.stopDrowing}
+                  pageType={pageType}
+                  // pointType={pointType}
+                  pointTypeArr={pointTypeArr}
+                  pointTypeChange={this.pointTypeChange}
+                  dragItemChange={this.dragItemChange}
+                  deletePointBind={this.deletePointBind}
+                />
             }
             <div className='bottomBox'>
-              <span className={`editAreaBtn ${pageType == 'region'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'region')}></span>
-              <span className={`editPointBtn ${pageType == 'point'?'selected':'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'point')}></span>
+              <span className={`editAreaBtn ${pageType === 'region' ? 'selected' : 'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'region')} />
+              <span className={`editPointBtn ${pageType === 'point' ? 'selected' : 'noSelect'}`} onClick={this.changeAreaPoint.bind(this,'point')} />
             </div>
             <div className='rightBox'>
               {
-                showRightPanel && pageType == 'region'? <RightEditRegionPanel detailData={selectArea} />:''
+                showRightPanel && pageType === 'region' ? <RightEditRegionPanel detailData={selectArea} /> : ''
               }
               {
-                showRightPanel && pageType == 'point'? <RightEditPointPanel detailData={selectPoints} />:''
+                showRightPanel && pageType === 'point' ? <RightEditPointPanel detailData={selectPoints} /> : ''
               }
             </div>
           </div>
@@ -1479,8 +1475,7 @@ class View3D extends Component {
           header="基本模态框"
           visible={this.state.simpleTipVisible}
           noDefaultHeader
-          // onCancel={this.simpleTipCancel}
-          onOk = {this.simpleTipOk}
+          onOk={this.simpleTipOk}
           content={<div>{this.tipMsg}</div>}
         />
       </div>