|
@@ -2047,8 +2047,8 @@ export default {
|
|
let population=this.incluedSelectedKeys.map(item=>{
|
|
let population=this.incluedSelectedKeys.map(item=>{
|
|
return item.id
|
|
return item.id
|
|
})
|
|
})
|
|
- values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):undefined;
|
|
|
|
- values.population=population.length>0?JSON.stringify(population):undefined;
|
|
|
|
|
|
+ values.excludePopulation=excludePopulation.length>0?JSON.stringify(excludePopulation):'[]';
|
|
|
|
+ values.population=population.length>0?JSON.stringify(population):'[]';
|
|
|
|
|
|
|
|
|
|
values.useAppMarket=values.useAppMarket?'1':'0'
|
|
values.useAppMarket=values.useAppMarket?'1':'0'
|
|
@@ -2401,16 +2401,17 @@ export default {
|
|
this.checkedList=sceneId
|
|
this.checkedList=sceneId
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
- if(res.result.population&&res.result.excludePopulation){
|
|
|
|
|
|
+ let population=res.result.population?JSON.parse(res.result.population):[]
|
|
|
|
+ let excludePopulation=res.result.excludePopulation?JSON.parse(res.result.excludePopulation):[]
|
|
|
|
+ if(population.length&&excludePopulation.length){
|
|
this.form.setFieldsValue({
|
|
this.form.setFieldsValue({
|
|
customCrowd:'3'
|
|
customCrowd:'3'
|
|
})
|
|
})
|
|
- }else if(res.result.population&&!res.result.excludePopulation){
|
|
|
|
|
|
+ }else if(population.length&&!excludePopulation.length){
|
|
this.form.setFieldsValue({
|
|
this.form.setFieldsValue({
|
|
customCrowd:'1'
|
|
customCrowd:'1'
|
|
})
|
|
})
|
|
- }else if(!res.result.population&&!res.result.excludePopulation){
|
|
|
|
|
|
+ }else if(!population.length&&!excludePopulation.length){
|
|
this.form.setFieldsValue({
|
|
this.form.setFieldsValue({
|
|
customCrowd:'0'
|
|
customCrowd:'0'
|
|
})
|
|
})
|