增加设备类型

languages/zh-CN.js

@@ -794,7 +794,9 @@ module.exports = {
     ALARM_HOUSEHOLD_SMOKE: '家用烟雾报警器',
     ALARM_BUTTON_SOS: '一键报警器',
     VITAL_SIGNS_DEVICE: '体征设备',
-    DOOR_LOCK: '门磁传感器'
+    ALARM_RESTRAINT_BAND: '约束带报警器',
+    DOOR_LOCK: '门磁传感器',
+    EMERGENCY_GATEWAY: '报警网关'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: '血糖仪',

public/domain.js

@@ -1,10 +1,6 @@
 const domain = {
-  // serverUrl: 'http://172.28.100.100:8005',
-  // DeviceUrl: 'http://172.28.100.100:8006',
-  serverUrl: 'http://localhost:8005',
-  DeviceUrl: 'http://localhost:8006',
-  // serverUrl: 'http://8.129.220.143:8005',
-  // DeviceUrl: 'http://8.129.220.143:8006',
+  serverUrl: 'http://8.129.220.143:8005',
+  DeviceUrl: 'http://8.129.220.143:8006',
   OnlineSystemUrl: 'http://api.base.wdklian.com',
   apiMode: 'dev',
   uiVersion: 3 // 1 医院版，2 月子中心版,3养老院版

src/utils/enum/DeviceTypeEnum.js

@@ -31,6 +31,8 @@ export const DEVICE_TYPE = createEnum(
     ALARM_HOUSEHOLD_SMOKE: [26, i18n.t('deviceType.ALARM_HOUSEHOLD_SMOKE')],
     ALARM_BUTTON_SOS: [27, i18n.t('deviceType.ALARM_BUTTON_SOS')],
     VITAL_SIGNS_DEVICE: [28, i18n.t('deviceType.VITAL_SIGNS_DEVICE')],
-    DOOR_LOCK: [30, i18n.t('deviceType.DOOR_LOCK')]
+    ALARM_RESTRAINT_BAND: [29, i18n.t('deviceType.ALARM_RESTRAINT_BAND')],
+    DOOR_LOCK: [30, i18n.t('deviceType.DOOR_LOCK')],
+    EMERGENCY_GATEWAY: [31, i18n.t('deviceType.EMERGENCY_GATEWAY')]
   }
 )

src/views/hospital/ncs_device/deviceManager.vue

@@ -405,7 +405,9 @@ export default {
         { key: this.$t('deviceType.ALARM_HOUSEHOLD_SMOKE'), value: 26 },
         { key: this.$t('deviceType.ALARM_BUTTON_SOS'), value: 27 },
         { key: this.$t('deviceType.VITAL_SIGNS_DEVICE'), value: 28 },
-        { key: this.$t('deviceType.DOOR_LOCK'), value: 30 }
+        { key: this.$t('deviceType.ALARM_RESTRAINT_BAND'), value: 29 },
+        { key: this.$t('deviceType.DOOR_LOCK'), value: 30 },
+        { key: this.$t('deviceType.EMERGENCY_GATEWAY'), value: 31 }
       ],
       deviceStatusTransfer: [
         { key: this.$t('deviceManage.statusTure'), value: 1, color: 'green' },
@@ -737,7 +739,8 @@ export default {
           val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT
       this.isVitalSigns = val === DEVICE_TYPE.VITAL_SIGNS_DEVICE
       this.hasSosDeviceSettings = val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
-          val === DEVICE_TYPE.DOOR_LOCK
+          val === DEVICE_TYPE.DOOR_LOCK ||
+          val === DEVICE_TYPE.ALARM_RESTRAINT_BAND
       this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN ||
           val === DEVICE_TYPE.LCD_SCREEN
     },
@@ -821,7 +824,8 @@ export default {
           params.device_type === DEVICE_TYPE.SIMULATE_DOOR_LIGHT
       this.isVitalSigns = params.device_type === DEVICE_TYPE.VITAL_SIGNS_DEVICE
       this.hasSosDeviceSettings = params.device_type === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
-          params.device_type === DEVICE_TYPE.DOOR_LOCK
+          params.device_type === DEVICE_TYPE.DOOR_LOCK ||
+          params.device_type === DEVICE_TYPE.ALARM_RESTRAINT_BAND
       this.isLedDevice = params.device_type === DEVICE_TYPE.LED_SCREEN ||
           params.device_type === DEVICE_TYPE.LCD_SCREEN
       this.deviceModel = {

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

@@ -396,7 +396,9 @@ export default {
         { key: this.$t('deviceType.ALARM_HOUSEHOLD_SMOKE'), value: 26 },
         { key: this.$t('deviceType.ALARM_BUTTON_SOS'), value: 27 },
         { key: this.$t('deviceType.VITAL_SIGNS_DEVICE'), value: 28 },
-        { key: this.$t('deviceType.DOOR_LOCK'), value: 30 }
+        { key: this.$t('deviceType.ALARM_RESTRAINT_BAND'), value: 29 },
+        { key: this.$t('deviceType.DOOR_LOCK'), value: 30 },
+        { key: this.$t('deviceType.EMERGENCY_GATEWAY'), value: 31 }
       ],
       deviceTypeEnum: DEVICE_TYPE.getValueList(),
       deviceStatusTransfer: [
@@ -787,7 +789,8 @@ export default {
                         val === DEVICE_TYPE.SIMULATE_DOOR_LIGHT
       this.isVitalSigns = val === DEVICE_TYPE.VITAL_SIGNS_DEVICE
       this.hasSosDeviceSettings = val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
-          val === DEVICE_TYPE.DOOR_LOCK
+          val === DEVICE_TYPE.DOOR_LOCK ||
+          val === DEVICE_TYPE.ALARM_RESTRAINT_BAND
       this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN ||
           val === DEVICE_TYPE.LCD_SCREEN
     },
@@ -865,7 +868,8 @@ export default {
                         params.device_type === DEVICE_TYPE.SIMULATE_DOOR_LIGHT
       this.isVitalSigns = params.device_type === DEVICE_TYPE.VITAL_SIGNS_DEVICE
       this.hasSosDeviceSettings = params.device_type === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
-          params.device_type === DEVICE_TYPE.DOOR_LOCK
+          params.device_type === DEVICE_TYPE.DOOR_LOCK ||
+          params.device_type === DEVICE_TYPE.ALARM_RESTRAINT_BAND
       this.isLedDevice = params.device_type === DEVICE_TYPE.LED_SCREEN ||
           params.device_type === DEVICE_TYPE.LCD_SCREEN
       this.deviceModel = {