From f36a6ededfb497e0699142faa4053cdd555b32b4 Mon Sep 17 00:00:00 2001 From: cxw <1056036578@qq.com> Date: Tue, 3 Jan 2023 15:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +-- .env.production | 4 +-- .env.staging | 4 +-- src/api/reagent/database.js | 8 ++++++ src/components/Scannner/index.vue | 28 ++++++++++++++++++-- src/router/modules/reagent.js | 44 +++++++++++++++---------------- 6 files changed, 62 insertions(+), 30 deletions(-) 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/api/reagent/database.js b/src/api/reagent/database.js index 83ed2f3..af44e70 100644 --- a/src/api/reagent/database.js +++ b/src/api/reagent/database.js @@ -15,3 +15,11 @@ export function dangerous_db_list(data) { data }) } + +export function get_uhf_code() { + return request({ + url: '/drug/get_uhf_code', + method: 'get', + baseURL: process.env.VUE_APP_FACE_API + }) +} \ No newline at end of file diff --git a/src/components/Scannner/index.vue b/src/components/Scannner/index.vue index 6dc69d5..2478498 100644 --- a/src/components/Scannner/index.vue +++ b/src/components/Scannner/index.vue @@ -2,6 +2,9 @@
diff --git a/src/router/modules/reagent.js b/src/router/modules/reagent.js index 9622978..52961de 100644 --- a/src/router/modules/reagent.js +++ b/src/router/modules/reagent.js @@ -89,7 +89,7 @@ const reagentRouter = [ path: '/reagent/warehousing', component: Layout, redirect: '/reagent/warehousing/index', - meta: { classification: 'reagent', module_code: 'DataReportIndex' }, + meta: { classification: 'reagent', module_code: 'DrugTemplatelndex' }, children: [ { path: 'index', @@ -159,7 +159,7 @@ const reagentRouter = [ path: '/reagent/weightregistration', component: Layout, redirect: '/reagent/weightregistration/index', - meta: { classification: 'reagent', module_code: 'CreateApplyView' }, + meta: { classification: 'reagent', module_code: 'WeightRegistration' }, children: [ { path: 'index', @@ -197,26 +197,26 @@ const reagentRouter = [ // } // ] // }, - // { - // path: '/reagent/database', - // component: Layout, - // redirect: '/reagent/database/msds', - // meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'reagent', module_code: 'ChemicalDB' }, - // children: [ - // { - // path: 'msds', - // name: 'MSDS', - // component: () => import('@/views/reagent/database/index'), - // meta: { title: 'MSDS数据库', classification: 'reagent' } - // }, - // { - // path: 'dangerous', - // name: 'Dangerous', - // component: () => import('@/views/reagent/database/index'), - // meta: { title: '危化品数据库', classification: 'reagent' } - // } - // ] - // }, + { + path: '/reagent/database', + component: Layout, + redirect: '/reagent/database/msds', + meta: { title: '化学品数据库', icon: '化学品数据库', classification: 'reagent', module_code: 'ChemicalDB' }, + children: [ + { + path: 'msds', + name: 'MSDS', + component: () => import('@/views/reagent/database/index'), + meta: { title: 'MSDS数据库', classification: 'reagent' } + }, + { + path: 'dangerous', + name: 'Dangerous', + component: () => import('@/views/reagent/database/index'), + meta: { title: '危化品数据库', classification: 'reagent' } + } + ] + }, { path: '/reagent/management', component: Layout,