全部量表查看

src/components/ScaleSearch/index.jsx

@@ -15,11 +15,21 @@ class ScaleSearch extends Component {
     this.handleChange = this.handleChange.bind(this);
     this.clear = this.clear.bind(this);
   }
+  getResult(id){
+    const {formulaResult} = this.props;
+    const scale=formulaResult&&formulaResult[id];
+    let result = scale&&scale.calcalculate?scale.calcalculate.result:null;
+    if(result){
+      return <i>( 结果：{result.value} {result.text} )</i>;
+    }
+    return '';
+  }
   getSearchList() {
     const { searchResult,getScale } = this.props;
     return searchResult && searchResult.map((item) => {
-      return <li key={item.conceptId} onClick={()=>getScale(item.name)}>
+      return <li key={item.conceptId} onClick={()=>getScale({id:item.conceptId,name:item.name})}>
         <span className={style['scale-name']}>{item.name}</span>
+        {this.getResult(item.conceptId)}
         <button>查看</button>
       </li>;
     });

src/components/ScaleSearch/index.less

@@ -51,6 +51,10 @@
         font-size: 14px;
         color: #000;
       }
+      i{
+        color: #2A9BD5;
+        font-size: 12px;
+      }
       .scale-name{
         display: inline-block;
         max-width: 320px;

src/containers/ScaleSearchContainer.js

@@ -2,11 +2,12 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { getSearchList } from '@store/async-actions/ScaleSearch';
 import ScaleSearch from '@components/ScaleSearch';
-import {getTableList} from '../store/async-actions/pushMessage';
+import {getScaleInfo} from '../store/async-actions/pushMessage';
 
 function mapStateToProps(state) {
     return{
         searchResult: state.scaleSearch.searchResult,
+        formulaResult: state.pushMessage.formulaResult,//量表内容
     }
 }
 
@@ -16,7 +17,7 @@ function mapDispatchToProps(dispatch) {
             dispatch(getSearchList(val))
         },
         getScale(name) {
-            dispatch(getTableList(name))
+            dispatch(getScaleInfo(name))
         }
     }
 }