|
@@ -2011,21 +2011,6 @@ export default {
|
|
|
}
|
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
- this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
|
|
|
- this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
|
|
|
- let selectedRow=[]
|
|
|
- // incluedSelectedRowKeys.forEach(item=>{
|
|
|
- // selectedRow.push({
|
|
|
- // accountId:this.accountId,
|
|
|
- // key:item,
|
|
|
- // id:item,
|
|
|
- // })
|
|
|
-
|
|
|
- // })
|
|
|
-
|
|
|
->>>>>>> master
|
|
|
|
|
|
this.incluedSelectedRowKeys=res.result.population?JSON.parse(res.result.population):[]
|
|
|
this.excludeSelectedRowKeys=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
|