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

src/components/Banner/index.jsx

@@ -16,7 +16,9 @@ import {CLEAR_COMSYMPTOMS} from '@store/types/mainSuit';
 import { GET_PREC_LIST,SET_PREC_SHOW } from "@store/types/preIcss";
 import {getPreMsg} from '@store/async-actions/preIcss';
 import ModeChange from './ModeChange'
-
+import { embedPush} from '../../store/async-actions/pushMessage'
+import {debounce} from '../../utils/tools'
+import store from '@store';
 class Banner extends Component {
   constructor(props){
     super(props);
@@ -35,6 +37,7 @@ class Banner extends Component {
     this.showHisModal = this.showHisModal.bind(this);
     this.handleHisClose = this.handleHisClose.bind(this);
     this.setInitConfig = this.setInitConfig.bind(this);
+    this.handleEmbedPush = this.handleEmbedPush.bind(this);
   }
 
   showConfigModal(){
@@ -106,6 +109,16 @@ class Banner extends Component {
     });
     dragBox('previewWrapper','previewStatic','del')    
   }
+
+
+  // 处理点击的默认推送
+  handleEmbedPush(){
+    store.dispatch(embedPush({
+      action: "patientia",
+      mode: 1
+    }))
+  }
+
   render() {
     const {visible,pre,ifShow,deptName, closeConfigModal,hasMain,hasCurrent,hasOther,preShow,show} = this.props;
     const {emergencyBox} = this.state;
@@ -113,7 +126,7 @@ class Banner extends Component {
     const domNode = document.getElementById('root');
     const disabled = !(hasMain||hasCurrent||hasOther);
     return (
-      <div className={style["logo"]} >
+      <div className={style["logo"]} onClick={this.handleEmbedPush}>
         <img src={logo} />
         <span className={style["logo-name"]}>|&nbsp;&nbsp;智能辅助临床决策系统</span>
         <div className={style["buon"]}>

src/components/HistoryCaseContainer/HistoryList/index.jsx

@@ -458,7 +458,7 @@ class HistoryCaseContainer extends React.Component {
                 >                  
                     <div className={styles.outBox}>
                       <span>病历名称：</span>
-                      <input type="text" placeholder="请输入病历名称" value={this.state.templateName} onChange={this.handleChange} autocomplete="off"/>
+                      <input type="text" className={styles.innerInput} placeholder="请输入病历名称" value={this.state.templateName} onChange={this.handleChange} autocomplete="off"/>
                     </div>
                 </ConfirmModal>
             </div>

src/components/HistoryCaseContainer/HistoryList/index.less

@@ -195,5 +195,18 @@
     display: flex;
     align-items: center;
 }
-
+.innerInput{
+    outline-style: none ;
+    border: 1px solid #ccc; 
+    border-radius: 3px;
+    padding: 7px 4px;
+    font-size: 14px;
+    font-family: "Microsoft soft";
+}
+.innerInput:focus{
+    border-color: #66afe9;
+    outline: 0;
+    -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)
+}
 

src/components/Operation/index.jsx

@@ -585,7 +585,7 @@ class Operation extends Component {
         <div className={style.outBox}>
           <div className={style.innerInp}>
             <span>病历名称：</span>
-            <input type="text" placeholder="请输入病历名称" value={this.state.medicalName} onChange={this.handleMedicalChange} autocomplete="off" /> 
+            <input type="text" className={style.innerInput} placeholder="请输入病历名称" value={this.state.medicalName} onChange={this.handleMedicalChange} autocomplete="off" /> 
           </div>
           {this.state.showValit ? (<div className={style.valit}>请输入病历名称</div>) : null}
         </div>

src/components/Operation/index.less

@@ -351,6 +351,20 @@
     // justify-content: center;
     margin-bottom: 40px;
     .innerInp{
+        .innerInput{
+            outline-style: none ;
+            border: 1px solid #ccc; 
+            border-radius: 3px;
+            padding: 7px 4px;
+            font-size: 14px;
+            font-family: "Microsoft soft";
+        }
+        .innerInput:focus{
+            border-color: #66afe9;
+            outline: 0;
+            -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6);
+            box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)
+        }
     }
     .valit{
         float: left;

src/utils/tools.js

@@ -352,6 +352,17 @@ const delHistoryDataList = () =>{
 }
 
 
+// 防抖函数
+export function debounce(func, delay) {
+  let timer = null;
+  return function (...args) {
+    if (timer) clearTimeout(timer);
+    timer = setTimeout(() => {
+      func.apply(this, args);
+    }, delay);
+  };
+}
+