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

src/components/AddInspect/SlideSelect/index.jsx

@@ -88,7 +88,7 @@ class SlideSelect extends Component {
     let numPlus = 0,numPlus1 = 0;
     let staticTime = {}
     if(dateTime){
-      let tmp1 = dateTime.split(' ')[0].split('-')            
+      let tmp1 = dateTime.split(' ')[0].split('-')
       let tmp2 = (dateTime).split(' ').length>1&&(dateTime).split(' ')[1].split(':')
       staticTime = {
         year: tmp1[0]-0,

src/utils/tools.js

@@ -734,7 +734,7 @@ function ifOtherClear(jsonData,jsonStr,baseList){
   }
 }
 function normalVal(min,max){
-  if(min == ''&&max==''){
+  if(!min&&!max){
     return null;
   }else if(!isNaN(min) && !isNaN(max)){
       return `正常值: (${min}~${max})`