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

mods/components/3dviewConvertor/styles/index.scss

@@ -13,13 +13,11 @@
 @import './actionbar.scss';
 @import './moduleEdit.scss';
 @import './searchpane.scss';
-
+@import './reservePlan.scss';
 @import './../assets/bizFont/iconfont.css';
 @import './../assets/amosFont/iconfont.css';
 
 
-
-
 .obj-loading-coms {
   position: absolute;
   top: 50%;
@@ -133,5 +131,3 @@
   border-image-slice: 50 50 50 50;
   border-image-repeat: stretch;
 }
-
-

mods/components/3dviewConvertor/styles/preControl.scss

@@ -365,53 +365,54 @@
       }
     }
 
-    .reserve-plan-root{
+    .reserve-plan-root {
       height: 80px;
 
       .operate-button-root + .operate-button-root {
         padding-left: 35px;
         margin-left: 20px;
-    }
+      }
 
       %operate-button-root-common {
         display: flex;
         align-items: center;
         width: 250px;
       }
-      .operate-button-display-root{
+
+      .operate-button-display-root {
         justify-content: center;
       }
 
-      .operate-button-root{
+      .operate-button-root {
         width: 250px;
         justify-content: center;
 
-        .operate-button-left{
+        .operate-button-left {
 
-          img{
+          img {
             // width: 20px !important;
             // height: 20px !important
           }
 
-          .operate-button-content{
+          .operate-button-content {
             margin-left: 5px;
             font-weight: 500;
             line-height: 15px;
             width: 170px;
-            .button-name{
+            .button-name {
               font-size: 14px !important
             }
 
-            .button-desc{
+            .button-desc {
               font-size: 8px !important
             }
           }
         }
 
-        .operate-button-right{
+        .operate-button-right {
           width: 77px;
 
-          .operate-button-button{
+          .operate-button-button {
             margin-left: 10px;
             width: 70px;
             height: 31px;
@@ -434,7 +435,7 @@
           .quit-btn {
             margin-top: 10px;
 
-            img{
+            img {
               width: 17px
             }
           }

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

@@ -98,7 +98,7 @@ class LayerPool extends Component {
     let wsURL = AmosConfig.wsURI.securityBaseURI + 'plan';
     return (
       <div className="layer-pool">
-      <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
+        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
         <SidePane
           className={displayDetail ? 'precontrol-sidePlan-detail-display' : 'precontrol-sidePlan-detail'}
           left={false}

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

@@ -91,6 +91,7 @@ class MaskContent extends Component {
       headerName,
       errorAreaId
     } = this.props;
+    alarmStarted && this.props.editModelChange(true);
     const wsURL = completeToken(SysWsURL.rulews);
     const controlAnimation = {
       animateName: 'zoom-comb-left',
@@ -121,13 +122,12 @@ class MaskContent extends Component {
     return (
       <div className="mask-content">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
-        { sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
-        {/* <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} /> */}
-        { sideControlShow && <DataPane animationProps={datapaneAnim} />}
-        <SearchPane visible={searchPaneVisible} changeSearchPaneVisible={() => this.changeSearchPaneVisible}/>
+        { !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
+        { !alarmStarted && sideControlShow && <DataPane animationProps={datapaneAnim} />}
+        { !alarmStarted && <SearchPane visible={searchPaneVisible} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
         <TopMsg alarmStart={alarmStart} />
-        {!isShowActionBar && <ModelHeader headerName={headerName} handleExceptModel={this.handleExceptModel} />}
-        {isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation}/> }
+        { !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
+        { !alarmStarted && isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation} /> }
         {alarmStarted && <LayerPool animationProps={layerPoolAnimation} planStart={planStart} planQuit={planQuit} planStarted={planStarted} />}
       </div>
     );

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

@@ -200,6 +200,7 @@ class View3D extends Component {
     tirggerTransTopic(CONSTS.forward, { details: { type: 'prePlan', show: false }, dateTime: Date.now() });
     removeFireAlarm2(this);
     this.cameraFactory.fitView(desigerHelperConfig.cameraEffect);
+    this.quitEditMode();
   };
 
   alarmStart = () => {
@@ -1202,13 +1203,13 @@ class View3D extends Component {
     const { markers } = this.state;
     pointModelistAction(actionType).then(d =>{
       // if (markerType === 'fireResource') {
-        markers['impEquipmentMode'] = d.filter(item => item.position != null);
-        // markers[markerType] = d;
-        this.setState({
-          markers,
-          markerType: "impEquipmentMode"
-        });
-        return;
+      markers['impEquipmentMode'] = d.dataList.filter(item => item.position !== null);
+      // markers[markerType] = d;
+      this.setState({
+        markers,
+        markerType: "impEquipmentMode"
+      });
+      return;
     });
 
   }
@@ -1304,7 +1305,7 @@ class View3D extends Component {
       headerName,
       errorAreaId
     } = this.state;
-    const { dimension, hiddenScreenSaver } = this.props;
+    const { dimension, hiddenScreenSaver, editModelChange } = this.props;
     const graphicProps = {
       ...dimension,
       ...desigerConf,
@@ -1372,6 +1373,7 @@ class View3D extends Component {
                 onActionItemClick={this.onActionItemClick}
                 errorAreaId={errorAreaId}
                 handleExceptModel={this.handleExceptModel}
+                editModelChange={editModelChange}
               />
             }
             modelContentProps={modelContentProps}

mods/components/3dviewConvertor/view/common/ModelHeader.js

@@ -12,9 +12,9 @@ export default class ModelHeader extends Component {
   }
 
   render() {
-    const { headerName } = this.props;
+    const { animationProps, headerName } = this.props;
     return (
-      <div className='ModuleEditPage'>
+      <div className='ModuleEditPage' {...animationProps}>
         <div className='topBox'>
           <span className='editTitle'>
             <span className='titleText'>{headerName}</span>