加入记录页面跳转问题

src/components/AssessResult/ScaleItem/index.jsx

@@ -160,7 +160,7 @@ class ScaleItem extends Component {
                          confirm={this.confirmOption.bind(this,item,i)}
                          footer="true">
                         <div className={style["infoOption"]}>
-                          <span>是否贫血：</span>
+                          <span>{it.content.name?it.content.name+'：':''}</span>
                           {it.content.details&&it.content.details.map((lis,ind)=>{
                             return <div className={style["chooseItem"]}>
                               <Radio label={lis.detailName}
@@ -228,6 +228,10 @@ class ScaleItem extends Component {
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
       <span className={style['okBtn']} onClick={()=>{}}>确定</span>
     </div>;
+    const scaleFooter = <div className={style['footer']}>
+      <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>
+      <span className={style['okBtn']} onClick={()=>this.closeTable()}>确定</span>
+    </div>;
     return <div className={style['assess-item']}>
       <h2>{title}</h2>
       <div className={style['item-content']}>
@@ -244,13 +248,13 @@ class ScaleItem extends Component {
           </li>
         </ul>
       </div>
-      {showScale?<ComplexModal onclose={this.closeScaleFn} footer={footer}
+      {showScale?<ComplexModal onclose={this.closeScaleFn} footer={scaleFooter}
                                title={scaleName}
                                icon={tableIcon}
                                top={20}
                                bottom={20}
                                width={820}>
-        <ScaleTable data={scaleInfo[scaleId]} title={scaleName} tableId={scaleId} parentId={parentId}></ScaleTable>
+        <ScaleTable title={scaleName} tableId={scaleId} parentId={parentId}></ScaleTable>
       </ComplexModal>:''}
     </div>;
   }

src/components/AssessResult/index.jsx

@@ -9,8 +9,8 @@ import ChartItem from "./ChartItem";
 class AssessResult extends Component {
   constructor(props) {
     super(props);
-    const chooseSelecteds = JSON.parse(JSON.stringify(props.chooseSelecteds));
-    const wholeIndexs = JSON.parse(JSON.stringify(props.wholeIndexs));      //深度复制，Object.assgin为浅复制，下下级会同源
+    const chooseSelecteds = JSON.parse(JSON.stringify(props.chooseSelecteds)||{});
+    const wholeIndexs = JSON.parse(JSON.stringify(props.wholeIndexs)||{});      //深度复制，Object.assgin为浅复制，下下级会同源
     this.state={
       chooseSelecteds:chooseSelecteds,     //大数据选择模块
       chartTimeTypes:{},      //图表模块

src/components/ChronicInfo/index.jsx

@@ -68,9 +68,6 @@ class ChronicInfo extends React.Component{
       operaSupport: false,
     });
   }
-  componentWillReceiveProps() {
-    $(this.$content.current)[0].scrollIntoView(true);
-  }
   
   showTableList(id){//量表按钮
     const {getTableList,questionId} = this.props;

src/components/PushItems/index.jsx

@@ -410,7 +410,7 @@ class PushItems extends Component {
                 )}
               </div>
             </div>
-            {chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems} indexs={wholeIndexs}></ChronicInfo>:''}
+            {chronicPushItems&&chronicPushItems.length>0?<ChronicInfo data={chronicPushItems}></ChronicInfo>:''}
             <div className={style["tips"]}>
               <h1>
                 <img src={tipsImg} />

src/containers/AssessResult.js

@@ -29,7 +29,7 @@ function mapStateToProps(state) {
     update1:assessResult.update1,       //加入记录更新
     timeTypes:assessResult.indexTimeTypes,    //图表切换的维度
     wholeAssessData:assessResult.wholeAssess,   //评估内容
-    wholeIndexs:assessResult.wholeIndexs,      //已加入评估记录的推送项
+    wholeIndexs:assessResult.wholeIndexs||{},      //已加入评估记录的推送项
     chooseSelecteds:assessResult.chooseSelecteds,    //已选中的选项
     wholeAssessText:assessResult.wholeAssessText,     //整体评估补充说明
     scaleInfo: state.pushMessage.scaleInfo,//量表内容

src/containers/ChronicInfo.js

@@ -16,7 +16,8 @@ function mapStateToProps(state){
     scaleInfo: state.pushMessage.scaleInfo,//量表内容
     chronicDesease:state.mainSuit.chronicDesease,//主诉存的慢病
     update:state.assessResult.update1,
-    formulaResult:state.pushMessage.formulaResult //量表信息
+    formulaResult:state.pushMessage.formulaResult, //量表信息
+    indexs:state.assessResult.wholeIndexs,
   }
 }
 

src/containers/PushItemsContainer.js

@@ -16,8 +16,6 @@ function mapStateToProps(state) {
         tableList: pushMessage.tableList,
         showList: pushMessage.showList,
         chronicPushItems: pushMessage.chronicPushItems,
-        wholeIndexs:state.assessResult.wholeIndexs,
-        update:state.assessResult.update1
     }
 }