diff --git a/dist.rar b/dist.rar index dabd233..df7c820 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/api/system/role.js b/src/api/system/role.js index f13e6f4..e9f35db 100644 --- a/src/api/system/role.js +++ b/src/api/system/role.js @@ -8,6 +8,22 @@ export function listRole(query) { params: query }) } +// 获取角色选择框列表 +export function optionselect(query) { + return request({ + url: '/system/role/optionselect', + method: 'get', + params: query + }) +} + +// 获取菜单角色 +export function getMenu(roleId) { + return request({ + url: '/system/role/getMenu/' + roleId, + method: 'get' + }) +} // 查询角色详细 export function getRole(roleId) { @@ -97,7 +113,15 @@ export function authUserCancelAll(data) { return request({ url: '/system/role/authUser/cancelAll', method: 'put', - params: data + data: data + }) +} +// 批量清除关联账号 +export function authRolecancelAll(data) { + return request({ + url: '/system/role/authRole/cancelAll', + method: 'put', + data: data }) } @@ -106,7 +130,7 @@ export function authUserSelectAll(data) { return request({ url: '/system/role/authUser/selectAll', method: 'put', - params: data + data: data }) } diff --git a/src/api/system/user.js b/src/api/system/user.js index 0085784..6b9fa1a 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -43,13 +43,36 @@ export function delUser(userId) { method: 'delete' }) } +//删除账户/批量删除 +export function deleteUserSystem(data) { + return request({ + url: '/system/user/delete', + method: 'delete', + data: data + }) +} +//冻结账户 +export function changeStatus(data) { + return request({ + url: '/system/user/changeStatus', + method: 'put', + data: data + }) +} +//清空角色 +export function resetRole(data) { + return request({ + url: '/system/user/resetRole', + method: 'put', + data: data + }) +} // 用户密码重置 -export function resetUserPwd(userId, password,codeGoogle) { +export function resetUserPwd(userId,inputGoogleCode) { const data = { userId, - password, - codeGoogle + inputGoogleCode } return request({ url: '/system/user/resetPwd', @@ -58,6 +81,20 @@ export function resetUserPwd(userId, password,codeGoogle) { }) } +// 用户重置谷歌验证码 +export function resetGoogle(userId,inputGoogleCode) { + const data = { + userId, + inputGoogleCode + } + return request({ + url: '/system/user/resetGoogle', + method: 'put', + data: data + }) +} + + // 用户状态修改 export function changeUserStatus(userId, status) { const data = { @@ -89,10 +126,11 @@ export function updateUserProfile(data) { } // 用户密码重置 -export function updateUserPwd(oldPassword, newPassword) { +export function updateUserPwd(oldPassword, newPassword,codeGoogle) { const data = { oldPassword, - newPassword + newPassword, + codeGoogle } return request({ url: '/system/user/profile/updatePwd', @@ -101,6 +139,15 @@ export function updateUserPwd(oldPassword, newPassword) { }) } +// 修改密码 +export function updateUserPassword(data) { + return request({ + url: '/system/user/profile/change/password', + method: 'put', + data: data + }) +} + // 用户头像上传 export function uploadAvatar(data) { return request({ @@ -136,11 +183,10 @@ export function deptTreeSelect() { }) } -// 修改密码 -export function updateUserPassword(data) { +// 用户名称检查 +export function getSystemUserCheck(userName) { return request({ - url: '/resetPwd', - method: 'post', - data: data + url: '/system/user/check/' + userName, + method: 'get' }) } diff --git a/src/components/TableBatchOperate/index.vue b/src/components/TableBatchOperate/index.vue new file mode 100644 index 0000000..26f6095 --- /dev/null +++ b/src/components/TableBatchOperate/index.vue @@ -0,0 +1,68 @@ + + + + + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 1ba2047..a977d74 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -27,17 +27,19 @@ /> --> -
- -
- - +
+ +
+ + {{ nickName }}
+ + + + + + {{ formData.userName }} + + + + + + + + {{ t('已设置') }} + + + 修改密码 + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -60,19 +117,49 @@ import useAppStore from '@/store/modules/app' import useSettingsStore from '@/store/modules/settings' import usePermissionStore from '@/store/modules/permission' import useUserStore from '@/store/modules/user' - +import { getLocalStorage } from "@/utils/auth"; +import { updateUserProfile,getUserProfile,updateUserPwd } from "@/api/system/user"; const route = useRoute(); const appStore = useAppStore() const userStore = useUserStore() const settingsStore = useSettingsStore() const permissionStore = usePermissionStore() - +const { proxy } = getCurrentInstance() const sidebarRouters = computed(() => permissionStore.sidebarRouters); const showLogo = computed(() => settingsStore.sidebarLogo); const sideTheme = computed(() => settingsStore.sideTheme); const theme = computed(() => settingsStore.theme); const windowWidth = ref(window.innerWidth) +const nickName = ref(getLocalStorage('userInfo')?.nickName); + +const dialogVisible = ref(false); +const rules = ref({ +}); +const formData = ref({ +}); +const oldForm = shallowRef({ }); +const passwordDialogVisible = ref(false); +const passwordFormData = ref({ + oldPassword: undefined, + newPassword: undefined, + confirmPassword: undefined, + codeGoogle: undefined +}); + +const equalToPassword = (rule, value, callback) => { + if (passwordFormData.value.newPassword !== value) { + callback(new Error("两次输入的密码不一致")); + } else { + callback(); + } +}; +const rulesPassword = ref({ + oldPassword: [{ required: true, message: "旧密码不能为空", trigger: "change" }], + newPassword: [{ required: true, message: "新密码不能为空", trigger: "change" }, { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "change" }, { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "change" }], + confirmPassword: [{ required: true, message: "确认密码不能为空", trigger: "change" }, { required: true, validator: equalToPassword, trigger: "change" }], + codeGoogle: [{ required: true, message: "谷歌验证码不能为空", trigger: "change" }] +}); function updateWidth() { windowWidth.value = window.innerWidth @@ -125,6 +212,51 @@ function logout() { }) }).catch(() => { }); } +const handleClick = () => { + getUserProfile().then(response => { + formData.value = response.data; + dialogVisible.value = true; + nextTick(() => { + oldForm.value = JSON.stringify(formData.value); + }) + }); +} +const closeDialog = () => { + dialogVisible.value = false; +} +//修改密码 +const updatePassword = () => { + passwordDialogVisible.value = true; +} +const submitForm = () => { + proxy.$refs.userRef.validate(valid => { + if (valid) { + if (JSON.stringify(formData.value) != oldForm.value) { + updateUserProfile(formData.value).then(response => { + proxy.$modal.msgSuccess("修改成功"); + nickName.value = formData.value.nickName; + dialogVisible.value = false; + }); + }else{ + dialogVisible.value = false; + } + } + }); +} + +const closePasswordDialog = () => { + passwordDialogVisible.value = false; +} +const submitPasswordForm = () => { + proxy.$refs.passwordRef.validate(valid => { + if (valid) { + updateUserPwd(passwordFormData.value.oldPassword, passwordFormData.value.newPassword,passwordFormData.value.codeGoogle).then(response => { + proxy.$modal.msgSuccess("修改成功"); + passwordDialogVisible.value = false; + }); + } + }); +} diff --git a/src/views/system/user/role/permission-dialog.vue b/src/views/system/user/role/permission-dialog.vue deleted file mode 100644 index e6172b1..0000000 --- a/src/views/system/user/role/permission-dialog.vue +++ /dev/null @@ -1,78 +0,0 @@ - - - - - diff --git a/src/views/system/user/role/permission-example.vue b/src/views/system/user/role/permission-example.vue deleted file mode 100644 index 7cfc634..0000000 --- a/src/views/system/user/role/permission-example.vue +++ /dev/null @@ -1,195 +0,0 @@ - - - - - diff --git a/src/views/system/user/role/render.vue b/src/views/system/user/role/render.vue deleted file mode 100644 index cbe703f..0000000 --- a/src/views/system/user/role/render.vue +++ /dev/null @@ -1,588 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/views/system/user/role/selectUser.vue b/src/views/system/user/role/selectUser.vue index 7ff0fe3..126e529 100644 --- a/src/views/system/user/role/selectUser.vue +++ b/src/views/system/user/role/selectUser.vue @@ -1,6 +1,6 @@ - - - diff --git a/src/views/system/user/user/components/DetailsDialog.vue b/src/views/system/user/user/components/DetailsDialog.vue new file mode 100644 index 0000000..ec1dce0 --- /dev/null +++ b/src/views/system/user/user/components/DetailsDialog.vue @@ -0,0 +1,122 @@ + + + diff --git a/src/views/system/user/user/components/GoogleCodeDialog.vue b/src/views/system/user/user/components/GoogleCodeDialog.vue new file mode 100644 index 0000000..1954af1 --- /dev/null +++ b/src/views/system/user/user/components/GoogleCodeDialog.vue @@ -0,0 +1,101 @@ + + + diff --git a/src/views/system/user/user/components/MyCustomForm.vue b/src/views/system/user/user/components/MyCustomForm.vue new file mode 100644 index 0000000..95bf86f --- /dev/null +++ b/src/views/system/user/user/components/MyCustomForm.vue @@ -0,0 +1,44 @@ + + + + \ No newline at end of file diff --git a/src/views/system/user/user/index.vue b/src/views/system/user/user/index.vue index 1551060..7689f07 100644 --- a/src/views/system/user/user/index.vue +++ b/src/views/system/user/user/index.vue @@ -1,450 +1,593 @@ - - - - \ No newline at end of file +}; + +getDeptTree(); +getList(); + diff --git a/vite.config.js.timestamp-1757468331223-0fc47cc4b54.mjs b/vite.config.js.timestamp-1757468331223-0fc47cc4b54.mjs new file mode 100644 index 0000000..9bb728f --- /dev/null +++ b/vite.config.js.timestamp-1757468331223-0fc47cc4b54.mjs @@ -0,0 +1,151 @@ +// vite.config.js +import { defineConfig, loadEnv } from "file:///E:/project/gameapi-client/node_modules/vite/dist/node/index.js"; +import path2 from "path"; + +// vite/plugins/index.js +import vue from "file:///E:/project/gameapi-client/node_modules/@vitejs/plugin-vue/dist/index.mjs"; + +// vite/plugins/auto-import.js +import autoImport from "file:///E:/project/gameapi-client/node_modules/unplugin-auto-import/dist/vite.js"; +function createAutoImport() { + return autoImport({ + imports: [ + "vue", + "vue-router", + "pinia" + ], + dts: false + }); +} + +// vite/plugins/svg-icon.js +import { createSvgIconsPlugin } from "file:///E:/project/gameapi-client/node_modules/vite-plugin-svg-icons/dist/index.mjs"; +import path from "path"; +function createSvgIcon(isBuild) { + return createSvgIconsPlugin({ + iconDirs: [path.resolve(process.cwd(), "src/assets/icons/svg")], + symbolId: "icon-[dir]-[name]", + svgoOptions: isBuild + }); +} + +// vite/plugins/compression.js +import compression from "file:///E:/project/gameapi-client/node_modules/vite-plugin-compression/dist/index.mjs"; +function createCompression(env) { + const { VITE_BUILD_COMPRESS } = env; + const plugin = []; + if (VITE_BUILD_COMPRESS) { + const compressList = VITE_BUILD_COMPRESS.split(","); + if (compressList.includes("gzip")) { + plugin.push( + compression({ + ext: ".gz", + deleteOriginFile: false + }) + ); + } + if (compressList.includes("brotli")) { + plugin.push( + compression({ + ext: ".br", + algorithm: "brotliCompress", + deleteOriginFile: false + }) + ); + } + } + return plugin; +} + +// vite/plugins/setup-extend.js +import setupExtend from "file:///E:/project/gameapi-client/node_modules/unplugin-vue-setup-extend-plus/dist/vite.js"; +function createSetupExtend() { + return setupExtend({}); +} + +// vite/plugins/index.js +function createVitePlugins(viteEnv, isBuild = false) { + const vitePlugins = [vue()]; + vitePlugins.push(createAutoImport()); + vitePlugins.push(createSetupExtend()); + vitePlugins.push(createSvgIcon(isBuild)); + isBuild && vitePlugins.push(...createCompression(viteEnv)); + return vitePlugins; +} + +// vite.config.js +var __vite_injected_original_dirname = "E:\\project\\gameapi-client"; +var vite_config_default = defineConfig(({ mode, command }) => { + const env = loadEnv(mode, process.cwd()); + const { VITE_APP_ENV } = env; + const buildTime = (/* @__PURE__ */ new Date()).getTime(); + return { + base: VITE_APP_ENV === "production" ? "/" : "/", + plugins: [ + ...createVitePlugins(env, command === "build") + ], + resolve: { + alias: { + // 设置路径 + "~": path2.resolve(__vite_injected_original_dirname, "./"), + // 设置别名 + "@": path2.resolve(__vite_injected_original_dirname, "./src") + }, + extensions: [".mjs", ".js", ".ts", ".jsx", ".tsx", ".json", ".vue"] + }, + // vite 相关配置 + server: { + port: 80, + host: true, + open: true, + proxy: { + "/dev-api": { + target: "http://192.168.50.233:9080", + // target: 'http://192.168.50.11:9080', + // target: 'http://192.168.50.178:8080', + // target: 'http://192.168.50.99:8080', + changeOrigin: true, + rewrite: (p) => p.replace(/^\/dev-api/, "") + } + } + // proxy: { + // '/ff-api': { + // target: 'https://apiadmin.tt-gaming.com', // 线上接口地址 + // changeOrigin: true, // 是否允许跨域 + // pathRewrite: { + // '^/ff-api': '' // 如果你需要去掉前缀，例如将 /api/xxx 替换为 /xxx + // } + // } + // } + }, + css: { + postcss: { + plugins: [ + { + postcssPlugin: "internal:charset-removal", + AtRule: { + charset: (atRule) => { + if (atRule.name === "charset") { + atRule.remove(); + } + } + } + } + ] + } + }, + build: { + rollupOptions: { + output: { + entryFileNames: "assets/[name].[hash].js", + chunkFileNames: "assets/[name].[hash].js", + assetFileNames: "assets/[name].[hash].[ext]" + } + } + } + }; +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.js", "vite/plugins/index.js", "vite/plugins/auto-import.js", "vite/plugins/svg-icon.js", "vite/plugins/compression.js", "vite/plugins/setup-extend.js"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite.config.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite.config.js\";import { defineConfig, loadEnv } from 'vite'\r\nimport path from 'path'\r\nimport createVitePlugins from './vite/plugins'\r\nexport default defineConfig(({ mode, command }) => {\r\n   const env = loadEnv(mode, process.cwd())\r\n   const { VITE_APP_ENV } = env\r\n   const buildTime = new Date().getTime()\r\n   return {\r\n      base: VITE_APP_ENV === 'production' ? '/' : '/',\r\n      plugins: [\r\n         ...createVitePlugins(env, command === 'build'),\r\n      ],\r\n      resolve: {\r\n         alias: {\r\n            // \u8BBE\u7F6E\u8DEF\u5F84\r\n            '~': path.resolve(__dirname, './'),\r\n            // \u8BBE\u7F6E\u522B\u540D\r\n            '@': path.resolve(__dirname, './src')\r\n         },\r\n         extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']\r\n      },\r\n      // vite \u76F8\u5173\u914D\u7F6E\r\n      server: {\r\n         port: 80,\r\n         host: true,\r\n         open: true,\r\n         proxy: {\r\n            '/dev-api': {\r\n               target: 'http://192.168.50.233:9080',\r\n               // target: 'http://192.168.50.11:9080',\r\n              //  target: 'http://192.168.50.178:8080',\r\n               // target: 'http://192.168.50.99:8080',\r\n               changeOrigin: true,\r\n               rewrite: (p) => p.replace(/^\\/dev-api/, '')\r\n            }\r\n         },\r\n        //  proxy: {\r\n        //     '/ff-api': {\r\n        //        target: 'https://apiadmin.tt-gaming.com', // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n        //        changeOrigin: true, // \u662F\u5426\u5141\u8BB8\u8DE8\u57DF\r\n        //        pathRewrite: {\r\n        //           '^/ff-api': '' // \u5982\u679C\u4F60\u9700\u8981\u53BB\u6389\u524D\u7F00\uFF0C\u4F8B\u5982\u5C06 /api/xxx \u66FF\u6362\u4E3A /xxx\r\n        //        }\r\n        //     }\r\n        //  }\r\n      },\r\n      css: {\r\n         postcss: {\r\n            plugins: [\r\n               {\r\n                  postcssPlugin: 'internal:charset-removal',\r\n                  AtRule: {\r\n                     charset: (atRule) => {\r\n                        if (atRule.name === 'charset') {\r\n                           atRule.remove();\r\n                        }\r\n                     }\r\n                  }\r\n               }\r\n            ]\r\n         }\r\n      },\r\n      build: {\r\n         rollupOptions: {\r\n            output: {\r\n               entryFileNames: 'assets/[name].[hash].js',\r\n               chunkFileNames: 'assets/[name].[hash].js',\r\n               assetFileNames: 'assets/[name].[hash].[ext]'\r\n            }\r\n         }\r\n      }\r\n   }\r\n})\r\n", "const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\\\\index.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite/plugins/index.js\";import vue from '@vitejs/plugin-vue'\r\n\r\nimport createAutoImport from './auto-import'\r\nimport createSvgIcon from './svg-icon'\r\nimport createCompression from './compression'\r\nimport createSetupExtend from './setup-extend'\r\n\r\nexport default function createVitePlugins(viteEnv, isBuild = false) {\r\n    const vitePlugins = [vue()]\r\n    vitePlugins.push(createAutoImport())\r\n\tvitePlugins.push(createSetupExtend())\r\n    vitePlugins.push(createSvgIcon(isBuild))\r\n\tisBuild && vitePlugins.push(...createCompression(viteEnv))\r\n    return vitePlugins\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\\\\auto-import.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite/plugins/auto-import.js\";import autoImport from 'unplugin-auto-import/vite'\r\n\r\nexport default function createAutoImport() {\r\n    return autoImport({\r\n        imports: [\r\n            'vue',\r\n            'vue-router',\r\n            'pinia'\r\n        ],\r\n        dts: false\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\\\\svg-icon.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite/plugins/svg-icon.js\";import { createSvgIconsPlugin } from 'vite-plugin-svg-icons'\r\nimport path from 'path'\r\n\r\nexport default function createSvgIcon(isBuild) {\r\n    return createSvgIconsPlugin({\r\n\t\ticonDirs: [path.resolve(process.cwd(), 'src/assets/icons/svg')],\r\n        symbolId: 'icon-[dir]-[name]',\r\n        svgoOptions: isBuild\r\n    })\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\\\\compression.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite/plugins/compression.js\";import compression from 'vite-plugin-compression'\r\n\r\nexport default function createCompression(env) {\r\n    const { VITE_BUILD_COMPRESS } = env\r\n    const plugin = []\r\n    if (VITE_BUILD_COMPRESS) {\r\n        const compressList = VITE_BUILD_COMPRESS.split(',')\r\n        if (compressList.includes('gzip')) {\r\n            // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#\u4F7F\u7528gzip\u89E3\u538B\u7F29\u9759\u6001\u6587\u4EF6\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.gz',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n        if (compressList.includes('brotli')) {\r\n            plugin.push(\r\n                compression({\r\n                    ext: '.br',\r\n                    algorithm: 'brotliCompress',\r\n                    deleteOriginFile: false\r\n                })\r\n            )\r\n        }\r\n    }\r\n    return plugin\r\n}\r\n", "const __vite_injected_original_dirname = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\";const __vite_injected_original_filename = \"E:\\\\project\\\\gameapi-client\\\\vite\\\\plugins\\\\setup-extend.js\";const __vite_injected_original_import_meta_url = \"file:///E:/project/gameapi-client/vite/plugins/setup-extend.js\";import setupExtend from 'unplugin-vue-setup-extend-plus/vite'\r\n\r\nexport default function createSetupExtend() {\r\n    return setupExtend({})\r\n}\r\n"],
  "mappings": "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",
  "names": ["path", "path"]
}
