Kaynağa Gözat

免责声明弹窗层级bug修改

zhouna 6 yıl önce
ebeveyn
işleme
deb33405ce

+ 2 - 2
src/components/Banner/index.jsx

@@ -61,12 +61,12 @@ class Banner extends Component {
     }
   }*/
   render() {
-    const {visible} = this.props;
+    const {visible,disVisible,copyVisible} = this.props;
     const {mode,zIndex} = this.state;
     const {showConfigModal, closeConfigModal, changeType, confirmType} = this;
 
     return (
-      <div className={style["logo"]} style={{zIndex:zIndex}}>
+      <div className={style["logo"]} style={{zIndex:disVisible||copyVisible?40:zIndex}}>
         <img src={logo} />
         <span>|&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]} onClick={showConfigModal}>

+ 18 - 3
src/components/InfoTitle/index.jsx

@@ -1,6 +1,7 @@
 import React, { Component } from "react";
 import PatInfoContainer from '@containers/PatInfoContainer.js';
 import style from "./index.less";
+import { connect } from 'react-redux';
 import historyCase from '@common/images/history.png';
 import health from '@common/images/health.png'
 import store from '@store';
@@ -17,8 +18,9 @@ class InfoTitle extends Component {
         store.dispatch(initItemList());
         store.dispatch(showHistory(true))
     }
-    render() {
-        return <div className={style['title-wrapper']} >
+    render() {console.log(store)
+        const {disVisible,copyVisible} = store.getState().copyRight;console.log(disVisible,copyVisible)
+        return <div className={style['title-wrapper']} style={{zIndex:disVisible||copyVisible?40:204}}>
             <PatInfoContainer />
             <div className={style["operations"]} onClick={this.showHistoryBox}>
                 <span><img src={historyCase} />&nbsp;历史病历</span>
@@ -30,5 +32,18 @@ class InfoTitle extends Component {
         </div>;
     }
 }
+function mapStateToProps(state) {
+  return {
+    disVisible: state.copyRight.disVisible,
+    copyVisible:state.copyRight.copyVisible
+  }
+}
+
+const InfoTitleCont = connect(
+  mapStateToProps,
+  null
+)(InfoTitle);
+
+
 
-export default InfoTitle;
+export default InfoTitleCont;

+ 1 - 1
src/components/PushContainer/index.less

@@ -7,7 +7,7 @@
   padding-top: 20px;
   position: absolute;
   right: 10px;
-  z-index: 205;
+  z-index: 200;
 
   position: fixed;
   top: 50px;

+ 1 - 1
src/containers/CurrentIll.js

@@ -12,7 +12,7 @@ import {getModule} from '@store/async-actions/fetchModules.js';
 import {didPushParamChange} from '@utils/tools.js';
 
 
-function mapStateToProps(state) {console.log(state)
+function mapStateToProps(state) {
   const {homePage} = state;
     return {
         data:state.currentIll.data,//主诉模板

+ 2 - 0
src/containers/TypeConfigContainer.js

@@ -11,6 +11,8 @@ import {Notify} from '@commonComp';
 
 function mapStateToProps(state) {
   return {
+    disVisible:state.copyRight.disVisible,
+    copyVisible:state.copyRight.copyVisible,
     //failed:state.typeConfig.failed,
     typeConfig:state.typeConfig.typeConfig||config.defaultValue.mode,
     visible:state.typeConfig.visible