Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/lang/zh.js

@@ -62,13 +62,13 @@ export default {
     clipboardDemo: 'Clipboard',
     i18n: '国际化',
     medicalScheduling:'医护排班',
-    medicalSchedulingIndex:'医护排班',
+    medicalSchedulingIndex:'排班管理',
     class:'班种列表',
     schedulingStatistics:'排班统计',
     permissionManage: '权限管理',
     adminManage: '员工管理',
     roleManage: '权限管理',
-    dialysis: '透析管理',
+    dialysis: '透析监控',
     paper: '透析管理',
     advice: '今日医嘱',
     prepare: '透析准备',
@@ -77,17 +77,17 @@ export default {
     data_dictionary: '数据字典',
     specialDictionary: '专项字典',
     field_config: '字段配置',
-    template: '模版配置',
+    template: '数据模版',
     druguse: '医嘱模版',
     watch: '透析监测',
     addAdmin: '新增用户',
     editAdmin: '编辑用户信息',
     setupPerview: '设置权限',
-    user: '病人管理',
-    createPatient: '新增病人',
+    user: '患者中心',
+    createPatient: '新增患者',
     patientPage: '病人信息',
     editPatient: '修改病人信息',
-    patient: '病人管理',
+    patient: '患者中心',
     dialysisSolution: '透析处方',
     inspection: '检验检查',
     home: '首页',
@@ -119,7 +119,7 @@ export default {
     completeOrder: '购买结果',
     orderRecord: '订单详情',
     recordList: '订单记录',
-    stockManage: '库存管理',
+    stockManage: '耗材管理',
     goodType: '商品类型',
     stockIn: '入库管理',
     stockOut: '出库管理',
@@ -149,7 +149,8 @@ export default {
     RescueRecord: '抢救记录',
     special_permission_manage: '特殊权限管理',
     schedule_print: '排班打印',
-
+    
+    otherManagement:'其他管理',
     drugsExpiryDate:'药品有效期预警',
     drugsSurplus:'药品剩余预警',
     drugsQuery:'明细查询',
@@ -195,7 +196,7 @@ export default {
     upload_config: '质控上报配置',
     quality_control: '质控上报',
     remind_print: '排版提醒打印',
-    system_prescription: '透析方案',
+    system_prescription: '处方模版',
     integration_config: '集成配置',
     his_config: 'HIS集成配置',
 
@@ -226,6 +227,9 @@ export default {
     lineUp:'排队窗口',
     otherManagement:'其他管理',
     calling:'排队叫号',
+    bedManagement:'床位管理',
+    dictionaryManagement:'字典管理',
+    templateManagement:'模板管理',
 
   },
   navbar: {
@@ -318,7 +322,7 @@ export default {
   data_config: {
     patient: '病人管理',
     scheduling: '排班管理',
-    device: '设备管理',
+    device: '院感管理',
     hemodialysis: '血透管理',
     system: '系统配置',
     education: '透后宣教',

src/router/index.js

@@ -39,6 +39,9 @@ import dataPrescription from './modules/dataPrescription'
 import dataDruguse from './modules/dataDruguse'
 import dataShowconfig from './modules/dataShowconfig'
 import dataPrint from './modules/dataPrint'
+import bedManagement from './modules/bedManagement'
+import dictionaryManagement from './modules/dictionaryManagement'
+import templateManagement from './modules/templateManagement'
 
 Vue.use(Router)
 
@@ -132,8 +135,11 @@ var _asy_router_map = [
   integration,
   systems,
   roleManage,
-  dataDictionary,
-  specialDictionary,
+  bedManagement,
+  dictionaryManagement,
+  templateManagement,
+  // dataDictionary,
+  // specialDictionary,
   dataTemplate,
   dataPrescription,
   dataDruguse,

src/router/modules/bedManagement.js

@@ -0,0 +1,46 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/bedManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'bedManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'bedManagement',
+    icon: 'bedManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/device/groups',
+        component: () => import('@/xt_pages/device/group_main'),
+        name: 'deviceGroupManage',
+        meta: {
+          title: 'deviceGroupManage',
+          noCache: true,
+  
+        }
+    },
+    {
+        path: '/device/zones',
+        component: () => import('@/xt_pages/device/zone_main'),
+        name: 'deviceZoneManage',
+        meta: {
+          title: 'deviceZoneManage',
+          noCache: true,
+  
+        }
+    }, 
+    {
+        path: '/device/numbers',
+        component: () => import('@/xt_pages/device/number_main'),
+        name: 'deviceNumberManage',
+        meta: {
+          title: 'deviceNumberManage',
+          noCache: true,
+  
+        }
+    },
+  ]
+}

src/router/modules/device.js

@@ -13,32 +13,14 @@ export default {
     title: 'deviceManage',
     icon: 'shebei'
   },
-  children: [{
-      path: '/device/zones',
-      component: () => import('@/xt_pages/device/zone_main'),
-      name: 'deviceZoneManage',
-      meta: {
-        title: 'deviceZoneManage',
-        noCache: true,
-
-      }
-    },
-    {
-      path: '/device/groups',
-      component: () => import('@/xt_pages/device/group_main'),
-      name: 'deviceGroupManage',
-      meta: {
-        title: 'deviceGroupManage',
-        noCache: true,
-
-      }
-    },
+  children: [
     {
-      path: '/device/numbers',
-      component: () => import('@/xt_pages/device/number_main'),
-      name: 'deviceNumberManage',
+      path: '/device/main',
+      component: () => import('@/xt_pages/management/index'),
+      // component: () => import("@/xt_pages/device/main"),
+      name: 'dialysisMachineManage',
       meta: {
-        title: 'deviceNumberManage',
+        title: 'dialysisMachineManage',
         noCache: true,
 
       }
@@ -53,17 +35,7 @@ export default {
 
       }
     },
-    {
-      path: '/device/main',
-      component: () => import('@/xt_pages/management/index'),
-      // component: () => import("@/xt_pages/device/main"),
-      name: 'dialysisMachineManage',
-      meta: {
-        title: 'dialysisMachineManage',
-        noCache: true,
-
-      }
-    },
+    
     {
       path: '/device/home',
       component: () => import('@/xt_pages/management/home'),

src/router/modules/dictionaryManagement.js

@@ -0,0 +1,36 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/dictionaryManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'dictionaryManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'dictionaryManagement',
+    icon: 'dictionaryManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/data/dictionary',
+        component: () => import('@/xt_pages/data/index'),
+        name: 'dictionary',
+        meta: {
+          title: 'data_dictionary',
+          noCache: true,
+    
+        }
+    },
+    {
+        path: '/data/specialDictionary',
+        component: () => import('@/xt_pages/data/specialDictionary'),
+        name: 'specialDictionary',
+        meta: {
+          title: 'specialDictionary',
+          noCache: true,
+    
+        }
+    }
+  ]
+}

src/router/modules/templateManagement.js

@@ -0,0 +1,43 @@
+import Layout from '@/views/layout/Layout'
+
+export default {
+  path: '/templateManagement',
+  component: Layout,
+  redirect: 'noredirect',
+  name: 'templateManagement',
+  alwaysShow: true,
+  meta: {
+    title: 'templateManagement',
+    icon: 'templateManagement',
+    isChild: true
+  },
+  children: [
+    {
+        path: '/data/druguse',
+        component: () => import('@/xt_pages/data/druguseTemplate'),
+        name: 'druguse',
+        meta: {
+          title: 'druguse'
+        }
+    },
+    {
+        path: '/data/template',
+        component: () => import('@/xt_pages/data/template'),
+        name: 'template',
+        meta: {
+          title: 'template',
+          noCache: true,
+    
+        }
+    },
+    {
+        path: '/data/prescription',
+        component: () => import('@/xt_pages/data/prescription'),
+        name: 'prescription',
+        meta: {
+          title: 'system_prescription'
+        }
+    },
+    
+  ]
+}

src/views/layout/Layout.vue

@@ -255,6 +255,7 @@ export default {
     background: #1F2D3D;
     margin-top:50px;
     .navOne{
+      font-size:14px;
       width:80px;
       height:80px;
       color:#BFCBD9;

src/views/layout/components/Sidebar/index.vue

@@ -11,7 +11,7 @@
       :default-active="$route.path"
       background-color="#f3f5f6"
       text-color="#000"
-      active-text-color="#000"
+      active-text-color="#409EFF"
     >
       <sidebar-item v-for="route in arr" :key="route.name" :item="route" :base-path="route.path"></sidebar-item>
     </el-menu>
@@ -48,7 +48,7 @@ export default {
   },
   created(){
     if(this.navTitle == '透析管理'){
-      let nameArr = ['workforce','dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
+      let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
       // console.log('permission_routers',this.permission_routers)
       let routerArr = []
       this.permission_routers.map(item => {
@@ -103,7 +103,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '透析管理'){
-          let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'quality_control']
+          let nameArr = ['workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {
@@ -138,7 +138,7 @@ export default {
             this.$emit('func',a)
           }
         }else if(newVal == '配置管理'){
-          let nameArr = ['system','roleManage','dictionary','specialDictionary','template','prescription','druguse','showconfig','printTemplate']
+          let nameArr = ['system','roleManage', 'bedManagement', 'dictionaryManagement', 'templateManagement','showconfig','printTemplate']
           // console.log('permission_routers',this.permission_routers)
           let routerArr = []
           this.permission_routers.map(item => {