From b94bdf30ba0a0661a14317cbe7448e233d29412f Mon Sep 17 00:00:00 2001 From: duan Date: Wed, 31 Aug 2022 13:53:58 +0800 Subject: [PATCH] =?UTF-8?q?perf(index):=20=E5=87=8F=E5=B0=91=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=EF=BC=8C=E5=8A=A0=E9=80=9F=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- .../2-主界面/{仪器管理.png => instrument.png} | Bin .../2-主界面/{标准品管理.png => standard.png} | Bin .../3-主概览/{主概览背景.png => main_bg.png} | Bin .../3-主概览/{今日领用.png => today_get.png} | Bin .../{今日未归还.png => today_noreturn.png} | Bin .../{今日归还.png => today_return.png} | Bin .../{今日入库.png => today_store.png} | Bin .../{库存信息总览.png => store_info_overview.png} | Bin .../{入库信息查询.png => store_info_search.png} | Bin .../{登录-白-100px.png => login_white.png} | Bin ...概览-白-60px.png => mainoverview_white.png} | Bin .../{主界面-黑-80px.png => mianoverview.png} | Bin .../rms/{常用-白-32px.png => use_white.png} | Bin src/layout/components/Navbar.vue | 6 +- src/store/getters.js | 7 +- src/store/modules/app.js | 7 +- src/views/home/index.vue | 6 +- src/views/login/index.vue | 77 +++++++++---- src/views/{reagent => }/mixin/getClients.js | 0 src/views/reagent/envrecord/index.vue | 106 ++++++++++++------ src/views/reagent/inventory/index.vue | 34 ++++-- src/views/reagent/mainoverview/index.vue | 98 +++++++++------- src/views/reagent/management/index.vue | 12 +- src/views/reagent/report/index.vue | 4 +- .../reagent/report/reagentinfo/index.vue | 26 +++-- src/views/reagent/report/record/index.vue | 8 +- src/views/reagent/report/storeinfo/index.vue | 6 +- .../reagent/report/usefrequency/index.vue | 28 +++-- src/views/reagent/warehousing/index.vue | 16 ++- src/views/reagent/weighing/index.vue | 15 +-- src/views/shortcut/index.vue | 2 +- 33 files changed, 277 insertions(+), 185 deletions(-) rename src/assets/2-主界面/{仪器管理.png => instrument.png} (100%) rename src/assets/2-主界面/{标准品管理.png => standard.png} (100%) rename src/assets/3-主概览/{主概览背景.png => main_bg.png} (100%) rename src/assets/3-主概览/{今日领用.png => today_get.png} (100%) rename src/assets/3-主概览/{今日未归还.png => today_noreturn.png} (100%) rename src/assets/3-主概览/{今日归还.png => today_return.png} (100%) rename src/assets/3-主概览/{今日入库.png => today_store.png} (100%) rename src/assets/4-报表统计/{库存信息总览.png => store_info_overview.png} (100%) rename src/assets/4-报表统计/{入库信息查询.png => store_info_search.png} (100%) rename src/assets/rms/{登录-白-100px.png => login_white.png} (100%) rename src/assets/rms/{主概览-白-60px.png => mainoverview_white.png} (100%) rename src/assets/rms/{主界面-黑-80px.png => mianoverview.png} (100%) rename src/assets/rms/{常用-白-32px.png => use_white.png} (100%) rename src/views/{reagent => }/mixin/getClients.js (100%) diff --git a/.env.development b/.env.development index f40f389..8971a6a 100644 --- a/.env.development +++ b/.env.development @@ -2,5 +2,5 @@ ENV = 'development' # base api -VUE_APP_BASE_API = 'http://111.231.67.55:9001' +VUE_APP_BASE_API = 'http://127.0.0.1:9001' VUE_APP_FACE_API = 'http://127.0.0.1:5000' diff --git a/.env.production b/.env.production index b138f14..03db484 100644 --- a/.env.production +++ b/.env.production @@ -2,6 +2,6 @@ ENV = 'production' # base api -VUE_APP_BASE_API = '/prod-api' +VUE_APP_BASE_API = 'http://127.0.0.1:9001' VUE_APP_FACE_API ='http://127.0.0.1:5000' diff --git a/src/assets/2-主界面/仪器管理.png b/src/assets/2-主界面/instrument.png similarity index 100% rename from src/assets/2-主界面/仪器管理.png rename to src/assets/2-主界面/instrument.png diff --git a/src/assets/2-主界面/标准品管理.png b/src/assets/2-主界面/standard.png similarity index 100% rename from src/assets/2-主界面/标准品管理.png rename to src/assets/2-主界面/standard.png diff --git a/src/assets/3-主概览/主概览背景.png b/src/assets/3-主概览/main_bg.png similarity index 100% rename from src/assets/3-主概览/主概览背景.png rename to src/assets/3-主概览/main_bg.png diff --git a/src/assets/3-主概览/今日领用.png b/src/assets/3-主概览/today_get.png similarity index 100% rename from src/assets/3-主概览/今日领用.png rename to src/assets/3-主概览/today_get.png diff --git a/src/assets/3-主概览/今日未归还.png b/src/assets/3-主概览/today_noreturn.png similarity index 100% rename from src/assets/3-主概览/今日未归还.png rename to src/assets/3-主概览/today_noreturn.png diff --git a/src/assets/3-主概览/今日归还.png b/src/assets/3-主概览/today_return.png similarity index 100% rename from src/assets/3-主概览/今日归还.png rename to src/assets/3-主概览/today_return.png diff --git a/src/assets/3-主概览/今日入库.png b/src/assets/3-主概览/today_store.png similarity index 100% rename from src/assets/3-主概览/今日入库.png rename to src/assets/3-主概览/today_store.png diff --git a/src/assets/4-报表统计/库存信息总览.png b/src/assets/4-报表统计/store_info_overview.png similarity index 100% rename from src/assets/4-报表统计/库存信息总览.png rename to src/assets/4-报表统计/store_info_overview.png diff --git a/src/assets/4-报表统计/入库信息查询.png b/src/assets/4-报表统计/store_info_search.png similarity index 100% rename from src/assets/4-报表统计/入库信息查询.png rename to src/assets/4-报表统计/store_info_search.png diff --git a/src/assets/rms/登录-白-100px.png b/src/assets/rms/login_white.png similarity index 100% rename from src/assets/rms/登录-白-100px.png rename to src/assets/rms/login_white.png diff --git a/src/assets/rms/主概览-白-60px.png b/src/assets/rms/mainoverview_white.png similarity index 100% rename from src/assets/rms/主概览-白-60px.png rename to src/assets/rms/mainoverview_white.png diff --git a/src/assets/rms/主界面-黑-80px.png b/src/assets/rms/mianoverview.png similarity index 100% rename from src/assets/rms/主界面-黑-80px.png rename to src/assets/rms/mianoverview.png diff --git a/src/assets/rms/常用-白-32px.png b/src/assets/rms/use_white.png similarity index 100% rename from src/assets/rms/常用-白-32px.png rename to src/assets/rms/use_white.png diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 7e5e112..31a5bfe 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -2,7 +2,7 @@
-
+
@@ -19,7 +19,7 @@
- +
为您提供基于物联网的智慧实验室物资管理解决方案 @@ -46,7 +46,7 @@ export default { data() { return { obj: { - 'background-image': 'url(' + require('@/assets/3-主概览/主概览背景.png') + ')', + 'background-image': 'url(' + require('@/assets/3-主概览/main_bg.png') + ')', 'background-size': '100%' } } diff --git a/src/store/getters.js b/src/store/getters.js index f9544e4..f93254c 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -1,6 +1,6 @@ const getters = { - sidebar: state => state.app.sidebar, - device: state => state.app.device, + // sidebar: state => state.app.sidebar, + // device: state => state.app.device, token: state => state.user.token, avatar: state => state.user.avatar, name: state => state.user.name, @@ -9,6 +9,7 @@ const getters = { classification: state => state.user.classification, isMain: state => state.settings.isMain, roleData: state => state.permission.roleData, - opts: state => state.permission.opts + opts: state => state.permission.opts, + clientOptions: state => state.app.clientOptions } export default getters diff --git a/src/store/modules/app.js b/src/store/modules/app.js index b14ed93..37fd18b 100644 --- a/src/store/modules/app.js +++ b/src/store/modules/app.js @@ -4,7 +4,8 @@ const state = { sidebar: { // opened: Cookies.get('sidebarStatus') ? !!+Cookies.get('sidebarStatus') : true, opened: true, - withoutAnimation: false + withoutAnimation: false, + clientOptions: [] }, device: 'desktop' } @@ -26,6 +27,9 @@ const mutations = { }, TOGGLE_DEVICE: (state, device) => { state.device = device + }, + SET_COPTS: (state, opt) => { + state.clientOptions = opt } } @@ -47,3 +51,4 @@ export default { mutations, actions } + diff --git a/src/views/home/index.vue b/src/views/home/index.vue index 8dbe678..3d5b3fa 100644 --- a/src/views/home/index.vue +++ b/src/views/home/index.vue @@ -2,15 +2,15 @@
-
+
-
+
-
+
diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 9a01199..09dd014 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -6,13 +6,20 @@