修复国外科室设置选择时间后会消除0,导致无法保存的问题.完善翻译

.gitignore

@@ -2,3 +2,4 @@
 /dist/
 .DS_Store
 .idea
+package-lock.json

languages/en.js

@@ -257,7 +257,8 @@ module.exports = {
     disableCancel: 'Disabled',
     deleteMember: 'Are you sure you want to delete this user information?',
     cannotDeleteAdmin: 'Cannot delete the person in charge of the organization',
-    leaderName: 'Leader Name'
+    leaderName: 'Leader Name',
+    passNo:'Employee No'
   },
   home: {
     todayTask: "Today's task",
@@ -1003,6 +1004,7 @@ module.exports = {
     functionRoleMapping: 'Component Permissions',
     countdownConfig:'Countdown Component Configuration',
     screentip:'ScreenTip Component Configuration',
+    bedsideInteration: 'Interaction components',
     interactionChain: 'Interaction Accept Order',
     allClerk: 'All employees',
     allCustomer: 'All users',
@@ -1162,7 +1164,8 @@ module.exports = {
     POSITION_COMPONENT: 'Locate',
     COUNTDOWN_COMPONENT: 'Countdown',
     ROOMCHECK_COMPONENT: 'Room patrol',
-    SCREEN_TIP_SET_COMPONENT: 'Set screen prompt'
+    SCREEN_TIP_SET_COMPONENT: 'Set screen prompt',
+    SIGN_IN:'Sign In'
   },
   countdownConfig:{
     countDownItmes:'Countdown items',

languages/es.js

@@ -258,7 +258,9 @@ module.exports = {
     deleteMember: '¿Está seguro de que desea eliminar esta información de usuario?',
     cantDeleteAdmin: 'No se puede eliminar al responsable de la organización',
     leaderName: 'Nombre del líder',
-    cannotDeleteAdmin: 'No se puede eliminar al responsable de la organización'
+    cannotDeleteAdmin: 'No se puede eliminar al responsable de la organización',
+    passNo:'Número de empleado'
+
   },
   home: {
     todayTask: 'Tarea de hoy',
@@ -1004,6 +1006,7 @@ module.exports = {
     functionRoleMapping: 'Permisos de componentes',
     countdownConfig:'Configuración del componente de cuenta atrás',
     screentip:'Configuración del componente de recordatorio de pantalla',
+    bedsideInteration: 'Componentes interactivos',
     interactionChain: 'Aceptar órdenes de forma interactiva',
     allClerk: 'Todos los empleados',
     allCustomer: 'Todos los usuarios',
@@ -1022,6 +1025,7 @@ module.exports = {
     customBoardManage: 'Pantalla de tablero personalizada',
     customBoardDesigner: 'Pantalla del tablero de diseño',
     staffManageFrames: 'Estructura del servicio al personal'
+
   },
   deviceType: {
     NURSE_HOST: 'Enfermera anfitriona',
@@ -1162,7 +1166,8 @@ module.exports = {
     POSITION_COMPONENT: 'location',
     COUNTDOWN_COMPONENT: 'cuenta atrás',
     ROOMCHECK_COMPONENT: 'patrulla de casas',
-    SCREEN_TIP_SET_COMPONENT: 'configurar el recordatorio de pantalla'
+    SCREEN_TIP_SET_COMPONENT: 'configurar el recordatorio de pantalla',
+    SIGN_IN:'Firmar'
   },
   countdownConfig:{
     countDownItmes:'proyecto de cuenta atrás',

languages/ru-RU.js

@@ -253,7 +253,9 @@ module.exports = {
     disabled: 'Отключено!',
     disableCancel: 'Отключено',
     deleteMember: 'Вы уверены, что хотите удалить эту информацию о пользователе?',
-    cannotDeleteAdmin: 'Невозможно удалить человека, ответственного за организацию'
+    cannotDeleteAdmin: 'Невозможно удалить человека, ответственного за организацию',
+    leaderName: 'Старший сотрудник',
+    passNo:'Номер работника'
   },
   home: {
     TodayTask: 'Сегодняшняя задача',
@@ -966,6 +968,9 @@ module.exports = {
     interactionChars: 'Статистика взаимодействия',
     functionRoleMapping: 'Права компонентов',
     countdownConfig: 'Настройка компонентов обратного отсчета',
+    screentip: 'Настройка компонентов подсказок экрана',
+    bedsideInteration:'Компонент взаимодействия',
+    interactionChain: 'Интерактивный порядок приема',
     partSetting: 'Настройки организации',
     allClerk: 'Все сотрудники',
     allCustomer: 'Все пользователи',
@@ -1141,7 +1146,8 @@ module.exports = {
     POSITION_COMPONENT: 'Месторасположение',
     COUNTDOWN_COMPONENT: 'Обратный отсчет',
     ROOMCHECK_COMPONENT: 'Патрульный дом',
-    SCREEN_TIP_SET_COMPONENT: 'Настройка подсказок экрана'
+    SCREEN_TIP_SET_COMPONENT: 'Настройка подсказок экрана',
+    SIGN_IN:'Подписаться'
   },
   countdownConfig: {
     countDownItmes: 'Проект обратного отсчета',

languages/zh-CN.js

@@ -257,7 +257,8 @@ module.exports = {
     disableCancel: '已取消禁用',
     deleteMember: '你确定要删除此用户信息?',
     cannotDeleteAdmin: '不能删除机构负责人',
-    leaderName: '上级职员'
+    leaderName: '上级职员',
+    passNo:'工号/职工卡号'
   },
   home: {
     todayTask: '今日任务',
@@ -1166,7 +1167,8 @@ module.exports = {
     POSITION_COMPONENT: '定位',
     COUNTDOWN_COMPONENT: '倒计时',
     ROOMCHECK_COMPONENT: '巡房',
-    SCREEN_TIP_SET_COMPONENT: '设置屏幕提示语'
+    SCREEN_TIP_SET_COMPONENT: '设置屏幕提示语',
+    SIGN_IN:'签到'
   },
   countdownConfig: {
     countDownItmes: '倒计时项目',

package.json

@@ -39,6 +39,7 @@
     "jszip": "3.2.1",
     "jwt-decode": "^3.1.2",
     "moment": "^2.29.4",
+    "moment-timezone": "^0.5.43",
     "nanoid": "^4.0.2",
     "normalize.css": "7.0.0",
     "nprogress": "0.2.0",

src/router/index.js

@@ -482,7 +482,7 @@ export const partRoutes = [
     children: [
       {
         path: 'index/:id?',
-        component: () => import('@/views/custom-infoboard/screen-designer'),//自定义看板 component: () => import('@/views/custom-infoboard/infoboard-designer')，资阳 component: () => import('@/views/custom-infoboard/infoboard-designer')
+        component: () => import('@/views/custom-infoboard/infoboard-designer'),//自定义看板 component: () => import('@/views/custom-infoboard/infoboard-designer')，资阳 component: () => import('@/views/custom-infoboard/screen-designer')
         name: 'BoardDesigner',
         meta: { title: i18n.t('tab.customBoardDesigner'), icon: 'el-icon-data-board', noCache: true }
       }

src/utils/Foundation.js

@@ -14,6 +14,7 @@
  * @param format 转换格式
  * @returns {*|string}
  */
+import moment from 'moment-timezone'
 export function unixToDate(unix, format) {
   if (!unix) return unix
   let _format = format || 'yyyy-MM-dd hh:mm:ss'
@@ -52,6 +53,11 @@ export function unix2Date(unix, format) {
   return _format
 }
 
+export function unix2DateWithTimeZone(unix,format) {
+  if (!unix) return unix
+  let time = moment.tz(unix,'Asia/Shanghai').format(format)
+  return time
+}
 /**
  * 将时间转unix时间戳
  * @param date

src/views/calling-setting/index.vue

@@ -24,7 +24,7 @@ export default {
       ],
       activeName: 'systemSetting',
       createdTimes: 0,
-      partid: this.$store.getters.partId
+      partid: Number(this.$store.getters.partId)
     }
   },
   watch: {

src/views/custom-infoboard/mixinnew.js

@@ -1,5 +1,5 @@
 import dragtool from './templates/DragTool'
-import {unix2Date} from '@/utils/Foundation'
+import {unix2Date,unix2DateWithTimeZone} from '@/utils/Foundation'
 export default {
     props: {
         /** 模块设计数据 */
@@ -64,7 +64,7 @@ export default {
             }
 
             if(this.data.moduleConfig.styleConfig.backgroundColorToday&&this.data.moduleConfig.styleConfig.backgroundColorToday!==''){ //设置日期等于当天的颜色
-                if(this.displayText===unix2Date(new Date().getTime(),this.data.moduleConfig.dataConfig.textFormat)){
+                if(this.displayText===unix2DateWithTimeZone(new Date().getTime(),this.data.moduleConfig.dataConfig.textFormat)){
                     backgroundColorNurse=this.data.moduleConfig.styleConfig.backgroundColorToday
                 }
             }
@@ -102,7 +102,7 @@ export default {
                     }
                 }
                 if(this.data.moduleConfig.styleConfig.textColorToday&&this.data.moduleConfig.styleConfig.textColorToday!==''){ //设置日期等于当天的颜色
-                    if(this.displayText===unix2Date(new Date().getTime(),this.data.moduleConfig.dataConfig.textFormat)){
+                    if(this.displayText===unix2DateWithTimeZone(new Date().getTime(),this.data.moduleConfig.dataConfig.textFormat)){
                         textcolor=this.data.moduleConfig.styleConfig.textColorToday
                     }
                 }

src/views/custom-infoboard/templates/common/index.js

@@ -10,14 +10,14 @@ import row_container from './row-container'
 import column_container from './cloumn-container'
 
 export default {
-    1: tpl_one_cloum, //资阳ui 123 ，其他5 6 7 8 9 10
-    2: tpl_two_cloum,
-    3: tpl_three_cloum,
+    // 1: tpl_one_cloum, //资阳ui 123 ，其他5 6 7 8 9 10
+    // 2: tpl_two_cloum,
+    // 3: tpl_three_cloum,
     /// // 4:tpl_header,
-    // 5:tpl_beds_grid,
-    // 6:tpl_bed_unit,
-    // 9:row_container,
-    // 10:column_container,
-    // 7:text_display,
-    // 8:text_display2
+    5:tpl_beds_grid,
+    6:tpl_bed_unit,
+    9:row_container,
+    10:column_container,
+    7:text_display,
+    8:text_display2
 }

src/views/custom-infoboard/templates/common/text-display.vue

@@ -18,7 +18,7 @@
     <script>
     import DragTool from "../DragTool";
     import mixin from '../../mixinnew'
-    import {unix2Date} from '@/utils/Foundation'
+    import {unix2Date,unix2DateWithTimeZone} from '@/utils/Foundation'
     export default {
         name: "text-display",
         mixins:[mixin],
@@ -31,7 +31,7 @@
               // console.log('childDataIndex',this.childDataIndex)
               if(this.data.moduleConfig.dataConfig&&this.data.moduleConfig.dataConfig.textWith==='system.date'){ //系统信息
 
-                  return unix2Date(this.systemDate,this.data.moduleConfig.dataConfig.textFormat)
+                  return unix2DateWithTimeZone(this.systemDate,this.data.moduleConfig.dataConfig.textFormat)
               } else if(this.data.moduleConfig.dataConfig&&this.data.moduleConfig.dataConfig.textWith==='part.name'){ //科室信息
 
                     let text = this.data.moduleConfig.dataConfig.contentText
@@ -44,7 +44,7 @@
                   if(this.bindData){
                       text = this.bindData.items[this.childDataIndex][this.data.moduleConfig.dataConfig.textWith.replace('patient.','')]
                       if(this.data.moduleConfig.dataConfig.textType==='日期'){ //格式化日期
-                        text = unix2Date(text*1000,this.data.moduleConfig.dataConfig.textFormat)
+                        text = unix2DateWithTimeZone(text*1000,this.data.moduleConfig.dataConfig.textFormat)
                       }
                       if(this.data.moduleConfig.dataConfig.textWith==='patient.sex'){ //格式化性别
                           text=(text===0?'女':text===1?'男':'未知')

src/views/custom-infoboard/templates/common/tpl-one-cloum.vue

@@ -225,7 +225,7 @@
         }
 
         .layout-body {
-            padding: 10px;
+            padding: 0px;
             overflow: hidden;
             background-color: #FFF;
 
@@ -256,20 +256,20 @@
             overflow: hidden;
         }
 
-        .bz-cover {
-            position: relative;
-            overflow: hidden;
-            float: left;
-            width: 186px;
-            height: 260px;
-            margin-right: 10px;
-            background-color: #F7F7F7;
-
-            img {
-                width: 196px;
-                height: 260px;
-            }
-        }
+        /*.bz-cover {*/
+        /*    position: relative;*/
+        /*    overflow: hidden;*/
+        /*    float: left;*/
+        /*    width: 186px;*/
+        /*    height: 260px;*/
+        /*    margin-right: 10px;*/
+        /*    background-color: #F7F7F7;*/
+
+        /*    img {*/
+        /*        width: 196px;*/
+        /*        height: 260px;*/
+        /*    }*/
+        /*}*/
 
         .bz-mt {
             position: relative;

src/views/custom-infoboard/templates/common/tpl-three-colum.vue

@@ -254,7 +254,7 @@
         }
 
         .layout-body {
-            padding: 10px;
+            padding: 0px;
             overflow: hidden;
             background-color: #FFF;
 
@@ -285,20 +285,20 @@
             overflow: hidden;
         }
 
-        .bz-cover {
-            position: relative;
-            overflow: hidden;
-            float: left;
-            width: 186px;
-            height: 260px;
-            margin-right: 10px;
-            background-color: #F7F7F7;
-
-            img {
-                width: 196px;
-                height: 260px;
-            }
-        }
+        /*.bz-cover {*/
+        /*    position: relative;*/
+        /*    overflow: hidden;*/
+        /*    float: left;*/
+        /*    width: 186px;*/
+        /*    height: 260px;*/
+        /*    margin-right: 10px;*/
+        /*    background-color: #F7F7F7;*/
+
+        /*    img {*/
+        /*        width: 196px;*/
+        /*        height: 260px;*/
+        /*    }*/
+        /*}*/
 
         .bz-mt {
             position: relative;

src/views/custom-infoboard/templates/common/tpl-two-cloum.vue

@@ -238,7 +238,7 @@
         }
 
         .layout-body {
-            padding: 10px;
+            padding: 0px;
             overflow: hidden;
             background-color: #FFF;
 
@@ -269,20 +269,20 @@
             overflow: hidden;
         }
 
-        .bz-cover {
-            position: relative;
-            overflow: hidden;
-            float: left;
-            width: 186px;
-            height: 260px;
-            margin-right: 10px;
-            background-color: #F7F7F7;
-
-            img {
-                width: 196px;
-                height: 260px;
-            }
-        }
+        /*.bz-cover {*/
+        /*    position: relative;*/
+        /*    overflow: hidden;*/
+        /*    float: left;*/
+        /*    width: 186px;*/
+        /*    height: 260px;*/
+        /*    margin-right: 10px;*/
+        /*    background-color: #F7F7F7;*/
+
+        /*    img {*/
+        /*        width: 196px;*/
+        /*        height: 260px;*/
+        /*    }*/
+        /*}*/
 
         .bz-mt {
             position: relative;

src/views/ncs-clerk/components/clerkList.vue

@@ -189,7 +189,10 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-
+            <!--工号/职工卡号-->
+            <el-form-item :label="this.$t('member.passNo')">
+              <el-input v-model="addMemberForm.pass_no" :maxlength="20" />
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -899,8 +902,8 @@ export default {
       })
     },
     handleSelect(item) {
-      const {member_id,uname,sex,birthday,mobile,face,midentity,nickname,address} =item
-      this.addMemberForm={...this.addMemberForm,member_id,uname,sex,birthday,mobile,face,midentity,nickname,address}
+      const {member_id,uname,sex,birthday,mobile,face,midentity,nickname,address,pass_no} =item
+      this.addMemberForm={...this.addMemberForm,member_id,uname,sex,birthday,mobile,face,midentity,nickname,address,pass_no}
       if (birthday) {
         this.addMemberForm.birthday *= 1000
       }

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

@@ -72,6 +72,7 @@
               <el-form-item :label="this.$t('partInfo.dayStart')" prop="dayStart">
                 <el-time-picker
                   v-model="dayStart"
+
                   :placeholder="this.$t('partInfo.dayStart')"
                 />
               </el-form-item>
@@ -119,6 +120,7 @@
               <el-form-item :label="this.$t('partInfo.nightStart')" prop="nightStart">
                 <el-time-picker
                   v-model="nightStart"
+
                   :placeholder="this.$t('partInfo.nightStart')"
                 />
               </el-form-item>
@@ -589,6 +591,7 @@ import * as API_Clerk from '@/api/ncs_clerk'
 import * as API_SystemConfig from '@/api/ncs_systemconfig'
 import * as API_Device from '@/api/ncs_device'
 import * as API_Excel from "@/api/ncs_excel";
+import moment from  'moment'
 const serverUrl = domain.serverUrl
 const DeviceUrl = domain.DeviceUrl
 export default {
@@ -759,10 +762,11 @@ export default {
         if (valid) {
           // this.formmodel.nursing_color_rgb = this.formmodel.nursing_color_rgb.replace('#', '')
           if (this.dayStart) {
-            this.formmodel.day_start = this.dayStart.toLocaleTimeString('chinese', { hour12: false })
+            this.formmodel.day_start = moment(this.dayStart.getTime()).format("HH:mm:ss")  // this.dayStart.toLocaleTimeString('chinese', { hour12: false })
+
           }
           if (this.nightStart) {
-            this.formmodel.night_start = this.nightStart.toLocaleTimeString('chinese', { hour12: false })
+            this.formmodel.night_start =moment(this.nightStart.getTime()).format("HH:mm:ss") // this.nightStart.toLocaleTimeString('chinese', { hour12: false })
           }
           if (this.formmodel.member_password) {
             let params = {}