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

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

@@ -67,7 +67,7 @@ export default {
     search: require('../assets/convertor/3dview/datapanel/search.png'),
     smilingFace: require('../assets/convertor/3dview/datapanel/smilingFace.png'),
     user: require('../assets/convertor/3dview/datapanel/user.png'),
-    searchPane: require('../assets/convertor/3dview/actionbars/chaxun.png'),
+    searchPane: require('../assets/convertor/3dview/actionbars/chaxun.png')
   },
   markers: {
     riskSource_0: require('../assets/convertor/3dview/markers/risk-0.png'),

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

-.action-pane-data{
+.action-pane-data {
   position: absolute;
   bottom: 5%;
   left: 50%;
@@ -7,46 +7,46 @@
   .action-list {
     height: 40px;
     padding: 0 1rem;
+    background-color: rgba(216, 216, 216, 0.24);
+    border: 1px solid rgba(146, 149, 151, 1);
     border-radius: 6px;
-        background:rgba(216,216,216,0.24);
-        border:1px solid rgba(146,149,151,1);
 
-        .action-item{
+    .action-item {
       float: left;
       width: 40px;
       height: 38px;
       text-align: center;
-            cursor: pointer ;
-            border:1px solid rgba(146,149,151,1);
+      cursor: pointer;
+      border: 1px solid rgba(146, 149, 151, 1);
 
-            .action-item-title{
-                color: #e0e0e0;
+      .action-item-title {
         position: absolute;
         top: -20px;
-                white-space: nowrap;
         width: 51px;
-                -webkit-transform-origin-x: 0;
-                -webkit-transform: scale(0.80);
+        color: #e0e0e0;
         text-align: center;
+        white-space: nowrap;
+        -webkit-transform-origin-x: 0;
+        -webkit-transform: scale(0.8);
       }
 
-            .action-item-content{
-                text-align: center;
+      .action-item-content {
         position: relative;
         width: 100%;
         height: 100%;
+        text-align: center;
 
-                .action-item-icon{
-                    margin: 8px;
+        .action-item-icon {
+          position: relative;
           width: 21px;
           height: 21px;
-                    position: relative;
+          margin: 8px;
         }
       }
     }
 
-        .action-active{
-            background: linear-gradient(180deg,rgba(0,96,154,0.8) 0%,rgba(0,54,105,0.5) 100%);
+    .action-active {
+      background: linear-gradient(180deg, rgba(0, 96, 154, 0.8) 0%, rgba(0, 54, 105, 0.5) 100%);
     }
   }
 }

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

 .ModuleEditPage {
   position: relative;
   height: 100%;
-    ::-webkit-scrollbar {             /* 血槽宽度 */
-      width:5px;
+  ::-webkit-scrollbar {
+    /* 血槽宽度 */
+    width: 5px;
     height: 5px;
     background-color: rgba(10, 53, 62, 1);
     border-radius: 5px;
   }
-    ::-webkit-scrollbar-thumb {           /* 拖动条 */
+  ::-webkit-scrollbar-thumb {
+    /* 拖动条 */
     border-radius: 5px;
     background-color: rgba(255, 255, 255, 0.4);
   }
-    ::-webkit-scrollbar-track {          /* 背景槽 */
-      background-color:rgba(17, 44, 88, 0.2);
+  ::-webkit-scrollbar-track {
+    /* 背景槽 */
+    background-color: rgba(17, 44, 88, 0.2);
   }
 
   .topBox {
@@ -24,8 +27,8 @@
       display: inline-block;
     }
     .editTitle {
-            width:257px;
-            height:55px;
+      width: 257px;
+      height: 55px;
       background: url('../assets/convertor/moduleEdit/title.png') no-repeat 100% 100%;
       // opacity:0.4;
       font-size: 24px;
@@ -61,7 +64,7 @@
       width: 177px;
       height: 42px;
       line-height: 42px;
-            background: rgba(46,217,239,0.2);
+      background: rgba(46, 217, 239, 0.2);
       // border: 2px solid #2ED9EF;
       margin: 0 10px;
       text-align: center;
@@ -81,10 +84,9 @@
     .editPointBtn.selected {
       background: url('../assets/convertor/moduleEdit/poingBtn_select.png') no-repeat 100% 100%;
     }
-
   }
 
-// 左侧树
+  // 左侧树
   .leftTree {
     position: absolute;
     top: 0;
@@ -110,11 +112,9 @@
         border: none;
         line-height: 31px;
         padding: 5px;
-                color: #F0DF2D;
-
+        color: #f0df2d;
       }
 
-
       .leftSearch {
         height: 33px;
         line-height: 33px;
@@ -126,10 +126,9 @@
           color: #fff;
         }
         .amosicon-search {
-                    color: #2ED9EF;
+          color: #2ed9ef;
         }
       }
-
     }
     .treeBox {
       height: calc(100% - 132px);
@@ -168,7 +167,7 @@
     }
   }
 
-// 右侧面板
+  // 右侧面板
   .rightEditPanel {
     position: absolute;
     top: 0;
@@ -185,7 +184,7 @@
       border: 1px solid rgba(46, 217, 239, 0.59);
       padding: 12px;
       color: #fff;
-            .basic-demo{
+      .basic-demo {
         height: calc(100% - 53px);
         overflow-y: auto;
       }
@@ -193,27 +192,26 @@
         color: #fff;
       }
       .topForm {
-              .rightTitle{
+        .rightTitle {
           margin-left: -15px;
-                .titleText{
+          .titleText {
             margin-left: 5px;
           }
         }
-              .amos-input{
-                background-color: rgba(4, 30, 36,0.4);
+        .amos-input {
+          background-color: rgba(4, 30, 36, 0.4);
           border-radius: 1px;
           border: solid 1px rgba(46, 217, 239, 0.59);
           font-size: 14px;
-                color:#fff;
+          color: #fff;
         }
-              .moduleTitle{
+        .moduleTitle {
           height: 50px;
           display: flex;
           align-items: center;
-                .titleText{
+          .titleText {
             margin-left: 5px;
           }
-
         }
         height: calc(100% - 48px);
         padding-left: 20px;
@@ -223,16 +221,16 @@
         .amos-select {
           width: 100%;
         }
-                .radio-text{
-                  color:#fff
+        .radio-text {
+          color: #fff;
         }
       }
     }
     .bottomBtns {
       position: absolute;
-            bottom:15px;
+      bottom: 15px;
       padding-top: 15px;
-            left:50%;
+      left: 50%;
       margin-left: -100px;
       .sureBtn {
         width: 100px;
@@ -261,42 +259,41 @@
     left: 50%;
   }
 }
-.amos-select-options{
-  .selectOption{
-    color:#fff;
+.amos-select-options {
+  .selectOption {
+    color: #fff;
     background-color: rgba(10, 53, 62, 0.8);
   }
-  .selectOption:hover{
-    color:#F0DF2D;
-    background-color: rgba(10, 53, 62, 0.8)
+  .selectOption:hover {
+    color: #f0df2d;
+    background-color: rgba(10, 53, 62, 0.8);
   }
-
 }
-.pormpt-modal{
-  height:100%;
-  .amos-modal-container{
+.pormpt-modal {
+  height: 100%;
+  .amos-modal-container {
     background-image: url('../assets/convertor/3dview/promptModal.png');
     background-repeat: no-repeat;
     background-size: 100% 100%;
-    height:253px;
+    height: 253px;
     width: 392px !important;
     background-color: transparent;
     box-shadow: none;
-    .amos-modal-content{
+    .amos-modal-content {
       width: 100%;
       height: 100%;
       color: #fff;
       font-size: 20px;
       font-weight: normal;
-      .prompt-content{
+      .prompt-content {
         width: 100%;
         height: 100%;
-        padding-top:40px ;
-        display:flex;
+        padding-top: 40px;
+        display: flex;
         flex-direction: column;
         justify-content: space-around;
         align-items: center;
-        .prompt-buttons{
+        .prompt-buttons {
           span {
             display: inline-block;
             width: 71px;
@@ -305,24 +302,22 @@
             margin: 0 10px;
             text-align: center;
           }
-          .promptOk{
+          .promptOk {
             background: url('../assets/convertor/3dview/promptOk.png') no-repeat 100% 100%;
           }
           .promptNo {
             background: url('../assets/convertor/3dview/promptNo.png') no-repeat 100% 100%;
           }
-          .promptSave{
+          .promptSave {
             background: url('../assets/convertor/3dview/promptSave.png') no-repeat 100% 100%;
           }
-          .promptCancel{
+          .promptCancel {
             background: url('../assets/convertor/3dview/promptCancel.png') no-repeat 100% 100%;
           }
         }
       }
     }
   }
-
-
 }
 // .rayd-modal{
 //   background-color:  rgba(25, 86, 147, 0.6) !important;

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

@@ -48,7 +48,7 @@
   .carousel-img {
     width: 100%;
     height: 100%;
-    padding: 5px
+    padding: 5px;
   }
 
   .carousel-indicators {
@@ -138,9 +138,7 @@
     float: left;
     width: 131px;//9.84%;
     height: 40px;
-    //background: $biz-table-title-color;//#333;
     background: rgba(25, 86, 147, 1);
-   // border-left: 1px solid $core-border-color;
     box-sizing: border-box;
     flex: 1;
   }

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

@@ -56,7 +56,7 @@ class MaskContent extends Component {
       this.setState({ activeAction: type });
     }
     this.props.onActionItemClick && this.props.onActionItemClick(type, label, showLabel);
-    if(type === "search"){
+    if (type === 'search'){
       this.changeSearchPaneVisible();
     }
   }

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

@@ -136,12 +136,18 @@ class PointsPool extends Component {
           markers={markers.pool}
           onCreated={(val) => this.onMarkersCreated('pool', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.hydrant}
           onCreated={(val) => this.onMarkersCreated('hydrant', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
@@ -157,12 +163,18 @@ class PointsPool extends Component {
           markers={markers.fireChamber}
           onCreated={(val) => this.onMarkersCreated('fireChamber', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <FireResourcePoint
           {...rest}
           markers={markers.fireFoamRoom}
           onCreated={(val) => this.onMarkersCreated('fireFoamRoom', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         {!hideDetector ?
           <FireResourcePoint
@@ -204,6 +216,9 @@ class PointsPool extends Component {
           markers={markers.fireCar}
           onCreated={(val) => this.onMarkersCreated('fireCar', val)}
           isEditMode={this.props.isEditMode}
+          addMarker={this.addMarker}
+          stagePilot={this.props.stagePilot}
+          selectPoints={this.props.selectPoints}
         />
         <PointStatistics
           {...rest}

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

 import React, { Component } from 'react';
-import { Modal ,Button} from 'amos-framework';
+import { Modal } from 'amos-framework';
+
 class PromptModal extends Component {
   constructor(props) {
     super(props);
-    this.state = {
-
-    };
-  }
-  cancel = ()=>{
-    const {isback} =this.props.promptData
-    this.props.closePromptModal()
-    if(isback){
-      this.props.handleOutExceptModel()
-    }
+    this.state = {};
   }
-  saveData=()=>{
-    const {isback,type} =this.props.promptData
-    if(isback){
-      this.props.handleOutExceptModel()
+  cancel = () => {
+    const { isback } = this.props.promptData;
+    this.props.closePromptModal();
+    if (isback) {
+      this.props.handleOutExceptModel();
     }
-    this.props.closePromptModal()
-    if(type=='region')
-    {
-      this.props.saveAreaData()
-    }else{
-      this.props.savePointData()
+  };
+  saveData = () => {
+    const { isback, type } = this.props.promptData;
+    if (isback) {
+      this.props.handleOutExceptModel();
     }
-
+    this.props.closePromptModal();
+    if (type === 'region') {
+      this.props.saveAreaData();
+    } else {
+      this.props.savePointData();
     }
+  };
   render() {
-const {promptData} =this.props
+    const { promptData } = this.props;
     return (
       <Modal
         visible={promptData.promptvisible}
         className={'pormpt-modal'}
-          content={<div className ='prompt-content'>
+        content={
+          <div className="prompt-content">
             <div>{promptData.promptContent}</div>
-                    {promptData.btnType =='isOk'?
-                    <div className='prompt-buttons'>
+            {promptData.btnType == 'isOk' ? (
+              <div className="prompt-buttons">
                 <span className={'promptOk'} onClick={this.saveData} />
                 <span className={'promptNo'} onClick={this.cancel} />
-                    </div>:
-                    <div className='prompt-buttons'>
+              </div>
+            ) : (
+              <div className="prompt-buttons">
                 <span className={'promptSave'} onClick={this.saveData} />
                 <span className={'promptCancel'} onClick={this.cancel} />
               </div>
-                    }
+            )}
           </div>
         }
         noDefaultFooter

mods/components/3dviewConvertor/view/exceptionArea/ExceptionArea.js

@@ -44,10 +44,13 @@ class ExceptionArea extends Component {
   }
 
   onMarkerClick = (marker) => {
+    console.log(marker);
     const { extData } = marker;
     this.props.handleExceptModel && this.props.handleExceptModel('into_except_model',extData.id);
+    this.props.focusPosition(this.toCameraPosition(extData.position));
   }
 
+
   setTopCardConf = (obj,{ safetyIndex })=>{
     obj.baseObjHelper.titleConfig = {
       // 顶牌平面参数
@@ -71,6 +74,16 @@ class ExceptionArea extends Component {
     obj.baseObjHelper.title = safetyIndex;
   }
 
+  toCameraPosition = (item) => {
+    if (item && item.x){
+      return { x: item.x , y: item.y + 200 , z: item.z + 200 };
+    } else if (item && item[0]){
+      return { x: item[0] , y: item[1] + 200 , z: item[2] + 200 };
+    } else {
+      return;
+    }
+
+  }
   markerCreated = ({ markersCache }) => {
     this.markersCache = markersCache;
     markersCache.eachValue(item=>{
@@ -97,7 +110,8 @@ class ExceptionArea extends Component {
 
 ExceptionArea.propTypes = {
   markers: PropTypes.array,
-  handleExceptModel: PropTypes.func
+  handleExceptModel: PropTypes.func,
+  focusPosition: PropTypes.func
 };
 
 export default ExceptionArea;

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

+/* eslint-disable react/prop-types */
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Connect, Tree, Select, Search, Button } from 'amos-framework';
@@ -33,11 +34,11 @@ class PointLeftTree extends Component {
       autoExpandParent: true,
       checkedKeys: [],
       selectedKeys: [],
-    treeData:[],
-    pointTypeArr:[],
-    pointType:'',
-    treeDataList : [],
-    searchValue:''
+      treeData: [],
+      pointTypeArr: [],
+      pointType: '',
+      treeDataList: [],
+      searchValue: ''
     };
 
   }
@@ -53,27 +54,22 @@ class PointLeftTree extends Component {
     // console.log(this.props)
   }
 
-  componentWillUnmount() {
-
-  }
   componentWillReceiveProps(nextProps) {
-      console.log(nextProps)
-      let {treeData,pointTypeArr,treeDataList} = nextProps;
+    console.log(nextProps);
+    let { treeData,treeDataList } = nextProps;
     this.setState({
       treeData,
-        treeDataList,
-        //pointTypeArr,
-        //pointType: pointTypeArr[0]?pointTypeArr[0].code:''
-      })
+      treeDataList
+    });
   }
 
   onSelectChange = (value, item) =>{
     console.log(value, item);
-    this.setState({pointType:value})
+    this.setState({ pointType: value });
     this.props.pointTypeChange(value);
   }
   onSearchChange = e => {
-    const {treeDataList,treeData} = this.state
+    const { treeDataList,treeData } = this.state;
     const value = e.target.value;
     const expandedKeys = treeDataList
      .map(item => {
@@ -91,9 +87,6 @@ class PointLeftTree extends Component {
   }
 
   onExpand = (expandedKeys) => {
-    //console.log('onExpand', arguments);
-    // if not set autoExpandParent to false, if children expanded, parent can not collapse.
-    // or, you can remove all expanded children keys.
     this.setState({
       expandedKeys,
       autoExpandParent: false
@@ -107,10 +100,11 @@ class PointLeftTree extends Component {
 
 
   }
+  // eslint-disable-next-line react/sort-comp
   renderTreeNodes = (data) => {
-    let {searchValue} =this.state
+    let { searchValue } = this.state;
     // console.log(data);
-    if (data.length>0) {
+    if (data.length > 0) {
       return data.map((item) => {
         const index = item.name.indexOf(searchValue);
         const beforeStr = item.name.substr(0, index);
@@ -165,8 +159,9 @@ class PointLeftTree extends Component {
               key={item.id}
               dataRef={item}
               onDragStart={() => {
-              this.props.dragItemChange(item)
-            }}>
+                this.props.dragItemChange(item);
+              }}
+            >
               {this.renderTreeNodes(item.children)}
             </TreeNode>
           );
@@ -184,18 +179,17 @@ class PointLeftTree extends Component {
     this.props.selectPointChange(selectItem);
   }
   render() {
-      let { treeData, checkedPointsKeys,pointTypeArr,pointType } = this.state;
-      let { pageType } = this.props;
+    let { treeData,pointTypeArr,pointType } = this.state;
     return (
       <div className="leftTree">
         <div className='leftContainer'>
           <div className='topForm'>
-            {(pointType!='') &&
+            {(pointType !== '') &&
 
             <Select  onChange={this.onSelectChange} defaultValue={pointType} value={pointType} className='leftSelect'>
               {
-                  pointTypeArr.map(item => {
-                    return (<Option className='selectOption' value={item.code} >{item.name}</Option>)
+                  pointTypeArr.map((item )=> {
+                    return (<Option key={item} className='selectOption' value={item.code} >{item.name}</Option>);
                   })
                 }
             </Select>
@@ -205,14 +199,10 @@ class PointLeftTree extends Component {
           </div>
           <div className='treeBox'>
             <Tree
-                    // checkable
-                    // checkStrictly
-                    selectable={true}
+              selectable
               onExpand={this.onExpand}
               expandedKeys={this.state.expandedKeys}
               autoExpandParent={this.state.autoExpandParent}
-                    // onCheck={this.onCheck}
-                    // checkedKeys={checkedPointsKeys}
               onSelect={this.onTreeSelect}
               selectedKeys={this.state.selectedKeys}
               blockNode
@@ -224,13 +214,15 @@ class PointLeftTree extends Component {
             <Button
               className='sureBtn'
               onClick={() => {
-                    this.props.savePointData()
-                }} ></Button>
+                this.props.savePointData();
+              }}
+            />
             <Button
               className='deleteBtn'
               onClick={() => {
-                    this.props.deletePointBind()
-                }} ></Button>
+                this.props.deletePointBind();
+              }}
+            />
           </div>
         </div>
 

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

@@ -89,7 +89,6 @@ class RightEditRegionPanel extends Component {
     this.form.validate((valid, dataValues, errors) => {
       console.log('返回内容:', dataValues, valid, errors);
       if (valid) {
-
         let routePathData=[ {
           riskSourceId: detailData.id,
           routePath: JSON.stringify({
@@ -106,8 +105,10 @@ class RightEditRegionPanel extends Component {
           })
         }
         this.props.changeRoutePath(routePathDataNode);
+        this.props.closeRightPanel()
       } else {
         console.log('error submit!!');
+        this.props.closeRightPanel()
         return false;
       }
     });

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

@@ -4,7 +4,7 @@ import { Button, Input, Select, Group } from 'amos-framework';
 import { SingleQueryEnum } from 'amos-processor/lib/config/queryEnum';
 import { trim } from 'amos-tool';
 import { DatePicker } from 'amos-antd';
-import moment from "moment";
+import moment from 'moment';
 import imgStatic from './../../consts/imgStatic';
 import {
   getImpEquipmentAction,
@@ -16,9 +16,9 @@ const Option = Select.Option;
 
 const MsgTypeEnum = [{ id: 'protal', name: '巡检' }, { id: 'equiment', name: '设备' }, { id: 'risk', name: '风险' }];
 const groupStyle = { display: 'unset', width: '100%' };
-const selectStyle = { width: '25%', minWidth: '20%', marginRight:'14px' };
-const inputStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight:'14px' };
-const datePickerStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight:'14px' };
+const selectStyle = { width: '25%', minWidth: '20%', marginRight: '14px' };
+const inputStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight: '14px' };
+const datePickerStyle = { width: '30%', minWidth: '20%', height: '28px', marginRight: '14px' };
 const enterkey = 13;
 /**
  *
@@ -45,7 +45,7 @@ class paramsHeader extends Component {
       impEquiList: [],
       filter: [],
       recordFilter: [],
-      statusList: [],
+      statusList: []
     };
   }
 
@@ -61,10 +61,10 @@ class paramsHeader extends Component {
         msgTextValue: undefined,
         recordTextValue: undefined,
         filter: [],
-        recordFilter: [],
-      })
+        recordFilter: []
+      });
+    }
   }
-}
 
   onChange = (e) => {
     this.setState({ value: e.target.value });
@@ -74,9 +74,9 @@ class paramsHeader extends Component {
     let showRiskLevel = false;
     let showImpEquiList = false;
 
-    if(value === 'riskSource'){
+    if (value === 'riskSource'){
       showRiskLevel = true;
-    }else if(value === 'monitorEquipment'){
+    } else if (value === 'monitorEquipment'){
       showImpEquiList = true;
     }
     this.setState({ showRiskLevel, showImpEquiList });
@@ -85,8 +85,8 @@ class paramsHeader extends Component {
 
   onPamarmsChange = (name,value) => {
     let { filter } = this.state;
-    if(name === 'time'){
-      value = value == null ? '' : moment(value).format("YYYY-MM-DD");
+    if (name === 'time'){
+      value = value == null ? '' : moment(value).format('YYYY-MM-DD');
     }
     if (value) {
       const flag = filter.some(e => {
@@ -99,19 +99,19 @@ class paramsHeader extends Component {
     } else {
       filter = filter.filter(e => e.name !== name);
     }
-    if(name === 'inputText'){
+    if (name === 'inputText'){
       this.setState({ textValue: value,filter });
-    }else if(name === 'title'){
+    } else if (name === 'title'){
       this.setState({ msgTextValue: value,filter });
-    }else{
+    } else {
       this.setState({ filter }, this.props.paramsOnChange(filter));
     }
   }
 
   paramsTypeonChange = (name,value,type,key) => {
-    let {recordFilter} = this.state;
-    if(name === 'checkTime'){
-      value = value == null ? '' : moment(value).format("YYYY-MM-DD");
+    let { recordFilter } = this.state;
+    if (name === 'checkTime'){
+      value = value == null ? '' : moment(value).format('YYYY-MM-DD');
     }
     if (value) {
       const flag = recordFilter.some(e => {
@@ -125,16 +125,15 @@ class paramsHeader extends Component {
     } else {
       recordFilter = recordFilter.filter(e => e.name !== name);
     }
-    debugger;
-    if(name === 'contingencyName'){
-      this.setState({recordTextValue:value,recordFilter})
-    }else if(name === 'pointName'){
-      if(key === 'record'){
-        this.setState({ recordTextValue:value,recordFilter });
-      }else{
+    if (name === 'contingencyName'){
+      this.setState({ recordTextValue: value,recordFilter });
+    } else if (name === 'pointName'){
+      if (key === 'record'){
+        this.setState({ recordTextValue: value,recordFilter });
+      } else {
         this.setState({ trajectoryTextValue: value,recordFilter });
       }
-    }else{//不为input时直接查询
+    } else {//不为input时直接查询
       this.setState({ recordFilter }, this.props.paramsOnChange(recordFilter));
     }
   }
@@ -142,8 +141,8 @@ class paramsHeader extends Component {
   //检索
   getSearchContent = () => {
     const { showRiskLevel, showImpEquiList, impEquiList,filter  } = this.state;
-    let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight:'14px' };
-    let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight:'14px' };
+    let levelStyle = { width: '20%', minWidth: '15%', height: '28px', marginRight: '14px' };
+    let implStyle = { width: '35%', minWidth: '20%', height: '28px', marginRight: '14px' };
     return (<Group style={groupStyle}>
       <Select
         key="searchType"
@@ -160,7 +159,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('inputText',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
+        <img className="params-input-img" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)} />
       </div>
       {
         showRiskLevel &&
@@ -207,7 +206,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.onPamarmsChange('title',e.target.value)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={() => this.props.paramsOnChange(filter)} />
       </div>
       <DatePicker
         key="time"
@@ -230,7 +229,7 @@ class paramsHeader extends Component {
         key="recordImpl"
         style={selectStyle}
         data={impEquiList}
-        renderOption={item => <Option key={item.id+item.name} value={item.id}>{item.name}</Option>}
+        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)}
       />
@@ -241,7 +240,7 @@ class paramsHeader extends Component {
           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)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=> this.props.paramsOnChange(recordFilter)} />
       </div>
       <DatePicker
         key="createTime"
@@ -273,7 +272,7 @@ class paramsHeader extends Component {
           onChange={(e) => this.paramsTypeonChange('pointName', e.target.value, SingleQueryEnum.LIKE)}
           placeholder="输入关键字"
         />
-        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)}/>
+        <img className="params-input-img1" src={imgStatic.datapane.searchPane} alt="" onClick={()=>this.props.paramsOnChange(recordFilter)} />
       </div>
       <DatePicker
         key="createTime"
@@ -288,13 +287,13 @@ class paramsHeader extends Component {
 
   getContent = () =>{
     const { activeKey } = this.props;
-    if(activeKey === 'search'){
+    if (activeKey === 'search'){
       return this.getSearchContent();
-    }else if(activeKey === 'message'){
+    } else if (activeKey === 'message'){
       return this.getMessageContent();
-    }else if(activeKey === 'record'){
+    } else if (activeKey === 'record'){
       return this.getRecordContent();
-    }else{
+    } else {
       return this.getTrajectoryContent();
     }
   }