增加多项设备类型

src/utils/enum/DeviceTypeEnum.js

@@ -23,6 +23,12 @@ export const DEVICE_TYPE = createEnum(
     VISITATION: [19, '探视机'],
     RS485_TRANSFER: [20, '485转换盒'],
     EMERGENCY_BUTTON: [21, '紧急按钮'],
-    RS485_DOOR: [22, '485门口分机']
+    RS485_DOOR: [22, '485门口分机'],
+    ALARM_BODY_INDUCTIVE: [23, '红外报警器'],
+    ALARM_WATER_OVERFLOW: [24, '用水监控器'],
+    ALARM_HOUSEHOLD_GAS: [25, '家用燃起报警器'],
+    ALARM_HOUSEHOLD_SMOKE: [26, '家用烟雾报警器'],
+    ALARM_BUTTON_SOS: [27, '一键报警器'],
+    DOOR_LOCK: [30, '门磁传感器']
   }
 )

src/views/customer/components/customerManager.vue

@@ -559,6 +559,7 @@ export default {
         ],
         age: [
           { required: true, message: '请输入年龄', trigger: 'blur' }
+          // { required: false, message: '请输入年龄', trigger: 'blur' }
         ],
         mobile: [
           this.MixinRequired('请输入手机号！'),
@@ -572,6 +573,9 @@ export default {
             }
           }
         ],
+        // mobile: [
+        //   { required: false, message: '请输入手机号码', trigger: 'blur' }
+        // ],
         frame_id: [
           { required: Object.keys(this.frame).length === 0, message: '请选床位！', trigger: 'blur' } // 没有传入frame 属性，必须选择床位
         ]

src/views/hospital/ncs_device/deviceManager.vue

@@ -302,7 +302,13 @@ export default {
         { key: '看板', value: 17 },
         { key: '485转换盒', value: 20 },
         { key: '紧急按钮', value: 21 },
-        { key: '485门口机', value: 22 }
+        { key: '485门口机', value: 22 },
+        { key: '红外报警器', value: 23 },
+        { key: '用水监控器', value: 24 },
+        { key: '家用燃起报警器', value: 25 },
+        { key: '家用烟雾报警器', value: 26 },
+        { key: '一键报警器', value: 27 },
+        { key: '门磁传感器', value: 30 }
       ],
       deviceStatusTransfer: [
         { key: '启用', value: 1, color: 'green' },
@@ -610,18 +616,29 @@ export default {
           val === DEVICE_TYPE.WORKER_WATCH ||
           val === DEVICE_TYPE.TRANSFER_DEVICE ||
           val === DEVICE_TYPE.INFORMATION_BOARD ||
-          val === DEVICE_TYPE.RS485_TRANSFER) {
+          val === DEVICE_TYPE.RS485_TRANSFER ||
+          val === DEVICE_TYPE.DOOR_LOCK
+      ) {
         this.getFramesByType(FRAME_TYPE.PART)
       } else if (val === DEVICE_TYPE.DOOR_DEVICE ||
           val === DEVICE_TYPE.SIMULATE_EMERGENCY_BUTTON ||
           val === DEVICE_TYPE.RS485_DOOR ||
           val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
-          val === DEVICE_TYPE.BEACON) {
+          val === DEVICE_TYPE.BEACON ||
+          val === DEVICE_TYPE.DOOR_LOCK
+      ) {
         this.getFramesByType(FRAME_TYPE.ROOM)
       } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||
           val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||
           val === DEVICE_TYPE.REMOTE_CONTROL ||
-          val === DEVICE_TYPE.CELL_PHONE) {
+          val === DEVICE_TYPE.CELL_PHONE ||
+          val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
+          val === DEVICE_TYPE.ALARM_WATER_OVERFLOW ||
+          val === DEVICE_TYPE.ALARM_HOUSEHOLD_GAS ||
+          val === DEVICE_TYPE.ALARM_HOUSEHOLD_SMOKE ||
+          val === DEVICE_TYPE.ALARM_BUTTON_SOS ||
+          val === DEVICE_TYPE.DOOR_LOCK
+      ) {
         this.getFramesByType(FRAME_TYPE.BED)
       } else {
         this.typeFrames = this.partFrames
@@ -632,6 +649,7 @@ export default {
       this.deviceModel = {
         soft_ver: 'SV1.0',
         hard_ver: 'HV1.0',
+        priority: 1,
         code: 'C' + parseInt(Math.random() * 100000),
         model: 'M' + parseInt(Math.random() * 100000)
       }

src/views/ncs-device/components/deviceManager.vue

@@ -304,7 +304,13 @@ export default {
         { key: '探视机', value: 19 },
         { key: '485转换盒', value: 20 },
         { key: '紧急按钮', value: 21 },
-        { key: '485门口机', value: 22 }
+        { key: '485门口机', value: 22 },
+        { key: '红外报警器', value: 23 },
+        { key: '用水监控器', value: 24 },
+        { key: '家用燃起报警器', value: 25 },
+        { key: '家用烟雾报警器', value: 26 },
+        { key: '一键报警器', value: 27 },
+        { key: '门磁传感器', value: 30 }
       ],
       deviceStatusTransfer: [
         { key: '启用', value: 1, color: 'green' },
@@ -676,15 +682,22 @@ 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 ||
-                 val === DEVICE_TYPE.RS485_DOOR ||
-                 val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT ||
-                 val === DEVICE_TYPE.BEACON) {
+          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)
       } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||
-                 val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||
-                 val === DEVICE_TYPE.REMOTE_CONTROL ||
-                 val === DEVICE_TYPE.CELL_PHONE) {
+          val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||
+          val === DEVICE_TYPE.REMOTE_CONTROL ||
+          val === DEVICE_TYPE.CELL_PHONE ||
+          val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
+          val === DEVICE_TYPE.ALARM_WATER_OVERFLOW ||
+          val === DEVICE_TYPE.ALARM_HOUSEHOLD_GAS ||
+          val === DEVICE_TYPE.ALARM_HOUSEHOLD_SMOKE ||
+          val === DEVICE_TYPE.ALARM_BUTTON_SOS ||
+          val === DEVICE_TYPE.DOOR_LOCK
+      ) {
         this.getFramesByType(FRAME_TYPE.BED)
       } else {
         this.typeFrames = this.partFrames
@@ -695,6 +708,7 @@ export default {
       this.deviceModel = {
         soft_ver: 'SV1.0',
         hard_ver: 'HV1.0',
+        priority: 1,
         code: 'C' + parseInt(Math.random() * 100000),
         model: 'M' + parseInt(Math.random() * 100000),
         part_id: this.$store.getters.partId