diff --git a/screen-vue/package-lock.json b/screen-vue/package-lock.json index 845b752..beea651 100644 --- a/screen-vue/package-lock.json +++ b/screen-vue/package-lock.json @@ -12,6 +12,7 @@ "echarts": "^6.0.0", "element-plus": "^2.13.2", "file-saver": "^2.0.5", + "pinia": "^3.0.4", "v-scale-screen": "^2.3.0", "vue": "^3.5.28", "vue-router": "^5.0.3", @@ -57,7 +58,6 @@ "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,7 +1404,6 @@ "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": "*" } @@ -1898,7 +1897,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "baseline-browser-mapping": "^2.9.0", "caniuse-lite": "^1.0.30001759", @@ -2639,15 +2637,13 @@ "version": "4.17.23", "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.23.tgz", "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "license": "MIT", - "peer": true + "license": "MIT" }, "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", - "peer": true + "license": "MIT" }, "node_modules/lodash-unified": { "version": "1.0.3", @@ -2875,6 +2871,66 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pinia": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/pinia/-/pinia-3.0.4.tgz", + "integrity": "sha512-l7pqLUFTI/+ESXn6k3nu30ZIzW5E2WZF/LaHJEpoq6ElcLD+wduZoB2kBN19du6K/4FDpPMazY2wJr+IndBtQw==", + "license": "MIT", + "dependencies": { + "@vue/devtools-api": "^7.7.7" + }, + "funding": { + "url": "https://github.com/sponsors/posva" + }, + "peerDependencies": { + "typescript": ">=4.5.0", + "vue": "^3.5.11" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/pinia/node_modules/@vue/devtools-api": { + "version": "7.7.9", + "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz", + "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==", + "license": "MIT", + "dependencies": { + "@vue/devtools-kit": "^7.7.9" + } + }, + "node_modules/pinia/node_modules/@vue/devtools-kit": { + "version": "7.7.9", + "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz", + "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==", + "license": "MIT", + "dependencies": { + "@vue/devtools-shared": "^7.7.9", + "birpc": "^2.3.0", + "hookable": "^5.5.3", + "mitt": "^3.0.1", + "perfect-debounce": "^1.0.0", + "speakingurl": "^14.0.1", + "superjson": "^2.2.2" + } + }, + "node_modules/pinia/node_modules/@vue/devtools-shared": { + "version": "7.7.9", + "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz", + "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==", + "license": "MIT", + "dependencies": { + "rfdc": "^1.4.1" + } + }, + "node_modules/pinia/node_modules/perfect-debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", + "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", + "license": "MIT" + }, "node_modules/pkg-types": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/pkg-types/-/pkg-types-2.3.0.tgz", @@ -3203,7 +3259,6 @@ "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.27.0", "fdir": "^6.5.0", @@ -3382,7 +3437,6 @@ "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/package.json b/screen-vue/package.json index 8bfba66..dfd914e 100644 --- a/screen-vue/package.json +++ b/screen-vue/package.json @@ -13,6 +13,7 @@ "echarts": "^6.0.0", "element-plus": "^2.13.2", "file-saver": "^2.0.5", + "pinia": "^3.0.4", "v-scale-screen": "^2.3.0", "vue": "^3.5.28", "vue-router": "^5.0.3", diff --git a/screen-vue/src/api/bizUser.js b/screen-vue/src/api/bizUser.js index cb97733..4b9b504 100644 --- a/screen-vue/src/api/bizUser.js +++ b/screen-vue/src/api/bizUser.js @@ -14,22 +14,11 @@ export function getHomeUserList(params) { /** * 保存用户信息列表 */ -export function getHomeUserSave(params) { +export function getHomeUserSave(data) { return request({ url: '/biz/homeUser/save', method: 'post', - params: params - }) -} - -/** - * 修改用户信息列表 - */ -export function getHomeUserUpdate(params) { - return request({ - url: '/biz/homeUser/update', - method: 'post', - params: params + data }) } diff --git a/screen-vue/src/components/Layout/components/editPswd.vue b/screen-vue/src/components/Layout/components/editPswd.vue index 27f7fb1..21151d0 100644 --- a/screen-vue/src/components/Layout/components/editPswd.vue +++ b/screen-vue/src/components/Layout/components/editPswd.vue @@ -19,7 +19,9 @@ import { ref, reactive, onUnmounted, nextTick } from 'vue' import { ElMessage, ElMessageBox } from 'element-plus' import { updatePasswd } from '@/api/user' -const LoginUser = ref(JSON.parse(localStorage.getItem("loginUser")) || {}); +import { useUserStore } from '@/stores/user' + +const userStore = useUserStore() const emit = defineEmits(['success']) const pwdFormRef = ref(null) @@ -104,7 +106,7 @@ const submitForm = async () => { const reqParams = { oldPasswd :pwdForm.oldPassword, password : pwdForm.newPassword, - userId : LoginUser.value?.userId || '', + userId : userStore.loginUser?.userId || '', } const res = await updatePasswd(reqParams); await new Promise(res => setTimeout(res, 800)) diff --git a/screen-vue/src/components/Layout/index.vue b/screen-vue/src/components/Layout/index.vue index 8fa875e..9e43a1a 100644 --- a/screen-vue/src/components/Layout/index.vue +++ b/screen-vue/src/components/Layout/index.vue @@ -19,7 +19,7 @@
- {{ LoginUser?.uname }} + {{ userStore.loginUser?.uname }}