推荐结果历史显示bug修改1107

src/components/AssessResult/AssessHis/index.jsx

@@ -34,7 +34,11 @@ class AssessResultHis extends Component {
     const list = item.data&&item.data.rows;
     switch (+item.regionType){
       case 0:     //数据来源与右侧手动添加
-        return <ScaleItem title={name} data={wholeAssess} indexs={wholeIndexs} disabled={true}></ScaleItem>;
+        return <ScaleItem title={name}
+                          data={wholeAssess}
+                          indexs={wholeIndexs}
+                          disabled={true}
+                          isRecommend={item.isRecommend}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list} selecteds={chooseSelecteds&&chooseSelecteds[i]} disabled={true}></ChooseItem>;
       case 10:    //数据来源于后台

src/components/AssessResult/ScaleItem/index.jsx

@@ -169,7 +169,7 @@ class ScaleItem extends Component {
                         </span>;
         }else if(its.type==2){      //计算公式
           it=formulaData[formulaId]||deepClone(its);
-          const showRes = calcuResult[item.id]||it.content.result;
+          const showRes = calcuResult&&calcuResult[item.id]||it.content.result;
           const cresult = showRes&&showRes[1]&&showRes[1].text;
                     temp = <div className={style['results']}>
                     <span>计算公式：</span>

src/components/AssessResult/index.jsx

@@ -32,7 +32,7 @@ class AssessResult extends Component {
   }
   componentWillMount(){
     //获取评估
-    this.props.getAssess();
+    this.props.getAssess(this.props.isRecommend);
   }
   handleScaleText(text){
       this.setState({

src/containers/AssessResult.js

@@ -41,7 +41,19 @@ function mapStateToProps(state) {
 
 function mapDispatchToProps(dispatch) {
   return {
-    getAssess(){        //获取评估内容数据
+    getAssess(isRecommend){        //获取评估内容数据
+      if(isRecommend){
+        const data = {
+          regionName: "整体评估",
+          regionType: "0",
+          isRecommend:true
+        };
+        dispatch({
+          type:SET_ASSESS_DATA,
+          data:[data]
+        });
+        return;
+      }
       dispatch(getAssessData()).then((res)=>{
         if(res.data.code=='0'){
           dispatch({