Parcourir la source

预问诊引用,banner样式修改

luolei il y a 5 ans
Parent
commit
012ff6603d

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

@@ -117,9 +117,9 @@ class Banner extends Component {
         <img src={logo} />
         <span className={style["logo-name"]}>|&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]}>
-          {ifShow==1&&deptName=='急诊科'?<div className={style["buon1"]} onClick={this.showHisModal}>
+          {ifShow==1&&deptName=='急诊科'?<div className={`${style["buon1"]} ${style["buon2"]}`} onClick={this.showHisModal}>
                       <img className={`${style["st"]} ${style["his"]}`} src={emergIcon} />
-                      本科室近期全部病历
+                      <i>本科室近期全部病历</i>
                     </div>:''}
           <div className={style.prec} onClick={()=>preShow(show)}>
             <img className={style["st"]} src={prec} alt="预问诊"/>

+ 4 - 2
src/components/Banner/index.less

@@ -11,7 +11,6 @@
     width: 100%;
     top: 0;
     // z-index: 202;
-
     img{
       vertical-align: middle;
       margin: 0 10px 2px 18px;
@@ -33,7 +32,10 @@
         .buon1{
           display: inline-block;
           cursor: pointer;
-          margin-left: 10px;
+          font-weight: bold;
+        }
+        .buon2 {
+          margin-right: 20px;
         }
         .prec {
           display: inline-block;

+ 0 - 2
src/components/PushItems/index.jsx

@@ -287,7 +287,6 @@ class PushItems extends Component {
             hideTips = {this.hideTips}
             showAllName = {showAllName}
             tipsDetails = {tipsDetails}/>}
-            
             {
               (setPushEmergencyIdx+'')&&(sysConfig.emergency_show==1)&&<EmergencyProcedure hideAllDrop={hideAllDrop} windowHeight={windowHeight} data={dataLis[setPushEmergencyIdx]} idx={setPushEmergencyIdx} setDataIdx={this.setDataIdx}></EmergencyProcedure>
             }
@@ -295,5 +294,4 @@ class PushItems extends Component {
     );
   }
 }
-
 export default PushItems;

+ 0 - 2
src/modules/HomePage/index.jsx

@@ -15,7 +15,6 @@ import {CHECKBODY_CLEAR} from '@types/checkBody';
 import style from './index.less';
 import {getInitModules,getChronic,getSystemConfig} from '@store/async-actions/homePage.js';
 import {getPreMsg} from '@store/async-actions/patInfo.js';
-import {tellPred} from '@store/async-actions/preIcss.js';
 import { getUrlArgObject,parseNameVal,pushAllDataList } from "@utils/tools";
 import $ from 'jquery';
 import loading from '@common/images/loading.gif';
@@ -107,7 +106,6 @@ const mapDispatchToProps = function (dispatch) {
         pushAllDataList(1,'push',store.getState().homePage.preData,'preIcss');
         dispatch(billing())
         dispatch({type:SETPRE,show:false});
-        tellPred()
       },
       noReferRecord(){
         dispatch({type:SETPRE,show:false});

+ 1 - 0
src/store/actions/typeConfig.js

@@ -28,6 +28,7 @@ export const setReadMode=(state,action)=>{
   res.readMode = action.readMode||(action.readConfig&&action.readConfig[0]);
   if(action.readConfig){
     res.readConfig = action.readConfig;
+    res.isPreIcss = action.isPreIcss
   }
   return res;
 };

+ 2 - 0
src/store/async-actions/print.js

@@ -4,6 +4,7 @@ import {
 import store from '@store';
 import {MODI_LOADING} from '@store/types/homePage.js';
 import Notify from '@commonComp/Notify';
+import {tellPred} from '@store/async-actions/preIcss.js';
 import {
     getAllDataList,
     getAllDataStringList,
@@ -12,6 +13,7 @@ import {
     filterOtherDataArr
 } from '@utils/tools';
 export const getConceptDetails = (bool) => {
+    tellPred()
     let baseList = store.getState();
     let disLis = baseList.diagnosticList.diagnosticList||[];
     let tmpLis  = [];

+ 1 - 0
src/store/reducers/typeConfig.js

@@ -4,6 +4,7 @@ import config from '@config/index';
 
 const initState = {
   visible: false,
+  isPreIcss:false,//是否为引用预问诊数据
   typeConfig: config.defaultValue,
   readConfig:-1,    //回读/引用回来的配置
   readMode:-1,  //回读/引用回来的模式,-1即没有回读模式

+ 2 - 2
src/utils/tools.js

@@ -157,7 +157,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
       const block = Object.assign(JSON.parse(config.textLabel),{full:true});//空白时保留一个自由文本标签
       //清除已删除标签记录
       localStorage.removeItem('deletedTags');
-      store.dispatch({type: SET_READ_MODE, readMode: -1,readConfig:-1});      //清除回读模式值
+      store.dispatch({type: SET_READ_MODE, readMode: -1,readConfig:-1,isPreIcss:false});      //清除回读模式值
       store.dispatch({type: CLEAR_MAIN_SUIT,data:[],saveText:[],editClear:true,mainIds:[],mainTailIds:[],clearAction:true,symptomFeature:[],chronicDesease:null,mainReadSonM:[]});
         store.dispatch({type: CLEAR_CURRENT_ILL,data:[],saveText:[],editClear:true,symptomIds:[],currReadSonM:[]});
         store.dispatch({type: CLEAROTHERHISTORY,data:[block],isEmpty:true,saveText:[],editClear:true,yjs_1:'',yjs_2:'',yjs_3:'',yjs_4:''});
@@ -211,7 +211,7 @@ const pushAllDataList =(whichSign,action,reData,type) =>{           //回读清
         storageLocal.remove('emrParam');
        // Notify.success('页面已清空')
     }else if(type == 'preIcss'){
-      store.dispatch({type: SET_READ_MODE, readMode: whichSign});
+      store.dispatch({type: SET_READ_MODE, readMode: whichSign,isPreIcss:true});
       store.dispatch({     //主诉文本框
           type: CLEAR_MAIN_SUIT,
           data:[],