Browse Source

补上缺失的翻译内容,优化医院的路由名称和跳转,修改脚本文件

vothin 1 year ago
parent
commit
ee9f1a4244

+ 1 - 0
Dockerfile

@@ -10,6 +10,7 @@ EXPOSE 443 80
 ENV OnlineSystemUrl=http://api.base.wdklian.com serverUrl=http://172.28.100.100:8005 DeviceUrl=http://172.28.100.100:8006 mediaUrl=http://172.28.100.100:8004 apiMode=dev uiVersion=1 enableBroadcast=false enableMobile=false enableEntraceguard=false enableNBiot=false enableCustomerDevice=false enableSosDevice=false enable485=false enableLinux=false
 RUN echo 'USERNAME=' $serverUrl ',DeviceUrl=' $DeviceUrl ',mediaUrl=' $mediaUrl',apiMode=' $apiMode ',uiVersion=' $uiVersion
 #CMD sh -c "sed -i 's/^.*8006.*$/serverUrl=$serverUrl' domain.js"
+RUN ["chmod", "777", "/app/domain.js"]
 RUN ["chmod", "+x", "/app/set-envs.sh"]
 CMD sh -c  "/app/set-envs.sh && exec nginx -g \"daemon off;\""
 #CMD sh -c "exec nginx -g 'daemon off;'"

File diff suppressed because it is too large
+ 1 - 1
dist/index.html


+ 5 - 2
languages/en.js

@@ -5,6 +5,7 @@ module.exports = {
     add: 'Add',
     edit: 'Edit',
     more: 'More',
+    view: 'View',
     delete: 'Delete',
     login: 'Login',
     usernameMsg: 'Username',
@@ -424,7 +425,8 @@ module.exports = {
     card: 'Card display',
     devices: ' devices',
     roomNoDevice: 'The room was not equipped',
-    bedNoDevice: 'The bed was not equipped'
+    bedNoDevice: 'The bed was not equipped',
+    operationAdvice: 'Operation suggestions'
   },
   deviceMenuManage: {
     add: 'Add Device Menu',
@@ -1363,6 +1365,7 @@ module.exports = {
     paramType: 'Parameter type',
     paramExplain: 'Parameter description',
     paramAlias: 'Parameter alias(rename the parameter)',
-    exampleValue: 'Parameter example value'
+    exampleValue: 'Parameter example value',
+    isEnable: 'Is it enabled'
   }
 }

+ 5 - 2
languages/es.js

@@ -5,6 +5,7 @@ module.exports = {
     add: 'Agregar',
     edit: 'Editar',
     more: 'mas',
+    view: 'Ver',
     delete: 'Eliminar',
     login: 'Iniciar sesión',
     usernameMsg: 'Nombre de usuario',
@@ -424,7 +425,8 @@ module.exports = {
     card: 'Visualización de tarjeta',
     devices: 'dispositivos',
     roomNoDevice: 'La habitación no estaba equipada',
-    bedNoDevice: 'La cama no estaba equipada'
+    bedNoDevice: 'La cama no estaba equipada',
+    operationAdvice: 'Recomendaciones operativas'
   },
   deviceMenuManage: {
     add: 'Añadir menú de dispositivos',
@@ -1363,6 +1365,7 @@ module.exports = {
     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'
+    exampleValue: 'valor de muestra del parámetro',
+    isEnable: 'Si se abre'
   }
 }

+ 5 - 2
languages/ru-RU.js

@@ -5,6 +5,7 @@ module.exports = {
     add: 'Добавить',
     edit: 'редактор',
     more: 'Больше',
+    view: 'Посмотреть',
     delete: 'Удалить',
     login: 'Войти',
     usernameMsg: 'Имя пользователя',
@@ -424,7 +425,8 @@ module.exports = {
     card: 'Отображение карты',
     devices: 'устройства',
     roomNoDevice: 'Помещение не было оборудовано',
-    bedNoDevice: 'Кровать не оборудована'
+    bedNoDevice: 'Кровать не оборудована',
+    operationAdvice: 'Оперативные рекомендации'
   },
   deviceMenuManage: {
     add: 'Добавить меню устройства',
@@ -1360,6 +1362,7 @@ module.exports = {
     paramType: 'Тип параметров',
     paramExplain: 'Описание параметров',
     paramAlias: 'Параметры псевдонимы (переименование параметров)',
-    exampleValue: 'Примерное значение параметров'
+    exampleValue: 'Примерное значение параметров',
+    isEnable: 'Открыть'
   }
 }

+ 3 - 3
public/domain.js

@@ -1,7 +1,7 @@
 const domain = {
-  serverUrl: 'http://8.129.220.143:8005',
-  DeviceUrl: 'http://8.129.220.143:8006',
-  mediaUrl: 'http://8.129.220.143:8004',
+  serverUrl: 'http://172.28.100.100:8005',
+  DeviceUrl: 'http://172.28.100.100:8006',
+  mediaUrl: 'http://172.28.100.100:8004',
   OnlineSystemUrl: 'http://api.base.wdklian.com',
   apiMode: 'dev',
   uiVersion: 1, // 1 医院版,2 月子中心版,3养老院版

+ 1 - 1
set-envs.sh

@@ -13,4 +13,4 @@ echo "const domain = {
   enableSosDevice: ${enableSosDevice}, //报警设备
   enable485:${enable485},
   enableLinux:${enableLinux}
-}"  > /app/domain.js
+}"  > /app/domain.js

+ 45 - 34
src/router/index.js

@@ -164,13 +164,13 @@ export const partRoutes = [
           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',
+        //   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'),
@@ -418,7 +418,7 @@ export const partRoutes = [
         path: '/frame_group',
         component: () => import('@/views/hospitalFrame/index'),
         name: 'frame-group-manager',
-        redirect: '/hospitalFrame/frameGroup',
+        redirect: '/frame_group/index',
         children: [
           {
             path: 'index',
@@ -448,70 +448,81 @@ export const partRoutes = [
 ]
 export const hospitalRoutes = [
   {
-    path: '/hospital/ncs_frame',
+    path: '/hospital/frame',
     component: Layout,
-    redirect: '/ncs_frame/index',
+    redirect: '/hospital/frame/index',
+    name: 'hospital-frame',
     children: [
       {
         path: 'index',
-        component: () => import('@/views/hospital/ncs_frame/frameTreeView'),
-        name: 'hospital_frameTreeView',
+        component: () => import('@/views/hospital/frame/frameTreeView'),
+        name: 'hospital-frame-tree',
         meta: { title: i18n.t('tab.frameManage'), icon: 'tree', noCache: true }
       }
     ]
   },
   {
-    path: '/hospital/ncs_device',
+    path: '/hospital/device',
     component: Layout,
-    redirect: '/ncs_device/index',
+    redirect: '/hospital/device/index',
+    name: 'hospital-device-manager',
+    meta: { title: i18n.t('deviceManage.deviceManage'), icon: 'devices' },
     children: [
       {
         path: 'index',
         component: () => import('@/views/hospital/deviceManagement'),
-        name: 'hospital_deviceList',
+        name: 'hospital-device-list',
         meta: { title: i18n.t('tab.deviceManage'), icon: 'component', noCache: true }
+      },
+      {
+        path: 'led_control',
+        component: () => import('@/views/hospital/ledControl'),
+        name: 'hospital-led-control',
+        meta: { title: i18n.t('tab.ledDevice'), icon: 'el-icon-message-solid', noCache: true }
       }
     ]
   },
   {
-    path: '/hospital/ncs_clerk',
+    path: '/hospital/clerk',
     component: Layout,
-    redirect: '/ncs_clerk/index',
+    redirect: '/hospital/clerk/index',
+    name: 'hospital-clerk-manager',
     children: [
       {
         path: 'index',
         component: () => import('@/views/hospital/clerkManager'),
-        name: 'hospital_clerkList',
+        name: 'hospital-clerk-list',
         meta: { title: i18n.t('tab.clerkManage'), icon: 'peoples', noCache: true }
       }
     ]
   },
   {
-    path: '/hospital/ncs_customer',
+    path: '/hospital/customer',
     component: Layout,
-    redirect: '/ncs_customer/index',
+    redirect: '/hospital/customer/index',
+    name: 'hospital-customer-manager',
     children: [
       {
         path: 'index',
         component: () => import('@/views/hospital/customerManagement'),
-        name: 'customer-list',
+        name: 'hospital-customer-list',
         meta: { title: i18n.t('tab.customerManage'), icon: 'el-icon-s-custom', noCache: true }
       }
     ]
   },
-  {
-    path: '/hospital/ncs_led',
-    component: Layout,
-    redirect: '/ncs_led/index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/hospital/ledControl'),
-        name: 'hospital_led',
-        meta: { title: i18n.t('tab.ledDevice'), icon: 'el-icon-message-solid', noCache: true }
-      }
-    ]
-  },
+  // {
+  //   path: '/hospital/led',
+  //   component: Layout,
+  //   redirect: '/hospital/led/index',
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       component: () => import('@/views/hospital/ledControl'),
+  //       name: 'hospital_led',
+  //       meta: { title: i18n.t('tab.ledDevice'), icon: 'el-icon-message-solid', noCache: true }
+  //     }
+  //   ]
+  // },
   { path: '*', redirect: '/404', hidden: true }
 ]
 export const adminRoutes = [

File diff suppressed because it is too large
+ 6 - 6
src/utils/domain.js


+ 0 - 0
src/views/hospital/ncs_customer/customerManager.vue


+ 1 - 1
src/views/hospital/customerManagement.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import CustomerManager from './ncs_customer/customerManager'
+import CustomerManager from './customer/customerManager'
 export default {
   name: 'CustomerManagement',
   components: { CustomerManager },

+ 0 - 0
src/views/hospital/ncs_device/deviceManager.vue


+ 1 - 1
src/views/hospital/deviceManagement.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script>
-import DeviceManager from './ncs_device/deviceManager'
+import DeviceManager from './device/deviceManager'
 export default {
   name: 'DeviceManagement',
   components: { DeviceManager },

+ 2 - 2
src/views/hospital/ncs_frame/frameTreeView.vue

@@ -295,8 +295,8 @@
 <script>
 import * as HospitalFrame_API from '@/api/ncs_hospitalFrame'
 import * as API_Frame from '@/api/ncs_hospitalFrame'
-import CustomerManager from '@/views/hospital/ncs_customer/customerManager'
-import DeviceManager from '@/views/hospital/ncs_device/deviceManager'
+import CustomerManager from '@/views/hospital/customer/customerManager'
+import DeviceManager from '@/views/hospital/device/deviceManager'
 // import ClerkList from '@/views/ncs-clerk/clerkList
 import ClerkManager from '@/views/hospital/clerkManager'
 import CountTo from 'vue-count-to'