加入评估中

src/components/AssessResult/ScaleItem/index.jsx

@@ -7,7 +7,40 @@ import deleteIcon from '@common/images/delete.png';
  * **/
 class ScaleItem extends Component {
   constructor(props) {
-    super(props)
+    super(props);
+    this.getItems = this.getItems.bind(this);
+    this.getDetailItems = this.getDetailItems.bind(this);
+  }
+  getDetailItems(item){
+    let arr = [],temp='';
+    item.details.map((it)=>{
+      if(it.add){
+        if(it.type==1){     //量表
+          temp = <span>【{it.content.name}】</span>;
+        }else if(it.type==2){      //计算公式
+          temp = <span>计算公式</span>
+        }else if(it.type==3){
+          temp = <span>可能结果</span>
+        }
+      }
+    })
+  }
+  getItems(){
+    const { data } = this.props;
+    let $li='';
+    data.map((it)=>{
+      return <li>
+                <span>{it.name}：</span>
+                <div className={style['row']}>
+                  {
+                    this.getDetailItems(it)
+                  }
+                </div>
+                <div className={style["recommend"]}>
+                  <img src={deleteIcon} />
+                </div>
+              </li>
+    });
   }
   render() {
     const {title,data  } = this.props;
@@ -15,23 +48,9 @@ class ScaleItem extends Component {
       <h2>{title}</h2>
       <div className={style['item-content']}>
         <ul>
-          <li>
-            <span>糖尿病周围神经病变：</span>
-            <div className={style['row']}>
-              正常
-            </div>
-            <div className={style["recommend"]}>
-              <img src={deleteIcon} />
-            </div>
-          </li>
-          <li>
-            <span>肾功能不全：</span>
-            <div className={style['row']}>
-            </div>
-            <div className={style["recommend"]}>
-              <img src={deleteIcon} />
-            </div>
-          </li>
+          {
+            this.getItems()
+          }
           <li>
             <textarea className={style['edit-row']} name="supplement" id="" rows="6" placeholder='评估描述'></textarea>
           </li>

src/components/AssessResult/index.jsx

@@ -37,14 +37,14 @@ class AssessResult extends Component {
     handleChange(i,selects);
   }
   handoutTypes(item,i){
-    const {getIndexData,indexData,timeTypes} =this.props;
+    const {getIndexData,indexData,timeTypes,wholeAssessData} =this.props;console.log(wholeAssessData)
     //console.log(indexData)
     const chartData = indexData;
     const name = item.regionName+"：";
     const list = item.data&&item.data.rows;
     switch (+item.regionType){
       case 0:     //数据来源与右侧手动添加
-        return <ScaleItem title={name} data={list} handleChange={this.handleScaleDel}></ScaleItem>;
+        return <ScaleItem title={name} data={wholeAssessData} handleChange={this.handleScaleDel}></ScaleItem>;
       case 1:     //数据来源于大数据
         return <ChooseItem title={name} data={list} handleChange={this.handleChooseChange.bind(this,i)}></ChooseItem>;
       case 10:    //数据来源于后台

src/containers/AssessResult.js

@@ -18,7 +18,7 @@ import store from '@store';
  * ***/
 
 function mapStateToProps(state) {
-  //console.log(state)
+  console.log(state)
   const {assessResult} = state;
   return {
     data:assessResult.data,
@@ -26,7 +26,8 @@ function mapStateToProps(state) {
     saveIndexData:assessResult.saveIndexData,
     saveData:assessResult.saveData,
     update:assessResult.update,
-    timeTypes:assessResult.indexTimeTypes
+    timeTypes:assessResult.indexTimeTypes,
+    wholeAssessData:assessResult.wholeAssess,
   }
 }
 

src/containers/ChronicInfo.js

@@ -2,6 +2,7 @@ import {connect} from 'react-redux';
 import ChronicInfo from '../components/ChronicInfo';
 import {SHOW_TABLE_LIST,HIDE_TABLE_LIST} from '@store/types/pushMessage';
 import {getTableList,getScaleInfo} from '../store/async-actions/pushMessage';
+import {ADD_ASSESS_ITEMS} from "@types/assessResult";
 
 function mapStateToProps(state){
   return{
@@ -25,6 +26,15 @@ function mapDispatchToProps(dispatch){
     getScaleInfo(item){
       dispatch(getScaleInfo(item))
     },
+    addAssessItem(row,pIndex,i){         //加入评估记录
+      let obj = Object.assign({},row);
+      obj.details[i].add=true;
+      dispatch({
+        type:ADD_ASSESS_ITEMS,
+        data:obj,
+        index:pIndex
+      })
+    },
     //保存管理评估
     saveAssessInfos(obj){
       console.log(222,obj);

src/store/reducers/assessResult.js

@@ -1,4 +1,4 @@
-import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_SAVE_ASSESS_DATA,SET_INDEX_SUB_TYPE} from '@types/assessResult';
+import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_SAVE_ASSESS_DATA,SET_INDEX_SUB_TYPE,ADD_ASSESS_ITEMS} from '@types/assessResult';
 import config from "@config";
 
 const init = {
@@ -7,6 +7,7 @@ const init = {
   saveData:[],      //保存的评估数据-点确定时保存
   saveIndexData:{},    //保存的评估图表数据-点确定时保存
   indexTimeTypes:{},    //单个图表选中的维度
+  wholeAssess:[],     //整体评估数据
 };
 export default (state=init,action)=>{
   const res = Object.assign({},state);
@@ -38,6 +39,9 @@ export default (state=init,action)=>{
       res.saveIndexData = action.indexData;
       return res;
     //case CLEAR_ASSESS_DATA:
+    case ADD_ASSESS_ITEMS:
+      res.wholeAssess[action.index] = action.data;
+      return res;
     default:
       return res;
   }

src/store/types/assessResult.js

@@ -1,4 +1,5 @@
 export const SET_ASSESS_DATA = 'SET_ASSESS_DATA';     //推送的评估弹窗内容
 export const SET_INDEX_DATA = 'SET_INDEX_DATA';       //评估图表数据
 export const SET_SAVE_ASSESS_DATA = 'SET_SAVE_ASSESS_DATA';  //保存的评估弹窗数据
-export const SET_INDEX_SUB_TYPE = 'SET_INDEX_SUB_TYPE';   //保存单个图表时间维度
+export const SET_INDEX_SUB_TYPE = 'SET_INDEX_SUB_TYPE';   //保存单个图表时间维度
+export const ADD_ASSESS_ITEMS = 'ADD_ASSESS_ITEMS';     //加入评估