|
@@ -567,7 +567,8 @@ export default {
|
|
/** 设备类型选中变化 **/
|
|
/** 设备类型选中变化 **/
|
|
deviceTypeChange(val) {
|
|
deviceTypeChange(val) {
|
|
this.deviceTypeChangeToFrameTypeChange(val)
|
|
this.deviceTypeChangeToFrameTypeChange(val)
|
|
- if (val === DEVICE_TYPE.SIMULATE_BED_DEVICE || DEVICE_TYPE.RS485_DOOR ||
|
|
|
|
|
|
+ if (val === DEVICE_TYPE.SIMULATE_BED_DEVICE || // 只能直接在后面加设备,会判断错误,必须重新用val = 设备
|
|
|
|
+ val === DEVICE_TYPE.RS485_DOOR ||
|
|
val === DEVICE_TYPE.SIMULATE_EMERGENCY_BUTTON ||
|
|
val === DEVICE_TYPE.SIMULATE_EMERGENCY_BUTTON ||
|
|
val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
|
|
val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
|
|
val === DEVICE_TYPE.EMERGENCY_BUTTON) { // 模拟设备不需要mac地址
|
|
val === DEVICE_TYPE.EMERGENCY_BUTTON) { // 模拟设备不需要mac地址
|
|
@@ -603,7 +604,8 @@ export default {
|
|
val === DEVICE_TYPE.RS485_TRANSFER) {
|
|
val === DEVICE_TYPE.RS485_TRANSFER) {
|
|
this.getFramesByType(FRAME_TYPE.PART)
|
|
this.getFramesByType(FRAME_TYPE.PART)
|
|
} else if (val === DEVICE_TYPE.DOOR_DEVICE ||
|
|
} else if (val === DEVICE_TYPE.DOOR_DEVICE ||
|
|
- val === DEVICE_TYPE.SIMULATE_EMERGENCY_BUTTON || DEVICE_TYPE.RS485_DOOR ||
|
|
|
|
|
|
+ val === DEVICE_TYPE.SIMULATE_EMERGENCY_BUTTON ||
|
|
|
|
+ val === DEVICE_TYPE.RS485_DOOR ||
|
|
val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
|
|
val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
|
|
val === DEVICE_TYPE.BEACON) {
|
|
val === DEVICE_TYPE.BEACON) {
|
|
this.getFramesByType(FRAME_TYPE.ROOM)
|
|
this.getFramesByType(FRAME_TYPE.ROOM)
|