Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

src/common/components/MiniToast/index.less

@@ -18,6 +18,7 @@
     .closeIcon{
       // vertical-align: middle;
       float: right;
+      cursor: pointer;
     }
   }
   .infoCon{

src/components/AddInspect/index.jsx

@@ -225,7 +225,7 @@ class Inspect extends React.Component {
                     value={item.value}
                     onKeyUp={(e) => { this.changeActivePart(idx, e.target.value.trim()) }}
                   />
-                  <p className={styles.unit}>{item.labelSuffix}</p>
+                  <p className={styles.unit} title={item.labelSuffix}>{item.labelSuffix}</p>
                 </span>
               </li>
             )

src/components/AddInspect/index.less

@@ -151,6 +151,7 @@
     }
     .itemPartT {
         float: right;
+        width: 110px;
         input {
             width: 40px;
             text-align: center;

src/components/AssessResult/index.less

@@ -156,6 +156,7 @@
   border-radius: 4px;
   cursor: auto;
   margin-top: 15px;
+  cursor: pointer;
 }
 .textareaStatic {
   display: none;

src/components/ChronicInfo/index.less

@@ -271,4 +271,5 @@
     border-radius: 4px;
     cursor: auto;
     margin-top: 15px;
+    cursor: pointer;
   }

src/store/async-actions/fetchModules.js

@@ -181,7 +181,7 @@ export function setOtherHisModule(){
     const state = getStore();
     const initData = state.homePage.initData;
     const mode = state.typeConfig.typeConfig;
-    const model = JSON.parse(JSON.stringify(initData.otherHisModel));     //查体模板
+    const model = JSON.parse(JSON.stringify(initData.otherHisModel || null));     //查体模板
     const arr = JSON.parse(JSON.stringify(initData.otherHis || null));        //最近其他史数据
     const arrSave = JSON.parse(JSON.stringify(initData.otherHisSave || null));    //最近其他史saveText
     const selects = JSON.parse(JSON.stringify(initData.otherSelecteds || null));  //其他史杂音类选中项