Skip to content

D
dcxy-manage-shell
Commit 40529696 by 姜雷
Options

Merge branch 'develop' into 'test'

修改当有区域选择时不更变区域搜索条件 See merge request !43
parents 46c0cc38 c7ec7611
Showing with 2 additions and 1 deletion
src/containers/Dashboard/Dashboard.js
...@@ -119,7 +119,8 @@ const actions = { ...@@ -119,7 +119,8 @@ const actions = {
commit(GET_EUIPMENT_DATA, list); commit(GET_EUIPMENT_DATA, list);
commit(LOADING_EQUIPMENT, false); commit(LOADING_EQUIPMENT, false);
} else { } else {
if (list.list && list.list.length > 5) { if (entity && entity.choiceareaIds) {
} else if (list.list && list.list.length > 5) {
let areaList = list.list.slice(0, 5); let areaList = list.list.slice(0, 5);
dispatch('updateFilters', { dispatch('updateFilters', {
choiceareaIds: areaList.map(item => item.areaId), choiceareaIds: areaList.map(item => item.areaId),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment