Merge branch 'zhuhai_Medicine' of gitee.com:yanyi_123456/yy_-rms_-multiple_-manage_4.0_-ui into dev

.env.development

@@ -1,6 +0,0 @@
-# just a flag
-ENV = 'development'
-
-# base api
-VUE_APP_BASE_API = 'http://127.0.0.1:9001'
-VUE_APP_FACE_API =  'http://127.0.0.1:5000'

src/permission.js

@@ -4,7 +4,8 @@ import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import getPageTitle from '@/utils/get-page-title'
-import { getALLRouter } from '@/utils'
+import { get_path, getALLRouter } from '@/utils'
+import mapTitle from '@/utils/mapTitle'
 
 NProgress.configure({ showSpinner: false }) // NProgress Configuration
 
@@ -26,16 +27,10 @@ router.beforeEach(async(to, from, next) => {
       next({ path: '/' })
       NProgress.done()
     } else {
-      const pa = to.path.split('/')[1]
+      const pat = get_path(to.path)
-      const pathMap = {
-        'reagent': 'reagent',
-        'user': 'user',
-        'userinfo': store.getters.classification
-      }
-      const pat = pathMap[pa]
       if (to.name) {
         // 设置header栏样式根据主预览页面不同
-        if (to.path === '/reagent/mainoverview/index') {
+        if (to.path === `/${pat}/mainoverview/index`) {
           store.commit('settings/CHANGE_SETTING', { key: 'isMain', value: true })
         } else {
           store.commit('settings/CHANGE_SETTING', { key: 'isMain', value: false })
@@ -49,6 +44,7 @@ router.beforeEach(async(to, from, next) => {
         router.addRoutes(asyncRoutes)
         next({ ...to, replace: true })
       }
+      store.commit('app/SET_TITLE', mapTitle[pat])
     }
   } else {
     /* has no token*/

src/router/modules/dangerous.js

@@ -0,0 +1,260 @@
+import Layout from '@/layout'
+
+const dangerousRouter = [
+  // {
+  //   path: '/dangerous',
+  //   hidden: true,
+  //   redirect: '/dangerous/mainoverview/index',
+  //   meta: { classification: 'dangerous', module_code: 'MainOverview' }
+  // },
+  {
+    path: '/dangerous/mainoverview',
+    component: Layout,
+    redirect: '/dangerous/mainoverview/index',
+    meta: { classification: 'dangerous', module_code: 'MainOverview' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousMainOverview',
+        meta: { title: '主预览', icon: '主概览', classification: 'dangerous' },
+        component: () => import('@/views/reagent/mainoverview/index')
+      }
+    ]
+  },
+  {
+    path: '/dangerous/report',
+    component: Layout,
+    redirect: '/dangerous/report/index',
+    meta: { classification: 'dangerous', module_code: 'DataReportIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousReport',
+        component: () => import('@/views/reagent/report/index'),
+        meta: { title: '报告统计', icon: '报表统计', classification: 'dangerous' }
+      },
+      {
+        path: 'storeinfo',
+        name: 'dangerousStoreInfo',
+        component: () => import('@/views/reagent/report/storeinfo/index'),
+        hidden: true,
+        meta: { title: '库存信息总览', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'dangerousinfo',
+        name: 'dangerousInfo',
+        component: () => import('@/views/reagent/report/reagentinfo/index'),
+        hidden: true,
+        meta: { title: '危化品信息详情', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'warehousinginfo',
+        name: 'dangerousWarehousingInfo',
+        component: () => import('@/views/reagent/report/warehousinginfo/index'),
+        hidden: true,
+        meta: { title: '入库信息查询', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'inventoryconsuminfo',
+        name: 'dangerousInventoryConsumInfo',
+        component: () => import('@/views/reagent/report/inventoryconsum/index'),
+        hidden: true,
+        meta: { title: '库存消耗', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'dangerousconsuminfo',
+        name: 'dangerousConsumInfo',
+        component: () => import('@/views/reagent/report/reagentconsum/index'),
+        hidden: true,
+        meta: { title: '危化品消耗', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'userconsuminfo',
+        name: 'dangerousUserConsumInfo',
+        component: () => import('@/views/reagent/report/userconsum/index'),
+        hidden: true,
+        meta: { title: '人员用量消耗', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'usefrequencyinfo',
+        name: 'dangerousUseFrequencyInfo',
+        component: () => import('@/views/reagent/report/usefrequency/index'),
+        hidden: true,
+        meta: { title: '使用频率', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      },
+      {
+        path: 'recordinfo/:t',
+        name: 'dangerousRecordInfo',
+        component: () => import('@/views/reagent/report/record/index'),
+        hidden: true,
+        meta: { title: '记录', icon: '报表统计', classification: 'dangerous', activeMenu: '/dangerous/report/index' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/warehousing',
+    component: Layout,
+    redirect: '/dangerous/warehousing/index',
+    meta: { classification: 'dangerous', module_code: 'DataReportIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousWarehousing',
+        component: () => import('@/views/reagent/warehousing/index'),
+        meta: { title: '危化品入库', icon: '试剂入库', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/receiving',
+    component: Layout,
+    redirect: '/dangerous/receiving/index',
+    meta: { classification: 'dangerous', module_code: 'DrugUseView' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousReceiving',
+        component: () => import('@/views/reagent/receivingandreturn/index'),
+        meta: { title: '危化品领用', icon: '试剂领用', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/sendback',
+    component: Layout,
+    redirect: '/dangerous/sendback/index',
+    meta: { classification: 'dangerous', module_code: 'DrugReturnView' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousSendBack',
+        component: () => import('@/views/reagent/receivingandreturn/index'),
+        meta: { title: '危化品归还', icon: '试剂归还', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/weighing',
+    component: Layout,
+    redirect: '/dangerous/weighing/index',
+    meta: { classification: 'dangerous', module_code: 'DrugWeigh' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousweighing',
+        component: () => import('@/views/reagent/weighing/index'),
+        meta: { title: '危化品称重', icon: '试剂称重', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/inventory',
+    component: Layout,
+    redirect: '/dangerous/inventory/index',
+    meta: { classification: 'dangerous', module_code: 'StockTakingIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousInventory',
+        component: () => import('@/views/reagent/inventory/index'),
+        meta: { title: '危化品盘点', icon: '库存盘点', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/database',
+    component: Layout,
+    redirect: '/dangerous/database/msds',
+    meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'dangerous', module_code: 'ChemicaDatabase' },
+    children: [
+      {
+        path: 'msds',
+        name: 'dangerousMSDS',
+        component: () => import('@/views/reagent/database/index'),
+        meta: { title: 'MSDS数据库', classification: 'dangerous' }
+      },
+      {
+        path: 'dangerous',
+        name: 'dangerousDangerous',
+        component: () => import('@/views/reagent/database/index'),
+        meta: { title: '危化品数据库', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/management',
+    component: Layout,
+    redirect: '/dangerous/management/index',
+    meta: { classification: 'dangerous', module_code: 'DrugIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousManagement',
+        component: () => import('@/views/reagent/management/index'),
+        meta: { title: '危化品管理', icon: '试剂管理', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/client',
+    component: Layout,
+    redirect: '/dangerous/client/index',
+    meta: { classification: 'dangerous', module_code: 'CabinetIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousClient',
+        component: () => import('@/views/reagent/client/index'),
+        meta: { title: '柜体管理', icon: '柜体管理', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/envrecord',
+    component: Layout,
+    redirect: '/dangerous/envrecord/index',
+    meta: { classification: 'dangerous', module_code: 'HumitureIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousEnvRecord',
+        component: () => import('@/views/reagent/envrecord/index'),
+        meta: { title: '环境记录', icon: '雪花', classification: 'dangerous' }
+      }
+    ]
+  },
+  {
+    path: '/dangerous/form',
+    component: Layout,
+    redirect: '/dangerous/form/index',
+    meta: { classification: 'dangerous', module_code: 'DrugCustomForm' },
+    children: [
+      {
+        path: 'index',
+        name: 'dangerousForm',
+        component: () => import('@/views/reagent/customform/index'),
+        meta: { title: '危化品表单自定义', icon: '表单', classification: 'dangerous' }
+      }
+    ]
+  },
+  // {
+  //   path: '/dangerous/buy',
+  //   component: Layout,
+  //   meta: { classification: 'dangerous' },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'Buy',
+  //       component: () => import('@/views/reagent/buy/index'),
+  //       meta: { title: '请购', icon: '请购', classification: 'dangerous' }
+  //     }
+  //   ]
+  // },
+  {
+    path: '/dangerous/gotohome',
+    redirect: '/home',
+    meta: { title: '返回主页', icon: 'el-icon-arrow-left', classification: 'dangerous' }
+  }
+]
+
+export default dangerousRouter

src/router/modules/standard.js

@@ -0,0 +1,260 @@
+import Layout from '@/layout'
+
+const standardRouter = [
+  // {
+  //   path: '/standard',
+  //   hidden: true,
+  //   redirect: '/reagent/mainoverview/index',
+  //   meta: { classification: 'standard', module_code: 'MainOverview' }
+  // },
+  {
+    path: '/standard/mainoverview',
+    component: Layout,
+    redirect: '/standard/mainoverview/index',
+    meta: { classification: 'standard', module_code: 'MainOverview' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardMainOverview',
+        meta: { title: '主预览', icon: '主概览', classification: 'standard' },
+        component: () => import('@/views/reagent/mainoverview/index')
+      }
+    ]
+  },
+  {
+    path: '/standard/report',
+    component: Layout,
+    redirect: '/standard/report/index',
+    meta: { classification: 'standard', module_code: 'DataReportIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardReport',
+        component: () => import('@/views/reagent/report/index'),
+        meta: { title: '报告统计', icon: '报表统计', classification: 'standard' }
+      },
+      {
+        path: 'storeinfo',
+        name: 'standardStoreInfo',
+        component: () => import('@/views/reagent/report/storeinfo/index'),
+        hidden: true,
+        meta: { title: '库存信息总览', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'standardinfo',
+        name: 'standardInfo',
+        component: () => import('@/views/reagent/report/reagentinfo/index'),
+        hidden: true,
+        meta: { title: '标准品信息详情', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'warehousinginfo',
+        name: 'standardWarehousingInfo',
+        component: () => import('@/views/reagent/report/warehousinginfo/index'),
+        hidden: true,
+        meta: { title: '入库信息查询', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'inventoryconsuminfo',
+        name: 'standardInventoryConsumInfo',
+        component: () => import('@/views/reagent/report/inventoryconsum/index'),
+        hidden: true,
+        meta: { title: '库存消耗', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'standardconsuminfo',
+        name: 'standardConsumInfo',
+        component: () => import('@/views/reagent/report/reagentconsum/index'),
+        hidden: true,
+        meta: { title: '标准品消耗', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'userconsuminfo',
+        name: 'standardUserConsumInfo',
+        component: () => import('@/views/reagent/report/userconsum/index'),
+        hidden: true,
+        meta: { title: '人员用量消耗', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'usefrequencyinfo',
+        name: 'standardUseFrequencyInfo',
+        component: () => import('@/views/reagent/report/usefrequency/index'),
+        hidden: true,
+        meta: { title: '使用频率', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      },
+      {
+        path: 'recordinfo/:t',
+        name: 'standardRecordInfo',
+        component: () => import('@/views/reagent/report/record/index'),
+        hidden: true,
+        meta: { title: '记录', icon: '报表统计', classification: 'standard', activeMenu: '/standard/report/index' }
+      }
+    ]
+  },
+  {
+    path: '/standard/warehousing',
+    component: Layout,
+    redirect: '/standard/warehousing/index',
+    meta: { classification: 'standard', module_code: 'DataReportIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardWarehousing',
+        component: () => import('@/views/reagent/warehousing/index'),
+        meta: { title: '标准品入库', icon: '试剂入库', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/receiving',
+    component: Layout,
+    redirect: '/standard/receiving/index',
+    meta: { classification: 'standard', module_code: 'DrugUseView' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardReceiving',
+        component: () => import('@/views/reagent/receivingandreturn/index'),
+        meta: { title: '标准品领用', icon: '试剂领用', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/sendback',
+    component: Layout,
+    redirect: '/standard/sendback/index',
+    meta: { classification: 'standard', module_code: 'DrugReturnView' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardSendBack',
+        component: () => import('@/views/reagent/receivingandreturn/index'),
+        meta: { title: '标准品归还', icon: '试剂归还', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/weighing',
+    component: Layout,
+    redirect: '/standard/weighing/index',
+    meta: { classification: 'standard', module_code: 'DrugWeigh' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardweighing',
+        component: () => import('@/views/reagent/weighing/index'),
+        meta: { title: '标准品称重', icon: '试剂称重', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/inventory',
+    component: Layout,
+    redirect: '/standard/inventory/index',
+    meta: { classification: 'standard', module_code: 'StockTakingIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardInventory',
+        component: () => import('@/views/reagent/inventory/index'),
+        meta: { title: '标准品盘点', icon: '库存盘点', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/database',
+    component: Layout,
+    redirect: '/standard/database/msds',
+    meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'standard', module_code: 'ChemicaDatabase' },
+    children: [
+      {
+        path: 'msds',
+        name: 'standardMSDS',
+        component: () => import('@/views/reagent/database/index'),
+        meta: { title: 'MSDS数据库', classification: 'standard' }
+      },
+      {
+        path: 'dangerous',
+        name: 'standardDangerous',
+        component: () => import('@/views/reagent/database/index'),
+        meta: { title: '危化品数据库', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/management',
+    component: Layout,
+    redirect: '/standard/management/index',
+    meta: { classification: 'standard', module_code: 'DrugIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardManagement',
+        component: () => import('@/views/reagent/management/index'),
+        meta: { title: '标准品管理', icon: '试剂管理', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/client',
+    component: Layout,
+    redirect: '/standard/client/index',
+    meta: { classification: 'standard', module_code: 'CabinetIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardClient',
+        component: () => import('@/views/reagent/client/index'),
+        meta: { title: '柜体管理', icon: '柜体管理', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/envrecord',
+    component: Layout,
+    redirect: '/standard/envrecord/index',
+    meta: { classification: 'standard', module_code: 'HumitureIndex' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardEnvRecord',
+        component: () => import('@/views/reagent/envrecord/index'),
+        meta: { title: '环境记录', icon: '雪花', classification: 'standard' }
+      }
+    ]
+  },
+  {
+    path: '/standard/form',
+    component: Layout,
+    redirect: '/standard/form/index',
+    meta: { classification: 'standard', module_code: 'DrugCustomForm' },
+    children: [
+      {
+        path: 'index',
+        name: 'standardForm',
+        component: () => import('@/views/reagent/customform/index'),
+        meta: { title: '标准品表单自定义', icon: '表单', classification: 'standard' }
+      }
+    ]
+  },
+  // {
+  //   path: '/standard/buy',
+  //   component: Layout,
+  //   meta: { classification: 'standard' },
+  //   children: [
+  //     {
+  //       path: 'index',
+  //       name: 'Buy',
+  //       component: () => import('@/views/reagent/buy/index'),
+  //       meta: { title: '请购', icon: '请购', classification: 'standard' }
+  //     }
+  //   ]
+  // },
+  {
+    path: '/standard/gotohome',
+    redirect: '/home',
+    meta: { title: '返回主页', icon: 'el-icon-arrow-left', classification: 'standard' }
+  }
+]
+
+export default standardRouter

src/store/modules/app.js

@@ -7,7 +7,8 @@ const state = {
     withoutAnimation: false,
     clientOptions: []
   },
-  device: 'desktop'
+  device: 'desktop',
+  title: ''
 }
 
 const mutations = {
@@ -30,6 +31,9 @@ const mutations = {
   },
   SET_COPTS: (state, opt) => {
     state.clientOptions = opt
+  },
+  SET_TITLE: (state, opt) => {
+    state.title = opt
   }
 }
 

src/utils/index.js

@@ -4,6 +4,9 @@
 
 import reagentRouter from '@/router/modules/reagent'
 import userRouter from '@/router/modules/user'
+import standardRouter from '@/router/modules/standard'
+import dangerousRouter from '@/router/modules/dangerous'
+import store from '@/store'
 
 /**
  * Parse the time to string
@@ -167,9 +170,13 @@ export function getALLRouter(data) {
   // TODO: 其他路由都在此操作
   const rasr = filterAsyncRoutes(reagentRouter, data.drug_manage)
   const uasr = filterAsyncRoutes(userRouter, data.drug_manage)
+  // const standard = filterAsyncRoutes(standardRouter, data.drug_manage)
   const asyncRoutes = [
     ...rasr,
     ...uasr,
+    // ...standard,
+    ...standardRouter,
+    ...dangerousRouter,
     // 404 page must be placed at the end !!!
     { path: '*', redirect: '/404', hidden: true }
   ]
@@ -179,6 +186,16 @@ export function getALLRouter(data) {
       router: rasr[0],
       title: '试剂管理'
     },
+    {
+      name: 'standard',
+      router: standardRouter[0],
+      title: '标准品管理'
+    },
+    {
+      name: 'dangerous',
+      router: dangerousRouter[0],
+      title: '危化品管理'
+    },
     {
       name: 'user',
       router: uasr[0],
@@ -243,3 +260,15 @@ export const web_stream = {
   }
 }
 
+export const get_path = function(path) {
+  const pa = path.split('/')[1]
+  const pathMap = {
+    'reagent': 'reagent',
+    'user': 'user',
+    'standard': 'standard',
+    'dangerous': 'dangerous',
+    'userinfo': store.getters.classification
+  }
+  return pathMap[pa]
+}
+

src/utils/mapTitle.js

@@ -0,0 +1,8 @@
+const mapTitle = {
+  'reagent': '试剂',
+  'user': 'user',
+  'standard': '标准品',
+  'dangerous': '危化品'
+}
+
+export default mapTitle

src/views/home/index.vue

@@ -8,9 +8,9 @@
     <div class="home-content">
       <div class="home-pic">
         <div class="home-pic-item" @click="picClick('reagent')"><img src="@/assets/2-主界面/试剂管理.png" alt=""></div>
-        <div key="2" class="home-pic-item"><img src="@/assets/2-主界面/standard.png" alt=""></div>
+        <div key="2" class="home-pic-item" @click="picClick('standard')"><img src="@/assets/2-主界面/standard.png" alt=""></div>
-        <div key="3" class="home-pic-item"><img src="@/assets/2-主界面/耗材管理.png" alt=""></div>
+        <div key="3" class="home-pic-item" @click="picClick('dangerous')"><img src="@/assets/2-主界面/危化品管理.png" alt=""></div>
-        <div key="4" class="home-pic-item"><img src="@/assets/2-主界面/instrument.png" alt=""></div>
+        <!--        <div key="4" class="home-pic-item"><img src="@/assets/2-主界面/instrument.png" alt=""></div>-->
         <div key="5" class="home-pic-item" @click="picClick('user')"><img src="@/assets/2-主界面/用户管理.png" alt=""></div>
       </div>
       <!--      <div class="home-menu">-->
@@ -33,6 +33,7 @@ export default {
   methods: {
     picClick(name) {
       const r = this.$store.getters.opts.find(item => item.name === name)
+      console.log(r)
       this.$router.push(r.router.path)
     }
   }
@@ -70,9 +71,9 @@ export default {
   background: #F7F7F7;
   height:calc(100vh - 6rem);
   .home-pic{
-    padding-top: 4.5625rem;
+    padding-top: 8rem;
     display: flex;
-    justify-content: center;
+    justify-content: space-around;
     .home-pic-item img{
       width: 19.75rem;
       margin: 0px 20px;

src/views/reagent/mainoverview/index.vue

@@ -48,15 +48,15 @@
       <div class="view-container-tr view-content">
         <div class="header">
           <div class="title">库存余量
-            <el-popover
+            <!--            <el-popover-->
-              placement="right"
+            <!--              placement="right"-->
-              title="怎么看试剂余量？"
+            <!--              title="怎么看试剂余量？"-->
-              width="200"
+            <!--              width="200"-->
-              trigger="hover"
+            <!--              trigger="hover"-->
-              content="如“2/50”，表示该试剂最后一次入库后共50瓶，当前剩余2瓶。"
+            <!--              content="如“2/50”，表示该试剂最后一次入库后共50瓶，当前剩余2瓶。"-->
-            >
+            <!--            >-->
-              <i slot="reference" class="el-icon-warning-outline" />
+            <!--              <i slot="reference" class="el-icon-warning-outline" />-->
-            </el-popover>
+            <!--            </el-popover>-->
           </div>
           <div>
             <!--            <el-button >查看全部</el-button>-->

src/views/reagent/management/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="main-container-text">
-    <div class="title">试剂管理</div>
+    <div class="title">{{ $store.state.app.title }}管理</div>
     <div class="header">
       <el-select v-model="client_id" clearable placeholder="请选择柜体">
         <el-option
@@ -10,10 +10,10 @@
           :value="item.client_id"
         />
       </el-select>
-      <el-input v-model="name" clearable placeholder="请输入试剂名称" />
+      <el-input v-model="name" clearable placeholder="请输入名称" />
       <el-button type="primary" icon="el-icon-search" @click="getList">搜索</el-button>
       <el-button type="primary" plain @click="handleSetEmpty"><svg-icon icon-class="cup" /> 设为空瓶</el-button>
-      <el-button icon="el-icon-edit" @click="handleEdit">编辑试剂</el-button>
+      <el-button icon="el-icon-edit" @click="handleEdit">编辑{{ $store.state.app.title }}</el-button>
       <el-button @click="showHistory"><svg-icon icon-class="流转" /> 查看流转记录</el-button>
       <el-button icon="el-icon-user" @click="handleDisable">分配禁用用户</el-button>
       <div class="header-right">
@@ -247,7 +247,7 @@
       </div>
 
     </el-dialog>
-    <el-dialog :visible.sync="dialogEditVisible" :close-on-click-modal="false" width="60%" title="编辑试剂" @close="onClose">
+    <el-dialog :visible.sync="dialogEditVisible" :close-on-click-modal="false" width="60%" :title="`编辑${$store.state.app.title}`" @close="onClose">
       <el-row :gutter="15">
         <el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="110px">
           <el-col :span="24">
@@ -669,7 +669,7 @@ export default {
     // 编辑
     handleEdit() {
       if (this.multipleSelection.length !== 1) {
-        this.$message.warning('请选择一个需要编辑的试剂！')
+        this.$message.warning(`请选择一个需要编辑的${this.$store.state.app.title}！`)
         return
       }
       // 给form赋值

src/views/reagent/receivingandreturn/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="contents">
     <div class="content left">
-      <div class="title">{{ this.$route.name === 'Receiving' ? '试剂领用' : '试剂归还' }}</div>
+      <div class="title">{{ mainTitle }}</div>
       <div class="img">
         <img src="@/assets/5-试剂入库/扫描试剂瓶.png" alt="">
       </div>
@@ -10,7 +10,7 @@
       </div>
     </div>
     <div class="content">
-      <div class="title">{{ this.$route.name === 'Receiving' ? '试剂领用列表' : '试剂归还列表' }}</div>
+      <div class="title">{{ subTitle }}</div>
       <div class="show-data">
         <el-table
           v-loading="loading"

src/views/reagent/report/index.vue

@@ -8,59 +8,86 @@
       <div class="info">
         <div class="info-text title text">库存信息统计</div>
         <div class="info-item">
-          <div @click="$router.push('/reagent/report/storeinfo')"><img src="@/assets/4-报表统计/store_info_overview.png" alt=""></div>
+          <div @click="$router.push(`/${$store.getters.classification}/report/storeinfo`)"><img
-          <div @click="$router.push('/reagent/report/warehousinginfo')"><img src="@/assets/4-报表统计/store_info_search.png" alt=""></div>
+            src="@/assets/4-报表统计/store_info_overview.png"
-          <div @click="$router.push('/reagent/report/reagentinfo')"><img src="@/assets/4-报表统计/试剂信息详情.png" alt=""></div>
+            alt=""
+          ></div>
+          <div @click="$router.push(`/${$store.getters.classification}/report/warehousinginfo`)"><img
+            src="@/assets/4-报表统计/store_info_search.png"
+            alt=""
+          ></div>
+          <div @click="$router.push(`/${$store.getters.classification}/report/${$store.getters.classification}info`)"><img
+            src="@/assets/4-报表统计/试剂信息详情.png"
+            alt=""
+          ></div>
         </div>
       </div>
       <div class="use-info">
-        <div class="title text">试剂使用统计</div>
+        <div class="title text">{{ $store.state.app.title }}使用统计</div>
         <div class="use-info-content">
-          <div class="user-info-text" @click="$router.push('/reagent/report/usefrequencyinfo')">
+          <div
+            class="user-info-text"
+            @click="$router.push(`/${$store.getters.classification}/report/usefrequencyinfo`)"
+          >
             <div class="user-info-img" style="float: right"><img src="@/assets/4-报表统计/使用频率.png"></div>
             <div class="title text" style="color:#FF9B02 ">使用频率</div>
             <div class="use-count">{{ use_avg_info.avg_use_number }}</div>
             <div class="use-info-total">平均使用频率(次/种)</div>
-            <div><svg-icon icon-class="皇冠" /> 使用最高频试剂：{{ use_avg_info.max_name }}</div>
+            <div>
-            <div><svg-icon icon-class="手" /> 单个试剂最高频次：已使用{{ use_avg_info.max_number }}次</div>
+              <svg-icon icon-class="皇冠" />
+              使用最高频{{ $store.state.app.title }}：{{ use_avg_info.max_name }}
+            </div>
+            <div>
+              <svg-icon icon-class="手" />
+              单个{{ $store.state.app.title }}最高频次：已使用{{ use_avg_info.max_number }}次
+            </div>
           </div>
-          <div class="user-info-text" @click="$router.push('/reagent/report/recordinfo/store')">
+          <div class="user-info-text" @click="$router.push(`/${$store.getters.classification}/report/recordinfo/store`)">
             <div class="user-info-img" style="float: right"><img src="@/assets/4-报表统计/入库记录.png"></div>
             <div class="title text" style="color:#409EFF ">入库记录</div>
             <div class="use-count">{{ recordStock.count_number }}</div>
             <div class="use-info-total">入库历史记录(条)</div>
             <div><i class="el-icon-time" /> {{ recordStock.date_time }}</div>
-            <div><svg-icon icon-class="cup" /> {{ recordStock.name }}</div>
+            <div>
+              <svg-icon icon-class="cup" />
+              {{ recordStock.name }}
+            </div>
           </div>
-          <div class="user-info-text" @click="$router.push('/reagent/report/recordinfo/collect')">
+          <div class="user-info-text" @click="$router.push(`/${$store.getters.classification}/report/recordinfo/collect`)">
             <div class="user-info-img" style="float: right"><img src="@/assets/4-报表统计/领用记录.png"></div>
             <div class="title text" style="color: #1ADCE9">领用记录</div>
             <div class="use-count">{{ recordCollect.count_number }}</div>
             <div class="use-info-total">领用历史记录(条)</div>
             <div><i class="el-icon-time" /> {{ recordCollect.date_time }}</div>
-            <div><svg-icon icon-class="cup" />{{ recordCollect.name }}</div>
+            <div>
+              <svg-icon icon-class="cup" />
+              {{ recordCollect.name }}
+            </div>
           </div>
-          <div class="user-info-text" @click="$router.push('/reagent/report/recordinfo/sendback')">
+          <div class="user-info-text" @click="$router.push(`/${$store.getters.classification}/report/recordinfo/sendback`)">
             <div class="user-info-img" style="float: right"><img src="@/assets/4-报表统计/归还记录.png"></div>
             <div class="title text" style="color: #5DDC1D">归还记录</div>
             <div class="use-count">{{ recordConsume.count_number }}</div>
             <div class="use-info-total">归还历史记录(条)</div>
             <div><i class="el-icon-time" /> {{ recordConsume.date_time }}</div>
-            <div><svg-icon icon-class="cup" />{{ recordConsume.name }}</div>
+            <div>
+              <svg-icon icon-class="cup" />
+              {{ recordConsume.name }}
+            </div>
           </div>
         </div>
       </div>
     </div>
     <div class="right">
-      <div class="consume-title title text">试剂消耗用量</div>
+      <div class="consume-title title text">{{ $store.state.app.title }}消耗用量</div>
       <div class="consume">
         <el-card class="box-card">
-          <div slot="header" class="clearfix" @click="$router.push('/reagent/report/inventoryconsuminfo')">
+          <div slot="header" class="clearfix" @click="$router.push(`/${$store.getters.classification}/report/inventoryconsuminfo`)">
-            <span class="text">试剂库存消耗</span>
+            <span class="text">{{ $store.state.app.title }}库存消耗</span>
             <i style="float: right; padding: 3px 0" class="el-icon-arrow-right" />
           </div>
           <div class="count text">{{ pdc }}</div>
-          <div class="desc">截至目前试剂入库总量</div>
+          <div class="desc">截至目前{{ $store.state.app.title }}入库总量</div>
           <div style="display: flex;line-height: 30px;text-align: center">
             <div :style="instock"><span>{{ instock.width }}</span></div>
             <div :style="lending"><span>{{ lending.width }}</span></div>
@@ -84,8 +111,8 @@
       </div>
       <div class="consume">
         <el-card class="box-card">
-          <div slot="header" class="clearfix" @click="$router.push('/reagent/report/reagentconsuminfo')">
+          <div slot="header" class="clearfix" @click="$router.push(`/${$store.getters.classification}/report/${$store.getters.classification}consuminfo`)">
-            <span class="text">试剂用量消耗</span>
+            <span class="text">{{ $store.state.app.title }}用量消耗</span>
             <i style="float: right; padding: 3px 0" class="el-icon-arrow-right" />
           </div>
           <div id="mychart" />
@@ -93,14 +120,17 @@
       </div>
       <div class="consume">
         <el-card class="box-card">
-          <div slot="header" class="clearfix" @click="$router.push('/reagent/report/userconsuminfo')">
+          <div slot="header" class="clearfix" @click="$router.push(`/${$store.getters.classification}/report/userconsuminfo`)">
             <span class="text">人员用量消耗</span>
             <i style="float: right; padding: 3px 0" class="el-icon-arrow-right" />
           </div>
           <div v-for="(user,index) in userData" :key="user.create_user_id" class="user-item">
-            <el-avatar :size="50" :src="user.avatar_url || 'https://t7.baidu.com/it/u=2006997523,200382512&fm=193&f=GIF'" />
+            <el-avatar
-            <div class="order">top{{ index+1 }}</div>
+              :size="50"
-            <div class="name">{{ user.create_user_name||"程小红" }}</div>
+              :src="user.avatar_url || 'https://t7.baidu.com/it/u=2006997523,200382512&fm=193&f=GIF'"
+            />
+            <div class="order">top{{ index + 1 }}</div>
+            <div class="name">{{ user.create_user_name || "程小红" }}</div>
             <div class="count">{{ user.count_number }}</div>
           </div>
         </el-card>
@@ -144,9 +174,7 @@ export default {
       recordConsume: {
         count_number: 0
       },
-      use_avg_info: {
+      use_avg_info: {},
-
-      },
       userData: []
     }
   },
@@ -221,111 +249,134 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.content{
+.content {
   padding: 1rem;
   display: flex;
   justify-content: space-between;
-  .left{
+
+  .left {
     width: 1080px;
-    .info{
+
-      .info-item{
+    .info {
+      .info-item {
         display: flex;
         justify-content: space-between;
-        img{
+
+        img {
           width: 21.25rem;
         }
       }
     }
-    .use-info{
+
+    .use-info {
       margin-top: 1rem;
     }
   }
-  .right{
+
-    .consume-title{
+  .right {
+    .consume-title {
       margin-left: 1rem;
     }
-    .consume{
+
+    .consume {
       margin-bottom: 1rem;
       margin-left: 1rem;
-      .box-card{
+
+      .box-card {
         width: 33.125rem;
       }
     }
   }
 }
-.title{
+
+.title {
   margin-bottom: 1rem;
 }
-.text{
+
+.text {
   font-size: 1rem;
   font-weight: bold;
   color: #303133
 }
-.count{
+
+.count {
   font-size: 2rem;
   font-weight: bold;
   color: #303133;
 }
-.desc{
+
+.desc {
   font-size: 1rem;
   font-weight: 400;
   color: #909399;
   margin-bottom: 1rem;
 }
-.data-count{
+
+.data-count {
   width: 100%;
   margin-top: 1rem;
   display: flex;
   justify-content: space-between;
-  div{
+
+  div {
     width: 30%;
   }
 }
-.user-info-img{
+
-  img{
+.user-info-img {
+  img {
     width: 3rem;
   }
 }
-.user-info-text{
+
+.user-info-text {
   width: 32.5rem;
   background: white;
   padding: 2rem;
   margin-bottom: 2rem;
-  div{
+
+  div {
     margin-bottom: 0.5rem;
   }
 }
-.use-info-content{
+
+.use-info-content {
   display: flex;
-  flex-wrap:wrap;
+  flex-wrap: wrap;
   justify-content: space-between;
 }
-.use-info-total{
+
+.use-info-total {
   font-size: 0.7rem;
   font-weight: bold;
   color: #303133;
   padding-bottom: 1rem;
 }
-.use-count{
+
+.use-count {
   font-size: 2rem;
   font-weight: bold;
   color: #303133;
 }
-#mychart{
+
-  width:30rem;
+#mychart {
+  width: 30rem;
   height: 12.5rem;
 }
-.user-item{
+
+.user-item {
   display: flex;
-  flex-direction:column;
+  flex-direction: column;
   align-items: center;
-  .name{
+
+  .name {
     font-size: 1rem;
     font-weight: bold;
     color: #303133;
     margin: 0.3rem 0 0.3rem 0;
   }
-  .count{
+
+  .count {
     font-size: 1rem;
     font-weight: 400;
     color: #909399;

src/views/reagent/report/inventoryconsum/index.vue

@@ -3,7 +3,7 @@
     <div class="title">库存消耗</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
         <el-date-picker
           v-model="start_time"

src/views/reagent/report/reagentconsum/index.vue

@@ -3,7 +3,7 @@
     <div class="title">试剂用量消耗</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
         <el-date-picker
           v-model="start_time"

src/views/reagent/report/reagentinfo/index.vue

@@ -3,7 +3,7 @@
     <div class="title">试剂信息详情</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-select v-model="client_id" clearable placeholder="请选择柜体">
           <el-option
             v-for="item in $store.getters.clientOptions"

src/views/reagent/report/record/index.vue

@@ -3,7 +3,7 @@
     <div class="title">{{ titleMap[$route.params.t] }}</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-select v-model="client_id" clearable placeholder="请选择柜体">
           <el-option
             v-for="item in $store.getters.clientOptions"

src/views/reagent/report/storeinfo/index.vue

@@ -3,7 +3,7 @@
     <div class="title">库存信息总览</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
         <el-button type="primary" icon="el-icon-search" @click="searchReagent">搜索</el-button>
       </div>

src/views/reagent/report/usefrequency/index.vue

@@ -3,7 +3,7 @@
     <div class="title">使用频率</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-select v-model="client_id" clearable placeholder="请选择柜体">
           <el-option
             v-for="item in $store.getters.clientOptions"

src/views/reagent/report/userconsum/index.vue

@@ -3,7 +3,7 @@
     <div class="title">人员用量消耗</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <!--        <el-input v-model="selectReagentValue"  placeholder="请输入搜索试剂名称" />-->
         <el-input v-model="seachUser" clearable placeholder="请输入用户名称" />
         <el-date-picker

src/views/reagent/report/warehousinginfo/index.vue

@@ -3,7 +3,7 @@
     <div class="title">入库信息查询</div>
     <div class="header">
       <div class="header-left">
-        <el-button @click="$router.push('/reagent/report/index')">返回上一级</el-button>
+        <el-button @click="$router.push(`/${$store.getters.classification}/report/index`)">返回上一级</el-button>
         <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
         <el-input v-model="value" clearable placeholder="请输入搜索生产厂商名称" />
         <el-date-picker

src/views/reagent/warehousing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-content-container">
     <div class="header">
-      <div class="title">试剂入库</div>
+      <div class="title">{{ $store.state.app.title }}入库</div>
       <div class="header-select">
         <!--        <el-button>返回上一级</el-button>-->
         <el-select v-model="client_id" clearable placeholder="请选择柜体" @change="getTmpList">
@@ -12,10 +12,10 @@
             :value="item.client_id"
           />
         </el-select>
-        <el-button type="primary" @click="handleReagentToDatabase">选择试剂入库</el-button>
+        <el-button type="primary" @click="handleReagentToDatabase">选择{{ $store.state.app.title }}入库</el-button>
         <el-button type="primary" @click="handleBindToDB">绑定入库</el-button>
-        <el-button type="primary" plain @click="handleAddTmp('add')">+ 新增试剂模板</el-button>
+        <el-button type="primary" plain @click="handleAddTmp('add')">+ 新增{{ $store.state.app.title }}模板</el-button>
-        <el-button @click="handleAddTmp('modify')"><i class="el-icon-edit" />编辑试剂模板</el-button>
+        <el-button @click="handleAddTmp('modify')"><i class="el-icon-edit" />编辑{{ $store.state.app.title }}模板</el-button>
         <el-button><i class="el-icon-printer" /> 打印模板条码</el-button>
         <el-button @click="handleImport"><i class="el-icon-folder-add" /> 导入入库模板</el-button>
         <div class="right">
@@ -94,15 +94,9 @@
       />
     </div>
     <!--    选择试剂入库 弹框 -->
-    <el-dialog
+    <el-dialog :title="`选择${$store.state.app.title}入库`" width="70%" :close-on-click-modal="false" :visible.sync="dialogTableVisible" @close="handleSelectClose">
-      title="选择试剂入库"
-      width="70%"
-      :close-on-click-modal="false"
-      :visible.sync="dialogTableVisible"
-      @close="handleSelectClose"
-    >
       <div class="search-header">
-        <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索试剂名称" />
+        <el-input v-model="selectReagentValue" clearable placeholder="请输入搜索名称" />
         <el-button type="primary" icon="el-icon-search" @click="searchReagent">搜索</el-button>
       </div>
       <el-table
@@ -142,7 +136,7 @@
       </div>
       <el-dialog
         width="53%"
-        title="编辑试剂信息"
+        :title="`编辑${$store.state.app.title}信息`"
         :close-on-click-modal="false"
         :visible.sync="formVisible"
         append-to-body
@@ -160,7 +154,7 @@
       @close="handleAddClose"
     >
       <div class="header-select">
-        <el-input v-model="reagentAddTmpName" placeholder="请输入模板名称" />
+        <el-input v-model="reagentAddTmpName" placeholder="请输入名称" />
         <el-select v-model="reagentAddClient" placeholder="请选择柜体">
           <el-option
             v-for="item in $store.getters.clientOptions"
@@ -169,9 +163,9 @@
             :value="item.client_id"
           />
         </el-select>
-        <el-button v-if="opType === 'add'" type="primary" plain @click="handleADDOpen('add')">+ 新增试剂条目</el-button>
+        <el-button v-if="opType === 'add'" type="primary" plain @click="handleADDOpen('add')">+ 新增{{ $store.state.app.title }}条目</el-button>
-        <el-button @click="handleADDOpen('modify')"><i class="el-icon-edit" />编辑试剂条目</el-button>
+        <el-button @click="handleADDOpen('modify')"><i class="el-icon-edit" />编辑{{ $store.state.app.title }}条目</el-button>
-        <el-button v-if="opType === 'add'" @click="handleADDDEL"><i class="el-icon-delete" /> 删除试剂条目</el-button>
+        <el-button v-if="opType === 'add'" @click="handleADDDEL"><i class="el-icon-delete" /> 删除{{ $store.state.app.title }}条目</el-button>
       </div>
       <div class="content">
         <el-table
@@ -220,7 +214,7 @@
       @close="handleCloseToDB"
     >
       <div class="to-database">
-        <div class="bind-to-db-title">请扫描试剂条码</div>
+        <div class="bind-to-db-title">请扫描{{ $store.state.app.title }}条码</div>
         <div>
           <el-select v-model="client_id_input" placeholder="请选择柜体">
             <el-option
@@ -513,7 +507,7 @@ export default {
       //   opTitle: '',
       this.opType = t
       if (t === 'add') {
-        this.opTitle = '新增试剂模板'
+        this.opTitle = `新增${this.$store.state.app.title}模板`
         if (this.multipleSelection.length === 0) {
           this.reagentAddVisible = true
         } else if (this.multipleSelection.length === 1) {
@@ -526,7 +520,7 @@ export default {
           this.$message.warning('请选择一个模板！')
         }
       } else {
-        this.opTitle = '编辑试剂模板'
+        this.opTitle = `编辑${this.$store.state.app.title}模板`
         if (this.multipleSelection.length === 1) {
           const data = this.multipleSelection[0]
           this.reagentAddTmpName = data.template_name

src/views/reagent/weighing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="contents">
     <div class="content left">
-      <div class="title">试剂称重</div>
+      <div class="title">{{ $store.state.app.title }}称重</div>
       <div class="img">
         <img src="@/assets/5-试剂入库/扫描试剂瓶.png" alt="">
       </div>