Merge remote-tracking branch 'origin/bugFix20190722' into bugFix20190722

src/common/components/Calendar/index.jsx

@@ -114,7 +114,9 @@ class Calendar extends React.Component {
       second: this.state.select.second
     };
     this.setState({
-      select: info
+      select: info,
+      month:this.month,
+      year:this.year
     });
     // this.props.timeSure(Object.assign({}, info))
     this.props.handleChange(info);

src/components/AddAssistCheck/index.jsx

@@ -37,7 +37,7 @@ class AddAssistCheck extends React.Component {
       if (_con && searchWrapAssist != event.target && !_con.is(event.target) && _con.has(event.target).length === 0) { // Mark 1
         this.setState({ show: false });
       }
-      if (!_cons.is(event.target) && _cons.has(event.target).length === 0) { // Mark 1
+      if (!_cons.is(event.target) && _cons.has(event.target).length === 0 || event.target.isEqualNode(_close)) { // Mark 1
         this.setState({ date: false });
       }
       

src/components/EmergencyProcedure/EmergencyModal/index.less

@@ -143,15 +143,15 @@
   overflow: hidden;
   z-index: 500;
   width: 900px;
-  padding-top: 30px;
+  padding-top: 20px;
   box-sizing: border-box;
   margin-left: -450px;
-  // margin-top: -400px;
+  // margin-top: -415px;
   // height: 800px;
   // top: 50%;
   left: 50%;
-  top: 40px;
-  bottom: 40px;
+  top: 60px;
+  bottom: 60px;
   .emergencyImg{
     height: 100%;
     width: 100%;

src/components/EmergencyProcedure/index.less

@@ -8,7 +8,7 @@
     -ms-user-select: none;
     user-select: none;
     position: fixed;
-    z-index: 205;
+    z-index: 202;
     top: 55px;
     right: 20px;
     width: auto;

src/components/WrapModalBody/WrapModalTableSon/index.jsx

@@ -6,8 +6,12 @@ import {getStatusImg} from '@utils/tools';
 
 class WrapModalTableSon extends React.Component {
   constructor(props) {
-    super(props)
+    super(props);
+    this.state = {
+      msg:'选中异常值数据'
+    }
     this.getImgPath = this.getImgPath.bind(this)
+    this.selectWaring = this.selectWaring.bind(this)
   }
   getImgPath(name,groupName,item){
     const { checkedList,selectOneCheck } = this.props;
@@ -24,11 +28,19 @@ class WrapModalTableSon extends React.Component {
       return <img className={style.check} onClick={()=>selectOneCheck(name,groupName,item)} src={check_circle} alt="" />
     }
   }
+  selectWaring(){
+    let tmpMsg = this.state.msg
+    const { selectWaring } = this.props;
+    this.setState({
+      msg:tmpMsg=='选中异常值数据'?'取消选中异常值数据集':'选中异常值数据'
+    })
+    selectWaring&&selectWaring()
+  }
   render() {
-    const { hospitalSonInspect,allCheckImportIns,allCheck,selectWaring } = this.props;
+    const { hospitalSonInspect,allCheckImportIns,allCheck } = this.props;
     return <div className={style['modalTable']}>
       <div className={style.sonTitle}>
-        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={selectWaring}>选中异常值数据</span>
+        <span>组名称 : {hospitalSonInspect.groupName}</span><span className={style.btn} onClick={this.selectWaring}>{this.state.msg}</span>
       </div>
       <div className={`${style.SonTable}`}>
         <table>

src/components/WrapModalBodyPac/WrapModalTableSon/index.jsx

@@ -8,19 +8,19 @@ class WrapModalTableSon extends React.Component {
     super(props)
     this.getImgPath = this.getImgPath.bind(this)
   }
-  getImgPath(name,checkItem,item){
+  getImgPath(name,checkItem,item,idx){
     const { checkedList,selectOneCheck } = this.props;
     let num = 0;
     for(let k = 0;k < checkedList.length;k++){
       let tmpLis = checkedList[k];
       if(tmpLis == name){
-        return <img className={style.check} onClick={()=>selectOneCheck(name,checkItem,item)} src={check_right} alt="" />
+        return <img className={style.check} onClick={()=>selectOneCheck(name,checkItem,item,idx)} src={check_right} alt="" />
       }else{
         ++num
       }
     }
     if(num == checkedList.length){
-      return <img className={style.check} onClick={()=>selectOneCheck(name,checkItem,item)} src={check_circle} alt="" />
+      return <img className={style.check} onClick={()=>selectOneCheck(name,checkItem,item,idx)} src={check_circle} alt="" />
     }
   }
   render() {
@@ -48,7 +48,7 @@ class WrapModalTableSon extends React.Component {
               return <tr>
                 <td className={`${style.fst}`}>
                   {
-                    this.getImgPath(item.checkItem,hospitalSonInspect.checkItem,item)
+                    this.getImgPath(item.checkItem,hospitalSonInspect.checkItem,item,idx)
                   }
                 </td>
                 <td title={item.checkItem} className={`${style.sec}`}>{item.checkItem}</td>

src/containers/WrapModalBodyPac.js

@@ -23,8 +23,8 @@ function mapDispatchToProps(dispatch, store) {
         showInIcss(){
           dispatch(showInIcsss())
         },
-        selectOneCheck(name,checkItem,item){
-          dispatch(selectOneChecks(name,checkItem,item))
+        selectOneCheck(name,checkItem,item,idx){
+          dispatch(selectOneChecks(name,checkItem,item,idx))
         },
         allCheckImport() {
           dispatch(allCheckImports())

src/store/actions/wrapModalBodyPac.js

@@ -3,11 +3,12 @@ import {SET_ALLCHECKS,SHOW_IN_ICSSS,SELECT_ONE_CHECKS,SEARCH_HOSPITAL_PAC_SON,SE
 export const showInIcsss = () => ({         //确认选择显示到页面
   type:SHOW_IN_ICSSS
 })
-export const selectOneChecks = (name,checkItem,item) => ({         //选一个
+export const selectOneChecks = (name,checkItem,item,idx) => ({         //选一个
   type:SELECT_ONE_CHECKS,
   name,
   checkItem,
-  item
+  item,
+  idx
 })
 export const allCheckImports = () => ({         //全选反选
   type:SET_ALLCHECKS

src/utils/config.js

@@ -1,8 +1,8 @@
 // const host='http://192.168.3.1:5050';//赵
 // const host='http://192.168.3.100:5050';//王峰
-const host='http://192.168.2.236:5050';//后端接口访问地址
+// const host='http://192.168.2.236:5050';//后端接口访问地址
 // const host='http://192.168.2.121:5050';//后端接口访问地址
-// const host='http://192.168.2.241:5050';//后端接口访问地址
+const host='http://192.168.2.241:5050';//后端接口访问地址
 // const host='http://192.168.3.11:5050';//王宇
 //const host='http://192.168.2.164:8080';
 // const host='http://192.168.3.117:5050'; //周铁刚

src/utils/drag.js

@@ -94,7 +94,6 @@ function dragBox(dragWrap,dragTop,type,addDom,img) {
   } else {
     drag.on('mousedown', function (event) {
       let lenHeight = wrap.height()
-      console.log(lenHeight,78787)
       if(img){
         $("#preImg").css("height",(lenHeight)+'px')
       }