|
@@ -53,8 +53,9 @@ export default (state = initSearchList, action) => {
|
|
const tempArrs = newState.assistLabel;
|
|
const tempArrs = newState.assistLabel;
|
|
let tempArr = [];
|
|
let tempArr = [];
|
|
let tmpString = '';
|
|
let tmpString = '';
|
|
|
|
+ let tmpCommonLis = store.getState().homePage.assistList;
|
|
if(action.sign == 'common'){
|
|
if(action.sign == 'common'){
|
|
- let tmpAssistList = store.getState().homePage.assistList
|
|
|
|
|
|
+ let tmpAssistList = JSON.parse(JSON.stringify(tmpCommonLis))
|
|
tempArr = tmpAssistList;
|
|
tempArr = tmpAssistList;
|
|
}else{
|
|
}else{
|
|
tempArr = newState.list
|
|
tempArr = newState.list
|
|
@@ -84,16 +85,15 @@ export default (state = initSearchList, action) => {
|
|
tempArrs.push(tempArr[k])
|
|
tempArrs.push(tempArr[k])
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if(tempArr == []){
|
|
|
|
|
|
+ if(tempArrs == []){
|
|
tmpString == ''
|
|
tmpString == ''
|
|
return
|
|
return
|
|
}
|
|
}
|
|
- for (let i = 0; i < tempArr.length; i++) {
|
|
|
|
- let tmpVal = tempArr[i].value?tempArr[i].value.trim():tempArr[i].value;
|
|
|
|
- tmpString += (tempArr[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArr[i].time?'报告日期:'+tempArr[i].time:'')+';')
|
|
|
|
|
|
+ for (let i = 0; i < tempArrs.length; i++) {
|
|
|
|
+ let tmpVal = tempArrs[i].value?tempArrs[i].value.trim():tempArrs[i].value;
|
|
|
|
+ tmpString += (tempArrs[i].name+(tmpVal?(':'+tmpVal)+', ':': ')+(tempArrs[i].time?'报告日期:'+tempArrs[i].time:'')+';')
|
|
}
|
|
}
|
|
newState.assistLabel = [...tempArrs]
|
|
newState.assistLabel = [...tempArrs]
|
|
- // console.log(tempArrs)
|
|
|
|
newState.dataString = tmpString
|
|
newState.dataString = tmpString
|
|
return newState;
|
|
return newState;
|
|
}
|
|
}
|