Merge branch 'newVersion6.0' of http://192.168.2.236:10080/zhouna/newICSS into newVersion6.0

src/components/PushData/index.jsx

@@ -28,6 +28,9 @@ class PushData extends Component{
         dragBox('dragModalWrap','dragModalTitle','del')
         togglePushData()
     }
+    handleScroll(e){
+        e.preventDefault();
+    }
     componentWillReceiveProps(next){
       
       }
@@ -41,10 +44,10 @@ class PushData extends Component{
                 朗通智能提醒 
                 <img class={style['arrowIcon']} src={arrowIcon} alt=""/>
             </div>}
-            {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+20+'px'}}>
+            {showPushData&&<div id="dragModalWrap" className={style['pushWrapper']} style={{right:(windowWidth-1200)/2+20+'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"></iframe>}
+                {hospitalId&&<iframe id='embedPage'  src={url} frameborder="0" width="348" height="507" onWheel={this.handleScroll.bind(this)}></iframe>}
                 {!hospitalId&&<div className={style['pushEmpty']}>
                         <div className={style['pushEmptyBox']}>
                             <img className={style['pushEmptyImg']} src={pushEmpty} alt=""/>

src/utils/config.js

@@ -13,6 +13,6 @@ module.exports={
     prefix:'',            //带权限验证的api
     pushPage:'http://192.168.2.241:5488/icssIndex.html',        //右侧推送页面的地址
     imageUrlPrefix,
-    pushPage2:'http://192.168.2.241:5654/cdss.html',        //右侧推送页面的地址
-    // pushPage2:'http://localhost:8080/cdss.html',        //右侧推送页面的地址
+    // pushPage2:'http://192.168.2.241:5654/cdss.html',        //右侧推送页面的地址
+    pushPage2:'http://localhost:8080/cdss.html',        //右侧推送页面的地址
 };