diff --git a/src/pages/collection/info/info.vue b/src/pages/collection/info/info.vue index 2857a77..a5d0fd1 100644 --- a/src/pages/collection/info/info.vue +++ b/src/pages/collection/info/info.vue @@ -209,8 +209,12 @@ export default { let _fiLs = _list.filter(e=> +e.val == stadium_id); if(_fiLs.length)_cur = _fiLs[0]; } + if(_cur&&_cur.val){ this.curStadium = _cur; + }else if(optionsQuery.stadium_id == 0){ + let _fLs = _list.filter(e=> +e.val == -1); + if(_fLs.length)this.curStadium = _fLs[0] || {}; }else{ this.curStadium = _list[0] || {}; } diff --git a/src/subpackage/device/pages/switch_manage/switch_manage.vue b/src/subpackage/device/pages/switch_manage/switch_manage.vue index 151d8ce..08b0af9 100644 --- a/src/subpackage/device/pages/switch_manage/switch_manage.vue +++ b/src/subpackage/device/pages/switch_manage/switch_manage.vue @@ -224,7 +224,7 @@ export default { if(switchInfo.hardware_type=="Light"&&status==2)_data.data.name = "set-rpio-lock" //针对门禁没有关按钮发两条命令->开&关 20201224 后端: 直接发两条 关的那条这里填5 然后你那边不用管返回 - if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '5'; + if(switchInfo.hardware_type === 'AccessControl'&&status == 0)_data['delay'] = '3'; return _data; },