Merge branch 'develop' into feature/1.5.3-deviceMenuDetail-20230921

# Conflicts:
#	languages/zh-CN.js
#	src/views/ncs-orginazition/components/partInfoEdit.vue

languages/en.js

@@ -872,7 +872,7 @@ module.exports = {
     attacHisCodes: 'Attach HIS system IDs',
     inputHisCode: 'Please enter the HIS system ID',
     sharedBedHisCodes: 'Shared Bed Department System ID',
-    distinguishSharedBeds:'Distinguish patient',
+    distinguishSharedBeds: 'Distinguish patient',
     inputSharedBedHisCodes: 'Enter the HIS department ID for shared beds in this department, with multiple departments separated by commas',
     inputAttacHisCode: 'Enter additional HIS department identification, multiple departments separated by commas',
     shopType: 'Organization type',
@@ -995,7 +995,8 @@ module.exports = {
     roomCallBed: 'Turn on the doorstep machine to call the bed button',
     boolAllDoorStatus: 'Enable all doorstep call displays',
     boolDooLightAlwaysOn: 'Is the door light always on',
-    convenientServiceEnabled: 'Convenient service'
+    convenientServiceEnabled: 'Convenient service',
+    ledServiceEnabled: 'Server control LED'
   },
   role: {
     roleName: 'Role name',

languages/es.js

@@ -995,7 +995,8 @@ module.exports = {
     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',
     boolDooLightAlwaysOn: '¿¿ las luces de la puerta siempre están encendidas?',
-    convenientServiceEnabled: 'Servicios convenientes'
+    convenientServiceEnabled: 'Servicios convenientes',
+    ledServiceEnabled: 'Control del servidor LED'
   },
   role: {
     roleName: 'Nombre de la función',

languages/ru-RU.js

@@ -995,7 +995,8 @@ module.exports = {
     roomCallBed: 'Открыть клапан. Машина вызывает кровать.',
     boolAllDoorStatus: 'Откройте все двери.',
     boolDooLightAlwaysOn: 'Светит ли дверь постоянно',
-    convenientServiceEnabled: 'Удобное обслуживание'
+    convenientServiceEnabled: 'Удобное обслуживание',
+    ledServiceEnabled: 'Управление сервером LED'
   },
   role: {
     roleName: 'Имя роли',

languages/zh-CN.js

@@ -172,7 +172,6 @@ module.exports = {
     uploaderImg2: '上传头像图片只能是 JPG、PNG、GIF 格式!',
     uploaderSize: '上传附件大小不能超过 5MB!',
     uploaderSize2: '上传头像图片大小不能超过 2MB!',
-    uploaderSize3: '上传头像图片大小不能超过 10MB!',
     uploaderImgMsg: '图片宽度必须在100~500之间,宽高比为1: 1！',
     uploaderImgMsg2: '请上传宽高比为1: 1的图片',
     uploaderImgMsg3: '图片高度必须在100~500之间！',
@@ -457,16 +456,6 @@ module.exports = {
     actIntent: 'Activity的参数',
     inputActIntent: '请输入Activity的参数'
   },
-  deviceMenuDetailManage: {
-    type: '类型',
-    chooseType: '请选择简介类型',
-    title: '标题',
-    inputTitle: '请输入标题',
-    titleBg: '头部背景',
-    titleIcon: '标题图标',
-    summary: '简介',
-    inputSummary: '请输入简介',
-  },
   clerkManage: {
     clerkEdit: '编辑成员信息',
     choiceClerk: '请选择员工',
@@ -883,7 +872,7 @@ module.exports = {
     attacHisCodes: '附加HIS科室标识',
     inputHisCode: '请输入HIS系统标识',
     sharedBedHisCodes: '共享床位HIS标识',
-    distinguishSharedBeds: '区分患者',
+    distinguishSharedBeds:'区分患者',
     inputSharedBedHisCodes: '输入共享本科室床位HIS科室标识,多个科室以逗号分割',
     inputAttacHisCode: '输入附加HIS科室标识,多个科室以逗号分割',
     shopType: '组织类型',
@@ -1007,7 +996,7 @@ module.exports = {
     boolAllDoorStatus: '开启所有门口机呼显示',
     boolDooLightAlwaysOn: '门灯是否常亮',
     convenientServiceEnabled: '便民服务',
-    boolLedService: '开发服务器控制点阵屏'
+    ledServiceEnabled: '服务端控制点阵屏'
   },
   role: {
     roleName: '角色名称',
@@ -1099,7 +1088,6 @@ module.exports = {
     customBoardDesigner: '看板屏设计',
     staffManageFrames: '空间管理设置',
     deviceMenuManager: '设备菜单',
-    deviceMenuDetail: '菜单详细信息',
     nbiotDeviceStatus: '故障物联设备',
     offlineDevice: '离线设备',
     lowBatteryDevice: '低电量设备',
@@ -1344,12 +1332,6 @@ module.exports = {
     FILE_UPLOAD_FAILED: '未配置文件存放目录！',
     FILE_FAILED: '文件错误'
   },
-  deviceMenuDetailType: {
-    HOSPITAL: '医院简介',
-    PART: '科室简介',
-    IN_NOTICE: '入院须知',
-    SATISFACTION: '满意度调查'
-  },
   entraceguardUser: {
     named: '用户姓名',
     idNo: '身份证号',

src/views/custom-infoboard/board-title.vue

@@ -412,7 +412,7 @@
             },
 
             toDesigner(row) {
-                this.$router.push({ name: 'infoboard-designer', params: { id:row.id }})
+                this.$router.push({ name: 'infoboard-designer-manager', params: { id:row.id }})
             }
 
 

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

@@ -419,9 +419,8 @@
                 <el-checkbox v-model="formmodel.convenient_service_enabled" :true-label="true" :false-label="false">{{ this.$t('action.enabled') }}</el-checkbox>
               </el-form-item>
             </el-col>
-
             <el-col :span="8">
-              <el-form-item :label="this.$t('partInfo.boolLedService')">
+              <el-form-item :label="this.$t('partInfo.ledServiceEnabled')">
                 <el-checkbox v-model="formmodel.bool_led_service" :true-label="true" :false-label="false">{{ this.$t('action.enabled') }}</el-checkbox>
               </el-form-item>
             </el-col>