From 9c438c2e1abda35aa1b8b60ca40b5f1da176fe0d Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 9 Nov 2022 21:10:49 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/JeecgListMixin.js | 12 ++++++------ src/views/description/ProcessDescriptionList.vue | 1 + .../materialstorage/ProcessMaterialStorageList.vue | 1 + .../merchandisenews/ProcessMerchandiseNewsList.vue | 1 + src/views/supplier/ProcessSupplierList.vue | 1 + .../suppliesstronger/ProcessSuppliesStrongerList.vue | 6 +++--- .../unitwaste/ProcessUnitWasteWarehouseCodeList.vue | 1 + src/views/waste/ProcessWasteList.vue | 2 +- src/views/waste/ProcessWasteListCable.vue | 2 +- .../wastematerials/ProcessWasteMaterialsList.vue | 6 +++--- 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js index 0df14a9..9a36a55 100644 --- a/src/mixins/JeecgListMixin.js +++ b/src/mixins/JeecgListMixin.js @@ -275,12 +275,12 @@ export const JeecgListMixin = { if (fileName ==="废旧物资库表"){ param.materialName = "废旧物资库表" } - // if (fileName ==="电缆模板"){ - // param.materialName = "电缆模板" - // } - // if (fileName ==="废旧物资库表导入模板"){ - // param.materialName = "废旧物资库表导入模板" - // } + if (fileName ==="电缆模板"){ + param.materialName = "电缆模板" + } + if (fileName ==="废旧物资库表导入模板"){ + param.materialName = "废旧物资库表导入模板" + } if (fileName ==="用户信息导入模板"){ param.realname = "用户信息导入模板" } diff --git a/src/views/description/ProcessDescriptionList.vue b/src/views/description/ProcessDescriptionList.vue index ce68fd5..11422be 100644 --- a/src/views/description/ProcessDescriptionList.vue +++ b/src/views/description/ProcessDescriptionList.vue @@ -44,6 +44,7 @@
新增 导出 + 品名分类导入模板 导入 diff --git a/src/views/materialstorage/ProcessMaterialStorageList.vue b/src/views/materialstorage/ProcessMaterialStorageList.vue index d3bc0dc..db98e01 100644 --- a/src/views/materialstorage/ProcessMaterialStorageList.vue +++ b/src/views/materialstorage/ProcessMaterialStorageList.vue @@ -50,6 +50,7 @@
新增 导出 + 物资储存地址导入模板 导入 diff --git a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue index 54e5ad5..acffd46 100644 --- a/src/views/merchandisenews/ProcessMerchandiseNewsList.vue +++ b/src/views/merchandisenews/ProcessMerchandiseNewsList.vue @@ -80,6 +80,7 @@
新增 导出 + 物资清单表导入模板 导入 diff --git a/src/views/supplier/ProcessSupplierList.vue b/src/views/supplier/ProcessSupplierList.vue index 27a5dce..4ada1fb 100644 --- a/src/views/supplier/ProcessSupplierList.vue +++ b/src/views/supplier/ProcessSupplierList.vue @@ -51,6 +51,7 @@
新增 导出 + 供应商导入模板 导入 diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue index 195048a..36f3653 100644 --- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue +++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue @@ -35,9 +35,9 @@
导出 - - 导入 - + + + 查询 重置 diff --git a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue index 229c3ba..c4364d4 100644 --- a/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue +++ b/src/views/unitwaste/ProcessUnitWasteWarehouseCodeList.vue @@ -41,6 +41,7 @@
新增 导出 + 废旧库房导入模板 导入 diff --git a/src/views/waste/ProcessWasteList.vue b/src/views/waste/ProcessWasteList.vue index f942eb0..f739cd3 100644 --- a/src/views/waste/ProcessWasteList.vue +++ b/src/views/waste/ProcessWasteList.vue @@ -50,7 +50,7 @@ 查询 重置 导出 - + 废旧物资库导入模板 导入 diff --git a/src/views/waste/ProcessWasteListCable.vue b/src/views/waste/ProcessWasteListCable.vue index 21907e6..f781cc9 100644 --- a/src/views/waste/ProcessWasteListCable.vue +++ b/src/views/waste/ProcessWasteListCable.vue @@ -52,7 +52,7 @@ 查询 重置 导出 - + 电缆导入模板 导入 diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue index f97142d..1e55c4c 100644 --- a/src/views/wastematerials/ProcessWasteMaterialsList.vue +++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue @@ -33,9 +33,9 @@
导出 - - 导入 - + + + 查询 重置
From d9efb8bcbca1fc6193326be5394373194b234201 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Wed, 9 Nov 2022 21:26:46 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/oss/OSSFileList.vue | 12 ++++++------ src/views/system/UserList.vue | 9 ++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/views/modules/oss/OSSFileList.vue b/src/views/modules/oss/OSSFileList.vue index 0266717..52b9ad7 100644 --- a/src/views/modules/oss/OSSFileList.vue +++ b/src/views/modules/oss/OSSFileList.vue @@ -65,12 +65,12 @@
-
- 已选择 {{ - selectedRowKeys.length }}项 - 清空 -
+ + + + + +
-
- 已选择 {{ selectedRowKeys.length }}项   - 清空 -
+ + + + From 6bbbccf0a3be96e9e14ee1e82aecdf175bf5ef85 Mon Sep 17 00:00:00 2001 From: kilo Date: Wed, 9 Nov 2022 22:05:57 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/layouts/UserLayout.vue | 2 +- src/store/modules/user.js | 16 ++- src/store/mutation-types.js | 1 + src/views/dashboard/HomePage.vue | 119 +++++++++--------- src/views/system/DepartUserList.vue | 86 ++++++------- src/views/system/RoleUserList.vue | 1 + src/views/system/modules/AddressListRight.vue | 2 +- src/views/waste/ProcessWasteListCable.vue | 2 +- .../ProcessWasteMaterialsList.vue | 2 + .../ProcessWasteMaterialsLists.vue | 6 +- 10 files changed, 126 insertions(+), 111 deletions(-) diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index 307f467..a513893 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -5,7 +5,7 @@
- 昊易信息 + 昊易信息管理平台
diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 72e311f..773373e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,6 +1,19 @@ import Vue from 'vue' import { login, logout, phoneLogin, thirdLogin } from "@/api/login" -import { ACCESS_TOKEN, USER_NAME,USER_INFO,USER_AUTH,SYS_BUTTON_AUTH,UI_CACHE_DB_DICT_DATA,TENANT_ID,CACHE_INCLUDED_ROUTES,PARENT_ID,USER_INFORMATION,PUWWC_Id } from "@/store/mutation-types" +import { + ACCESS_TOKEN, + USER_NAME, + USER_INFO, + USER_AUTH, + SYS_BUTTON_AUTH, + UI_CACHE_DB_DICT_DATA, + TENANT_ID, + CACHE_INCLUDED_ROUTES, + PARENT_ID, + USER_INFORMATION, + PUWWC_Id, + ASIDE_MEAN +} from '@/store/mutation-types' import { welcome } from "@/utils/util" import { queryPermissionsByUser } from '@/api/api' import { getAction } from '@/api/manage' @@ -131,6 +144,7 @@ const user = { sessionStorage.setItem(PARENT_ID,parentId); sessionStorage.setItem(PUWWC_Id,puwwcId); sessionStorage.setItem(USER_INFORMATION,JSON.stringify(userInformation)); + sessionStorage.setItem('ASIDE_MEAN',JSON.stringify(menuData)); if (menuData && menuData.length > 0) { //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------ menuData.forEach((item, index) => { diff --git a/src/store/mutation-types.js b/src/store/mutation-types.js index 59b21ee..7a05321 100644 --- a/src/store/mutation-types.js +++ b/src/store/mutation-types.js @@ -22,6 +22,7 @@ export const UI_CACHE_DB_DICT_DATA = 'UI_CACHE_DB_DICT_DATA' export const INDEX_MAIN_PAGE_PATH = '/dashboard/analysis' export const TENANT_ID = 'TENANT_ID' export const ONL_AUTH_FIELDS = 'ONL_AUTH_FIELDS' +export const ASIDE_MEAN = 'ASIDE_MEAN' //路由缓存问题，关闭了tab页时再打开就不刷新 #842 export const CACHE_INCLUDED_ROUTES = 'CACHE_INCLUDED_ROUTES' diff --git a/src/views/dashboard/HomePage.vue b/src/views/dashboard/HomePage.vue index a8895e8..64ab3ba 100644 --- a/src/views/dashboard/HomePage.vue +++ b/src/views/dashboard/HomePage.vue @@ -1,8 +1,8 @@ -