From 4c62e8040718ca37a51b318615f44ef7d0baece0 Mon Sep 17 00:00:00 2001 From: gaoxq <376340421@qq.com> Date: Fri, 6 Mar 2026 10:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- screen-vue/package-lock.json | 13 ++++- screen-vue/src/api/user.js | 12 ++++ .../components/Layout/components/editPswd.vue | 1 + screen-vue/src/components/Layout/index.vue | 1 - screen-vue/src/views/system/user/index.vue | 55 ++++++++++++++----- .../mini/mybigscreen/Auth/userController.java | 29 +++++++--- .../com/mini/mybigscreen/Model/Message.java | 4 +- .../biz/controller/CompanyController.java | 4 +- .../biz/controller/ErpAccountController.java | 9 --- .../biz/controller/ErpCategoryController.java | 4 +- .../ErpTransactionFlowController.java | 4 +- .../biz/controller/HomeMenuController.java | 4 +- .../biz/controller/HomeModuleController.java | 4 +- .../controller/HomeModuleUserController.java | 4 +- .../biz/controller/HomeRoleController.java | 4 +- .../controller/HomeRoleMenuController.java | 4 +- .../biz/controller/HomeUserController.java | 4 +- .../biz/controller/IndexInfoController.java | 4 +- .../biz/controller/ItemInfoController.java | 6 +- .../controller/ResumeEmployeeController.java | 5 +- .../controller/WebsiteStorageController.java | 4 +- .../com/mini/mybigscreen/utils/TextUtil.java | 10 ++++ 22 files changed, 126 insertions(+), 63 deletions(-) create mode 100644 src/main/java/com/mini/mybigscreen/utils/TextUtil.java diff --git a/screen-vue/package-lock.json b/screen-vue/package-lock.json index beea651..fd7761e 100644 --- a/screen-vue/package-lock.json +++ b/screen-vue/package-lock.json @@ -58,6 +58,7 @@ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@babel/code-frame": "^7.29.0", "@babel/generator": "^7.29.0", @@ -1404,6 +1405,7 @@ "resolved": "https://registry.npmmirror.com/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "license": "MIT", + "peer": true, "dependencies": { "@types/lodash": "*" } @@ -1897,6 +1899,7 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -2637,13 +2640,15 @@ "version": "4.17.23", "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.23.tgz", "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-es": { "version": "4.17.23", "resolved": "https://registry.npmmirror.com/lodash-es/-/lodash-es-4.17.23.tgz", "integrity": "sha512-kVI48u3PZr38HdYz98UmfPnXl2DXrpdctLrFLCd3kOx1xUkOmpFPx7gCWWM5MPkL/fD8zb+Ph0QzjGFs4+hHWg==", - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/lodash-unified": { "version": "1.0.3", @@ -2873,7 +2878,7 @@ }, "node_modules/pinia": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz", + "resolved": "https://registry.npmmirror.com/pinia/-/pinia-3.0.4.tgz", "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==", "license": "MIT", "dependencies": { @@ -3259,6 +3264,7 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -3437,6 +3443,7 @@ "resolved": "https://registry.npmmirror.com/vue/-/vue-3.5.28.tgz", "integrity": "sha512-BRdrNfeoccSoIZeIhyPBfvWSLFP4q8J3u8Ju8Ug5vu3LdD+yTM13Sg4sKtljxozbnuMu1NB1X5HBHRYUzFocKg==", "license": "MIT", + "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.28", "@vue/compiler-sfc": "3.5.28", diff --git a/screen-vue/src/api/user.js b/screen-vue/src/api/user.js index dffbc8a..032b522 100644 --- a/screen-vue/src/api/user.js +++ b/screen-vue/src/api/user.js @@ -41,4 +41,16 @@ export function updatePasswd(params) { method: 'post', params: params }) +} + + +/** + * 初始化密码 + */ +export function initPasswd(params) { + return request({ + url: '/initPasswd', + method: 'post', + params: params + }) } \ No newline at end of file diff --git a/screen-vue/src/components/Layout/components/editPswd.vue b/screen-vue/src/components/Layout/components/editPswd.vue index 9f56f89..9773ccb 100644 --- a/screen-vue/src/components/Layout/components/editPswd.vue +++ b/screen-vue/src/components/Layout/components/editPswd.vue @@ -68,6 +68,7 @@ const submitForm = async () => { userId: userStore.loginUser?.userId || '' } const res = await updatePasswd(reqParams) + ElMessage.success(res.msg); await new Promise(res => setTimeout(res, 800)) isMounted.value && emit('success') return true diff --git a/screen-vue/src/components/Layout/index.vue b/screen-vue/src/components/Layout/index.vue index 9e43a1a..e971894 100644 --- a/screen-vue/src/components/Layout/index.vue +++ b/screen-vue/src/components/Layout/index.vue @@ -377,7 +377,6 @@ const submitEditPwd = () => { const handlePwdModifySuccess = () => { if (!isMounted.value) return closeEditPwdDialog(); - ElMessage.success('密码修改成功,请重新登录'); userStore.logout(); router.push('/login'); } diff --git a/screen-vue/src/views/system/user/index.vue b/screen-vue/src/views/system/user/index.vue index 428b76a..1f6d4dc 100644 --- a/screen-vue/src/views/system/user/index.vue +++ b/screen-vue/src/views/system/user/index.vue @@ -73,6 +73,10 @@ 编辑 + + + 初始化 + 删除 @@ -98,8 +102,9 @@