Merge branch 'dev_upgrade' of http://172.16.10.76/station/amos-convertor-view into dev_upgrade

src/routes/view.js

@@ -58,6 +58,8 @@ import ModuleEdit from './../view/3dview/ModuleEdit'
 import PanoramicMonitor from './../view/panoramicMonitor';
 import LeaderStruct from './../view/planMgmt/view/leaderStruct';
 import Graph3DModel from 'amos-iot-3dgraph/lib/view/modelMgmt';
+import Panorama from './../view/Panorama';
+
 
 const Routes = {
   // 添加 rules 路由
@@ -109,7 +111,8 @@ const Routes = {
   moduleEdit: ModuleEdit,
   // planDrill: PublishView,
   modelManage: Graph3DModel,
-  leaderStruct: LeaderStruct
+  leaderStruct: LeaderStruct,
+  panorama: Panorama,
 };
 
 const pageCompontent = key => {

src/styles/view/3dview/moduleEdit.scss

@@ -175,4 +175,9 @@
         }
     }
     
+    .editButton {
+        position: absolute;
+        bottom: 100px;
+        left: 50%;
+    }
 }
\ No newline at end of file

src/view/3dview/ModuleEdit.js

@@ -99,7 +99,8 @@ class ModuleEdit extends Component {
         monitorEquipment: [],
         video: [],
         fireEquipment: []
-      }
+      },
+      editFlag: false,//编辑模式
     };
     this.nativeProps = {
       onMouseDown: this.onMouseDown,
@@ -592,6 +593,12 @@ class ModuleEdit extends Component {
     console.log(position)
   }
 
+  editButtonChange = () => {
+    let { editFlag } = this.state;
+    editFlag = !editFlag;
+    this.setState({ editFlag })
+  }
+
   render() {
     const {
       fireEquipmentPosition,
@@ -600,7 +607,8 @@ class ModuleEdit extends Component {
       markers,
       pageType,
       pointType,
-      pointTypeArr
+      pointTypeArr,
+      editFlag
     } = this.state;
     console.log(this.state)
     console.log(this.props)
@@ -662,30 +670,35 @@ class ModuleEdit extends Component {
             {this.renderAreas()}
           </A3DDesigner> 
         </div>
-        <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}
-        />
-        <div className='topBox'>
-          <span className='editTitle'>
-            <span className='titleText'>编辑模式</span>
-          </span>
-          <span className='quipBtn'></span>
-        </div>
-        <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>
-        </div>
-        <div className='rightBox'>
-          <RightEditPanel />
-        </div>
+        <div className="editButton" onClick={() => this.editButtonChange()}>编辑模式</div>
+        { editFlag && 
+          <div>
+              <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}
+            />
+            <div className='topBox'>
+              <span className='editTitle'>
+                <span className='titleText'>编辑模式</span>
+              </span>
+              <span className='quipBtn'></span>
+            </div>
+            <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>
+            </div>
+            <div className='rightBox'>
+              <RightEditPanel />
+            </div>
+          </div>
+        }
       </div>
       
     );

src/view/Panorama/index.js

+import React, { Component } from 'react';
+
+/**
+ * 全景监控
+ */
+export default class Panorama extends Component {
+  render() {
+    return <div>111</div>;
+  }
+}