Merge remote-tracking branch 'yudao/master'

src/api/infra/config/index.ts

@@ -49,5 +49,5 @@ export const deleteConfigList = (ids: number[]) => {
 
 
 // 导出参数
 // 导出参数
 export const exportConfig = (params) => {
 export const exportConfig = (params) => {
-  return request.download({ url: '/infra/config/export', params })
+  return request.download({ url: '/infra/config/export-excel', params })
 }
 }

src/api/mall/product/spu.ts

@@ -102,7 +102,7 @@ export const deleteSpu = (id: number) => {
 
 
 // 导出商品 Spu Excel
 // 导出商品 Spu Excel
 export const exportSpu = async (params: any) => {
 export const exportSpu = async (params: any) => {
-  return await request.download({ url: '/product/spu/export', params })
+  return await request.download({ url: '/product/spu/export-excel', params })
 }
 }
 
 
 // 获得商品 SPU 精简列表
 // 获得商品 SPU 精简列表

src/api/system/dict/dict.data.ts

@@ -54,6 +54,6 @@ export const deleteDictDataList = (ids: number[]) => {
 }
 }
 
 
 // 导出字典数据
 // 导出字典数据
-export const exportDictData = (params) => {
+export const exportDictData = (params: any) => {
   return request.download({ url: '/system/dict-data/export-excel', params })
   return request.download({ url: '/system/dict-data/export-excel', params })
 }
 }

src/api/system/loginLog/index.ts

@@ -21,5 +21,5 @@ export const getLoginLogPage = (params: PageParam) => {
 
 
 // 导出登录日志
 // 导出登录日志
 export const exportLoginLog = (params) => {
 export const exportLoginLog = (params) => {
-  return request.download({ url: '/system/login-log/export', params })
+  return request.download({ url: '/system/login-log/export-excel', params })
 }
 }

src/api/system/operatelog/index.ts

@@ -26,5 +26,5 @@ export const getOperateLogPage = (params: PageParam) => {
 }
 }
 // 导出操作日志
 // 导出操作日志
 export const exportOperateLog = (params: any) => {
 export const exportOperateLog = (params: any) => {
-  return request.download({ url: '/system/operate-log/export', params })
+  return request.download({ url: '/system/operate-log/export-excel', params })
 }
 }

src/api/system/user/index.ts

@@ -49,7 +49,7 @@ export const deleteUserList = (ids: number[]) => {
 
 
 // 导出用户
 // 导出用户
 export const exportUser = (params: any) => {
 export const exportUser = (params: any) => {
-  return request.download({ url: '/system/user/export', params })
+  return request.download({ url: '/system/user/export-excel', params })
 }
 }
 
 
 // 下载用户导入模板
 // 下载用户导入模板

src/views/infra/dataSourceConfig/index.vue

@@ -112,7 +112,7 @@ const handleDelete = async (id: number) => {
 /** 批量删除按钮操作 */
 /** 批量删除按钮操作 */
 const checkedIds = ref<number[]>([])
 const checkedIds = ref<number[]>([])
 const handleRowCheckboxChange = (rows: DataSourceConfigApi.DataSourceConfigVO[]) => {
 const handleRowCheckboxChange = (rows: DataSourceConfigApi.DataSourceConfigVO[]) => {
-  // 过滤掉id为0的主数据源
+  // 过滤掉id为 0 的主数据源
   checkedIds.value = rows.map((row) => row.id!).filter((id) => id !== 0 && Boolean(id))
   checkedIds.value = rows.map((row) => row.id!).filter((id) => id !== 0 && Boolean(id))
 }
 }