diff --git a/.env.development b/.env.development index 8971a6a..9db14b9 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API = 'http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.114:9001' +VUE_APP_FACE_API = 'http://192.168.1.114:5000' diff --git a/.env.production b/.env.production index 03db484..b33d4a4 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API ='http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.114:9001' +VUE_APP_FACE_API ='http://192.168.1.114:5000' diff --git a/.env.staging b/.env.staging index c1452c1..5f4a155 100644 --- a/.env.staging +++ b/.env.staging @@ -4,6 +4,6 @@ NODE_ENV = production ENV = 'staging' # base api -VUE_APP_BASE_API = 'http://127.0.0.1:9001' -VUE_APP_FACE_API='http://127.0.0.1:5000' +VUE_APP_BASE_API = 'http://192.168.1.114:9001' +VUE_APP_FACE_API='http://192.168.1.114:5000' diff --git a/src/router/modules/reagent.js b/src/router/modules/reagent.js index 778e2af..9622978 100644 --- a/src/router/modules/reagent.js +++ b/src/router/modules/reagent.js @@ -231,20 +231,20 @@ const reagentRouter = [ } ] }, - // { - // path: '/reagent/client', - // component: Layout, - // redirect: '/reagent/client/index', - // meta: { classification: 'reagent', module_code: 'CabinetIndex' }, - // children: [ - // { - // path: 'index', - // name: 'Client', - // component: () => import('@/views/reagent/client/index'), - // meta: { title: '柜体管理', icon: '柜体管理', classification: 'reagent' } - // } - // ] - // }, + { + path: '/reagent/client', + component: Layout, + redirect: '/reagent/client/index', + meta: { classification: 'reagent', module_code: 'CabinetIndex' }, + children: [ + { + path: 'index', + name: 'Client', + component: () => import('@/views/reagent/client/index'), + meta: { title: '柜体管理', icon: '柜体管理', classification: 'reagent' } + } + ] + }, { path: '/reagent/envrecord', component: Layout, diff --git a/src/views/reagent/applymanagement/index.vue b/src/views/reagent/applymanagement/index.vue index 338c774..08a8843 100644 --- a/src/views/reagent/applymanagement/index.vue +++ b/src/views/reagent/applymanagement/index.vue @@ -40,6 +40,7 @@ +
- + 2小时 @@ -158,8 +159,8 @@ export default { history_page: 1, history_page_size: 15, history_total: 100, - statusColorMap: ['warning','success'], - statusMap: ['未处理', '已处理'], + statusColorMap: ['warning','success','danger'], + statusMap: ['未处理', '已处理','已驳回'], row:'' } }, diff --git a/src/views/reagent/createapply/index.vue b/src/views/reagent/createapply/index.vue index c64812a..7d8c057 100644 --- a/src/views/reagent/createapply/index.vue +++ b/src/views/reagent/createapply/index.vue @@ -108,10 +108,15 @@ + + + - +