Commit 40adf2a5 authored by suhuiguang's avatar suhuiguang

1.删除多余action

parent 6f336b34
...@@ -16,6 +16,9 @@ import { ...@@ -16,6 +16,9 @@ import {
const { TabList, Tab, TabPanel } = Tabs; const { TabList, Tab, TabPanel } = Tabs;
const MsgType = { protal: '巡检',equiment: '设备', riskAlert: '风险' }; const MsgType = { protal: '巡检',equiment: '设备', riskAlert: '风险' };
const space = 200;
const defaultHeight = 200;
const getColumns = (self,retrieveType) => { const getColumns = (self,retrieveType) => {
switch (retrieveType) { switch (retrieveType) {
case 'riskSource': case 'riskSource':
...@@ -144,7 +147,7 @@ class SearchPane extends Component { ...@@ -144,7 +147,7 @@ class SearchPane extends Component {
} }
} }
getPanelHeight = () => { getPanelHeight = () => {
return 700; return defaultHeight;
}; };
setPageConfig = ({ pageSize, current }) => { setPageConfig = ({ pageSize, current }) => {
...@@ -252,9 +255,9 @@ class SearchPane extends Component { ...@@ -252,9 +255,9 @@ class SearchPane extends Component {
toCameraPosition = (item) => { toCameraPosition = (item) => {
if (item && item.x){ if (item && item.x){
return { x: item.x , y: item.y + 200 , z: item.z + 200 }; return { x: item.x , y: item.y + space , z: item.z + space };
} else if (item && item[0]){ } else if (item && item[0]){
return { x: item[0] , y: item[1] + 200 , z: item[2] + 200 }; return { x: item[0] , y: item[1] + space , z: item[2] + space };
} else { } else {
return; return;
} }
...@@ -290,7 +293,6 @@ class SearchPane extends Component { ...@@ -290,7 +293,6 @@ class SearchPane extends Component {
<AmosGridTable <AmosGridTable
rowKey="id" rowKey="id"
columns={getColumns(this,retrieveType)} columns={getColumns(this,retrieveType)}
getTableDataAction={()=>{}}
callBack={this.reload} callBack={this.reload}
isPageable isPageable
setPageConfig={this.setPageConfig} setPageConfig={this.setPageConfig}
...@@ -306,7 +308,6 @@ class SearchPane extends Component { ...@@ -306,7 +308,6 @@ class SearchPane extends Component {
<TabPanel activeKey="message"> <TabPanel activeKey="message">
<AmosGridTable <AmosGridTable
columns={getMsgColumns()} columns={getMsgColumns()}
getTableDataAction={()=>{}}
callBack={this.reload} callBack={this.reload}
isPageable isPageable
setPageConfig={this.setPageConfig} setPageConfig={this.setPageConfig}
...@@ -319,7 +320,6 @@ class SearchPane extends Component { ...@@ -319,7 +320,6 @@ class SearchPane extends Component {
<TabPanel activeKey="record"> <TabPanel activeKey="record">
<AmosGridTable <AmosGridTable
columns={getRecordColumns()} columns={getRecordColumns()}
getTableDataAction={()=>{}}
callBack={this.reload} callBack={this.reload}
isPageable isPageable
setPageConfig={this.setPageConfig} setPageConfig={this.setPageConfig}
...@@ -332,7 +332,6 @@ class SearchPane extends Component { ...@@ -332,7 +332,6 @@ class SearchPane extends Component {
<TabPanel activeKey="trajectory"> <TabPanel activeKey="trajectory">
<AmosGridTable <AmosGridTable
columns={getTrajectoryColumns()} columns={getTrajectoryColumns()}
getTableDataAction={()=>{}}
callBack={this.reload} callBack={this.reload}
isPageable isPageable
setPageConfig={this.setPageConfig} setPageConfig={this.setPageConfig}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment