ソースを参照

增加433多功能按钮相关功能

wenningning 1 年間 前
コミット
2726a35746

+ 7 - 1
languages/en.js

@@ -1185,7 +1185,9 @@ module.exports = {
     S433_RECEIVER: 'Signal receiver',
     SLEEPMATTRESS: 'sleep mattress',
     S4G_INTERCOM: '4G intercom',
-    WATCH_IW: 'Smart Watch - IW'
+    WATCH_IW: 'Smart Watch - IW',
+    MULTIFUNCTIONAL_BUTTON: 'Multi function button',
+    S433_BJMD: 'Alarm door light'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Blood Pressure Meter',
@@ -1593,5 +1595,9 @@ module.exports = {
     nurseWatch: 'Nurse watch equipment',
     customerAgeHidden: 'Extension user age hidden',
     customerAgeHiddenOnDoor: 'Door machine user age hidden',
+  },
+  wnn20240126: {
+    MULTIFUNCTIONAL_BUTTON: 'Multi function button',
+    S433_BJMD: 'Alarm door light'
   }
 }

+ 7 - 1
languages/es.js

@@ -1185,7 +1185,9 @@ module.exports = {
     S433_RECEIVER: 'Receptor de señal',
     SLEEPMATTRESS: 'Colchón para dormir',
     S4G_INTERCOM: 'Walkie - talkie 4G',
-    WATCH_IW: 'Reloj inteligente - IW'
+    WATCH_IW: 'Reloj inteligente - IW',
+    MULTIFUNCTIONAL_BUTTON: 'Botón multifuncional',
+    S433_BJMD: 'Luz de la puerta de alarma'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Medidor de presión arterial',
@@ -1593,5 +1595,9 @@ module.exports = {
     nurseWatch: 'Reloj de enfermera',
     customerAgeHidden: 'Se oculta la edad de los usuarios de la extensión',
     customerAgeHiddenOnDoor: 'La edad del usuario de la máquina de puerta está oculta',
+  },
+  wnn20240126: {
+    MULTIFUNCTIONAL_BUTTON: 'Botón multifuncional',
+    S433_BJMD: 'Luz de la puerta de alarma'
   }
 }

+ 7 - 1
languages/ru-RU.js

@@ -1185,7 +1185,9 @@ module.exports = {
     S433_RECEIVER: '433 Приемник',
     SLEEPMATTRESS: 'Матрас для сна',
     S4G_INTERCOM: 'Диалог 4G',
-    WATCH_IW: 'Умные часы - IW'
+    WATCH_IW: 'Умные часы - IW',
+    MULTIFUNCTIONAL_BUTTON: 'Многофункциональная кнопка',
+    S433_BJMD: 'Сигнализация дверей'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Измеритель сахара в крови',
@@ -1593,5 +1595,9 @@ module.exports = {
     nurseWatch: 'Часы медсестры',
     customerAgeHidden: 'Скрыть возраст пользователя ',
     customerAgeHiddenOnDoor: 'Скрыть возраст пользователя',
+  },
+  wnn20240126: {
+    MULTIFUNCTIONAL_BUTTON: 'Многофункциональная кнопка',
+    S433_BJMD: 'Сигнализация дверей'
   }
 }

+ 7 - 1
languages/zh-CN.js

@@ -1185,7 +1185,9 @@ module.exports = {
     S433_RECEIVER: '433接收器',
     SLEEPMATTRESS: '睡眠床垫',
     S4G_INTERCOM: '4G对讲器',
-    WATCH_IW: '智能手表-IW'
+    WATCH_IW: '智能手表-IW',
+    MULTIFUNCTIONAL_BUTTON: '多功能按钮',
+    S433_BJMD: '报警门灯'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: '血糖仪',
@@ -1593,5 +1595,9 @@ module.exports = {
     nurseWatch: '护士腕表',
     customerAgeHidden: '分机用户年龄隐藏',
     customerAgeHiddenOnDoor: '门口机用户年龄隐藏',
+  },
+  wnn20240126: {
+    MULTIFUNCTIONAL_BUTTON: '多功能按钮',
+    S433_BJMD: '报警门灯'
   }
 }

+ 8 - 6
src/utils/enum/DeviceTypeEnum.js

@@ -41,12 +41,14 @@ export const DEVICE_TYPE = createEnum(
     FALL_DETECTION_RADAR: [36, i18n.t('deviceType.FALL_DETECTION_RADAR')], // 防跌倒雷达
     HUMAN_DETECTION_RADAR: [37, i18n.t('deviceType.HUMAN_DETECTION_RADAR')], // 睡眠监测雷达
     ALARM_INFUSION: [38, i18n.t('deviceType.ALARM_INFUSION')], // 输液报警器
-    ELECTRONIC_FENCE: [39, i18n.t('deviceType.ELECTRONIC_FENCE')], //电子围栏
+    ELECTRONIC_FENCE: [39, i18n.t('deviceType.ELECTRONIC_FENCE')], // 电子围栏
     S433_DOOR_LAMP: [40, i18n.t('deviceType.S433_DOOR_LAMP')], // 433无线门灯
-    S433_TRANSFER_BOX: [41, i18n.t('deviceType.S433_TRANSFER_BOX')], //433无线转换盒
-    S433_RECEIVER: [42, i18n.t('deviceType.S433_RECEIVER')], //433接收器
-    SLEEPMATTRESS: [43, i18n.t('deviceType.SLEEPMATTRESS')], //睡眠床垫
-    S4GINTERCOM: [44, i18n.t('deviceType.S4G_INTERCOM')], //4G对讲器
-    WATCH_IW: [46, i18n.t('deviceType.WATCH_IW')] //智能手表-埃微
+    S433_TRANSFER_BOX: [41, i18n.t('deviceType.S433_TRANSFER_BOX')], // 433无线转换盒
+    S433_RECEIVER: [42, i18n.t('deviceType.S433_RECEIVER')], // 433接收器
+    SLEEPMATTRESS: [43, i18n.t('deviceType.SLEEPMATTRESS')], // 睡眠床垫
+    S4GINTERCOM: [44, i18n.t('deviceType.S4G_INTERCOM')], // 4G对讲器
+    MULTIFUNCTIONAL_BUTTON: [45, i18n.t('多功能按钮')], // 多功能按钮
+    WATCH_IW: [46, i18n.t('deviceType.WATCH_IW')], // 智能手表-埃微
+    S433_BJMD: [47, i18n.t('deviceType.S433_BJMD')] // 报警门灯
   }
 )

+ 1 - 2
src/views/hospital/device/deviceManager.vue

@@ -731,8 +731,7 @@ export default {
       } 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_DOOR_LIGHT
       ) {
         this.getFramesByType(FRAME_TYPE.ROOM)
       } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||

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

@@ -1066,8 +1066,7 @@
                 } 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_DOOR_LIGHT) {
                     this.getFramesByType(FRAME_TYPE.ROOM)
                 } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||
                     val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||

+ 1 - 2
src/views/ncs-device/components/nbDeviceConditionView.vue

@@ -557,8 +557,7 @@
                 } 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_DOOR_LIGHT) {
                     this.getFramesByType(FRAME_TYPE.ROOM)
                 } else if (val === DEVICE_TYPE.DIGIT_BED_DEVICE ||
                     val === DEVICE_TYPE.SIMULATE_BED_DEVICE ||