Merge remote-tracking branch 'origin/unLogo0718'

src/components/Banner/index.jsx

@@ -11,7 +11,7 @@ import {Notify} from '@commonComp';
 import Emergency from '@containers/Emergency';
 import PreInIcss from '@containers/PreInIcss';
 import {getAllHis} from '@store/async-actions/fetchModules.js';
-import {timestampToTime,getCurrentDate} from '@utils/tools.js';
+import {timestampToTime,getCurrentDate,getUrlArgObject} from '@utils/tools.js';
 import {dragBox} from '@utils/drag';
 import {CLEAR_COMSYMPTOMS} from '@store/types/mainSuit';
 import { GET_PREC_LIST,SET_PREC_SHOW } from "@store/types/preIcss";
@@ -195,6 +195,7 @@ class Banner extends Component {
     e.stopPropagation()
   }
   render() {
+      const hideLg  = getUrlArgObject("hideLg");
     const {visible,pre,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show,hospitalMsg,curHos} = this.props;
     const {emergencyBox,showHos,showM,hosName,hosNameTmp} = this.state;
     const {showConfigModal, changeType, showHospitalLis,showCheckModal,showConnect} = this;
@@ -202,8 +203,8 @@ class Banner extends Component {
     const disabled = !(hasMain||hasCurrent||hasOther);
     return (
       <div className={style["logo"]}>
-        <img src={logo} onClick={this.handleEmbedPush}/>
-        <span className={style["logo-name"]} onClick={this.handleEmbedPush}>|&nbsp;&nbsp;智能辅助临床决策系统</span>
+          {hideLg?'':<img src={logo} onClick={this.handleEmbedPush}/>}
+        <span className={style["logo-name"]} onClick={this.handleEmbedPush}>{hideLg?'':`|`}&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]}>
           {ifShow==1&&deptName=='急诊科'?<div className={`${style["buon1"]} ${style["buon2"]}`} onClick={this.showHisModal}>
                       <img className={`${style["st"]} ${style["his"]}`} src={emergIcon} />

src/components/PushData/index.jsx

@@ -3,6 +3,7 @@ import style from './index.less';
 import arrowIcon from '@images/arrowIcon.png';
 import pushEmpty from '@images/pushEmpty.png';
 import {pushPage2} from '@utils/config';
+import {getUrlArgObject} from '@utils/tools';
 import {dragBox} from '@utils/drag';
 import hideConfirm from '@images/hideConfirm.png';
 
@@ -36,19 +37,19 @@ class PushData extends Component{
       }
 
     render(){
-        const {hashNum } = this.state
-        const {mrId,isTcm,planCode,showPushData,togglePushData ,windowWidth,windowHeight,hospitalId} = this.props
+        const hideLg  = getUrlArgObject("hideLg");
+        const {mrId,isTcm,planCode,showPushData ,windowWidth,hospitalId} = this.props
         const pushBoxPos = windowWidth>1200?(windowWidth-1200)/2:0;
-        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&isTcm=${isTcm}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`;
+        const url =`${pushPage2}?mrId=${mrId.indexOf("reStart") > - 1?"":mrId}&isTcm=${isTcm}&planCode=${planCode}&hospitalId=${hospitalId}${mrId.indexOf("reStart") > - 1 ? '&reStart='+Math.random():""}`+(hideLg?`&hideLg=1`:``);
         return <div >
             {!showPushData&&<div className={style['slideButton']} style={{right:pushBoxPos+'px'}} onClick={this.showPushData}>
-                朗通智能提醒 
+                {hideLg?'智能提醒':'朗通智能提醒'}
                 <img class={style['arrowIcon']} src={arrowIcon} alt=""/>
             </div>}
             {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:pushBoxPos+'px'}} onWheel={this.handleScroll.bind(this)}>
                 {/* <div id="dragModalTitle"  className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>收起</span></div> */}
-                <div className={style['pushDataTitle']}>朗通智能提醒 <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
-                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="348" height="507" onWheel={this.handleScroll.bind(this)}></iframe>}
+                <div className={style['pushDataTitle']}>{hideLg?'智能提醒':'朗通智能提醒'} <span className={style['pushDataHide']} onClick={this.hidePushData}>    <img class={style['hideConfirm']} src={hideConfirm} alt=""/></span></div>
+                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="400" height="557" onWheel={this.handleScroll.bind(this)}></iframe>}
                 {!hospitalId&&<div className={style['pushEmpty']}>
                         <div className={style['pushEmptyBox']}>
                             <img className={style['pushEmptyImg']} src={pushEmpty} alt=""/>

src/components/PushData/index.less

@@ -36,7 +36,7 @@
     margin: 15px 0 0 0;
 }
 .pushWrapper{
-    width:350px;
+    width:400px;
     // height:600px;
     border-radius:4px;
     border: 1px solid #E6E6E6;

src/store/async-actions/homePage.js

@@ -180,9 +180,13 @@ export const getCommonData = (dispatch) => {
 
 // 医院列表
 export const getHosData = (dispatch) => {
+  const hideLg = getUrlArgObject("hideLg");  //隐藏logo时朗通显示为默认
   return (dispatch) => {
       json(api.getAllEnableHospitalInfo,{}).then((res)=>{
           const data = res.data;
+          if(hideLg&&data.data){
+              data.data[0].name = "默认";
+          }
           if(data.code == '0'){
             dispatch({
               type:HOSPITALMSG,

src/store/async-actions/pushMessage.js

@@ -46,7 +46,7 @@ export const embedPush = (obj) => {      //内嵌页面推送时推送
     // console.log(obj,'推送的obj');
     const param = getEMRParams();   // 获取推送参数
     // console.log(param,'=param');
-      param.dept = [{name:param.deptName,uniqueName:param.deptName}]
+      param.dept = [{name:param.deptName,uniqueName:param.hospitalId==-1?param.deptName:''}]
       param.deptName = undefined;
     json(api.setMrInfo, param, true).then((res) => {
       // console.log(res,'======推送的结果');

src/utils/config.js

@@ -34,11 +34,16 @@ function geturl(){
             gourl:'http://192.168.2.121:5654/cdss.html',
             imgurl:'http://192.168.2.121:82'
         }
+    }else if(window.location.href.indexOf('192.168.2.122')>-1){
+        return {
+            gourl:'http://192.168.2.122:2654/cdss.html',
+            imgurl:'http://192.168.2.122:82'
+        }
     }else{
         return {
             // gourl:'http://192.168.2.122:5654/cdss.html',
-            gourl:'http://223.93.170.82:12254/cdss.html',
-            imgurl:'http://192.168.2.122:82'
+            gourl:'http://223.93.170.82:22654/cdss.html',
+            imgurl:'http://223.93.170.82:12282'
         }
     }
 }