Browse Source

调整部分语言文件

vothin 2 năm trước cách đây
mục cha
commit
a465fddf86

+ 25 - 25
languages/en.js

@@ -462,6 +462,7 @@ module.exports = {
     initializeDevice: 'Initialize the device',
     watchFrame: 'Manage space',
     watchDeviceFrame: 'Manage space for mobile device',
+    allFrame: 'All rooms',
     place: 'Location',
     placeInfo: 'Location information',
     getNewPlace: 'Get the latest location',
@@ -918,10 +919,10 @@ module.exports = {
     EMERGENCY_GATEWAY: 'Alarm Gateway',
     ALARM_433BUTTON: '433 Alarm',
     OTHER_HOST: 'Other Host',
-    BREASTPLATE:'Breast Plate',
-    OWON_X5_GATEWAY:'X5 Gateway',
-    FALL_DETECTION_RADAR:'Fall Detection Radar',
-    HUMAN_DETECTION_RADAR:'Sleep Detection Radar',
+    BREASTPLATE: 'Breast Plate',
+    OWON_X5_GATEWAY: 'X5 Gateway',
+    FALL_DETECTION_RADAR: 'Fall Detection Radar',
+    HUMAN_DETECTION_RADAR: 'Sleep Detection Radar'
 
   },
   vitalSignsDeviceType: {
@@ -970,26 +971,25 @@ module.exports = {
     SPONTANEOUS_LABOR: 'Natrual Birth',
     CAESAREAN_BIRTH: 'Caesarean Birth'
   },
-  sleepData:{
-    Awake:'Awake',
-    DeepSleep:'Deep Sleep',
-    LightSleep:'Light Sleep',
-    Hour:'h',
-    Minute:'m',
-    Quality:'Quality',
-    InBed:'In Bed',
-    Asleep:'Asleep',
-    AvarageBreath:'Avarage Breath',
-    AvarageHeartBeat:'Avarage Heart Beat',
-    LeaveBedTimes:'Leave Bed Times',
-    TurnOverTimes:'Turnover Times',
-    BreathPauseTimes:'Breath Pause Times',
-    GetInBedTime:'Get In Bed Time',
-    AwakeTime:'Awake Time',
-    NoData:'Empty',
-    Times:'Times',
-    ChooseDate:'Choose Date',
-    SleepData:'Sleep Data'
-
+  sleepData: {
+    Awake: 'Awake',
+    DeepSleep: 'Deep Sleep',
+    LightSleep: 'Light Sleep',
+    Hour: 'h',
+    Minute: 'm',
+    Quality: 'Quality',
+    InBed: 'In Bed',
+    Asleep: 'Asleep',
+    AvarageBreath: 'Avarage Breath',
+    AvarageHeartBeat: 'Avarage Heart Beat',
+    LeaveBedTimes: 'Leave Bed Times',
+    TurnOverTimes: 'Turnover Times',
+    BreathPauseTimes: 'Breath Pause Times',
+    GetInBedTime: 'Get In Bed Time',
+    AwakeTime: 'Awake Time',
+    NoData: 'Empty',
+    Times: 'Times',
+    ChooseDate: 'Choose Date',
+    SleepData: 'Sleep Data'
   }
 }

+ 36 - 10
languages/es.js

@@ -69,10 +69,10 @@ module.exports = {
     tips: 'Consejos',
     time: 'Hora',
     time2: 'Tiempo',
-    miunte: 'Minuto',
+    minute: 'Minuto',
     minute2: 'Minuto',
     second: 'Segundo',
-    milisegundo: 'Milisegundos',
+    millisecond: 'Milisegundos',
     oneSecond: 'Dentro de 1 segundo',
     Monday: 'lunes',
     Tuesday: 'martes',
@@ -180,16 +180,16 @@ module.exports = {
     unknown: 'Desconocido',
     IDCard: 'Número de identificación',
     birthday: 'Cumpleaños',
-    choicebirthday: 'Elige una fecha',
+    choiceBirthday: 'Elige una fecha',
     birthday2: 'Fecha de nacimiento',
-    choicebirthday2: 'Elige la fecha de nacimiento',
+    choiceBirthday2: 'Elige la fecha de nacimiento',
     address: 'Dirección detallada',
     addressInputMsg: 'Máximo 50 caracteres',
     homeAddress: 'Dirección de casa',
     inputHomeAddress: 'Ingrese la dirección de su casa',
     disabledClerk: '¿Está seguro de que desea deshabilitar a este usuario?',
     disabled: '¡Deshabilitado!',
-    disablecancel: 'Deshabilitado',
+    disableCancel: 'Deshabilitado',
     deleteMember: '¿Está seguro de que desea eliminar esta información de usuario?',
     cantDeleteAdmin: 'No se puede eliminar al responsable de la organización'
   },
@@ -386,7 +386,7 @@ module.exports = {
     idCard: 'ID',
     noIdCard: 'Sin tarjeta de identificación',
     null: 'Actualmente no disponible',
-    pasaporte: 'Pasaporte',
+    passport: 'Pasaporte',
     servicemanCard: 'Tarjeta militar',
     idNo: 'Número de identificación',
     inputIdNo: 'Ingrese el número de identificación',
@@ -412,7 +412,7 @@ module.exports = {
     worker: 'trabajador responsable del cuidado',
     choiceWorker: 'Por favor elija una enfermera',
     choiceUser: 'Seleccione un usuario',
-    CustomerRelative: 'Usuario Relativo',
+    customerRelative: 'Usuario Relativo',
     sureDeleteRelative: '¿Está seguro de que desea eliminar la información relativa a este paciente?',
     customerRelativeTrueName: 'Nombre relativo',
     inputCustomerRelativeTrueName: 'Por favor ingrese el nombre del familiar',
@@ -462,6 +462,7 @@ module.exports = {
     initializeDevice: 'Inicializar el dispositivo',
     watchFrame: 'Administrar espacio',
     watchDeviceFrame: 'Administrar espacio para dispositivo móvil',
+    allFrame: 'Todos los espacios',
     place: 'Ubicación',
     placeInfo: 'Información de ubicación',
     getNewPlace: 'Obtener la última ubicación',
@@ -480,7 +481,7 @@ module.exports = {
     channelAdd: 'Agregar canal',
     channelName: 'Nombre del canal',
     inputChannelName: 'Ingrese el nombre del canal',
-    subscribeManage: 'Administración',
+    subscribeManage: 'subscribir',
     channelImHistory: 'Historia',
     senderMemberName: 'Nombre del remitente',
     senderTime: 'Hora de envío',
@@ -917,13 +918,17 @@ module.exports = {
     DOOR_LOCK: 'Sensor magnético de puerta',
     EMERGENCY_GATEWAY: 'Puerta de enlace de alarma',
     ALARM_433BUTTON: 'Alarma 433',
-    OTHER_HOST: 'Otro anfitrión'
+    OTHER_HOST: 'Otro anfitrión',
+    BREASTPLATE: 'Insignia',
+    OWON_X5_GATEWAY: 'OWONX5_entrada',
+    FALL_DETECTION_RADAR: 'Radar anticaída',
+    HUMAN_DETECTION_RADAR: 'Radar de monitoreo del sueño'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Medidor de presión arterial',
     BLOOD_OXYGEN: 'Oxímetro',
     BLOOD_PRESSURE: 'Monitor de presión arterial',
-    TEMPERATURA: 'Pistola de temperatura',
+    TEMPERATURE: 'Pistola de temperatura',
     SHADOW_OF_GUARDIAN: 'Sombra guardiana'
   },
   sosDeviceSettingType: {
@@ -964,5 +969,26 @@ module.exports = {
   childbirthType: {
     SPONTANEOUS_LABOR: 'Nacimiento Natural',
     CAESAREAN_BIRTH: 'Nacimiento por cesárea'
+  },
+  sleepData: {
+    Awake: 'Despierto',
+    DeepSleep: 'Sueño profundo',
+    LightSleep: 'Sueño ligero',
+    Hour: 'Hora',
+    Minute: 'dividir',
+    Quality: 'Calidad del sueño',
+    InBed: 'En la cama',
+    Asleep: 'dormir',
+    AvarageBreath: 'Respiración promedio',
+    AvarageHeartBeat: 'Latido cardíaco promedio',
+    LeaveBedTimes: 'Número de veces que se levanta de la cama',
+    TurnOverTimes: 'Número de volúmenes de negocios',
+    BreathPauseTimes: 'Número de apneas',
+    GetInBedTime: 'Hora de acostarse',
+    AwakeTime: 'Hora de despertar',
+    NoData: 'No hay datos',
+    Times: 'veces',
+    ChooseDate: 'fecha',
+    SleepData: 'Datos de sueño'
   }
 }

+ 25 - 24
languages/zh-CN.js

@@ -462,6 +462,7 @@ module.exports = {
     initializeDevice: '初始化设备',
     watchFrame: '管理空间',
     watchDeviceFrame: '移动设备管辖空间',
+    allFrame: '所有房间',
     place: '位置',
     placeInfo: '位置信息',
     getNewPlace: '获取最新位置',
@@ -918,10 +919,10 @@ module.exports = {
     EMERGENCY_GATEWAY: '报警网关',
     ALARM_433BUTTON: '433报警器',
     OTHER_HOST: '其他主机',
-    BREASTPLATE:'胸牌',
-    OWON_X5_GATEWAY:'OWONX5网关',
-    FALL_DETECTION_RADAR:'防跌倒雷达',
-    HUMAN_DETECTION_RADAR:'睡眠监测雷达'
+    BREASTPLATE: '胸牌',
+    OWON_X5_GATEWAY: 'OWONX5网关',
+    FALL_DETECTION_RADAR: '防跌倒雷达',
+    HUMAN_DETECTION_RADAR: '睡眠监测雷达'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: '血糖仪',
@@ -969,25 +970,25 @@ module.exports = {
     SPONTANEOUS_LABOR: '顺产',
     CAESAREAN_BIRTH: '剖腹产'
   },
-  sleepData:{
-    Awake:'醒着',
-    DeepSleep:'深睡',
-    LightSleep:'浅睡',
-    Hour:'时',
-    Minute:'分',
-    Quality:'睡眠质量',
-    InBed:'在床上',
-    Asleep:'睡眠',
-    AvarageBreath:'平均呼吸',
-    AvarageHeartBeat:'平均心跳',
-    LeaveBedTimes:'离床次数',
-    TurnOverTimes:'翻身次数',
-    BreathPauseTimes:'呼吸暂停次数',
-    GetInBedTime:'上床时间',
-    AwakeTime:'醒来时间',
-    NoData:'没有数据',
-    Times:'次',
-    ChooseDate:'日期',
-    SleepData:'睡眠数据'
+  sleepData: {
+    Awake: '醒着',
+    DeepSleep: '深睡',
+    LightSleep: '浅睡',
+    Hour: '时',
+    Minute: '分',
+    Quality: '睡眠质量',
+    InBed: '在床上',
+    Asleep: '睡眠',
+    AvarageBreath: '平均呼吸',
+    AvarageHeartBeat: '平均心跳',
+    LeaveBedTimes: '离床次数',
+    TurnOverTimes: '翻身次数',
+    BreathPauseTimes: '呼吸暂停次数',
+    GetInBedTime: '上床时间',
+    AwakeTime: '醒来时间',
+    NoData: '没有数据',
+    Times: '次',
+    ChooseDate: '日期',
+    SleepData: '睡眠数据'
   }
 }

+ 8 - 7
src/views/customer/components/patientManager.vue

@@ -436,9 +436,9 @@
                 <my-map-html :map-url="mapUrl" style="width: 100%; height: 670px;"></my-map-html>
               </el-tab-pane>
 
-                <el-tab-pane  :label="this.$t('sleepData.SleepData')" name="sleepData">
-                  <sleep-detect-data :member-id="formmodel.member_id"></sleep-detect-data>
-                </el-tab-pane>
+<!--                <el-tab-pane  :label="this.$t('sleepData.SleepData')" name="sleepData">-->
+<!--                  <sleep-detect-data :member-id="formmodel.member_id"></sleep-detect-data>-->
+<!--                </el-tab-pane>-->
 
             </el-tabs>
         </el-dialog>
@@ -1560,14 +1560,15 @@
                             acc[val] = (acc[val] || []).concat(arr[i])
                             return acc
                         }, {})
-                    const groupData = groupBy(res, item => item.role_name)
+                    const groupData = groupBy(res, item => item.role_id)
                     if (Object.entries(groupData).length > 0) {
                         Object.entries(groupData).forEach(item => {
-                            if (item[0] === '医生') {
+                          console.log(item[0])
+                            if (item[0] === '2') {
                                 _this.doctors = item[1]
-                            } else if (item[0] === '护士') {
+                            } else if (item[0] === '3') {
                                 _this.nurses = item[1]
-                            } else if (item[0] === '护工') {
+                            } else if (item[0] === '4') {
                                 _this.workers = item[1]
                             }
                         })

+ 12 - 12
src/views/hospitalFrame/nurse_watch_frame.vue

@@ -3,24 +3,24 @@
 
       <el-form ref="editform" label-width="80px">
         <el-tabs v-model="activeName" style="margin:0px;" type="border-card">
-          <el-tab-pane label="所有房间" name="frameInfo">
+          <el-tab-pane :label="$t('watch.allFrame')" name="frameInfo">
 <!--        <fieldset class="margin-top-sm">-->
 <!--          <legend>{{ watchDeviceFrame }}</legend>-->
           <el-row v-if="rooms.length > 1" :gutter="20" type="flex">
             <el-col v-for="(item,index) in rooms" :key="index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
               <el-card class="box-card">
-                <div v-if="roleName !== '护士组长'" slot="header" class="clearfix">
+                <div v-if="roleId !== 8" slot="header" class="clearfix">
                   <el-checkbox v-if="uiVersion === 1" v-model="item.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></el-checkbox>
                   <span v-if="uiVersion !== 1"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></span>
                   <el-checkbox v-model="item.allCkeck" style="float: right" :indeterminate="item.indeterminate" @change="(checked)=>{handleCheckAll(checked,item)}">
                     {{ $t('action.choiceAll') }}</el-checkbox>
                 </div>
                 <div v-for="(bed,_index) in item.children" :key="_index" class="text item">
-                  <el-checkbox  v-if="roleName !== '护士组长'" v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                  <el-checkbox  v-if="roleId !== 8" v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                     <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                     <span v-else>{{ bed.full_name }}</span>
                   </el-checkbox>
-                  <div v-if="roleName === '护士组长'">
+                  <div v-if="roleId === 8">
                     <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                     <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                     <span v-else>{{ bed.full_name }}</span>
@@ -32,19 +32,19 @@
           <el-row v-if="rooms.length === 1" :gutter="20" type="flex">
             <el-col :span="24">
               <div class="text item">
-                <div v-if="roleName !== '护士组长'" style="margin: 10px;">
+                <div v-if="roleId !== 8" style="margin: 10px;">
                   <el-checkbox v-if="uiVersion === 1" v-model="rooms[0].checked" @change="handleCheckboxChanged(rooms[0])"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ rooms[0].name }}</span></el-checkbox>
                   <span v-if="uiVersion !== 1"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ rooms[0].name }}</span></span>
                   <el-checkbox v-model="rooms[0].allCkeck" style="margin-left: 30px;" :indeterminate="rooms[0].indeterminate" @change="(checked)=>{handleCheckAll(checked,rooms[0])}">{{ $t('action.choiceAll') }}</el-checkbox>
                 </div>
                 <el-row>
                   <el-col v-for="(bed,_index) in rooms[0].children" :key="_index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
-                    <el-checkbox v-if="roleName !== '护士组长'" v-model="bed.checked" @change="handleCheckboxChanged(rooms[0])">
+                    <el-checkbox v-if="roleId !== 8" v-model="bed.checked" @change="handleCheckboxChanged(rooms[0])">
                       <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                       <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                       <span v-else>{{ bed.full_name }}</span>
                     </el-checkbox>
-                    <div v-if="roleName === '护士组长'">
+                    <div v-if="roleId !== 8">
                       <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                       <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                       <span v-else>{{ bed.full_name }}</span>
@@ -60,18 +60,18 @@
             <el-row v-if="group[1].length > 1" :gutter="20" type="flex">
               <el-col v-for="(item,index) in group[1]" :key="index" :xs="8" :sm="8" :md="6" :lg="6" :xl="6">
                 <el-card class="box-card">
-                  <div v-if="roleName !== '护士组长'" slot="header" class="clearfix">
+                  <div v-if="roleId !== 8" slot="header" class="clearfix">
                     <el-checkbox v-if="uiVersion === 1" v-model="item.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></el-checkbox>
                     <span v-if="uiVersion !== 1"><svg-icon icon-class="sickroom" style="color: #9aaabf;margin-right: 5px" /><span>{{ item.name }}</span></span>
                     <el-checkbox v-model="item.allCkeck" style="float: right" :indeterminate="item.indeterminate" @change="(checked)=>{handleCheckAll(checked,item)}">
                       {{ $t('action.choiceAll') }}</el-checkbox>
                   </div>
                   <div v-for="(bed,_index) in item.children" :key="_index" class="text item">
-                    <el-checkbox  v-if="roleName !== '护士组长'" v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
+                    <el-checkbox  v-if="roleId !== 8" v-model="bed.checked" @change="handleCheckboxChanged(item)"><svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                       <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                       <span v-else>{{ bed.full_name }}</span>
                     </el-checkbox>
-                    <div v-if="roleName === '护士组长'">
+                    <div v-if="roleId === 8">
                       <svg-icon icon-class="bed" style="color: #9aaabf;margin-right: 5px" />
                       <span v-if="bed.device_id && !bed.checked" style="color: #13ce66">{{ bed.full_name }} {{ bed.clerk_name }}</span>
                       <span v-else>{{ bed.full_name }}</span>
@@ -82,7 +82,7 @@
             </el-row>
           </el-tab-pane>
         </el-tabs>
-        <el-form-item v-if="roleName !== '护士组长'" align="center" class="margin-top-sm">
+        <el-form-item v-if="roleId !== 8" align="center" class="margin-top-sm">
           <el-button type="success" @click="onSubmit">{{ $t('action.saveSettings') }}</el-button>
           <el-button type="primary" @click="onQK">{{ $t('action.deleteSettings') }}</el-button>
           <el-button @click="back">{{ $t('action.back') }}</el-button>
@@ -178,7 +178,7 @@ export default {
                 return acc
               }, {})
 
-      if (this.roleName === '护士组长') {
+      if (this.roleId === 8) {
         API_hospitalFrame.getFrameByRoleGroupId(this.$store.getters.partId, this.memberId).then(res => {
           _this.rooms = _this.filterGroupFrames(res)
           const room_group = groupBy(_this.rooms, item => item.group_name)

+ 3 - 3
src/views/ncs-channel/index.vue

@@ -104,7 +104,7 @@ export default {
         fixedCondition: ' part_id = ' + this.$store.getters.partId
       },
       /** 新建组织弹出参数 **/
-      formtitle: '新增频道',
+      formtitle: this.$t('channel.channelAdd'),
       formshow: false,
       /** 频道订阅设置 */
       formSubscribe: false,
@@ -112,7 +112,7 @@ export default {
       frameGroups: [],
       rules: {
         channel_name: [
-          { required: true, message: '频道名称不能为空', trigger: 'blur' }
+          { required: true, message: this.$t('channel.inputChannelName'), trigger: 'blur' }
         ]
       },
       timeRange: [new Date(2020, 11, 11, 7, 0), new Date(2020, 11, 11, 8, 0)],
@@ -206,7 +206,7 @@ export default {
         filter: false,
         pinned: 'right',
         lockPinned: true,
-        minWidth: this.$i18n.locale === 'zh' ? 310 : 340,
+        minWidth: this.$i18n.locale === 'zh' ? 310 : 350,
         resizable: false,
         sortable: false
       }