From 67864e67b33e2c320e7ac5c8d5db48ab8124e1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Wed, 26 Apr 2023 22:47:28 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20oss=20=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=BC=8F=E6=94=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Editor/index.vue | 2 +- src/components/FileUpload/index.vue | 2 +- src/components/ImageUpload/index.vue | 2 +- src/plugins/download.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Editor/index.vue b/src/components/Editor/index.vue index e250050..a0728eb 100644 --- a/src/components/Editor/index.vue +++ b/src/components/Editor/index.vue @@ -68,7 +68,7 @@ const { proxy } = getCurrentInstance() as ComponentInternalInstance; const upload = reactive({ headers: { Authorization: "Bearer " + getToken() }, - url: import.meta.env.VITE_APP_BASE_API + '/system/oss/upload' + url: import.meta.env.VITE_APP_BASE_API + '/resource/oss/upload' }) const myQuillEditor = ref(); diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 9d8f742..a46d5ee 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -78,7 +78,7 @@ const number = ref(0); const uploadList = ref([]); const baseUrl = import.meta.env.VITE_APP_BASE_API; -const uploadFileUrl = ref(baseUrl + "/system/oss/upload"); // 上传文件服务器地址 +const uploadFileUrl = ref(baseUrl + "/resource/oss/upload"); // 上传文件服务器地址 const headers = ref({ Authorization: "Bearer " + getToken() }); const fileList = ref([]); diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue index 57697fa..0791f3e 100644 --- a/src/components/ImageUpload/index.vue +++ b/src/components/ImageUpload/index.vue @@ -76,7 +76,7 @@ const dialogImageUrl = ref(""); const dialogVisible = ref(false); const baseUrl = import.meta.env.VITE_APP_BASE_API; -const uploadImgUrl = ref(baseUrl + "/system/oss/upload"); // 上传的图片服务器地址 +const uploadImgUrl = ref(baseUrl + "/resource/oss/upload"); // 上传的图片服务器地址 const headers = ref({ Authorization: "Bearer " + getToken() }); const fileList = ref([]); diff --git a/src/plugins/download.ts b/src/plugins/download.ts index 2640763..e1c4414 100644 --- a/src/plugins/download.ts +++ b/src/plugins/download.ts @@ -9,7 +9,7 @@ const baseURL = import.meta.env.VITE_APP_BASE_API; let downloadLoadingInstance: LoadingInstance; export default { async oss(ossId: string | number) { - const url = baseURL + '/system/oss/download/' + ossId; + const url = baseURL + '/resource/oss/download/' + ossId; downloadLoadingInstance = ElLoading.service({ text: '正在下载数据，请稍候', background: 'rgba(0, 0, 0, 0.7)' }); try { const res = await axios({ From 351eedacec20bf9c0bf047e344c77515395d7441 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Fri, 28 Apr 2023 22:40:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E4=B8=8E=E7=94=A8=E6=88=B7=20=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/role/authUser.vue | 2 +- src/views/system/role/index.vue | 2 +- src/views/system/user/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue index 4b2bec8..ae4f73f 100644 --- a/src/views/system/role/authUser.vue +++ b/src/views/system/role/authUser.vue @@ -63,7 +63,7 @@ :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" - @pagination="handleQuery" + @pagination="getList" /> diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue index 48ed9c9..56c14c5 100644 --- a/src/views/system/role/index.vue +++ b/src/views/system/role/index.vue @@ -93,7 +93,7 @@ v-model:total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" - @pagination="handleQuery" + @pagination="getList" /> diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 33ca77a..63c2adf 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -138,7 +138,7 @@ :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" - @pagination="handleQuery" + @pagination="getList" /> From d192f73ca41c573718420c859711c0e6da05063d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Thu, 4 May 2023 19:48:40 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E9=81=BF?= =?UTF-8?q?=E5=85=8D=E9=BC=A0=E6=A0=87=E7=A7=BB=E5=87=BA=E6=97=B6=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E9=9A=90=E8=97=8F=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/sidebar.scss | 2 +- src/layout/index.vue | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 4c2f3f1..1db15fa 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -1,6 +1,6 @@ #app { .main-container { - min-height: 100%; + height: 100%; transition: margin-left 0.28s; margin-left: $base-sidebar-width; position: relative; diff --git a/src/layout/index.vue b/src/layout/index.vue index 4c6ab94..d49de04 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -1,17 +1,17 @@