修复缺陷773、774

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

@@ -4,7 +4,6 @@ import { Connect } from 'amos-framework';
 import AmosWebSocket from 'amos-websocket';
 import SysWsURL, { completeToken } from './../consts/wsUrlConsts';
 import SideControl from './sideControl';
-import DataPane from './datapane';
 import globalMsg from './pagefactory/msgFactory';
 import { eventTopics, rulesDataFactory } from './consts';
 import LayerPool from './LayerPool';
@@ -17,7 +16,6 @@ const eventConnect = Connect.eventConnect;
 
 @eventConnect
 class MaskContent extends Component {
-
   constructor(props) {
     super(props);
     this.state = {
@@ -72,7 +70,8 @@ class MaskContent extends Component {
   }
 
   initViewModel = ()=>{
-    this.setState({ activeAction: 'panoramic' });
+    //选中全景监控、隐藏检索查询框
+    this.setState({ activeAction: 'panoramic', searchPaneVisible: false });
   }
 
   render() {
@@ -101,14 +100,6 @@ class MaskContent extends Component {
         transitionAppear: true
       }
     };
-    const datapaneAnim = {
-      animateName: 'zoom-comb-right',
-      visible: !planStarted && !alarmStarted,
-      animateProps: {
-        key: 'animate-datapane', // animate key
-        transitionAppear: true
-      }
-    };
     const layerPoolAnimation = {
       animateName: 'fade',
       visible: alarmStarted,
@@ -123,7 +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} />}
-        { !alarmStarted && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
+        { !alarmStarted && isShowActionBar && <SearchPane visible={searchPaneVisible} focusPosition={focusPosition} changeSearchPaneVisible={() => this.changeSearchPaneVisible} />}
         <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} /> }
@@ -154,7 +145,9 @@ MaskContent.propTypes = {
   headerName: PropTypes.string,
   setHeaderName: PropTypes.string,
   handleExceptModel: PropTypes.func,
-  errorAreaId: PropTypes.number
+  errorAreaId: PropTypes.number,
+  editModelChange: PropTypes.func,
+  focusPosition: PropTypes.func
 };
 
 MaskContent.defaultProps = {

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

@@ -10,11 +10,11 @@ import {
   searchAction,
   msgAction,
   exeRecordAction,
-  trajectoryAction,
   recordAction
 } from './../../services/3dService';
 
 const { TabList, Tab, TabPanel } = Tabs;
+const MsgType = { protal: '巡检',equiment: '设备', riskAlert: '风险' };
 
 const getColumns = (self,retrieveType) => {
   switch (retrieveType) {
@@ -29,23 +29,23 @@ const getColumns = (self,retrieveType) => {
       return [
         { title: '编号',dataIndex: 'code',key: 'code',width: '16.5%' },
         { title: '名称',dataIndex: 'label',key: 'label',width: '16.5%' },
-        { title: '路线',dataIndex: 'routeName',key: 'level',width: '16.5%' },
-        { title: '状态',dataIndex: 'title',key: 'level',width: '16.5%' },
-        { title: '责任人',dataIndex: 'person',key: 'level',width: '16.5%' },
+        { title: '路线',dataIndex: 'routeName',key: 'routeName',width: '16.5%' },
+        { title: '状态',dataIndex: 'title',key: 'title',width: '16.5%' },
+        { title: '责任人',dataIndex: 'person',key: 'person',width: '16.5%' },
         { title: '类别',dataIndex: 'typeName',key: 'typeName',width: '16.5%' }
       ];
     case 'monitorEquipment':
       return [
         { title: '编号',dataIndex: 'code',key: 'code',width: '25%' },
         { title: '名称',dataIndex: 'label',key: 'label',width: '25%' },
-        { title: '监控对象',dataIndex: 'level',key: 'protectObjName',width: '25%' },
+        { title: '监控对象',dataIndex: 'protectObjName',key: 'protectObjName',width: '25%' },
         { title: '类别',dataIndex: 'typeName',key: 'typeName',width: '25%' }
       ];
     case 'video':
       return [
         { title: '编号',dataIndex: 'code',key: 'code',width: '25%' },
         { title: '名称',dataIndex: 'label',key: 'label',width: '25%' },
-        { title: '监控对象',dataIndex: 'level',key: 'protectObjName',width: '25%' },
+        { title: '监控对象',dataIndex: 'protectObjName',key: 'protectObjName',width: '25%' },
         { title: '类别',dataIndex: 'typeName',key: 'typeName',width: '25%' }
       ];
     default:
@@ -60,7 +60,7 @@ const getColumns = (self,retrieveType) => {
 const getMsgColumns = () => {
   return [
     { title: '标题',dataIndex: 'title',key: 'title',width: '15%' },
-    { title: '类型',dataIndex: 'type',key: 'type',width: '15%' },
+    { title: '类型',dataIndex: 'type',key: 'type',width: '15%',render: text => MsgType[text] },
     { title: '时间',dataIndex: 'timeStr',key: 'timeStr',width: '15%' },
     { title: '内容',dataIndex: 'content',key: 'content',width: '55%' }
   ];
@@ -113,35 +113,6 @@ class SearchPane extends Component {
     this.fetchRetrieveData();
   }
 
-  paramsOnChange = (filter) => {
-    const { activeKey } = this.state;
-    if (activeKey === 'search'){
-      this.setState({ filter },this.fetchRetrieveData);
-    } else if (activeKey === 'message'){
-      this.setState({ filter },this.fetchMsgData);
-    } else if (activeKey === 'record'){
-      this.setState({ filter },this.fetchRecordData);
-    } else if (activeKey === 'trajectory'){
-      this.setState({ filter },this.fetchTrajectoryData);
-    }
-  }
-
-
-    /**
-   * 获取表格刷新方法
-   */
-  reload = r => {
-    this.setState(
-      {
-        reload: () => {
-          r();
-          this.setState({ selectedRows: [], selectedRowKeys: [] });
-        }
-      },
-      r()
-    );
-  };
-
   onTabClick = (value) =>{
     this.pageConfig.current = 0;
     if (value === 'search'){
@@ -156,9 +127,35 @@ class SearchPane extends Component {
     this.setState({ activeKey: value ,filter: [] });
   }
 
+  onRetrieveRowDoubleClick = (record) => {
+    // 更新视图数据
+    let views = new Array();
+    if (record.position){
+      record.id = record.id.replace( `${record.type}-` ,'' );
+      views.push(record);
+      let args = {
+        target: views,
+        operateType: operateTypes.POINT_SEARCH
+      };
+      update3DViewData(args);
+      this.props.focusPosition(this.toCameraPosition(record.position));
+    } else {
+      message.danger('坐标未绑定!!!');
+    }
+  }
   getPanelHeight = () => {
     return 700;
   };
+
+  setPageConfig = ({ pageSize, current }) => {
+    if (pageSize !== undefined) {
+      this.pageConfig.pageSize = pageSize;
+    }
+    if (current !== undefined) {
+      this.pageConfig.current = current - 1;
+    }
+  };
+
   //轨迹
   fetchTrajectoryData = () => {
     const { filter } = this.state;
@@ -225,29 +222,31 @@ class SearchPane extends Component {
     });
   }
 
-  setPageConfig = ({ pageSize, current }) => {
-    if (pageSize !== undefined) {
-      this.pageConfig.pageSize = pageSize;
-    }
-    if (current !== undefined) {
-      this.pageConfig.current = current - 1;
-    }
+      /**
+   * 获取表格刷新方法
+   */
+  reload = r => {
+    this.setState(
+      {
+        reload: () => {
+          r();
+          this.setState({ selectedRows: [], selectedRowKeys: [] });
+        }
+      },
+      r()
+    );
   };
 
-  onRetrieveRowDoubleClick = (record) => {
-    // 更新视图数据
-    let views = new Array();
-    if (record.position){
-      record.id = record.id.replace( `${record.type}-` ,'' );
-      views.push(record);
-      let args = {
-        target: views,
-        operateType: operateTypes.POINT_SEARCH
-      };
-      update3DViewData(args);
-      this.props.focusPosition(this.toCameraPosition(record.position));
-    } else {
-      message.danger('坐标未绑定!!!');
+  paramsOnChange = (filter) => {
+    const { activeKey } = this.state;
+    if (activeKey === 'search'){
+      this.setState({ filter },this.fetchRetrieveData);
+    } else if (activeKey === 'message'){
+      this.setState({ filter },this.fetchMsgData);
+    } else if (activeKey === 'record'){
+      this.setState({ filter },this.fetchRecordData);
+    } else if (activeKey === 'trajectory'){
+      this.setState({ filter },this.fetchTrajectoryData);
     }
   }
 
@@ -347,6 +346,9 @@ class SearchPane extends Component {
 }
 
 SearchPane.propTypes = {
+  focusPosition: PropTypes.func,
+  visible: PropTypes.bool,
+  changeSearchPaneVisible: PropTypes.func
 };
 
 export default SearchPane;

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

@@ -14,12 +14,11 @@ import { bizControlsTypes, riskSourceLevel } from './../conf';
 
 const Option = Select.Option;
 
-const MsgTypeEnum = [{ id: 'protal', name: '巡检' }, { id: 'equiment', name: '设备' }, { id: 'risk', name: '风险' }];
+const MsgTypeEnum = [{ id: 'protal', name: '巡检' }, { id: 'equiment', name: '设备' }, { id: 'riskAlert', 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 enterkey = 13;
 /**
  *
  * @class paramsHeader