|
@@ -17,7 +17,7 @@ class HomePage extends Component {
|
|
|
super();
|
|
|
this.state={
|
|
|
timer:null,
|
|
|
- idx:getUrlArgObject('emergency')+''
|
|
|
+ dataEmergency:{}
|
|
|
}
|
|
|
this.setDataIdx = this.setDataIdx.bind(this)
|
|
|
}
|
|
@@ -25,7 +25,6 @@ class HomePage extends Component {
|
|
|
const {setWindow,getChronicList,getConfig} = this.props;
|
|
|
getConfig();
|
|
|
getChronicList&&getChronicList();//获取慢病列表
|
|
|
-
|
|
|
// 获取并监听窗口宽度,用于有横向滚动条时患者信息和打印预览跟随滚动
|
|
|
let width = $(window).width();
|
|
|
let height = $(window).height();
|
|
@@ -54,13 +53,13 @@ class HomePage extends Component {
|
|
|
})
|
|
|
}
|
|
|
render() {
|
|
|
- const {flag} = this.props;
|
|
|
+ const {flag,setPushEmergencyData,sysConfig} = this.props;
|
|
|
return <div className={style['home-page']} onClick={this.props.hideAllDrop}>
|
|
|
<BannerContainer />
|
|
|
{/* <InfoTitle /> */}
|
|
|
<BodyContainer></BodyContainer>
|
|
|
{
|
|
|
- this.state.idx&&data[this.state.idx]?<EmergencyProcedure data={data[this.state.idx]} idx={this.state.idx} setDataIdx={this.setDataIdx}></EmergencyProcedure>:null
|
|
|
+ (JSON.stringify(setPushEmergencyData) != '{}')&&(sysConfig.emergency_show==1)?<EmergencyProcedure data={setPushEmergencyData} idx={setPushEmergencyData.idx} setDataIdx={this.setDataIdx}></EmergencyProcedure>:null
|
|
|
}
|
|
|
<div className={style['mask']} style={{display:flag?"block":"none"}}>
|
|
|
<img src={loading} className={style['load']}/>
|
|
@@ -71,7 +70,9 @@ class HomePage extends Component {
|
|
|
|
|
|
const mapStateToProps = function (state) {
|
|
|
return {
|
|
|
- flag:state.homePage.loadingFlag
|
|
|
+ flag:state.homePage.loadingFlag,
|
|
|
+ setPushEmergencyData: state.pushMessage.setPushEmergencyData || {},
|
|
|
+ sysConfig:state.homePage.sysConfig
|
|
|
}
|
|
|
};
|
|
|
const mapDispatchToProps = function (dispatch) {
|