Merge branch 'develop' of http://git.wdklian.com/allen/ncs_ui into develop

# Conflicts:
#	languages/zh-CN.js

languages/en.js

@@ -127,7 +127,7 @@ module.exports = {
     filters: 'filter',
     loadingOoo: 'Loading...',
     noRowsToShow: 'No data to show',
-    enabled: 'open',
+    // enabled: 'open',
     pinColumn: 'fixed column',
     pinLeft: 'Fixed to the left',
     pinRight: 'Fixed to the right',
@@ -1142,22 +1142,22 @@ module.exports = {
     convenientDataSync: 'Convenient Data Sync'
   },
   deviceType: {
-    NURSE_HOST: 'Nurse Host',
-    DOCTOR_HOST: 'Doctor Host',
-    DOOR_DEVICE: 'Door Station',
+    NURSE_HOST: 'Nurse Host Machine',
+    DOCTOR_HOST: 'Doctor Machine',
+    DOOR_DEVICE: 'Doorway Screen',
     DIGIT_BED_DEVICE: 'Bed Extension',
     LCD_SCREEN: 'LCD Corridor Screen',
     LED_SCREEN: 'LED Dot Corridor Screen',
-    NURSE_WATCH: 'Nurse Moves',
-    WORKER_WATCH: 'The Carer Moves',
-    USER_WATCH: 'User Move',
+    NURSE_WATCH: 'Nurse Phone',
+    WORKER_WATCH: 'worker Phone',
+    USER_WATCH: 'BT Bracelet',
     CELL_PHONE: 'Mobile App',
     TRANSFER_DEVICE: 'Bus Conversion Box',
-    SIMULATE_BED_DEVICE: 'Analog Extension',
+    SIMULATE_BED_DEVICE: 'Analog Bed Unit',
     SIMULATE_EMERGENCY_BUTTON: 'Analog Emergency Button',
-    SIMULATE_DOOR_LIGHT: 'Analog Door Light',
+    SIMULATE_DOOR_LIGHT: 'Analog Door Lamp',
     REMOTE_CONTROL: 'Remote Control',
-    BEACON: 'Beacons',
+    BEACON: 'BT NetGate',
     INFORMATION_BOARD: 'Information Board',
     ENTRANCE_GUARD: 'Access Control Device',
     VISITATION: 'Visiting Machine',
@@ -1166,29 +1166,31 @@ module.exports = {
     RS485_DOOR: '485 Door Extension',
     ALARM_BODY_INDUCTIVE: 'Infrared Alarm',
     ALARM_WATER_OVERFLOW: 'Water Monitor',
-    ALARM_HOUSEHOLD_GAS: 'Household Fire Alarm',
-    ALARM_HOUSEHOLD_SMOKE: 'Household Smoke Alarm',
+    ALARM_HOUSEHOLD_GAS: 'Fire Alarm',
+    ALARM_HOUSEHOLD_SMOKE: 'Smoke Alarm',
     ALARM_BUTTON_SOS: 'One Button Alarm',
-    VITAL_SIGNS_DEVICE: 'Signs Devices',
+    VITAL_SIGNS_DEVICE: 'Vital Signs Devices',
     ALARM_RESTRAINT_BAND: 'Restriction Band Alarm',
     DOOR_LOCK: 'Door Magnetic Sensor',
     EMERGENCY_GATEWAY: 'Alarm Gateway',
     ALARM_433BUTTON: '433 Alarm',
     OTHER_HOST: 'Other Host',
-    BREASTPLATE: 'Breast Plate',
+    BREASTPLATE: 'Badge/bracelet',
     OWON_X5_GATEWAY: 'X5 Gateway',
     FALL_DETECTION_RADAR: 'Fall Detection Radar',
     HUMAN_DETECTION_RADAR: 'Sleep Detection Radar',
     ALARM_INFUSION: 'Infusion alarm',
     ELECTRONIC_FENCE: 'Electronic fence',
-    S433_DOOR_LAMP: 'Wireless door lamp',
-    S433_TRANSFER_BOX: 'Wireless conversion box',
+    S433_DOOR_LAMP: '433 Door Lamp',
+    S433_TRANSFER_BOX: '433 Lora Converter',
     S433_RECEIVER: 'Signal receiver',
     SLEEPMATTRESS: 'sleep mattress',
     S4G_INTERCOM: '4G intercom',
     WATCH_IW: 'Smart Watch - IW',
-    MULTIFUNCTIONAL_BUTTON: 'Multi function button',
-    S433_BJMD: 'Alarm door light'
+    MULTIFUNCTIONAL_BUTTON: '433 Button',
+    S433_BJMD: '433 Lamp',
+    SOS_VOICE_BUTTON: 'Voice Button',
+    PTT: 'ptt'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Blood Pressure Meter',
@@ -1654,5 +1656,9 @@ module.exports = {
       content_show: 'Content Display Mode'
     },
     clear_icon: 'Clear Icon'
+  },
+  wnn20240322: {
+    SOS_VOICE_BUTTON: 'SOS voice button',
+    PTT: 'ptt'
   }
 }

languages/es.js

@@ -127,7 +127,7 @@ module.exports = {
     filters: 'filtro',
     loadingOoo: 'Cargando...',
     noRowsToShow: 'No hay datos para mostrar',
-    enabled: 'abierto',
+    // enabled: 'abierto',
     pinColumn: 'columna fija',
     pinLeft: 'Fijo a la izquierda',
     pinRight: 'Fijo a la derecha',
@@ -1188,7 +1188,9 @@ module.exports = {
     S4G_INTERCOM: 'Walkie - talkie 4G',
     WATCH_IW: 'Reloj inteligente - IW',
     MULTIFUNCTIONAL_BUTTON: 'Botón multifuncional',
-    S433_BJMD: 'Luz de la puerta de alarma'
+    S433_BJMD: 'Luz de la puerta de alarma',
+    SOS_VOICE_BUTTON: 'Botón de voz sos',
+    PTT: 'ptt'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Medidor de presión arterial',
@@ -1654,5 +1656,9 @@ module.exports = {
       content_show: 'Modo de Visualización del Contenido'
     },
     clear_icon: 'Limpiar Icono'
+  },
+  wnn20240322: {
+    SOS_VOICE_BUTTON: 'Botón de voz sos',
+    PTT: 'ptt'
   }
 }

languages/ru-RU.js

@@ -127,7 +127,7 @@ module.exports = {
     filters: 'фильтр',
     loadingOoo: 'Идет загрузка...',
     noRowsToShow: 'Нет данных для отображения',
-    enabled: 'открыть',
+    // enabled: 'открыть',
     pinColumn: 'фиксированный столбец',
     pinLeft: 'Зафиксировано слева',
     pinRight: 'Закреплено справа',
@@ -1188,7 +1188,9 @@ module.exports = {
     S4G_INTERCOM: 'Диалог 4G',
     WATCH_IW: 'Умные часы - IW',
     MULTIFUNCTIONAL_BUTTON: 'Многофункциональная кнопка',
-    S433_BJMD: 'Сигнализация дверей'
+    S433_BJMD: 'Сигнализация дверей',
+    SOS_VOICE_BUTTON: 'Звуковая кнопка SOS',
+    PTT: 'ptt'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Измеритель сахара в крови',
@@ -1653,5 +1655,9 @@ module.exports = {
       content_show: 'Способ отображения контента'
     },
     clear_icon: 'Очистить иконку'
+  },
+  wnn20240322: {
+    SOS_VOICE_BUTTON: 'Звуковая кнопка SOS',
+    PTT: 'ptt'
   }
 }

languages/zh-CN.js

@@ -127,7 +127,7 @@ module.exports = {
     filters: '筛选器',
     loadingOoo: '加载中...',
     noRowsToShow: '无数据显示',
-    enabled: '开启',
+    // enabled: '开启',
     pinColumn: '固定列',
     pinLeft: '固定到左边',
     pinRight: '固定到右边',
@@ -1188,7 +1188,9 @@ module.exports = {
     S4G_INTERCOM: '4G对讲器',
     WATCH_IW: '智能手表-IW',
     MULTIFUNCTIONAL_BUTTON: '多功能按钮',
-    S433_BJMD: '报警门灯'
+    S433_BJMD: '报警门灯',
+    SOS_VOICE_BUTTON: 'SOS语音按钮',
+    PTT: '一键通'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: '血糖仪',
@@ -1655,7 +1657,12 @@ module.exports = {
     },
     clear_icon: '清除图标'
   },
+
   wu20240604: {
     textDisplayHospitalModuleTitle: '院级统计信息'
+  },
+  wnn20240322: {
+    SOS_VOICE_BUTTON: 'SOS语音按钮',
+    PTT: '一键通'
   }
 }

src/utils/enum/DeviceTypeEnum.js

@@ -47,8 +47,10 @@ export const DEVICE_TYPE = createEnum(
     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('多功能按钮')], // 多功能按钮
+    MULTIFUNCTIONAL_BUTTON: [45, i18n.t('deviceType.MULTIFUNCTIONAL_BUTTON')], // 多功能按钮
     WATCH_IW: [46, i18n.t('deviceType.WATCH_IW')], // 智能手表-埃微
-    S433_BJMD: [47, i18n.t('deviceType.S433_BJMD')] // 报警门灯
+    S433_BJMD: [47, i18n.t('deviceType.S433_BJMD')], // 报警门灯
+    SOS_VOICE_BUTTON: [48, i18n.t('deviceType.SOS_VOICE_BUTTON')], // SOS语音按钮
+    PTT: [49, i18n.t('deviceType.PTT')] // 一键通
   }
 )

src/views/customer/components/elderlyCareManager.vue

@@ -342,7 +342,7 @@
                 </el-tab-pane>
 
                 <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.vital')" name="customer-vital-sign">
-                    <vital-sign-log :member-id="formmodel.id+''" :active-name="'vital_signs1'"/>
+                    <vital-sign-log :member-id="formmodel.member_id+''" :active-name="'vital_signs1'"/>
                 </el-tab-pane>
 
                 <el-tab-pane v-if="formmodel.id" :label="this.$t('customerManage.remark')" name="customerRemark">