历史评估图表显示bug修改1359

src/components/AssessResult/AssessHis/index.jsx

@@ -44,7 +44,7 @@ class AssessResultHis extends Component {
   }
   handoutTypes(obj,item,i){
     const {wholeAssess,wholeIndexs,chooseSelecteds,scaleResult,wholeResults,wholeAssessText} =obj;
-    const {getIndexData,inquiryDate,indexData,timeTypes} = this.props;
+    const {getIndexData,inquiryDate,indexData,timeTypes,indexNames} = this.props;
     const {chartTimeTypes} = this.state;
     const name = item.regionName+"：";
     const list = item.data&&item.data.rows;
@@ -64,6 +64,7 @@ class AssessResultHis extends Component {
       case 10:    //数据来源于后台
         return <ChartItem title={name}
                           data={indexData||{}}
+                          names={indexNames||{}}
                           timeTypes={JSON.stringify(chartTimeTypes||{})=='{}'?timeTypes&&timeTypes[i]:chartTimeTypes[i]}
                           initFn={getIndexData}
                           endDate={inquiryDate}

src/containers/AssessResult.js

@@ -5,8 +5,7 @@ import {ISREAD} from '@store/types/homePage.js';
 import {billing} from '@store/async-actions/pushMessage';
 import {getAssessData,getIndexData} from '@store/async-actions/fetchModules';
 import {SET_ASSESS_DATA,SET_INDEX_DATA,SET_INDEX_SUB_TYPE,REMOVE_ASSESS_ITEMS,CLEAR_INDEX_DATA} from '@types/assessResult';
-import store from '@store';
-import {SET_SCALE_INFO} from "../store/types/pushMessage";
+import {parseChartData} from '@utils/tools';
 
 /***
  * 管理评估逻辑：
@@ -94,22 +93,7 @@ function mapDispatchToProps(dispatch) {
   }
 }
 
-function parseChartData(indexData){
-  let arr=[],obj={},temp={};
-  let nameArr=[],nameObj={};
-  if(!indexData){
-    return [];
-  }
-  indexData.itemIndexData.map((it)=>{
-    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
-    arr=obj[temp.indexDesc]||[];
-    nameArr=nameObj[temp.indexDesc]||[];
-    obj[temp.indexDesc]=[...arr,it];
-    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
-  });
-  //nameObj,obj;
-  return {nameObj,obj};
-}
+
 const AssessResultContainer = connect(mapStateToProps, mapDispatchToProps)(AssessResult);
 
 export default AssessResultContainer;

src/containers/AssessResultHis.js

@@ -6,6 +6,7 @@ import {billing} from '@store/async-actions/pushMessage';
 import {getAssessHis,getIndexData} from '@store/async-actions/fetchModules';
 import {SET_ASSESS_DATA,SET_INDEX_DATA} from '@types/assessResult';
 import {SET_ASSESS_HISTORY_DATA,SET_ASSESS_HISTORY_LOADING} from '@types/assessResultHis';
+import {parseChartData} from '@utils/tools';
 
 /***
  * 管理评估逻辑：
@@ -22,6 +23,7 @@ function mapStateToProps(state) {
   return {
     list:assessResultHis,    //已获取到的历史评估列表
     indexData:assessResult.indexData,
+    indexNames:assessResult.indexNames,
     loading:assessResultHis.loading,
     timeTypes:assessResult.indexTimeTypes,    //图表切换的维度
   }
@@ -76,22 +78,6 @@ function mapDispatchToProps(dispatch) {
   }
 }
 
-function parseChartData(indexData){
-  let arr=[],obj={},temp={};
-  let nameArr=[],nameObj={};  //暂弃
-  if(!indexData){
-    return [];
-  }
-  indexData.itemIndexData.map((it)=>{
-    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
-    arr=obj[temp.orderNo]||[];
-    nameArr=nameObj[temp.orderNo]||[];
-    obj[temp.orderNo]=[...arr,it];
-    nameObj[temp.orderNo]=[...nameArr,it.itemName];
-  });
-  //nameObj,obj;
-  return obj;
-}
 const AssessResultHisContainer = connect(mapStateToProps, mapDispatchToProps)(AssessResultHis);
 
 export default AssessResultHisContainer;

src/utils/tools.js

@@ -920,6 +920,25 @@ function readyKeepHistory(){
     return 3;
   }
 }
+
+//评估图表数据转换
+function parseChartData(indexData){
+  let arr=[],obj={},temp={};
+  let nameArr=[],nameObj={};
+  if(!indexData){
+    return [];
+  }
+  indexData.itemIndexData.map((it)=>{
+    temp=indexData.indexConfigData.find((i)=>{return it.itemName==i.indexUnique});
+    arr=obj[temp.indexDesc]||[];
+    nameArr=nameObj[temp.indexDesc]||[];
+    obj[temp.indexDesc]=[...arr,it];
+    nameObj[temp.indexDesc]=[...nameArr,it.itemName];
+  });
+  //nameObj,obj;
+  return {nameObj,obj};
+}
+
 module.exports = {
     checkType: Type.checkType,
     regexp,
@@ -955,4 +974,5 @@ module.exports = {
     getCurrentDate,
     ifOtherClear,
     readyKeepHistory,
+    parseChartData,
 };