1、加上门灯常亮功能；

2、增加睡眠床垫设备类型；

languages/en.js

@@ -942,7 +942,8 @@ module.exports = {
     recordAble: 'Turn on the audio and video recording function',
     screenLight: 'Turn on screen bright and triggers the function',
     roomCallBed: 'Turn on the doorstep machine to call the bed button',
-    boolAllDoorStatus: 'Enable all doorstep call displays'
+    boolAllDoorStatus: 'Enable all doorstep call displays',
+    boolDooLightAlwaysOn: 'Is the door light always on'
   },
   role: {
     roleName: 'Role name',
@@ -1076,7 +1077,8 @@ module.exports = {
     ELECTRONIC_FENCE: 'Electronic fence',
     S433_DOOR_LAMP: 'Wireless door lamp',
     S433_TRANSFER_BOX: 'Wireless conversion box',
-    S433_RECEIVER: 'Signal receiver'
+    S433_RECEIVER: 'Signal receiver',
+    SLEEPMATTRESS: 'sleep mattress'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Blood Pressure Meter',

languages/es.js

@@ -944,7 +944,8 @@ module.exports = {
     recordAble: 'Active la función de grabación de audio y video',
     screenLight: 'Enciende la pantalla y activa la función',
     roomCallBed: 'Abra el botón de la máquina de la puerta para llamar a la cama',
-    boolAllDoorStatus: 'Activar la visualización de llamadas en todas las puertas'
+    boolAllDoorStatus: 'Activar la visualización de llamadas en todas las puertas',
+    boolDooLightAlwaysOn: '¿¿ las luces de la puerta siempre están encendidas?'
   },
   role: {
     roleName: 'Nombre de la función',
@@ -1078,7 +1079,8 @@ module.exports = {
     ELECTRONIC_FENCE: 'Valla electrónica',
     S433_DOOR_LAMP: 'Luz de puerta inalámbrica',
     S433_TRANSFER_BOX: 'Caja de conversión inalámbrica',
-    S433_RECEIVER: 'Receptor de señal'
+    S433_RECEIVER: 'Receptor de señal',
+    SLEEPMATTRESS: 'Colchón para dormir',
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Medidor de presión arterial',

languages/zh-CN.js

@@ -946,7 +946,8 @@ module.exports = {
     recordAble: '开启录音录像功能',
     screenLight: '开启按钮亮屏并触发功能',
     roomCallBed: '开启门口机呼叫床位按钮',
-    boolAllDoorStatus: '开启所有门口机呼显示'
+    boolAllDoorStatus: '开启所有门口机呼显示',
+    boolDooLightAlwaysOn: '门灯是否常亮'
   },
   role: {
     roleName: '角色名称',
@@ -1082,7 +1083,8 @@ module.exports = {
     ELECTRONIC_FENCE: '电子围栏',
     S433_DOOR_LAMP: '433无线门灯',
     S433_TRANSFER_BOX: '433无线转换盒',
-    S433_RECEIVER: '433接收器'
+    S433_RECEIVER: '433接收器',
+    SLEEPMATTRESS: '睡眠床垫'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: '血糖仪',

src/api/ncs_device.js

@@ -276,4 +276,13 @@ export function getWatchFootprint(memberId, deviceType){
   })
 }
 
+/** 查询定位设备 */
+export function getLocationDeviceList(partid) {
+  return request({
+    url: `/ncs/device/getLocationDeviceList/${partid}`,
+    method: 'get',
+    loading: false
+  })
+}
+
 

src/utils/enum/DeviceTypeEnum.js

@@ -44,6 +44,7 @@ export const DEVICE_TYPE = createEnum(
     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接收器
+    S433_RECEIVER: [42, i18n.t('deviceType.S433_RECEIVER')], //433接收器
+    SLEEPMATTRESS: [43, i18n.t('deviceType.SLEEPMATTRESS')] //睡眠床垫
   }
 )

src/views/ncs-device/watch_location.vue

@@ -15,7 +15,7 @@
       <el-row>
         <el-col :span="6" v-for="(item, index) in beaconDevices" :key="index">
           <el-card :id="'myFrame'+item.id" shadow="never" class="myClass">
-            <div>
+            <div :style="item.device_type === getDeviceList().ELECTRONIC_FENCE ? 'color: red' : ''">
               <svg-icon :id="'myIcon' + item.id" icon-class="footmark" class-name="footmark" style="font-size: 30px;display: none" />
               <svg-icon icon-class="sickroom" style="font-size: 40px;padding-right: 20px" />{{ item.name }}
             </div>
@@ -57,7 +57,7 @@ import { unixToDate } from '@/utils/Foundation'
 import { getListByDeviceId } from '@/api/ncs_hospitalFrame'
 // import {DeviceUrl} from "@/utils/domain"
 const DeviceUrl = domain.DeviceUrl
-import { getDeviceByType } from '@/api/ncs_device'
+import { getLocationDeviceList } from '@/api/ncs_device'
 import { DEVICE_TYPE } from '@/utils/enum/DeviceTypeEnum'
 export default {
   name: 'Index',
@@ -118,7 +118,7 @@ export default {
   methods: {
     API_Devices() {
       const _this = this
-      getDeviceByType(this.$store.getters.partId, DEVICE_TYPE.BEACON).then(res => {
+      getLocationDeviceList(this.$store.getters.partId).then(res => {
         _this.beaconDevices = res
         _this.API_GetList()
       })
@@ -272,6 +272,9 @@ export default {
     },
     websocketclose: function(e) {
       console.log('connection closed (' + e + ')')
+    },
+    getDeviceList() {
+      return DEVICE_TYPE;
     }
   }
 }

src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -351,6 +351,14 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.boolDooLightAlwaysOn')">
+                <el-checkbox v-model="formmodel.bool_door_light_always_on" :true-label="1" :false-label="0">{{ this.$t('action.enabled') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
 
           <el-row>
             <el-col :span="8">
@@ -709,7 +717,8 @@ export default {
                 customize_hospital_call_first: 0,
                 customize_hospital_call_second: 0,
                 customize_hospital_call_third: 0,
-                bool_all_door_status: 0
+                bool_all_door_status: 0,
+                bool_door_light_always_on: 0
               }
             }
           } else {