|
@@ -1,6 +1,6 @@
|
|
import React from 'react';
|
|
import React from 'react';
|
|
import { connect } from 'react-redux';
|
|
import { connect } from 'react-redux';
|
|
-import { getSearchList } from '@store/async-actions/ScaleSearch';
|
|
|
|
|
|
+import { getSearchList } from '@store/async-actions/scaleSearch';
|
|
import ScaleSearch from '@components/ScaleSearch';
|
|
import ScaleSearch from '@components/ScaleSearch';
|
|
import {getScaleInfo} from '../store/async-actions/pushMessage';
|
|
import {getScaleInfo} from '../store/async-actions/pushMessage';
|
|
import {SHOW_TABLE_LIST} from '@store/types/pushMessage';
|
|
import {SHOW_TABLE_LIST} from '@store/types/pushMessage';
|
|
@@ -10,7 +10,7 @@ function mapStateToProps(state) {
|
|
return{
|
|
return{
|
|
searchResult: state.scaleSearch.searchResult,
|
|
searchResult: state.scaleSearch.searchResult,
|
|
formulaResult: pushMessage.formulaResult,//????????
|
|
formulaResult: pushMessage.formulaResult,//????????
|
|
- scaleInfo: pushMessage.scaleInfo,//Á¿±íÄÚÈÝ
|
|
|
|
|
|
+ scaleInfo: pushMessage.scaleInfo,//��������
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|