From f7b3203b6097f2a82349fad40841224e8102f28e Mon Sep 17 00:00:00 2001 From: BINGWU Date: Tue, 14 May 2024 00:38:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=BE=A7=E8=BE=B9=E6=A0=8F?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=EF=BC=8C=E6=90=AD=E5=BB=BA=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=93=E6=9E=84,=E5=B0=81=E8=A3=85axios?= =?UTF-8?q?=EF=BC=8C=E6=90=AD=E5=BB=BA=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components.d.ts | 7 ++++ app/index.html | 6 +-- app/src/api/user.js | 14 ++++++- app/src/stores/modules/user.js | 20 +++++----- app/src/utils/http.js | 7 +++- app/src/views/EmployeeManageView.vue | 12 +++++- app/src/views/LoginView.vue | 38 +++++++++++++++++-- app/src/views/RewardManageView.vue | 12 +++++- app/src/views/UserManageView.vue | 12 +++++- app/src/views/feedback/FeedbackManageView.vue | 11 +++++- app/src/views/request/RequestManageView.vue | 11 +++++- 11 files changed, 121 insertions(+), 29 deletions(-) diff --git a/app/components.d.ts b/app/components.d.ts index d3c7ebe..0af365e 100644 --- a/app/components.d.ts +++ b/app/components.d.ts @@ -16,8 +16,12 @@ declare module 'vue' { ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] ElButton: typeof import('element-plus/es')['ElButton'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] + ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup'] + ElCol: typeof import('element-plus/es')['ElCol'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] ElContainer: typeof import('element-plus/es')['ElContainer'] + ElDatePicker: typeof import('element-plus/es')['ElDatePicker'] ElDialog: typeof import('element-plus/es')['ElDialog'] ElDivider: typeof import('element-plus/es')['ElDivider'] ElDropdown: typeof import('element-plus/es')['ElDropdown'] @@ -36,12 +40,15 @@ declare module 'vue' { ElOption: typeof import('element-plus/es')['ElOption'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElProgress: typeof import('element-plus/es')['ElProgress'] + ElRadio: typeof import('element-plus/es')['ElRadio'] + ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup'] ElSelect: typeof import('element-plus/es')['ElSelect'] ElSubMenu: typeof import('element-plus/es')['ElSubMenu'] ElSwitch: typeof import('element-plus/es')['ElSwitch'] ElTable: typeof import('element-plus/es')['ElTable'] ElTableColumn: typeof import('element-plus/es')['ElTableColumn'] ElTag: typeof import('element-plus/es')['ElTag'] + ElTimePicker: typeof import('element-plus/es')['ElTimePicker'] ElUpload: typeof import('element-plus/es')['ElUpload'] ExportExcelCom: typeof import('./src/components/excel/ExportExcelCom.vue')['default'] ImportExcelCom: typeof import('./src/components/excel/ImportExcelCom.vue')['default'] diff --git a/app/index.html b/app/index.html index 1debcaa..0877b70 100644 --- a/app/index.html +++ b/app/index.html @@ -2,8 +2,8 @@ * @Author: BINGWU * @Date: 2024-04-10 16:15:37 * @LastEditors: BINGWU HuJiaCheng2003@163.com - * @LastEditTime: 2024-04-11 17:08:12 - * @FilePath: \app\index.html + * @LastEditTime: 2024-05-14 00:18:47 + * @FilePath: \employee-information-management-system\app\index.html * @Describe: * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა --> @@ -12,7 +12,7 @@ - + bingwu-admin diff --git a/app/src/api/user.js b/app/src/api/user.js index 1c83b5f..492035d 100644 --- a/app/src/api/user.js +++ b/app/src/api/user.js @@ -1,3 +1,12 @@ +/* + * @Author: BINGWU + * @Date: 2024-04-11 16:31:41 + * @LastEditors: BINGWU HuJiaCheng2003@163.com + * @LastEditTime: 2024-05-13 23:50:42 + * @FilePath: \employee-information-management-system\app\src\api\user.js + * @Describe: + * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა + */ import http from '@/utils/http' const getUser = () => { @@ -7,4 +16,7 @@ const getUser = () => { } }) } -export { getUser } +const loginUser = (params) => { + return http.post('/user/login', params) +} +export { getUser, loginUser } diff --git a/app/src/stores/modules/user.js b/app/src/stores/modules/user.js index abfa180..75835de 100644 --- a/app/src/stores/modules/user.js +++ b/app/src/stores/modules/user.js @@ -2,8 +2,8 @@ * @Author: BINGWU * @Date: 2024-02-15 14:18:43 * @LastEditors: BINGWU HuJiaCheng2003@163.com - * @LastEditTime: 2024-04-11 17:38:14 - * @FilePath: \app\src\stores\modules\user.js + * @LastEditTime: 2024-05-14 00:23:33 + * @FilePath: \employee-information-management-system\app\src\stores\modules\user.js * @Describe: * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა */ @@ -21,29 +21,29 @@ const useUserStore = defineStore( const asideData = ref([ { index: '/home', - icon: 'icon iconfont icon-shouye', - name: '首页' + icon: 'icon iconfont icon-shujutongji', + name: '数据统计' }, // { index: '/user-manage', - icon: 'icon iconfont icon-guanliyuan_jiaoseguanli', + icon: 'icon iconfont icon-yonghuguanli', name: '用户管理' }, { index: '/employee-manage', - icon: 'icon iconfont icon-yuangongguanli', + icon: 'icon iconfont icon-shenfenzhongxin-xinxiguanlizhigongxinxiguanli', name: '职工管理' }, { index: '/reward-manage', - icon: 'icon iconfont icon-wodejixiao', + icon: 'icon iconfont icon-gerenjixiao', name: '绩效管理' }, // 二级 { index: '/feedback', - icon: 'icon iconfont icon-xinxifankui', + icon: 'icon iconfont icon-fankui', name: '员工反馈与投诉管理', children: [ { @@ -58,7 +58,7 @@ const useUserStore = defineStore( }, { index: '/request', - icon: 'icon iconfont icon-qingjiatiao', + icon: 'icon iconfont icon-qingjiashenqing', name: '请假管理', children: [ { @@ -73,7 +73,7 @@ const useUserStore = defineStore( }, { index: '/person', - icon: 'icon iconfont icon-geren', + icon: 'icon iconfont icon-gerenxinxiguanli', name: '个人信息管理', children: [ { diff --git a/app/src/utils/http.js b/app/src/utils/http.js index facb023..85e1618 100644 --- a/app/src/utils/http.js +++ b/app/src/utils/http.js @@ -2,8 +2,8 @@ * @Author: BINGWU * @Date: 2024-01-23 21:37:43 * @LastEditors: BINGWU HuJiaCheng2003@163.com - * @LastEditTime: 2024-04-11 16:27:14 - * @FilePath: \app\src\utils\http.js + * @LastEditTime: 2024-05-14 00:01:39 + * @FilePath: \employee-information-management-system\app\src\utils\http.js * @Describe: * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა */ @@ -31,6 +31,9 @@ instance.interceptors.response.use( (response) => { // 2xx 范围内的状态码都会触发该函数。 // 对响应数据做点什么 + if (response.data.code === 1000) { + return Promise.reject(response.data.msg) + } return response }, (error) => { diff --git a/app/src/views/EmployeeManageView.vue b/app/src/views/EmployeeManageView.vue index fe72d35..f134006 100644 --- a/app/src/views/EmployeeManageView.vue +++ b/app/src/views/EmployeeManageView.vue @@ -1,7 +1,15 @@ - + diff --git a/app/src/views/LoginView.vue b/app/src/views/LoginView.vue index bd5080e..8e37ed2 100644 --- a/app/src/views/LoginView.vue +++ b/app/src/views/LoginView.vue @@ -1,21 +1,52 @@ @@ -25,6 +56,7 @@ const login = () => { justify-content: center; .content { margin-top: 100px; + text-align: center; } } diff --git a/app/src/views/RewardManageView.vue b/app/src/views/RewardManageView.vue index ed016ad..ad99be5 100644 --- a/app/src/views/RewardManageView.vue +++ b/app/src/views/RewardManageView.vue @@ -1,7 +1,15 @@ - + diff --git a/app/src/views/UserManageView.vue b/app/src/views/UserManageView.vue index 484bd01..9444cc8 100644 --- a/app/src/views/UserManageView.vue +++ b/app/src/views/UserManageView.vue @@ -8,9 +8,17 @@ * @Mark: ૮(˶ᵔ ᵕ ᵔ˶)ა --> - + diff --git a/app/src/views/feedback/FeedbackManageView.vue b/app/src/views/feedback/FeedbackManageView.vue index 0200626..6b855d0 100644 --- a/app/src/views/feedback/FeedbackManageView.vue +++ b/app/src/views/feedback/FeedbackManageView.vue @@ -1,7 +1,14 @@ - + diff --git a/app/src/views/request/RequestManageView.vue b/app/src/views/request/RequestManageView.vue index 983f071..75327f4 100644 --- a/app/src/views/request/RequestManageView.vue +++ b/app/src/views/request/RequestManageView.vue @@ -1,7 +1,14 @@ - +