冲突

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

@@ -245,5 +245,10 @@ export const safetyIndexIconMapper = {
 };
 
 export const markerTitleBgMapper = {
-  base: require('../assets/convertor/3dview/markers/markerTitle.png')
+  base: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/markerTitle.png'
+};
+
+export const equipStatusIconMapper = {
+  equip_false: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/pa-0.png',
+  equip_true: '/mods/components/3dviewConvertor/assets/convertor/3dview/markers/pa-1.png'
 };

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

@@ -112,6 +112,7 @@
                 line-height: 31px;
                 padding: 5px;
                 color: #F0DF2D;
+
             }
             .leftSearch {
                 height: 33px;

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

@@ -114,6 +114,7 @@ class PointsPool extends Component {
           onCreated={(val) => this.onMarkersCreated('riskSource', val)}
           isEditMode={this.props.isEditMode}
           addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
           selectPoints={this.props.selectPoints}
         />
         {/* <PatrolPoint

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

@@ -362,6 +362,10 @@ export const desigerHelperConfig = {
   },
   objAnchor: {
     position: [0, 5, 0]
+  },
+  verticalCameraEffect: {
+    position: [2.3815615940156256, 419.57425506421896, 11.965199740306224],
+    target: [2.408441971875859, 1.3271790975878637, 3.918674823963386]
   }
 };
 

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

@@ -7,7 +7,20 @@ import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditS
 const eventConnect = Connect.eventConnect;
 const TreeNode = Tree.TreeNode;
 const Option = Select.Option;
-
+const getParentKey = (key, tree) => {
+  let parentKey;
+  for (let i = 0; i < tree.length; i++) {
+    const node = tree[i];
+    if (node.children && node.children.length >0) {
+      if (node.children.some(item => item.id === key)) {
+        parentKey = node.id;
+      } else if (getParentKey(key, node.children)) {
+        parentKey = getParentKey(key, node.children);
+      }
+    }
+  }
+  return parentKey;
+};
 
 @eventConnect
 class AreaLeftTree extends Component {
@@ -22,29 +35,34 @@ class AreaLeftTree extends Component {
     selectedKeys: [],
     treeData:[],
     pointTypeArr:[],
-    pointType:''
+    pointType:'',
+    treeDataList : [],
+    searchValue:''
     };
 
   }
 
   componentDidMount() {
-    let {treeData,pointTypeArr} = this.props;
+    let {treeData,pointTypeArr,treeDataList} = this.props;
     this.setState({
       treeData,
+      treeDataList,
       pointTypeArr,
       pointType: pointTypeArr[0]?pointTypeArr[0].code:''
     })
+
   }
 
   componentWillUnmount() {
 
   }
   componentWillReceiveProps(nextProps) {
-      console.log(nextProps,'nextProps')
-      let {treeData,pointTypeArr} = nextProps;
+      console.log(nextProps)
+      let {treeData,pointTypeArr,pageType,treeDataList} = nextProps;
       this.setState({
         treeData,
         pointTypeArr,
+        treeDataList,
         pointType: pointTypeArr[0]?pointTypeArr[0].code:''
       })
   }
@@ -54,10 +72,23 @@ class AreaLeftTree extends Component {
   //   this.state.pointType = value;
   //   this.props.pointTypeChange(value);
   // }
-  onSearchChange = (e, value) => {
-    console.log(e, value);
+
+  onSearchChange = e => {
+     const {treeDataList,treeData} = this.state
+    const value = e.target.value;
+    const expandedKeys = treeDataList
+      .map(item => {
+        if (item.title.indexOf(value) > -1) {
+          return getParentKey(item.key, treeData);
+        }
+        return null;
+      })
+      .filter((item, i, self) => item && self.indexOf(item) === i);
     this.setState({
-      value
+      expandedKeys,
+      searchValue: value,
+      autoExpandParent: true
+
     });
   }
 
@@ -105,9 +136,23 @@ class AreaLeftTree extends Component {
   }
   // onClick={(e)=>{e.nativeEvent.stopImmediatePropagation();e.stopPropagation();console.log(123123);}}
   renderTreeNodes = (data) => {
+    let {searchValue} =this.state
     // console.log(data);
     if (data.length>0) {
       return data.map((item) => {
+        const index = item.name.indexOf(searchValue);
+        const beforeStr = item.name.substr(0, index);
+        const afterStr = item.name.substr(index + searchValue.length);
+        const title =
+          index > -1 ? (
+            <span>
+              {beforeStr}
+              <span style={{ color: '#f50' }}>{searchValue}</span>
+              {afterStr}
+            </span>
+          ) : (
+            <span>{item.name}</span>
+          );
         if (item.children) {
           return (
           <TreeNode
@@ -115,7 +160,7 @@ class AreaLeftTree extends Component {
               <div>
                 {
                   <span >
-                    {item.name}
+                    {title}
                     <span className='icon'>
                       {
                         item.isBind?'':
@@ -145,46 +190,12 @@ class AreaLeftTree extends Component {
             </TreeNode>
           );
         }
-        return <TreeNode
-          key={item.id}
-          title={
-            <div>
-              {
-                <span >
-                  {item.name}
-                  <span className='icon'>
-                    {
-                      item.isBind?'':
-                      <img
-                        src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/editBtn.png'
-                        onClick={(e) => {
-                          e.nativeEvent.stopImmediatePropagation();
-                          e.stopPropagation();
-                          this.props.startDrow(item);
-                        }}
-                      />
-                    }
-                    {
-                      item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
-                      item.routePath?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />:
-                      <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
-                    }
-                  </span>
-                </span>
-              }
-            </div>
-          }
-          dataRef={item}
-          {...item}
-          />;
       });
     }
 
   }
-
-
   render() {
-      let { treeData, checkedKeys,pointTypeArr,pointType } = this.state;
+      let { treeData, checkedKeys,pointTypeArr,pointType} = this.state;
       let { pageType } = this.props;
      return (
       <div className="leftTree">
@@ -199,7 +210,7 @@ class AreaLeftTree extends Component {
                     selectable={true}
                     onExpand={this.onExpand}
                     expandedKeys={this.state.expandedKeys}
-                    autoExpandParent={this.state.autoExpandParent}
+                    autoExpandParent={true}
                     // onCheck={this.onCheck}
                     // checkedKeys={checkedKeys}
                     onSelect={this.onTreeSelect}

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

@@ -7,7 +7,20 @@ import { getAreaTreeAction,saveAreaDataAction } from '../../services/moduleEditS
 const eventConnect = Connect.eventConnect;
 const TreeNode = Tree.TreeNode;
 const Option = Select.Option;
-
+const getParentKey = (key, tree) => {
+  let parentKey;
+  for (let i = 0; i < tree.length; i++) {
+    const node = tree[i];
+    if (node.children) {
+      if (node.children.some(item => item.name === key)) {
+        parentKey = node.id;
+      } else if (getParentKey(key, node.children)) {
+        parentKey = getParentKey(key, node.children);
+      }
+    }
+  }
+  return parentKey;
+};
 
 @eventConnect
 class PointLeftTree extends Component {
@@ -22,15 +35,18 @@ class PointLeftTree extends Component {
     selectedKeys: [],
     treeData:[],
     pointTypeArr:[],
-    pointType:''
+    pointType:'',
+    treeDataList : [],
+    searchValue:''
     };
 
   }
 
   componentDidMount() {
-    let {treeData,pointTypeArr} = this.props;
+    let {treeData,pointTypeArr,treeDataList} = this.props;
     this.setState({
       treeData,
+      treeDataList,
       pointTypeArr,
       pointType: pointTypeArr[0]?pointTypeArr[0].code:''
     })
@@ -42,11 +58,12 @@ class PointLeftTree extends Component {
   }
   componentWillReceiveProps(nextProps) {
       console.log(nextProps)
-      let {treeData,pointTypeArr} = nextProps;
+      let {treeData,pointTypeArr,treeDataList} = nextProps;
       this.setState({
         treeData,
-        // pointTypeArr,
-        // pointType: pointTypeArr[0]?pointTypeArr[0].code:''
+        treeDataList,
+        //pointTypeArr,
+        //pointType: pointTypeArr[0]?pointTypeArr[0].code:''
       })
   }
 
@@ -55,10 +72,21 @@ class PointLeftTree extends Component {
     this.setState({pointType:value})
     this.props.pointTypeChange(value);
   }
-  onSearchChange = (e, value) => {
-    console.log(e, value);
+  onSearchChange = e => {
+    const {treeDataList,treeData} = this.state
+    const value = e.target.value;
+    const expandedKeys = treeDataList
+     .map(item => {
+       if (item.title.indexOf(value) > -1) {
+         return getParentKey(item.title, treeData);
+       }
+       return null;
+     })
+     .filter((item, i, self) => item && self.indexOf(item) === i);
     this.setState({
-      value
+     expandedKeys,
+     searchValue: value,
+     autoExpandParent: true
    });
  }
 
@@ -80,9 +108,23 @@ class PointLeftTree extends Component {
 
   }
   renderTreeNodes = (data) => {
+    let {searchValue} =this.state
     // console.log(data);
     if (data.length>0) {
       return data.map((item) => {
+        const index = item.name.indexOf(searchValue);
+        const beforeStr = item.name.substr(0, index);
+        const afterStr = item.name.substr(index + searchValue.length);
+        const title =
+          index > -1 ? (
+            <span>
+              {beforeStr}
+              <span style={{ color: '#f50' }}>{searchValue}</span>
+              {afterStr}
+            </span>
+          ) : (
+            <span>{item.name}</span>
+          );
         if (item.children) {
           return (
           <TreeNode
@@ -90,7 +132,7 @@ class PointLeftTree extends Component {
               <div>
                 {item.isRegion?
                 <span>
-                  {item.name}
+                  {title}
                   <span className='icon'>
                     {
                       item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
@@ -107,7 +149,7 @@ class PointLeftTree extends Component {
                     this.props.dragItemChange(item)
                   }}
                 >
-                  {item.name}
+                  {title}
                   <span className='icon'>
                     {
                       item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
@@ -129,46 +171,6 @@ class PointLeftTree extends Component {
             </TreeNode>
           );
         }
-        return <TreeNode
-          key={item.id}
-          title={
-            <div>
-              {item.isRegion?
-              <span>
-                {item.name}
-                <span className='icon'>
-                  {
-                    item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
-                    <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />:
-                    item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
-                    item.position3d?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />:
-                    <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
-                  }
-                </span>
-              </span>:
-              <span
-                draggable={true}
-                onDragStart={() => {
-                  this.props.dragItemChange(item)
-                }}
-              >
-                {item.name}
-                <span className='icon'>
-                  {
-                    item.isRegion?item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
-                    <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />:
-                    item.isBind?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/bindedTip.png' />:
-                    item.position3d?<img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/noSaveTip.png' />:
-                    <img src='/mods/components/3dviewConvertor/assets/convertor/moduleEdit/nobindTip.png' />
-                  }
-                </span>
-              </span>}
-            </div>
-          }
-          dataRef={item}
-          {...item}
-          // onClick={() => {console.log('aaa')}}
-          />;
       });
     }
 
@@ -181,19 +183,14 @@ class PointLeftTree extends Component {
     this.setState({ selectedKeys });
     this.props.selectPointChange(selectItem)
   }
-
-
-
-
   render() {
       let { treeData, checkedPointsKeys,pointTypeArr,pointType } = this.state;
       let { pageType } = this.props;
-      console.log(treeData)
-      console.log(this.props)
      return (
       <div className="leftTree">
           <div className='leftContainer'>
             <div className='topForm'>
+            {(pointType!='') &&
               <Select  onChange={this.onSelectChange} defaultValue={pointType} value={pointType} className='leftSelect'>
                 {
                   pointTypeArr.map(item => {
@@ -201,7 +198,9 @@ class PointLeftTree extends Component {
                   })
                 }
               </Select>
-              <Search className='leftSearch' icon="search" value={''} onChange={this.onSearchChange} onIconClick={this.onSearchChange} />
+              }
+
+              <Search className='leftSearch' icon="search"  onChange={this.onSearchChange} onIconClick={this.onSearchChange} />
             </div>
             <div className='treeBox'>
                 <Tree

mods/components/3dviewConvertor/view/panoramic/statistical/EquipStatusList.js

 import React, { Component } from 'react';
 import { equipStatusListAction } from './../../../services/panoramicService';
+import { equipStatusIconMapper } from './../../../consts/imgStatic';
 
 
+const getIcon = (status)=>{
+  return equipStatusIconMapper[`equip_${status}`];
+};
+
 /**
  * 设备状态消息
  */
@@ -32,7 +37,7 @@ export default class EquipStatusList extends Component {
         return (
           <div key={item.id} className="title-child">
             <div className="title-date" >{item.changeDate}</div>
-            <div className="title-text" >{item.label}</div>
+            <div className="title-text" >{item.label}&nbsp;&nbsp;<img src={getIcon(item.status)} alt="" /></div>
           </div>
         );
       })

mods/components/3dviewConvertor/view/points/marker3DFactory.js

@@ -78,22 +78,16 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
     }
 
     componentWillReceiveProps = nextProps => {
-      // if(nextProps.isEditMode){
-      //   this.markersCache.eachValue(obj=>{
-      //     if(nextProps.selectPoints.type == obj.extData.type && nextProps.selectPoints.id ==obj.extData.id ){
-      //       this.setTwinkleConf(obj);
-      //     }
-      //   });
-      // }
+      if(nextProps.isEditMode){
+        this.markersCache.eachValue(obj=>{
+          // this.setTopCardConf(obj, obj.extData);
+          if(nextProps.selectPoints.type == obj.extData.type && nextProps.selectPoints.id ==obj.extData.id ){
+            this.setTwinkleConf(obj);
+          }
+        });
+      }
       this.setState({ planStarted: nextProps.planStarted });
     }
-    // onEditorChangeDone = (evt) => {
-    //   if (evt && evt.target && evt.target.object){
-    //     const marker = evt.target.object;
-    //     //alert(marker.position.toArray());//(marker.extData
-    //    this.props.addMarker(marker)
-    //   }
-    // }
     componentWillUnmount() {
       this.objAnchorHelper && this.objAnchorHelper.destroy();
     }
@@ -172,17 +166,17 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
       obj.baseObjHelper.titleConfig = {
         // 顶牌平面参数
         planeOptions: {
-          width: 30,
-          height: 15,
+          width: 40,
+          height: 20,
           position: [0,20,0],
           doubleSide: true
         },
         canvasOptions: {
-          font: '34px Microsoft YaHei',
+          font: '28px Microsoft YaHei',
           fillStyle: 'white',
           textBaseline: 'middle',
           textAlign: 'center',
-          textX: 128,
+          textX: 128
         },
         imgWidth: 256,
         imgHeight: 128,