修改bug

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

@@ -553,7 +553,7 @@ class View3D extends Component {
     treeData.forEach( t => {
       if(t.isRegion && t.children && t.children.length > 0){
         this.getPointLoop( { markers }, pointType, t.children)
-      }else if(t.position3d){
+      }else if(t.position3d && !t.isRegion){
         t.position = t.position3d;
         t.key = `${t.type}-${t.id}`;
         t.label = t.name;

mods/components/3dviewConvertor/view/panoramic/index.js

@@ -9,7 +9,7 @@ export default class Panoramic extends Component {
   render() {
     return (
       <div className="sys-view-panoramic">
-        <Statistical/>
+        {/* <Statistical/> */}
       </div>
     );
   }

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

@@ -14,6 +14,11 @@ import SysWsURL, { completeToken } from './../../../consts/wsUrlConsts';
  */
 export default class Statistical extends Component {
 
+  constructor(props) {
+    super(props);
+    this.state = {};
+  }
+
   handleData = (data = {}) => {
     console.log('ws data:', data);
     data = JSON.parse(JSON.stringify(data));
@@ -69,7 +74,7 @@ export default class Statistical extends Component {
     const wsURL = completeToken(SysWsURL.convertorView3d);
     return (
       <div className="statistical">
-        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData} reconnect debug />
+        <AmosWebSocket ref={node => this.aws = node} url={wsURL} onMessage={this.handleData.bind(this)} reconnect debug />
         <div className="statistical-left">
           <SafetyIndex ref={node => this.safetyIndex = node} />
           <SafetyExecuteList ref={node => this.safetyExecute = node} />

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

@@ -52,7 +52,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
             marker.object2DPipe.toggleDisplay(true);
           }
           if(marker.extData.type === 'riskSource'){
-            marker.node.baseObjHelper.title = marker.extData.name;
+            marker.baseObjHelper.title = marker.extData.name;
             marker.object2DPipe && marker.object2DPipe.toggleDisplay(true);
           }
         },
@@ -63,7 +63,7 @@ export default function marker3DFactory(WrappedComponent = 'div', options){
             marker.object2DPipe.toggleDisplay(false);
           }
           if(marker.extData.type === 'riskSource'){
-            marker.node.baseObjHelper.title = marker.extData.title;
+            marker.baseObjHelper.title = marker.extData.title;
             marker.object2DPipe.toggleDisplay(false);
           }
         }

mods/components/3dviewConvertor/view/searchPane/index.js

@@ -68,9 +68,9 @@ const getMsgColumns = () => {
 
 const getRecordColumns = () => {
   return [
-    {title: '名称',dataIndex: 'pointName',key: 'pointName',width: '33%'},
-    {title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
-    {title: '路线名称',dataIndex: 'routeName',key: 'status',width: '33%'}
+    {title: '名称',dataIndex: 'fire_Equipment_Name',key: 'name',width: '33%'},
+    {title: '时间',dataIndex: 'create_time',key: 'create_time',width: '33%'},
+    {title: '重点设备',dataIndex: 'equipment_Name',key: 'equipment_Name',width: '33%'}
   ]
 }
 
@@ -78,14 +78,14 @@ const getTrajectoryColumns = () => {
   return [
     {title: '巡检人',dataIndex: 'userName',key: 'userName',width: '33%'},
     {title: '时间',dataIndex: 'checkTime',key: 'checkTime',width: '33%'},
-    {title: '轨迹',dataIndex: 'traName',key: 'traName',width: '33%'}
+    {title: '轨迹',dataIndex: 'pointName',key: 'pointName',width: '33%'}
   ]
 }
 
 const tabs = [
   { id: '1', key: 'search', closable: false, title: '检索' },
   { id: '2', key: 'message', closable: false, title: '消息' },
-  { id: '3', key: 'record', closable: false, title: '预案' },
+  { id: '3', key: 'record', closable: false, title: '步骤' },
   { id: '4', key: 'trajectory', closable: false, title: '轨迹' },
 ];
 
@@ -164,14 +164,14 @@ class SearchPane extends Component {
   //轨迹
   fetchTrajectoryData = () => {
     const { filter } = this.state;
-    trajectoryAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
+    recordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
       this.setState({trajectoryDataList:d.content,totalCount: d.totalElements});
     });
   }
-  //预案
+  //步骤
   fetchRecordData = () => {
     const { filter } = this.state;
-    recordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
+    exeRecordAction(filter, this.pageConfig.current, this.pageConfig.pageSize).then(d => {
       this.setState({recordDataList:d.content,totalCount: d.totalElements});
     });
   }

mods/components/3dviewConvertor/view/searchPane/paramsHeader.js

@@ -139,6 +139,7 @@ class paramsHeader extends Component {
     }
   }
 
+  //检索
   getSearchContent = () => {
     const { showRiskLevel, showImpEquiList, impEquiList,filter  } = this.state;
     let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
@@ -187,6 +188,7 @@ class paramsHeader extends Component {
 
   }
 
+  //消息
   getMessageContent = () => {
     const { filter } = this.state;
     return (<Group style={groupStyle}>
@@ -220,22 +222,23 @@ class paramsHeader extends Component {
 
   }
 
+  //步骤
   getRecordContent = () =>{
-    const { recordFilter } = this.state;
+    const { recordFilter,impEquiList  } = this.state;
     return (<Group style={groupStyle}>
-      {/* <Select
+      <Select
         key="recordImpl"
         style={selectStyle}
         data={impEquiList}
         renderOption={item => <Option key={item.id+item.name} value={item.id}>{item.name}</Option>}
         defaultOption={<Option>重点设备</Option>}
         onChange={(v) => this.paramsTypeonChange('equipmentId', v , SingleQueryEnum.EQUAL)}
-      /> */}
+      />
       <div className="params-input" style={inputStyle}>
         <Input
           key="recordTextValue"
           value={this.state.recordTextValue}
-          onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE,'record')}
+          onChange={(e) => this.paramsTypeonChange('contingencyName', e.target.value, SingleQueryEnum.LIKE,'record')}
           placeholder="输入关键字"
         />
         <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)}/>
@@ -246,11 +249,12 @@ class paramsHeader extends Component {
         style={datePickerStyle}
         placeholder="时间"
         format="YYYY/MM/DD"
-        onChange={(v) => this.paramsTypeonChange('checkTime', v, SingleQueryEnum.EQUAL)}
+        onChange={(v) => this.paramsTypeonChange('createTime', v, SingleQueryEnum.EQUAL)}
         />
     </Group>);
   }
 
+  //轨迹
   getTrajectoryContent = () => {
     const { statusList,recordFilter } = this.state;
     return (<Group style={groupStyle}>