From 22e534b67db49da7e2f1032e526cf2cbbbc94d73 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Wed, 19 Mar 2025 15:08:13 +0800 Subject: [PATCH] =?UTF-8?q?feat()=EF=BC=9B=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=99=A8=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/menu.js | 2 +- src/api/tool/gen.js | 22 ++++++++++---------- src/components/Editor/index.vue | 2 +- src/components/FileUpload/index.vue | 4 ++-- src/components/ImageUpload/index.vue | 4 ++-- src/views/system/role/selectUser.vue | 2 +- src/views/system/user/profile/index.vue | 2 +- src/views/system/user/profile/userAvatar.vue | 2 +- src/views/tool/gen/createTable.vue | 4 ++-- src/views/tool/gen/editTable.vue | 6 +++--- src/views/tool/gen/importTable.vue | 4 ++-- src/views/tool/gen/index.vue | 4 ++-- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/api/system/menu.js b/src/api/system/menu.js index 2b9992d..2b345c5 100644 --- a/src/api/system/menu.js +++ b/src/api/system/menu.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 查询菜单列表 -export function listMenu(query) { +export function listMenu(query={}) { return request({ url: '/system/menu/list', method: 'POST', diff --git a/src/api/tool/gen.js b/src/api/tool/gen.js index a82aaa0..af32e4c 100644 --- a/src/api/tool/gen.js +++ b/src/api/tool/gen.js @@ -3,15 +3,15 @@ import request from '@/utils/request' // 查询生成表数据 export function listTable(query) { return request({ - url: '/tool/gen/list', + url: '/code/gen/list', method: 'POST', data: query }) } // 查询db数据库列表 -export function listDbTable(query) { +export function listDbTable(query={}) { return request({ - url: '/tool/gen/db/list', + url: '/code/gen/db/list', method: 'POST', data: query }) @@ -20,7 +20,7 @@ export function listDbTable(query) { // 查询表详细信息 export function getGenTable(tableId) { return request({ - url: '/tool/gen/' + tableId, + url: '/code/gen/' + tableId, method: 'GET' }) } @@ -28,7 +28,7 @@ export function getGenTable(tableId) { // 修改代码生成信息 export function updateGenTable(data) { return request({ - url: '/tool/gen', + url: '/code/gen', method: 'PUT', data: data }) @@ -37,7 +37,7 @@ export function updateGenTable(data) { // 导入表 export function importTable(data) { return request({ - url: '/tool/gen/importTable', + url: '/code/gen/importTable', method: 'POST', params: data }) @@ -46,7 +46,7 @@ export function importTable(data) { // 创建表 export function createTable(data) { return request({ - url: '/tool/gen/createTable', + url: '/code/gen/createTable', method: 'POST', params: data }) @@ -55,7 +55,7 @@ export function createTable(data) { // 预览生成代码 export function previewTable(tableId) { return request({ - url: '/tool/gen/preview/' + tableId, + url: '/code/gen/preview/' + tableId, method: 'GET' }) } @@ -63,7 +63,7 @@ export function previewTable(tableId) { // 删除表数据 export function delTable(tableId) { return request({ - url: '/tool/gen/' + tableId, + url: '/code/gen/' + tableId, method: 'DELETE' }) } @@ -71,7 +71,7 @@ export function delTable(tableId) { // 生成代码（自定义路径） export function genCode(tableName) { return request({ - url: '/tool/gen/genCode/' + tableName, + url: '/code/gen/genCode/' + tableName, method: 'GET' }) } @@ -79,7 +79,7 @@ export function genCode(tableName) { // 同步数据库 export function synchDb(tableName) { return request({ - url: '/tool/gen/synchDb/' + tableName, + url: '/code/gen/synchDb/' + tableName, method: 'GET' }) } diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index f26b596..57f1449 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -150,7 +150,7 @@ function handleBeforeUpload(file) { // 上传成功处理 function handleUploadSuccess(res, file) { // 如果上传成功 - if (res.data.code == 200) { + if (res.code == 200) { // 获取富文本实例 let quill = toRaw(quillEditorRef.value).getQuill(); // 获取光标位置 diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index be6b307..16c99f7 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -138,13 +138,13 @@ function handleUploadError(err) { // 上传成功回调 function handleUploadSuccess(res, file) { - if (res.data.code === 200) { + if (res.code === 200) { uploadList.value.push({ name: res.data.fileName, url: res.data.fileName }); uploadedSuccessfully(); } else { number.value--; proxy.$modal.closeLoading(); - proxy.$modal.msgError(res.data.msg); + proxy.$modal.msgError(res.msg); proxy.$refs.fileUpload.handleRemove(file); uploadedSuccessfully(); } diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 1184c56..9c7172a 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -150,13 +150,13 @@ function handleExceed() { // 上传成功回调 function handleUploadSuccess(res, file) { - if (res.data.code === 200) { + if (res.code === 200) { uploadList.value.push({ name: res.data.fileName, url: res.data.fileName }); uploadedSuccessfully(); } else { number.value--; proxy.$modal.closeLoading(); - proxy.$modal.msgError(res.data.msg); + proxy.$modal.msgError(res.msg); proxy.$refs.imageUpload.handleRemove(file); uploadedSuccessfully(); } diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue index a3b37e4..9db25c7 100644 --- a/src/views/system/role/selectUser.vue +++ b/src/views/system/role/selectUser.vue @@ -132,7 +132,7 @@ function handleSelectUser() { return; } authUserSelectAll({ roleId: roleId, userIds: uIds }).then(res => { - proxy.$modal.msgSuccess(res.data.msg); + proxy.$modal.msgSuccess(res.msg); visible.value = false; emit("ok"); }); diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue index 0b54d1e..e1e040a 100644 --- a/src/views/system/user/profile/index.vue +++ b/src/views/system/user/profile/index.vue @@ -77,7 +77,7 @@ const state = reactive({ function getUser() { getUserProfile().then(response => { - state.user = response.data; + state.user = response.data.sysUser; state.roleGroup = response.data.roleGroup; state.postGroup = response.data.postGroup; }); diff --git a/src/views/system/user/profile/userAvatar.vue b/src/views/system/user/profile/userAvatar.vue index f7a57f1..fae60e2 100644 --- a/src/views/system/user/profile/userAvatar.vue +++ b/src/views/system/user/profile/userAvatar.vue @@ -133,7 +133,7 @@ function uploadImg() { formData.append("avatarfile", data, options.filename); uploadAvatar(formData).then(response => { open.value = false; - options.img = import.meta.env.VITE_APP_BASE_API + response.data.imgUrl; + options.img = response.data; userStore.avatar = options.img; proxy.$modal.msgSuccess("修改成功"); visible.value = false; diff --git a/src/views/tool/gen/createTable.vue b/src/views/tool/gen/createTable.vue index e577705..00fdfdb 100644 --- a/src/views/tool/gen/createTable.vue +++ b/src/views/tool/gen/createTable.vue @@ -32,8 +32,8 @@ function handleImportTable() { return; } createTable({ sql: content.value }).then(res => { - proxy.$modal.msgSuccess(res.data.msg); - if (res.data.code === 200) { + proxy.$modal.msgSuccess(res.msg); + if (res.code === 200) { visible.value = false; emit("ok"); } diff --git a/src/views/tool/gen/editTable.vue b/src/views/tool/gen/editTable.vue index abdd5a4..5d22780 100644 --- a/src/views/tool/gen/editTable.vue +++ b/src/views/tool/gen/editTable.vue @@ -147,7 +147,7 @@ function submitForm() { const basicForm = proxy.$refs.basicInfo.$refs.basicInfoForm; const genForm = proxy.$refs.genInfo.$refs.genInfoForm; Promise.all([basicForm, genForm].map(getFormPromise)).then(res => { - const validateResult = res.data.every(item => !!item); + const validateResult = res.every(item => !!item); if (validateResult) { const genTable = Object.assign({}, info.value); genTable.columns = columns.value; @@ -158,8 +158,8 @@ function submitForm() { parentMenuId: info.value.parentMenuId }; updateGenTable(genTable).then(res => { - proxy.$modal.msgSuccess(res.data.msg); - if (res.data.code === 200) { + proxy.$modal.msgSuccess(res.msg); + if (res.code === 200) { close(); } }); diff --git a/src/views/tool/gen/importTable.vue b/src/views/tool/gen/importTable.vue index 0bb59e5..5a23d9b 100644 --- a/src/views/tool/gen/importTable.vue +++ b/src/views/tool/gen/importTable.vue @@ -112,8 +112,8 @@ function handleImportTable() { return; } importTable({ tables: tableNames }).then(res => { - proxy.$modal.msgSuccess(res.data.msg); - if (res.data.code === 200) { + proxy.$modal.msgSuccess(res.msg); + if (res.code === 200) { visible.value = false; emit("ok"); } diff --git a/src/views/tool/gen/index.vue b/src/views/tool/gen/index.vue index 7593280..322033f 100644 --- a/src/views/tool/gen/index.vue +++ b/src/views/tool/gen/index.vue @@ -46,7 +46,7 @@ v-hasPermi="['tool:gen:code']" >生成 - +