浏览代码

开发双色门灯控制,修改LCD走廊屏的注册输入,增加LCD走廊屏APK上传类型

vothin 3 年之前
父节点
当前提交
b9c9b10220

+ 4 - 1
languages/zh-CN.js

@@ -723,9 +723,12 @@ module.exports = {
     mobiledevice: '移动设备',
     vistitation: '探视机',
     transferDevice: '转换盒',
+    lcdDevice: 'LCD走廊屏',
     organizationAdd: '新建组织',
     boardShowEmptyBed: '看板显示空床',
-    nursingColorRgb: '护理门灯颜色'
+    nursingColorRgb: '护理门灯颜色',
+    twoColorDoorLightValid: '是否支持双色门灯',
+    support: '支持双色门灯'
   },
   role: {
     roleName: '角色名称',

+ 3 - 5
src/views/hospital/ncs_device/deviceManager.vue

@@ -741,8 +741,7 @@ export default {
       this.isVitalSigns = val === DEVICE_TYPE.VITAL_SIGNS_DEVICE
       this.hasSosDeviceSettings = val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
           val === DEVICE_TYPE.DOOR_LOCK
-      this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN ||
-          val === DEVICE_TYPE.LCD_SCREEN
+      this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN
     },
     /** 设备类型选中对应的空间结构  **/
     deviceTypeChangeToFrameTypeChange(val) {
@@ -826,12 +825,11 @@ export default {
       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
-      this.isLedDevice = params.device_type === DEVICE_TYPE.LED_SCREEN ||
-          params.device_type === DEVICE_TYPE.LCD_SCREEN
+      this.isLedDevice = params.device_type === DEVICE_TYPE.LED_SCREEN
       this.deviceModel = {
         ...params
       }
-      if (params.device_type === DEVICE_TYPE.NURSE_HOST && params.part_id == this.$store.getters.partId) {
+      if (params.device_type === DEVICE_TYPE.NURSE_HOST && params.part_id === this.$store.getters.partId) {
         this.getGroupHost(params.id, params.part_id)
       }
       this.deviceEditTitle = this.$t('deviceManage.deviceEdit')

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

@@ -797,8 +797,7 @@ export default {
       this.hasSosDeviceSettings = val === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
           val === DEVICE_TYPE.DOOR_LOCK ||
           val === DEVICE_TYPE.ALARM_RESTRAINT_BAND
-      this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN ||
-          val === DEVICE_TYPE.LCD_SCREEN
+      this.isLedDevice = val === DEVICE_TYPE.LED_SCREEN
     },
     /** 设备类型选中对应的空间结构  **/
     deviceTypeChangeToFrameTypeChange(val) {
@@ -877,8 +876,7 @@ export default {
       this.hasSosDeviceSettings = params.device_type === DEVICE_TYPE.ALARM_BODY_INDUCTIVE ||
           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.isLedDevice = params.device_type === DEVICE_TYPE.LED_SCREEN
       this.deviceModel = {
         ...params
       }

+ 8 - 1
src/views/ncs-orginazition/components/partInfoEdit.vue

@@ -300,6 +300,12 @@
                 <el-input v-model="formmodel.nursing_color_rgb" />
               </el-form-item>
             </el-col>
+
+            <el-col :span="8">
+              <el-form-item :label="this.$t('partInfo.twoColorDoorLightValid')" prop="two_color_door_light_valid">
+                <el-checkbox v-model="formmodel.two_color_door_light_valid" :true-label="1" :false-label="0">{{ this.$t('partInfo.support') }}</el-checkbox>
+              </el-form-item>
+            </el-col>
           </el-row>
 
 
@@ -517,7 +523,8 @@ export default {
                 door_nursing_title: '进入护理',
                 door_nursing_valid: 1,
                 event_forward: 0,
-                nursing_color_rgb: '#000000'
+                nursing_color_rgb: '#000000',
+                two_color_door_light_valid: 0,
               }
             }
           } else {

+ 5 - 0
src/views/ncs-orginazition/partInfoSetting.vue

@@ -74,6 +74,11 @@
           <app-version-manager :part-id="part_id" :device-type="11" />
         </keep-alive>
       </el-tab-pane>
+      <el-tab-pane :label="this.$t('partInfo.lcdDevice')" name="lcdDevice">
+        <keep-alive>
+          <app-version-manager :part-id="part_id" :device-type="5" />
+        </keep-alive>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>