chongtu

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

@@ -114,11 +114,7 @@ class MaskContent extends Component {
       <div className="mask-content">
         <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
         { !alarmStarted && sideControlShow && <SideControl multiple={multiple} errorAreaId={errorAreaId} onItemClick={onItemClick} layerConfig={layerConfig} animationProps={controlAnimation} />}
-<<<<<<< HEAD
-        { !alarmStarted && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={this.changeSearchPaneVisible} />}
-=======
         { !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
->>>>>>> 876bde88e84eb33f87d6e192dd5d0e5e70297f58
         <TopMsg alarmStart={alarmStart} />
         { !alarmStarted && !isShowActionBar && <ModelHeader animationProps={controlAnimation} headerName={headerName} handleExceptModel={this.handleExceptModel} />}
         { !alarmStarted && isShowActionBar && <ActionBar activeAction={activeAction} onActionItemClick={(e) => this.actionBarClick(e)} animationProps={controlAnimation} /> }

mods/components/3dviewConvertor/view/moduleEditComponent/PointLeftTree.js

@@ -42,8 +42,6 @@ class PointLeftTree extends Component {
 
   }
 
-<<<<<<< HEAD
-=======
   componentWillMount() {
     const { treeData, pointTypeArr, treeDataList } = this.props;
     this.setState({
@@ -62,15 +60,15 @@ class PointLeftTree extends Component {
       treeDataList
     });
   }
->>>>>>> 876bde88e84eb33f87d6e192dd5d0e5e70297f58
 
   onSelectChange = (value, item) =>{
     console.log(value, item);
     this.setState({ pointType: value });
     this.props.pointTypeChange(value);
   }
-  onSearchChange =(e,value) => {
-    const { treeDataList,treeData } = this.props;
+  onSearchChange = e => {
+    const { treeDataList,treeData } = this.state;
+    const value = e.target.value;
     const expandedKeys = treeDataList
      .map(item => {
        if (item.title.indexOf(value) > -1) {
@@ -127,17 +125,7 @@ class PointLeftTree extends Component {
                     <span>
                       {title}
                       <span className='icon'>
-<<<<<<< HEAD
-                        {
-                        item.isRegion ? item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
-                        <img src={moduleEditIcon.nobindTip} alt='' /> :
-                        item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
-                        item.position3d ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
-                        <img src={moduleEditIcon.nobindTip} alt='' />
-                      }
-=======
                         { item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> : <img src={moduleEditIcon.nobindTip} alt='' /> }
->>>>>>> 876bde88e84eb33f87d6e192dd5d0e5e70297f58
                       </span>
                     </span> :
                     <span
@@ -149,18 +137,6 @@ class PointLeftTree extends Component {
                       {title}
                       <span className='icon'>
                         {
-<<<<<<< HEAD
-                        item.isRegion ? item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
-                        <img src={moduleEditIcon.nobindTip} alt='' /> :
-                        item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
-                        item.position3d ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
-                        <img src={moduleEditIcon.nobindTip} alt='' />
-                      }
-                      </span>
-                    </span>}
-                </div>
-            }
-=======
                           this.checkPointIsNoSave(pointType,item) ? <img src={moduleEditIcon.noSaveTip} alt='' /> :
                           item.isBind ? <img src={moduleEditIcon.bindedTip} alt='' /> :
                           <img src={moduleEditIcon.nobindTip} alt='' />
@@ -169,7 +145,6 @@ class PointLeftTree extends Component {
                     </span>}
                 </div>
               }
->>>>>>> 876bde88e84eb33f87d6e192dd5d0e5e70297f58
               key={item.id}
               dataRef={item}
               onDragStart={() => {
@@ -205,8 +180,7 @@ class PointLeftTree extends Component {
   }
 
   render() {
-    const { treeData,pointTypeArr } = this.props;
-    const pointType = pointTypeArr[0] ? pointTypeArr[0].code : '';
+    let { treeData,pointTypeArr,pointType } = this.state;
     return (
       <div className="leftTree">
         <div className='leftContainer'>