Browse Source

量表没有结果就不显示结果了

Luolei 6 years ago
parent
commit
cdb87f0bac

+ 5 - 5
src/components/EmergencyProcedure/EmergencyPart/PartSec/index.jsx

@@ -11,11 +11,11 @@ class PartSec extends React.Component{
       partClick:false,
     }
   }
-  // componentWillReceiveProps(nextState){
-  //   if(nextState.idx != this.props.idx){
-  //     this.setState({partCom:true})
-  //   }
-  // }
+  componentWillReceiveProps(nextState){
+    if(nextState.idx != this.props.idx){
+      this.setState({partCom:true})
+    }
+  }
   makeSureCom(link,num){
     const {idx,makeSureCom,makeSureWar} = this.props
     if(idx == 0){

+ 3 - 1
src/components/ScaleTable/index.jsx

@@ -445,7 +445,9 @@ class ScaleTable extends React.Component{
                     <span>总分:</span>
                     <span ref={resRef}>{scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value +' '+ (scaleResult.calcalculate.result.text?scaleResult.calcalculate.result.text:'')}</span>
                     <span className={style['totalBtn']} onClick={this.handleFormula}>得分</span>
-                  </div>:<p className={style['totalR']}>{"结果:"}{this.getType2Reult()||scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value}</p>}
+                  </div>:
+                  (this.getType2Reult()||scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value)?
+                  <p className={style['totalR']}>{"结果:"}{this.getType2Reult()||scaleResult&&scaleResult.calcalculate&&scaleResult.calcalculate.result&&scaleResult.calcalculate.result.value}</p>:''}
                 </div>
               }
             })}