Merge branch 'ChronicMag' of http://192.168.2.236:10080/zhouna/newICSS into ChronicMag

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

@@ -165,14 +165,14 @@ class ScaleItem extends Component {
 
           temp =<span className={style['scale']}
                       onClick={()=>this.handleShowScale(it.content,item.id)}>
-                        {scaleRes&&scaleRes.result?('结果：'+scaleRes.result.value+" "+scaleRes.result.text+' 【'+it.content.name+'】'):'【'+it.content.name+'】'}
+                        {scaleRes&&scaleRes.result?(' 【'+it.content.name+'】 结果：'+scaleRes.result.value+" "+scaleRes.result.text):'【'+it.content.name+'】'}
                         </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>
+                    <span>计算公式结果：</span>
                     <span className={style["blue"]} onClick={this.showFormula.bind(this,item.id,it)}>{cresult?cresult:'请选择'}</span>
                     <img src={level1} />
                     <MiniToast title={it.content.name}

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/components/AssessResult/index.less

@@ -152,7 +152,7 @@
   text-align: center;
   color: #fff;
   // background: #DBDBDB;
-  background: #DFEAFE;
+  background: #3B9ED0;
   border-radius: 4px;
   cursor: auto;
   margin-top: 15px;

src/components/CheckBody/index.jsx

@@ -36,7 +36,7 @@ class CheckBody extends Component{
     const moreNum =data.length-[...data].reverse().findIndex((it)=>it.showInCheck)-1;//被隐藏的位置
     const moreText = filterDataArr([...saveText].splice(moreNum+1));     //被收起的标签中是否有有值得，有则不能再收起showMoreBtn?more:''
     const more = showAll?<span className={style['more']} onClick={this.showHide}>收起<img src={hideImg} /></span>:<span className={style['more']} onClick={this.showHide}>展开<img src={showImg} /></span>;
-    const showMoreBtn = (data.length>moreNum&&!data[0].full)&&!moreText;
+    const showMoreBtn = data.length>config.showCheckNum&&(data.length>moreNum&&!data[0].full)&&!moreText;
     let showArray = data.filter((it)=>{
       if(it.showInCheck)
         return it;

src/components/ChronicInfo/index.jsx

@@ -312,8 +312,7 @@ class ChronicInfo extends React.Component{
                           return <p>
                                 <span className={style["listName"]}>
                                   <i onClick={this.showTable.bind(this,it.content,v.id,i)}>{'【'+it.content.name+'】'}</i>
-                                  {formulaResult&&formulaResult[it.content.id]&&formulaResult[it.content.id].pIndex==i?<i>{'结果：'}{formulaResult[it.content.id].calcalculate&&formulaResult[it.content.id].calcalculate.result.value +' '+ formulaResult[it.content.id].calcalculate.result.text}</i>:''}
-                                  
+                                  {formulaResult&&formulaResult[it.content.id]?<i>{'结果：'}{formulaResult[it.content.id].calcalculate&&formulaResult[it.content.id].calcalculate.result.value +' '+ formulaResult[it.content.id].calcalculate.result.text}</i>:''}
                                 </span>
                                 {indexs[i]&&indexs[i].includes(j)?<span className={style["addResult"]}>
                                   <img src={added} />
@@ -463,7 +462,7 @@ class ChronicInfo extends React.Component{
       <span className={style['okBtn']} onClick={()=>this.handleSaveAssess()}>确定</span>
     </div>;
     const recFooter =<div className={style['footer']}>
-      <span className={style['okBtn']} onClick={()=>this.handleSaveRecommend()}>关闭</span>
+      <span className={style['okBtn']} onClick={()=>this.handleSaveRecommend()}>确定</span>
     </div>;
     const scaleFooter = <div className={style['footer']}>
       <span className={style['print']} onClick={this.onPrint}><img src={printIcon} alt=""/>打印</span>

src/components/ScaleTable/index.jsx

@@ -118,7 +118,7 @@ class ScaleTable extends React.Component{
   }
 
   handleFormula(data){//得分计算
-    const {tableId,getResult,parentId,scaleInfo,parentIndex} = this.props; 
+    const {tableId,parentId,scaleInfo,parentIndex} = this.props; 
     const {valueData} = this.state; 
     this.setState({
       start:true
@@ -178,14 +178,16 @@ class ScaleTable extends React.Component{
   }
   componentWillUnmount(){
     // 储存计算结果和选择后的data
-    const {tableId,getResult,parentId,parentIndex,scaleInfo} = this.props; 
+    const {tableId,getResult,parentId,parentIndex,scaleInfo,saveScaleData} = this.props; 
     const {valueData,scaleResult1} = this.state; 
     // 替换表格内容
     let allDatas = scaleInfo[tableId]?JSON.parse(JSON.stringify(scaleInfo[tableId])):'' ;
     if(allDatas){
       allDatas[1].content = JSON.stringify(valueData);
+      // 需求：未点计算，直接点确定、关闭也保存选中数据 4-30
+      saveScaleData&&saveScaleData({id:tableId,data:allDatas});
     }
-     
+    
      if(scaleResult1){
       const params = {
         type:1,
@@ -193,7 +195,7 @@ class ScaleTable extends React.Component{
         id:tableId,
         pIndex:parentIndex
       }
-      getResult&&getResult({params,allDatas});
+      getResult&&getResult(params);
      }  
   }
   getContent(){ 
@@ -213,7 +215,7 @@ class ScaleTable extends React.Component{
                               <p className={style['miniName']}>{item.name}</p>
                               {item.details&&item.details.map((vv,ii)=>{
                                 return <div className={style['item']}>
-                                        <Radio label={vv.detailName}
+                                        <Radio label={vv.detailName+'('+vv.score+')'}
                                            isSelect={vv.select==1||selecteds[item.name]==vv.detailName}
                                            handleClick={this.handleRadio.bind(this,v.groupName,item.name,vv)}>
                                         </Radio>

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({

src/containers/ScaleTable.js

@@ -3,7 +3,7 @@ import ScaleTable from '@components/ScaleTable';
 import {getFormulaResult} from '@store/async-actions/fetchModules.js';
 import {SET_SCALE_INFO,SAVE_TABLE_RESULT} from '@store/types/pushMessage';
 
-function mapStateToProps (state){//console.log(state);
+function mapStateToProps (state){
   return {
     scaleInfo: state.pushMessage.scaleInfo,//量表内容
     formulaResult:state.pushMessage.formulaResult //计算结果
@@ -13,17 +13,17 @@ function mapStateToProps (state){//console.log(state);
 function mapDispatchToProps (dispatch){
   return {
     getResult(obj){//计算结果
-      const {params,allDatas} = obj;
-      // dispatch(getFormulaResult(params));
       dispatch({
-        type:SET_SCALE_INFO,
-        data:allDatas,
-        id:params.id //量表id
+        type:SAVE_TABLE_RESULT,
+        id:obj.id,  //量表id
+        data:Object.assign({},obj.data,{pIndex:obj.pIndex})
       })
+    },
+    saveScaleData(obj){//储存表格数据
       dispatch({
-        type:SAVE_TABLE_RESULT,
-        id:params.id,  //量表id
-        data:Object.assign({},params.data,{pIndex:params.pIndex})
+        type:SET_SCALE_INFO,
+        data:obj.data,
+        id:obj.id //量表id
       })
     }
   }