Преглед на файлове

修复选择设备时,空间出错的问题

vothin преди 3 години
родител
ревизия
ef98a57a7b

+ 0 - 1
dist/static/css/chunk-665577f1.e3b1b772.css

@@ -1 +0,0 @@
-[data-v-70c39c2b] .avatar-uploader .el-upload{border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;position:relative;overflow:hidden}.avatar-uploader .el-upload[data-v-70c39c2b]:hover{border-color:#409eff}.avatar-uploader-icon[data-v-70c39c2b]{font-size:28px;color:#8c939d;width:178px;height:178px;line-height:178px;text-align:center}.avatar[data-v-70c39c2b]{width:178px;height:178px;display:block}

+ 4 - 2
src/views/hospital/ncs_device/deviceManager.vue

@@ -567,7 +567,8 @@ export default {
     /** 设备类型选中变化  **/
     deviceTypeChange(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_DOOR_LIGHT ||
           val === DEVICE_TYPE.EMERGENCY_BUTTON) { // 模拟设备不需要mac地址
@@ -603,7 +604,8 @@ export default {
           val === DEVICE_TYPE.RS485_TRANSFER) {
         this.getFramesByType(FRAME_TYPE.PART)
       } 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.BEACON) {
         this.getFramesByType(FRAME_TYPE.ROOM)

+ 4 - 2
src/views/ncs-device/components/deviceManager.vue

@@ -630,7 +630,8 @@ export default {
     /** 设备类型选中变化  **/
     deviceTypeChange(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_DOOR_LIGHT ||
           val === DEVICE_TYPE.EMERGENCY_BUTTON) { // 模拟设备不需要mac地址
@@ -666,7 +667,8 @@ export default {
           val === DEVICE_TYPE.RS485_TRANSFER) {
         this.getFramesByType(FRAME_TYPE.PART)
       } 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.BEACON) {
         this.getFramesByType(FRAME_TYPE.ROOM)