Merge branch 'dev5.4.1' of http://192.168.2.236:10080/zhouna/newICSS into dev5.4.1

src/common/components/ItemBox/index.less

@@ -20,7 +20,7 @@
     min-height: 38px;
     margin:0 470px 0 60px;
     position: relative;
-    padding:5px;
+    padding:5px 12px 5px 5px;
     outline: none;
     border-bottom:1px @part-border-color dashed;
     color: #333;

src/components/Banner/ModeChange/index.less

@@ -29,6 +29,10 @@
           &.big-marb{
             margin-bottom: 20px;
           }
+          span{
+            display: inline-block;
+            width: 140px;
+          }
         }
         .fade{
           opacity: .4;

src/components/CheckBody/index.jsx

@@ -7,7 +7,7 @@ import {getPageCoordinate,windowEventHandler,isIE,filterDataArr} from '@utils/to
 import $ from "jquery";
 import showImg from "../../common/images/show.png";
 import hideImg from "../../common/images/close.png";
-import rePushIcon from '../../common/images/possible.png';
+import rePushIcon from '../../common/images/icon2.png';
 import config from '@config/index';
 
 class CheckBody extends Component{
@@ -111,10 +111,10 @@ class CheckBody extends Component{
     });
   }
   render(){
-    const {searchData,totalHide,data,saveText,rePush} = this.props;
+    const {searchData,totalHide,data,saveText,rePush,hasMain,isEmpty} = this.props;
     const {boxLeft,boxTop} = this.state;
     return <ItemBox title='查体' handleClick={this.handleClick}>
-        <img src={rePushIcon} onClick={rePush}/>
+        <img className={style['refresh']} src={rePushIcon} title='重新加载' onClick={!hasMain&&isEmpty?null:rePush}/>
         {this.getLabels()}
         {/*{showMoreBtn?more:''}*/}
         {searchData && searchData.length>0?<SearchDrop data={searchData} show={!totalHide} left={boxLeft} top={boxTop} onSelect={this.handleSearchSelect}></SearchDrop>:''}

src/components/CheckBody/index.less

@@ -13,4 +13,9 @@
     vertical-align: text-top;
     width: 15px;
   }
+}
+.refresh{
+  position: absolute;
+  right: 0;
+  top: 9px;
 }

src/containers/CheckBody.js

@@ -23,7 +23,6 @@ function mapStateToProps(state){
     span:checkBody.span,
     searchInEnd:checkBody.searchInEnd,      //是否在搜索末尾插入结果
     importLabel:checkBody.importLabel,    //需高亮的标签id
-    typeConfig: state.typeConfig
   }
 }