浏览代码

列表加入量表显示

zhouna 6 年之前
父节点
当前提交
7c95cbd4b3

+ 4 - 9
src/components/AssessResult/ScaleItem/index.jsx

@@ -62,15 +62,10 @@ class ScaleItem extends Component {
       optionId:null,
     });
   }
-  handleShowScale(item,parentId,pIndex){
-    const {showScaleFn,closeAssess,showListScale} = this.props;
+  handleShowScale(item){
+    const {showScaleFn,closeAssess} = this.props;
     closeAssess&&closeAssess();    //关闭评估弹窗
-    if(!parentId){                //显示量表
-      showListScale&&showListScale(item);
-    }else{
-      showScaleFn&&showScaleFn(item,parentId,pIndex);
-    }
-
+    showScaleFn&&showScaleFn(item);
   }
   handleRadio(item,parent){
     let {result} = this.props;
@@ -178,7 +173,7 @@ class ScaleItem extends Component {
         if(its.type==1){     //量表
           let scaleRes=formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].calcalculate;
           temp =<span className={style['scale']}
-                      onClick={()=>this.handleShowScale(it.content,item.id,i)}>
+                      onClick={()=>this.handleShowScale(it.content)}>
                         {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果:'+scaleRes.result.value+" "+(scaleRes.result.text||'')):'【'+it.content.name+'】'}
                         </span>;
         }else if(its.type==2){      //计算公式

+ 1 - 2
src/components/AssessResult/index.jsx

@@ -101,7 +101,7 @@ class AssessResult extends Component {
   }
   handoutTypes(item,i){
     const {getIndexData,indexData,timeTypes,wholeIndexs,closeAssess,showScaleFn,isRecommend,chronicPushItems,
-      formulaResult,indexNames,showListScale} =this.props;
+      formulaResult,indexNames} =this.props;
     let obj = [];
     Object.keys(wholeIndexs).map((i)=>{
       obj[i]=chronicPushItems[i];
@@ -123,7 +123,6 @@ class AssessResult extends Component {
                           scaleItems ={wholeScaleItems}
                           result={wholeResults}
                           showScaleFn={showScaleFn}
-                          showListScale={showListScale}
                           calcuResult={calcuResult}
                           calcuValues={calcuValues}
                           formulaResult={formulaResult}

+ 0 - 4
src/components/DiagnosticList/index.jsx

@@ -191,9 +191,6 @@ class DiagnosticList extends Component {
               isAssessConfirm:false,
             });
         }
-    }
-    handleListClick(){
-
     }
     handleSavePossible(obj){
       this.setState({
@@ -267,7 +264,6 @@ class DiagnosticList extends Component {
                        <AssessResult handleSave={saveAssessInfos}
                                      handleSavePossible={this.handleSavePossible}
                                      closeAssess={this.showAssessFn.bind(this)}
-                                     showListScale={this.handleListClick.bind(this)}
                                      radioVal={radioVal}
                                      possible={possible}
                                      isAssessConfirm={isAssessConfirm}