修改页面跳转，增加翻译

languages/en.js

@@ -1040,7 +1040,7 @@ module.exports = {
     functionRoleMapping: 'Component Permissions',
     countdownConfig: 'Countdown Component Configuration',
     screentip: 'ScreenTip Component Configuration',
-    bedsideInteration: 'Interaction components',
+    bedsideInteraction: 'Interaction components',
     interactionChain: 'Interaction Accept Order',
     allClerk: 'All employees',
     allCustomer: 'All users',
@@ -1067,7 +1067,8 @@ module.exports = {
     checkNetwork: 'Check the network of the device',
     changeBattery: 'Replace the battery of the device',
     interactionPush: 'Interactive record push configuration',
-    interactionPushParamConfig: 'Push parameter configuration'
+    interactionPushParamConfig: 'Push parameter configuration',
+    CustomerDistribution: 'User Distribution'
   },
   deviceType: {
     NURSE_HOST: 'Nurse Host',
@@ -1301,7 +1302,8 @@ module.exports = {
     LICENSE_ERROR: 'The authorization serial number is wrong, please contact after-sales service',
     LICENSE_EXPIRE: 'The authorization expires, please contact after-sales service',
     LICENSE_FAILED: 'Invalid authorization, please contact after-sales service',
-    FILE_UPLOAD_FAILED: 'No file storage directory configured!'
+    FILE_UPLOAD_FAILED: 'No file storage directory configured!',
+    FILE_FAILED: 'file error'
   },
   entraceguardUser: {
     named: 'User Name',

languages/es.js

@@ -1040,7 +1040,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',
+    bedsideInteraction: 'Componentes interactivos',
     interactionChain: 'Aceptar órdenes de forma interactiva',
     allClerk: 'Todos los empleados',
     allCustomer: 'Todos los usuarios',
@@ -1066,8 +1066,9 @@ module.exports = {
     lowBatteryDevice: 'Equipos de baja potencia',
     checkNetwork: 'Comprobar la red del dispositivo',
     changeBattery: 'Reemplazar la batería del dispositivo',
-    interactionPush:'configuración de empuje de registro interactivo',
-    interactionPushParamConfig:'configuración de parámetros push'
+    interactionPush: 'configuración de empuje de registro interactivo',
+    interactionPushParamConfig: 'configuración de parámetros push',
+    CustomerDistribution: 'Distribución de usuarios'
   },
   deviceType: {
     NURSE_HOST: 'Enfermera anfitriona',
@@ -1113,7 +1114,7 @@ module.exports = {
     S433_TRANSFER_BOX: 'Caja de conversión inalámbrica',
     S433_RECEIVER: 'Receptor de señal',
     SLEEPMATTRESS: 'Colchón para dormir',
-    S4G_INTERCOM: 'Walkie - talkie 4G',
+    S4G_INTERCOM: 'Walkie - talkie 4G'
   },
   vitalSignsDeviceType: {
     BLOOD_SUGAR: 'Medidor de presión arterial',
@@ -1301,7 +1302,8 @@ module.exports = {
     LICENSE_ERROR: 'Número de serie de autorización incorrecto, por favor póngase en contacto con post - venta',
     LICENSE_EXPIRE: 'La autorización expira, por favor póngase en contacto con post - venta',
     LICENSE_FAILED: 'Autorización inválida, por favor póngase en contacto con post - venta',
-    FILE_UPLOAD_FAILED: '¡Directorio de almacenamiento de archivos no configurado!'
+    FILE_UPLOAD_FAILED: '¡Directorio de almacenamiento de archivos no configurado!',
+    FILE_FAILED: 'Error de archivo'
   },
   entraceguardUser: {
     named: 'Nombre de usuario',
@@ -1344,23 +1346,23 @@ module.exports = {
     add433Box: 'Por favor, agregue primero un cuadro de conversión 433',
     volumeControl: 'Control de volumen'
   },
-  interactionPushConfig:{
-    apiUrl:'push Interface url',
-    enabled:'habilitado',
-    remark:'nota',
-    forParts:'para piezas',
-    add:'añadir nueva configuración',
-    createTitle:'añadir una nueva configuración de empuje',
-    configParam:'configuración de parámetros',
-    apiUrlRequired:'necesita empujar la dirección de la interfaz',
-    pushParam:'push param',
-    method:'empuje',
-    paramFormat:'formato de parámetros',
-    pushParamExample:'ejemplo de parámetros',
-    paramName:'nombre del parámetro',
-    paramType:'tipo de parámetro',
-    paramExplain:'descripción de parámetros',
-    paramAlias:'alias de parámetros (parámetros renombrados)',
-    exampleValue:'valor de muestra del parámetro'
+  interactionPushConfig: {
+    apiUrl: 'push Interface url',
+    enabled: 'habilitado',
+    remark: 'nota',
+    forParts: 'para piezas',
+    add: 'añadir nueva configuración',
+    createTitle: 'añadir una nueva configuración de empuje',
+    configParam: 'configuración de parámetros',
+    apiUrlRequired: 'necesita empujar la dirección de la interfaz',
+    pushParam: 'push param',
+    method: 'empuje',
+    paramFormat: 'formato de parámetros',
+    pushParamExample: 'ejemplo de parámetros',
+    paramName: 'nombre del parámetro',
+    paramType: 'tipo de parámetro',
+    paramExplain: 'descripción de parámetros',
+    paramAlias: 'alias de parámetros (parámetros renombrados)',
+    exampleValue: 'valor de muestra del parámetro'
   }
 }

languages/ru-RU.js

@@ -1040,7 +1040,7 @@ module.exports = {
     functionRoleMapping: 'Права компонентов',
     countdownConfig: 'Настройка компонентов обратного отсчета',
     screentip: 'Настройка компонентов подсказок экрана',
-    bedsideInteration: 'Компонент взаимодействия',
+    bedsideInteraction: 'Компонент взаимодействия',
     allClerk: 'Все сотрудники',
     allCustomer: 'Все пользователи',
     allDevice: 'Все устройства',
@@ -1066,7 +1066,8 @@ module.exports = {
     checkNetwork: 'Проверить сеть устройства',
     changeBattery: 'Замена батарей в оборудовании',
     interactionPush: 'Интерактивная запись push - конфигурация',
-    interactionPushParamConfig: 'Настройка параметров push'
+    interactionPushParamConfig: 'Настройка параметров push',
+    CustomerDistribution: 'Распределение пользователей'
   },
   deviceType: {
     NURSE_HOST: 'Устройство медсестры',
@@ -1298,7 +1299,8 @@ module.exports = {
     LICENSE_ERROR: 'ошибка авторизации серийных номеров после продажи',
     LICENSE_EXPIRE: 'срок действия разрешения истекает после продажи',
     LICENSE_FAILED: 'Неверный Авторизация после продажи',
-    FILE_UPLOAD_FAILED: 'каталог без профиля!'
+    FILE_UPLOAD_FAILED: 'каталог без профиля!',
+    FILE_FAILED: 'Ошибка файла'
   },
   entraceguardUser: {
     named: 'Имя пользователя',

languages/zh-CN.js

@@ -1009,7 +1009,7 @@ module.exports = {
     hisNurseOptionsKeyval: '护理项分类his主键'
   },
   tab: {
-    home: '首页',    
+    home: '首页',
     frameManage: '空间位置',
     deviceManage: '所有设备',
     clerkManage: '员工管理',
@@ -1043,7 +1043,7 @@ module.exports = {
     functionRoleMapping: '组件权限配置',
     countdownConfig: '倒计时组件配置',
     screentip: '屏幕提示语组件配置',
-    bedsideInteration: '床旁交互组件',
+    bedsideInteraction: '床旁交互组件',
     allClerk: '所有员工',
     allCustomer: '所有用户',
     allDevice: '所有设备',
@@ -1069,7 +1069,8 @@ module.exports = {
     checkNetwork: '检查设备网络',
     changeBattery: '更换设备电池',
     interactionPush: '交互记录推送配置',
-    interactionPushParamConfig: '推送参数配置'
+    interactionPushParamConfig: '推送参数配置',
+    CustomerDistribution: '用户分布'
   },
   deviceType: {
     NURSE_HOST: '护士主机',
@@ -1303,7 +1304,8 @@ module.exports = {
     LICENSE_ERROR: '授权序列号错误，请联系售后',
     LICENSE_EXPIRE: '授权到期，请联系售后',
     LICENSE_FAILED: '无效授权，请联系售后',
-    FILE_UPLOAD_FAILED: '未配置文件存放目录！'
+    FILE_UPLOAD_FAILED: '未配置文件存放目录！',
+    FILE_FAILED: '文件错误'
   },
   entraceguardUser: {
     named: '用户姓名',

src/api/calling-broadcast.js

@@ -1,5 +1,5 @@
 import request from '@/utils/request'
-import { mediaRequest } from '../utils/request'
+import { mediaRequest } from '@/utils/request'
 
 /**
  * 广播设置相关接口

src/api/ncs_board_item.js

@@ -6,64 +6,61 @@ import request from '@/utils/request'
  * @returns {*|Promise|Promise<unknown>}
  */
 export function getList(params) {
-    return request({
-        url: '/ncs/boarditem/page',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/boarditem/page',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 /** 新增自定义看板项 */
 export function add(params) {
-    return request({
-        url: '/ncs/boarditem',
-        method: 'POST',
-        loading: true,
-        data: params
-    })
+  return request({
+    url: '/ncs/boarditem',
+    method: 'POST',
+    loading: true,
+    data: params
+  })
 }
 
 /** 删除自定义看板项 */
 export function remove(params) {
-    const ids = params.toString()
-    return request({
-        url: `/ncs/boarditem/${ids}`,
-        method: 'DELETE',
-        loading: true,
-        data: params
-    })
+  const ids = params.toString()
+  return request({
+    url: `/ncs/boarditem/${ids}`,
+    method: 'DELETE',
+    loading: true,
+    data: params
+  })
 }
 
 /** 更新自定义看板项 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/boarditem/${id}`,
-        method: 'put',
-        data: params
-    })
+  return request({
+    url: `/ncs/boarditem/${id}`,
+    method: 'put',
+    data: params
+  })
 }
 
 /** 查询自定义看板项 */
 export function get(id, params) {
-    return request({
-        url: `/ncs/boarditem/${id}`,
-        method: 'get',
-        loading: false,
-        params
-    })
+  return request({
+    url: `/ncs/boarditem/${id}`,
+    method: 'get',
+    loading: false,
+    params
+  })
 }
 
-
 /** 获取某科室下的所有看板项 */
 export function getPartList(part_id) {
-    return request({
-        url: `/ncs/boarditem/partboarditem/${part_id}`,
-        method: 'get',
-        loading: false
-    })
+  return request({
+    url: `/ncs/boarditem/partboarditem/${part_id}`,
+    method: 'get',
+    loading: false
+  })
 }
 
-
-

src/api/ncs_board_title.js

@@ -6,73 +6,70 @@ import request from '@/utils/request'
  * @returns {*|Promise|Promise<unknown>}
  */
 export function getList(params) {
-    return request({
-        url: '/ncs/boardtitle/page',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/boardtitle/page',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 /** 新增自定义看板屏幕 */
 export function add(params) {
-    return request({
-        url: '/ncs/boardtitle',
-        method: 'POST',
-        loading: true,
-        data: params
-    })
+  return request({
+    url: '/ncs/boardtitle',
+    method: 'POST',
+    loading: true,
+    data: params
+  })
 }
 
 /** 删除自定义看板屏幕 */
 export function remove(params) {
-    const ids = params.toString()
-    return request({
-        url: `/ncs/boardtitle/${ids}`,
-        method: 'DELETE',
-        loading: true,
-        data: params
-    })
+  const ids = params.toString()
+  return request({
+    url: `/ncs/boardtitle/${ids}`,
+    method: 'DELETE',
+    loading: true,
+    data: params
+  })
 }
 
 /** 更新自定义看板屏幕 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/boardtitle/${id}`,
-        method: 'put',
-        data: params
-    })
+  return request({
+    url: `/ncs/boardtitle/${id}`,
+    method: 'put',
+    data: params
+  })
 }
 
 /** 查询自定义看板屏幕 */
 export function get(id, params) {
-    return request({
-        url: `/ncs/boardtitle/${id}`,
-        method: 'get',
-        loading: false,
-        params
-    })
+  return request({
+    url: `/ncs/boardtitle/${id}`,
+    method: 'get',
+    loading: false,
+    params
+  })
 }
 
-
 /** 保存为默认设计 */
 export function saveAsDefault(id, params) {
-    return request({
-        url: `/ncs/boardtitle/saveasdefault/${id}`,
-        method: 'put',
-        data: params
-    })
+  return request({
+    url: `/ncs/boardtitle/saveasdefault/${id}`,
+    method: 'put',
+    data: params
+  })
 }
 
-
-
 /** 加载默认设计 */
 export function getDefault(id, params) {
-    return request({
-        url: `/ncs/boardtitle/defaultdesign/${id}`,
-        method: 'get',
-        loading: false,
-        params
-    })
+  return request({
+    url: `/ncs/boardtitle/defaultdesign/${id}`,
+    method: 'get',
+    loading: false,
+    params
+  })
 }

src/api/ncs_countdown_config.js

@@ -1,18 +1,17 @@
 import request from '@/utils/request'
 
-
 export function update(id, params) {
-    return request({
-        url: `/ncs/countdown/${id}`,
-        method: 'put',
-        data: params,
-        headers: { 'Content-Type': 'application/json' }
-    })
+  return request({
+    url: `/ncs/countdown/${id}`,
+    method: 'put',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
 }
 
 export function getConfigByPartId(partId) {
-    return request({
-        url: `/ncs/countdown/${partId}`,
-        method: 'GET'
-    })
+  return request({
+    url: `/ncs/countdown/${partId}`,
+    method: 'GET'
+  })
 }

src/api/ncs_entrace_guard_user.js

@@ -1,28 +1,28 @@
 import request from '@/utils/request'
 export function getList(params) {
-    return request({
-        url: '/ncs/entrace_guard_user/page',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/entrace_guard_user/page',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 /** 更新用户设置 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/entrace_guard_user/${id}`,
-        method: 'put',
-        loading: false,
-        data: params
-    })
+  return request({
+    url: `/ncs/entrace_guard_user/${id}`,
+    method: 'put',
+    loading: false,
+    data: params
+  })
 }
 
 /** 更新用户记录 */
 export function refreshUser(part_id) {
-    return request({
-        url: `/ncs/entrace_guard_user/refresh/${part_id}`,
-        method: 'post'
-    })
+  return request({
+    url: `/ncs/entrace_guard_user/refresh/${part_id}`,
+    method: 'post'
+  })
 }

src/api/ncs_functions.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 export function getAll() {
-    return request({
-        url: '/ncs/functions/getall',
-        method: 'get'
-    })
+  return request({
+    url: '/ncs/functions/getall',
+    method: 'get'
+  })
 }

src/api/ncs_functions_role_mapping.js

@@ -1,41 +1,41 @@
 import request from '@/utils/request'
 export function getList(params) {
-    return request({
-        url: '/ncs/functionrolemapping/page',
-        method: 'POST',
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/functionrolemapping/page',
+    method: 'POST',
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
-export function getFunctionsRoleMappingByCodeAndPartId(function_code,part_id) {
-    return request({
-        url: `/ncs/functionrolemapping/${function_code}/${part_id}`,
-        method: 'GET'
-    })
+export function getFunctionsRoleMappingByCodeAndPartId(function_code, part_id) {
+  return request({
+    url: `/ncs/functionrolemapping/${function_code}/${part_id}`,
+    method: 'GET'
+  })
 }
 export function remove(id) {
-    return request({
-        url: `/ncs/functionrolemapping/${id}`,
-        method: 'DELETE',
-        loading: true
-    })
+  return request({
+    url: `/ncs/functionrolemapping/${id}`,
+    method: 'DELETE',
+    loading: true
+  })
 }
 /** 修改 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/functionrolemapping/${id}`,
-        method: 'put',
-        data: params,
-        headers: { 'Content-Type': 'application/json' }
-    })
+  return request({
+    url: `/ncs/functionrolemapping/${id}`,
+    method: 'put',
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
 }
 /** 新增 */
 export function add(params) {
-    return request({
-        url: '/ncs/functionrolemapping',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/json' }
-    })
+  return request({
+    url: '/ncs/functionrolemapping',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
 }

src/api/ncs_interaction-chain.js

@@ -1,35 +1,35 @@
 import request from '@/utils/request'
 export function getList(params) {
-    return request({
-        url: '/ncs/spreadchain/page',
-        method: 'POST',
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/spreadchain/page',
+    method: 'POST',
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 export function remove(id) {
-    return request({
-        url: `/ncs/spreadchain/${id}`,
-        method: 'DELETE',
-        loading: true
-    })
+  return request({
+    url: `/ncs/spreadchain/${id}`,
+    method: 'DELETE',
+    loading: true
+  })
 }
 /** 修改 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/spreadchain/${id}`,
-        method: 'put',
-        data: params
-    })
+  return request({
+    url: `/ncs/spreadchain/${id}`,
+    method: 'put',
+    data: params
+  })
 }
 /** 新增 */
 export function add(params) {
-    return request({
-        url: '/ncs/spreadchain',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/json' }
-    })
+  return request({
+    url: '/ncs/spreadchain',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/json' }
+  })
 }

src/api/ncs_nbdevicecondition.js

@@ -1,26 +1,25 @@
-import request from "@/utils/request";
+import request from '@/utils/request'
 
-
-export function getList(params,partId,viewtype) {
-    return request({
-        url: viewtype===0?`/mgr/nbdevcie/getoffline/${partId}/page`:`/mgr/nbdevcie/getlowbattery/${partId}/page`,
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+export function getList(params, partId, viewtype) {
+  return request({
+    url: viewtype === 0 ? `/mgr/nbdevcie/getoffline/${partId}/page` : `/mgr/nbdevcie/getlowbattery/${partId}/page`,
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 export function getLowBatteryDevices(partid) {
-    return request({
-        url: `/mgr/nbdevcie/getlowbattery/${partid}`,
-        method: 'get'
-    })
+  return request({
+    url: `/mgr/nbdevcie/getlowbattery/${partid}`,
+    method: 'get'
+  })
 }
 
 export function getOfflineDevices(partid) {
-    return request({
-        url: `/mgr/nbdevcie/getoffline/${partid}`,
-        method: 'get'
-    })
+  return request({
+    url: `/mgr/nbdevcie/getoffline/${partid}`,
+    method: 'get'
+  })
 }

src/api/ncs_screentip.js

@@ -6,51 +6,51 @@ import request from '@/utils/request'
  * @returns {*|Promise|Promise<unknown>}
  */
 export function getList(params) {
-    return request({
-        url: '/ncs/screentip/page',
-        method: 'POST',
-        loading: true,
-        data: params,
-        headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-    })
+  return request({
+    url: '/ncs/screentip/page',
+    method: 'POST',
+    loading: true,
+    data: params,
+    headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
+  })
 }
 
 /** 新增屏幕提示语设置 */
 export function add(params) {
-    return request({
-        url: '/ncs/screentip',
-        method: 'POST',
-        loading: true,
-        data: params
-    })
+  return request({
+    url: '/ncs/screentip',
+    method: 'POST',
+    loading: true,
+    data: params
+  })
 }
 
 /** 删除屏幕提示语设置 */
 export function remove(params) {
-    const ids = params.toString()
-    return request({
-        url: `/ncs/screentip/${ids}`,
-        method: 'DELETE',
-        loading: true,
-        data: params
-    })
+  const ids = params.toString()
+  return request({
+    url: `/ncs/screentip/${ids}`,
+    method: 'DELETE',
+    loading: true,
+    data: params
+  })
 }
 
 /** 更新屏幕提示语设置 */
 export function update(id, params) {
-    return request({
-        url: `/ncs/screentip/${id}`,
-        method: 'put',
-        data: params
-    })
+  return request({
+    url: `/ncs/screentip/${id}`,
+    method: 'put',
+    data: params
+  })
 }
 
 /** 查询屏幕提示语设置 */
 export function get(id, params) {
-    return request({
-        url: `/ncs/screentip/${id}`,
-        method: 'get',
-        loading: false,
-        params
-    })
+  return request({
+    url: `/ncs/screentip/${id}`,
+    method: 'get',
+    loading: false,
+    params
+  })
 }

src/router/index.js

@@ -74,113 +74,113 @@ export const constantRoutes = [
 ]
 // 科室级页面
 export const partRoutes = [
-  //空间设备相关
+  // 空间设备相关
   {
     path: '/frame',
     component: Layout,
     redirect: '/frame/tree',
-    name: 'part-frame-tree',
+    name: 'frame-tree',
     meta: { title: i18n.t('tab.frameManage'), icon: 'tree', noCache: true },
     children: [{
-        path: 'tree',
-        component: () => import('@/views/hospitalFrame/frameTreeView'),
-        name: 'part-frame-tree',
-        meta: { title: i18n.t('tab.frameManage'), icon: 'tree', noCache: true } // 空间位置
-      },{
-        path: 'clerk_frame_manage',
-        component: () => import('@/views/ncs-clerk-frame-manage/index'),
-        name: 'clerk-frame-manage',
-        meta: { title: i18n.t('tab.staffManageFrames'), icon: 'frame_manage', noCache: true }
-      },{
-        path: 'device',
-        name: 'part-device',
-        component: () => import('@/views/ncs-device/index'),
-        redirect: '/frame/device/list',
-        meta: {
-          title: i18n.t('deviceManage.deviceManage'),
-          icon: 'devices'
+      path: 'tree',
+      component: () => import('@/views/hospitalFrame/frameTreeView'),
+      name: 'part-frame-tree',
+      meta: { title: i18n.t('tab.frameManage'), icon: 'tree', noCache: true } // 空间位置
+    }, {
+      path: 'clerk_frame_manage',
+      component: () => import('@/views/ncs-clerk-frame-manage/index'),
+      name: 'clerk-frame-manage',
+      meta: { title: i18n.t('tab.staffManageFrames'), icon: 'frame_manage', noCache: true }
+    }, {
+      path: 'device',
+      name: 'part-device',
+      component: () => import('@/views/ncs-device/index'),
+      redirect: '/frame/device/list',
+      meta: {
+        title: i18n.t('deviceManage.deviceManage'),
+        icon: 'devices'
+      },
+      children: [
+        {
+          path: 'list',
+          component: () => import('@/views/ncs-device/deviceManagement'),
+          name: 'device-list',
+          meta: { title: i18n.t('tab.deviceManage'), icon: 'component', noCache: true } // 所有设备
         },
-        children: [
-          {
-            path: 'list',
-            component: () => import('@/views/ncs-device/deviceManagement'),
-            name: 'device-list',
-            meta: { title: i18n.t('tab.deviceManage'), icon: 'component', noCache: true } // 所有设备
-          },
-          {
-            path: 'mobile',
-            component: () => import('@/views/ncs-device/nurse_watch'),
-            name: 'device-mobile',
-            hidden: !enableMobile,
-            meta: { title: i18n.t('tab.mobileDeviceManage'), icon: 'el-icon-watch', noCache: true } // 移动设备
-          },
-          {
-            path: 'user_watch',
-            component: () => import('@/views/ncs-device/user_watch'),
-            name: 'user-watch',
-            hidden: !enableCustomerDevice,
-            meta: { title: i18n.t('tab.userLocationManage'), icon: 'el-icon-watch-1', noCache: true } // 用户设备
-          },
-          {
-            path: 'sos',
-            component: () => import('@/views/ncs-sos-device-setting/sos_device_setting'),
-            name: 'sos-device',
-            hidden: !enableSosDevice,
-            meta: { title: i18n.t('tab.sosDeviceSettingManage'), icon: 'el-icon-s-help', noCache: true } // 报警设备
-          },
-          {
-            path: 'map',
-            component: () => import('@/views/customer/myMapHtml'),
-            name: 'device-map',
-            meta: { title: i18n.t('customerManage.footprint'), icon: 'area', noCache: true }, // 足迹
-            hidden: true
-          },
-          {
-            path: 'nbdevice_condition',
-            component: () => import('@/views/ncs-device/nbDeviceCondition'),
-            name: 'nbdevice-condition',
-            meta: { title: i18n.t('tab.nbiotDeviceStatus'), icon: 'iot', noCache: true },
-            hidden: !enableNBiot
-          },
-          {
-            path: 'information_board',
-            component: () => import('@/views/calling-board/index'),
-            name: 'information-board',
-            meta: { title: i18n.t('tab.boardManage'), icon: 'infomation_board', noCache: true },
-            hidden: uiVersion === 2
-          },
-          {
-            path: 'custom_infoboard',
-            component: () => import('@/views/custom-infoboard/board-title'),
-            name: 'board-title',
-            meta: { title: i18n.t('tab.customBoardManage'), icon: 'designer', noCache: true },
-            hidden: uiVersion === 2
-          },
-          {
-            path: 'device_menu',
-            component: () => import('@/views/ncs-device-menu/index'),
-            name: 'device-menu',
-            meta: { title: i18n.t('tab.deviceMenuManager'), icon: 'el-icon-menu', noCache: true }
-          },
-          {
-            path: 'led',
-            component: () => import('@/views/ncs-led/ledDeviceManagement'),
-            name: 'led-manager',
-            meta: { title: i18n.t('tab.ledDeviceManager'), icon: 'led', noCache: true },
-            hidden: uiVersion === 2
-          },
-          {
-            path: 'led-control',
-            component: () => import('@/views/ncs-led/ledControl'),
-            name: 'led-control',
-            meta: { title: i18n.t('tab.ledDevice'), icon: 'el-icon-message-solid', noCache: true }, // LED点阵屏
-            hidden: true
-          }
-        ]
-      }
+        {
+          path: 'mobile',
+          component: () => import('@/views/ncs-device/nurse_watch'),
+          name: 'device-mobile',
+          hidden: !enableMobile,
+          meta: { title: i18n.t('tab.mobileDeviceManage'), icon: 'el-icon-watch', noCache: true } // 移动设备
+        },
+        {
+          path: 'user_watch',
+          component: () => import('@/views/ncs-device/user_watch'),
+          name: 'user-watch',
+          hidden: !enableCustomerDevice,
+          meta: { title: i18n.t('tab.userLocationManage'), icon: 'el-icon-watch-1', noCache: true } // 用户设备
+        },
+        {
+          path: 'sos',
+          component: () => import('@/views/ncs-sos-device-setting/sos_device_setting'),
+          name: 'sos-device',
+          hidden: !enableSosDevice,
+          meta: { title: i18n.t('tab.sosDeviceSettingManage'), icon: 'el-icon-s-help', noCache: true } // 报警设备
+        },
+        {
+          path: 'map',
+          component: () => import('@/views/customer/myMapHtml'),
+          name: 'device-map',
+          meta: { title: i18n.t('customerManage.footprint'), icon: 'area', noCache: true }, // 足迹
+          hidden: true
+        },
+        {
+          path: 'nbdevice_condition',
+          component: () => import('@/views/ncs-device/nbDeviceCondition'),
+          name: 'nbdevice-condition',
+          meta: { title: i18n.t('tab.nbiotDeviceStatus'), icon: 'iot', noCache: true },
+          hidden: !enableNBiot
+        },
+        {
+          path: 'information_board',
+          component: () => import('@/views/calling-board/index'),
+          name: 'information-board',
+          meta: { title: i18n.t('tab.boardManage'), icon: 'infomation_board', noCache: true },
+          hidden: uiVersion === 2
+        },
+        {
+          path: 'custom_infoboard',
+          component: () => import('@/views/custom-infoboard/board-title'),
+          name: 'board-title',
+          meta: { title: i18n.t('tab.customBoardManage'), icon: 'designer', noCache: true },
+          hidden: uiVersion === 2
+        },
+        {
+          path: 'device_menu',
+          component: () => import('@/views/ncs-device-menu/index'),
+          name: 'device-menu',
+          meta: { title: i18n.t('tab.deviceMenuManager'), icon: 'el-icon-menu', noCache: true }
+        },
+        {
+          path: 'led',
+          component: () => import('@/views/ncs-led/ledDeviceManagement'),
+          name: 'led-manager',
+          meta: { title: i18n.t('tab.ledDeviceManager'), icon: 'led', noCache: true },
+          hidden: uiVersion === 2
+        },
+        {
+          path: 'led-control',
+          component: () => import('@/views/ncs-led/ledControl'),
+          name: 'led-control',
+          meta: { title: i18n.t('tab.ledDevice'), icon: 'el-icon-message-solid', noCache: true }, // LED点阵屏
+          hidden: true
+        }
+      ]
+    }
     ]
   },
-  //职员相关
+  // 职员相关
   {
     path: '/clerk',
     component: Layout,
@@ -202,7 +202,7 @@ export const partRoutes = [
       }
     ]
   },
-  //门禁
+  // 门禁
   {
     path: '/entrace_guard',
     component: Layout,
@@ -212,17 +212,17 @@ export const partRoutes = [
       {
         path: 'users',
         component: () => import('@/views/entrace-guard/users'),
-        name: 'entrace-guard',
+        name: 'entrace-guard-manage',
         meta: { title: i18n.t('tab.entraceguardUser'), icon: 'pass_through', noCache: true },
         hidden: !enableEntraceguard
       }]
   },
-  //客户信息
+  // 客户信息
   {
     path: '/customer',
     component: Layout,
     redirect: '/customer/list',
-    name: 'customer',
+    name: 'customer-manager',
     children: [
       {
         path: 'list',
@@ -238,7 +238,7 @@ export const partRoutes = [
         path: 'map',
         component: () => import('@/views/customer/allMap'),
         name: 'map',
-        meta: { title: '用户分布', icon: 'area', noCache: true },
+        meta: { title: i18n.t('tab.CustomerDistribution'), icon: 'area', noCache: true },
         hidden: true
       },
       {
@@ -250,7 +250,7 @@ export const partRoutes = [
       }
     ]
   },
-  //便签
+  // 便签
   {
     path: '/remark',
     component: Layout,
@@ -264,7 +264,7 @@ export const partRoutes = [
       }
     ]
   },
-  //任务
+  // 任务
   {
     path: '/task',
     component: Layout,
@@ -278,7 +278,7 @@ export const partRoutes = [
       }
     ]
   },
-  //交互信息
+  // 交互信息
   {
     path: '/interaction',
     component: Layout,
@@ -291,7 +291,7 @@ export const partRoutes = [
         component: () => import('@/views/ncs-interaction/index'),
         name: 'interaction-history',
         meta: { title: i18n.t('tab.interactionHistory'), icon: 'list', noCache: true }
-      },{
+      }, {
         path: 'chars',
         component: () => import('@/views/ncs-chars/index'),
         name: 'interaction-chars',
@@ -299,7 +299,7 @@ export const partRoutes = [
       }
     ]
   },
-  //广播
+  // 广播
   {
     path: '/broadcast',
     component: Layout,
@@ -321,7 +321,7 @@ export const partRoutes = [
         hidden: true
       }
     ]
-  },{
+  }, {
     path: '/infoboard_designer',
     component: Layout,
     name: 'infoboard-designer',
@@ -334,7 +334,7 @@ export const partRoutes = [
       }
     ],
     hidden: true
-  },{
+  }, {
     path: '/settings',
     component: Layout,
     redirect: '/settings/index',
@@ -349,37 +349,37 @@ export const partRoutes = [
         component: () => import('@/views/calling-setting/index'),
         name: 'part-settings',
         meta: { title: i18n.t('tab.partSettings'), icon: 'el-icon-s-tools', noCache: true } // 机构设置
-      },{
+      }, {
         path: 'nurse_config',
         component: () => import('@/views/ncs-nurse-config/index'),
         name: 'nurse-config',
         meta: { title: i18n.t('tab.nurseConfig'), icon: 'care1', noCache: true }, // 护理参数
         hidden: uiVersion !== 1
-      },{
+      }, {
         path: 'channel',
         component: () => import('@/views/ncs-channel/index'),
         name: 'channel',
         meta: { title: i18n.t('tab.channelManage'), icon: 'el-icon-mobile-phone', noCache: true },
         children: [{
-            path: 'history/:id?',
-            component: () => import('@/views/ncs-channel/channelImHistory'),
-            name: 'channel-im-history',
-            meta: { title: i18n.t('tab.channelImHistory'), icon: 'area', noCache: true },
-            hidden: true
-          }
+          path: 'history/:id?',
+          component: () => import('@/views/ncs-channel/channelImHistory'),
+          name: 'channel-im-history',
+          meta: { title: i18n.t('tab.channelImHistory'), icon: 'area', noCache: true },
+          hidden: true
+        }
         ]
-      },{
+      }, {
         path: 'event_list',
         component: () => import('@/views/ncs-event/index'),
         name: 'event-list',
         meta: { title: i18n.t('tab.eventManage'), icon: 'el-icon-notebook-2', noCache: true }
-      },{
+      }, {
         path: 'components',
         component: () => import('@/views/hospitalFrame/index'),
         redirect: '/settings/components/function_mapping',
         name: 'beds-side',
         meta: {
-          title: i18n.t('tab.bedsideInteration'),
+          title: i18n.t('tab.bedsideInteraction'),
           icon: 'component'
         },
         children: [
@@ -408,7 +408,7 @@ export const partRoutes = [
             meta: { title: i18n.t('tab.screentip'), icon: 'screen_tip', noCache: true }
           }
         ]
-      },{
+      }, {
         path: '/frame_group',
         component: () => import('@/views/hospitalFrame/index'),
         name: 'frame-group',

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

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

src/views/dashboard/calling/index.vue

@@ -5,7 +5,7 @@
         <el-card style="maring:10px">
           <div slot="header" class="clearfix">
             <span style="float: left">{{ this.$t("home.todayTask") }}</span>
-            <el-link type="primary" style="float: right" @click="goMove('taskList')">{{ this.$t("action.more") }}</el-link>
+            <el-link type="primary" style="float: right" @click="goMove('task-list')">{{ this.$t("action.more") }}</el-link>
           </div>
           <div style="clear:both;font-size: 14px;height: 300px;">
             <el-scrollbar wrap-class="scrollbar-wrapper" style="min-height: 250px">
@@ -41,7 +41,7 @@
         <el-card>
           <div slot="header" class="clearfix">
             <span style="float: left">{{ this.$t('home.recentNote') }}</span>
-            <el-link type="primary" style="float: right" @click="goMove('remarkList')">{{ this.$t('action.more') }}</el-link>
+            <el-link type="primary" style="float: right" @click="goMove('remark-list')">{{ this.$t('action.more') }}</el-link>
           </div>
           <div style="clear:both;font-size: 14px;height: 300px;">
             <el-scrollbar wrap-class="scrollbar-wrapper" style="min-height: 250px">
@@ -76,7 +76,7 @@
         <el-card style="maring:10px">
           <div slot="header" class="clearfix">
             <span style="float: left">{{ this.$t('home.recentInteract') }}</span>
-            <el-link type="primary" style="float: right" @click="goMove('CallingList')">{{ this.$t("action.more") }}</el-link>
+            <el-link type="primary" style="float: right" @click="goMove('interaction-history')">{{ this.$t("action.more") }}</el-link>
           </div>
           <div style="height: 300px">
             <el-table :data="callingHistoryList" height="300px">
@@ -94,7 +94,7 @@
         <el-card>
           <div slot="header" class="clearfix">
             <span style="float: left">{{ this.$t('home.recentRemarks') }}</span>
-            <el-link type="primary" style="float: right" @click="goMove('customerList')">{{ this.$t("action.more") }}</el-link>
+            <el-link type="primary" style="float: right" @click="goMove('customer-manager')">{{ this.$t("action.more") }}</el-link>
           </div>
           <div style="clear:both;font-size: 14px;height: 300px;">
             <el-scrollbar wrap-class="scrollbar-wrapper" style="min-height: 250px">
@@ -244,9 +244,9 @@ export default {
       this.isShowArticle = true
     },
     goMove(path) {
-      if (path === 'customerList') {
-        uiVersion === 1 ? path = 'patientManagement' : uiVersion === 2 ? path = 'customerManager' : path = 'elderlyCareManager'
-      }
+      // if (path === 'customerList') {
+      //   uiVersion === 1 ? path = 'patientManagement' : uiVersion === 2 ? path = 'customerManager' : path = 'elderlyCareManager'
+      // }
       this.$router.push({ name: path })
     },
     formatterFromName(row, column, cellValue) {

src/views/hospitalFrame/nurse_watch_frame.vue

@@ -300,7 +300,7 @@ export default {
       })
     },
     back() {
-      this.$router.push({ name: 'nurse_watch' })
+      this.$router.push({ name: 'device-mobile' })
       this.$emit('fanhui')
     }
   }

src/views/ncs-device-menu/deviceMenuManagement.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <device-menu-manager :frame="frame" :part_view="false" />
+    <device-menu-manager :part_view="false" />
   </div>
 
 </template>
@@ -12,7 +12,6 @@ export default {
   components: { deviceMenuManager },
   data() {
     return {
-      frame: {}
     }
   }
 }

src/views/ncs-device-menu/index.vue

@@ -44,7 +44,7 @@
       <div>
         <el-form ref="editform" :rules="rules" label-width="120px" :model="formmodel">
           <el-form-item :label="this.$t('deviceMenuManage.name')" prop="name">
-            <el-input v-model="formmodel.name" :placeholder="this.$t('action.inputName')" :maxlength="20" />
+            <el-input v-model="formmodel.name" :placeholder="this.$t('action.inputName')" :maxlength="20" clearable/>
           </el-form-item>
           <el-form-item :label="this.$t('deviceManage.deviceType')" prop="device_type">
             <el-select v-model="formmodel.device_type"
@@ -68,7 +68,7 @@
             </el-select>
           </el-form-item>
           <el-form-item label="URL" prop="url">
-            <el-input v-model="formmodel.url" :placeholder="this.$t('deviceMenuManage.inputUrl')" />
+            <el-input v-model="formmodel.url" :placeholder="this.$t('deviceMenuManage.inputUrl')" clearable/>
           </el-form-item>
 <!--          <el-form-item :label="this.$t('deviceMenuManage.urlTemplate')" prop="url_params_temp">-->
 <!--            <el-input v-model="formmodel.url_params_temp" :placeholder="this.$t('deviceMenuManage.inputUrlTemplate')" :maxlength="20" />-->
@@ -77,10 +77,10 @@
           <el-form-item :label="urlTemplateStr"
                         v-for="(item, index) in formmodelUrlParamsTemp" :key="'u' + index">
             <el-col :span="10" style="margin: 0 10px 0 0">
-              <el-input v-model="item.parameter" :maxlength="50" :placeholder="inputTemplateStr"/>
+              <el-input v-model="item.parameter" :maxlength="50" :placeholder="inputTemplateStr" clearable/>
             </el-col>
             <el-col :span="10" style="margin: 0 10px 0 0">
-              <el-input v-model="item.value" :maxlength="50" :placeholder="inputTemplateValueStr"/>
+              <el-input v-model="item.value" :maxlength="50" :placeholder="inputTemplateValueStr" clearable/>
             </el-col>
             <el-col :span="3" style="margin: auto">
               <el-button v-if="index === 0" type="primary" @click="addInput(formmodelUrlParamsTemp)"> {{ addStr }} </el-button>
@@ -90,7 +90,7 @@
           </el-form-item>
 
           <el-form-item label="Activity" prop="act_name">
-            <el-input v-model="formmodel.act_name" :placeholder="this.$t('deviceMenuManage.inputActName')"/>
+            <el-input v-model="formmodel.act_name" :placeholder="this.$t('deviceMenuManage.inputActName')" clearable/>
           </el-form-item>
 <!--          <el-form-item :label="this.$t('deviceMenuManage.actIntent')" prop="act_intent">-->
 <!--            <el-input v-model="formmodel.act_intent" :placeholder="this.$t('deviceMenuManage.inputActIntent')" :maxlength="20" />-->
@@ -99,10 +99,10 @@
           <el-form-item :label="actIntentStr"
                         v-for="(item, index) in formmodelActIntent" :key="'a' + index">
             <el-col :span="10" style="margin: 0 10px 0 0">
-              <el-input v-model="item.parameter" :maxlength="50" :placeholder="inputTemplateStr"/>
+              <el-input v-model="item.parameter" :maxlength="50" :placeholder="inputTemplateStr" clearable/>
             </el-col>
             <el-col :span="10" style="margin: 0 10px 0 0">
-              <el-input v-model="item.value" :maxlength="50" :placeholder="inputTemplateValueStr"/>
+              <el-input v-model="item.value" :maxlength="50" :placeholder="inputTemplateValueStr" clearable/>
             </el-col>
             <el-col :span="3" style="margin: auto">
               <el-button v-if="index === 0" type="primary" @click="addInput(formmodelActIntent)"> {{ addStr }} </el-button>
@@ -111,7 +111,7 @@
 
           </el-form-item>
           <el-form-item :label="this.$t('action.sort')" prop="index">
-            <el-input-number v-model="formmodel.nindex" :min="1"  :placeholder="this.$t('action.sort')"  />
+            <el-input-number v-model="formmodel.nindex" :min="1"  :placeholder="this.$t('action.sort')" clearable/>
           </el-form-item>
 
           <el-form-item :label="this.$t('deviceMenuManage.actived')" prop="actived">
@@ -158,10 +158,6 @@ export default {
   name: "index",
   components: { ButtonCellRender, ImageViewer },
   props: {
-    frame: {
-      type: Object,
-      default: () => {}
-    },
     part_view: { // 是否为科室视图
       type: Boolean,
       default: true
@@ -415,6 +411,7 @@ export default {
         sort: ' role_id',
         dir: 'desc'
       })
+      this.formmodel = {}
       this.formmodelUrlParamsTemp = [{
         parameter: '',
         value: ''