From e6d75c666043ec80bfee3e28554e1b73be50b8ce Mon Sep 17 00:00:00 2001 From: 2910410219 <2910410219@qq.com> Date: Wed, 1 Apr 2026 15:45:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=BC=80=E5=8F=91=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E5=92=8C=E7=94=9F=E4=BA=A7=E7=8E=AF=E5=A2=83=E7=9A=84?= =?UTF-8?q?API=E6=9C=8D=E5=8A=A1=E5=9C=B0=E5=9D=80=EF=BC=8C=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E5=90=8E=E7=AB=AF=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=86=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E6=9C=8D=E5=8A=A1=E5=AE=9E=E4=BE=8B=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E8=AF=B7=E6=B1=82=E6=A8=A1=E5=9D=97=E4=BB=A5=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80=E7=9A=84=E8=AF=B7=E6=B1=82=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BB=A5=E6=8F=90=E9=AB=98=E4=BB=A3=E7=A0=81=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E6=80=A7=E5=92=8C=E5=8F=AF=E8=AF=BB=E6=80=A7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 22 ++---- .env.production | 2 +- src/api/assets/asset/index.ts | 40 +++++----- src/api/assets/category/index.ts | 18 ++--- src/api/assets/location/index.ts | 16 ++-- src/api/assets/operation/count/index.ts | 20 ++--- src/api/assets/warehouse/index.ts | 14 ++-- src/api/assets/zone/index.ts | 14 ++-- src/api/cid/apis/index.ts | 14 ++-- src/api/cid/datasource/index.ts | 16 ++-- src/api/cid/field/index.ts | 18 ++--- src/api/customerService/account/index.ts | 14 ++-- src/api/customerService/product/index.ts | 14 ++-- src/api/customerService/report/index.ts | 6 +- src/api/customerService/script/index.ts | 10 +-- src/api/knowledge/dataset/index.ts | 10 +-- src/api/knowledge/document/index.ts | 18 ++--- src/utils/request.ts | 39 +++------- .../{cid => report-engine}/apis/index.vue | 12 +-- .../datasource/index.vue | 77 +++++++++++-------- .../{cid => report-engine}/field/index.vue | 12 +-- 21 files changed, 200 insertions(+), 206 deletions(-) rename src/views/{cid => report-engine}/apis/index.vue (98%) rename src/views/{cid => report-engine}/datasource/index.vue (88%) rename src/views/{cid => report-engine}/field/index.vue (97%) diff --git a/.env.development b/.env.development index d0ddb43..3a62d8e 100644 --- a/.env.development +++ b/.env.development @@ -1,18 +1,10 @@ # 本地环境 ENV = 'development' -# ============================================================ -# 后端服务地址配置 -# 切换环境时，修改下面两个地址的 IP 即可 -# 当前环境: 192.168.3.11(本地开发地址) -# 备用环境: 192.168.3.200(服务器地址) -# 备用环境: 116.204.74.41(公网开发地址) -# 备用环境: 172.20.10.7(张哥) -# ============================================================ - -# 主服务地址（端口8808） -# 用途: 系统管理、用户认证、权限控制、模块开通等原有功能 -VITE_API_URL = 'http://192.168.3.30:8808/' -# 新功能服务地址（端口8000） -# 用途: 资产管理、分类、SKU、订单等新业务模块 -VITE_NEW_API_URL = 'http://192.168.3.30:8000/' +# 统一后端服务地址配置（全部模块共用 8000 端口） +# 切换环境时，仅需修改下面这一个地址的 IP +# 当前环境: 192.168.3.38 +# 备用环境: 192.168.3.200 +# 备用环境: 116.204.74.41 +# 备用环境: 172.20.10.7 +VITE_API_URL = 'http://192.168.74.41:8000/' diff --git a/.env.production b/.env.production index 358caaa..fa100b0 100644 --- a/.env.production +++ b/.env.production @@ -4,5 +4,5 @@ ENV = 'production' # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可 VITE_PUBLIC_PATH = '/sys/' -# 线上环境接口地址 +# 统一服务地址（端口8000） VITE_API_URL = '/' diff --git a/src/api/assets/asset/index.ts b/src/api/assets/asset/index.ts index f36e3f9..6a6a146 100644 --- a/src/api/assets/asset/index.ts +++ b/src/api/assets/asset/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 资产列表查询参数 export interface AssetQueryParams { @@ -11,7 +11,7 @@ export interface AssetQueryParams { // 获取资产列表 export function listAssets(params?: AssetQueryParams) { - return newService({ + return request({ url: '/assets/asset/listAssets', method: 'get', params, @@ -20,7 +20,7 @@ export function listAssets(params?: AssetQueryParams) { // 更新资产状态 export function updateAssetStatus(id: string, status: number) { - return newService({ + return request({ url: '/assets/asset/updateAssetStatus', method: 'put', data: { id, status }, @@ -29,7 +29,7 @@ export function updateAssetStatus(id: string, status: number) { // 删除资产 export function deleteAsset(id: string) { - return newService({ + return request({ url: '/assets/asset/deleteAsset', method: 'delete', params: { id }, @@ -38,7 +38,7 @@ export function deleteAsset(id: string) { // 获取资产详情 export function getAsset(id: string) { - return newService({ + return request({ url: '/assets/asset/getAsset', method: 'get', params: { id }, @@ -47,7 +47,7 @@ export function getAsset(id: string) { // 获取分类选项 export function getAssetCategories() { - return newService({ + return request({ url: '/assets/asset/getAsset', method: 'get', }); @@ -55,7 +55,7 @@ export function getAssetCategories() { // 新增资产 export function createAsset(data: any) { - return newService({ + return request({ url: '/assets/asset/createAsset', method: 'post', data, @@ -64,7 +64,7 @@ export function createAsset(data: any) { // 修改资产 export function updateAsset(data: any) { - return newService({ + return request({ url: '/assets/asset/updateAsset', method: 'put', data, @@ -75,7 +75,7 @@ export function updateAsset(data: any) { export function uploadAssetImage(file: File) { const formData = new FormData(); formData.append('file', file); - return newService({ + return request({ url: '/oss/file/uploadFile', method: 'post', data: formData, @@ -112,7 +112,7 @@ export interface CreateSkuParams { // 获取 SKU 列表 export function listAssetSkus(params: SkuQueryParams) { - return newService({ + return request({ url: '/assets/asset/sku/listAssetSkus', method: 'get', params, @@ -121,7 +121,7 @@ export function listAssetSkus(params: SkuQueryParams) { // 根据assetId获取资产和SKU信息（用于套餐开通弹窗） export function getAssetAndSku(params: { assetId: string }) { - return newService({ + return request({ url: '/assets/asset/getAssetAndSku', method: 'get', params, @@ -130,7 +130,7 @@ export function getAssetAndSku(params: { assetId: string }) { // 创建 SKU export function createAssetSku(data: CreateSkuParams) { - return newService({ + return request({ url: '/assets/asset/sku/createAssetSku', method: 'post', data, @@ -139,7 +139,7 @@ export function createAssetSku(data: CreateSkuParams) { // 获取 SKU 详情 export function getAssetSku(id: string) { - return newService({ + return request({ url: '/assets/asset/sku/getAssetSku', method: 'get', params: { id }, @@ -148,7 +148,7 @@ export function getAssetSku(id: string) { // 修改 SKU（支持部分更新，只传递修改过的字段） export function updateAssetSku(data: Partial & { id: string }) { - return newService({ + return request({ url: '/assets/asset/sku/updateAssetSku', method: 'put', data, @@ -157,7 +157,7 @@ export function updateAssetSku(data: Partial & { id: string }) // 删除 SKU export function deleteAssetSku(id: string) { - return newService({ + return request({ url: '/assets/asset/sku/deleteAssetSku', method: 'delete', params: { id }, @@ -166,7 +166,7 @@ export function deleteAssetSku(id: string) { // 获取规格单位选项 export function getSpecsUnitOptions(assetType: string) { - return newService({ + return request({ url: '/assets/enum/getSpecsUnit', method: 'get', params: { assetType }, @@ -175,7 +175,7 @@ export function getSpecsUnitOptions(assetType: string) { // 获取库存表单字段 export function getStockFormFields(assetSkuId: string) { - return newService({ + return request({ url: '/assets/stock/manage/getStockFormFields', method: 'get', params: { assetSkuId }, @@ -194,7 +194,7 @@ export interface StockOperationParams { } export function stockOperation(data: StockOperationParams) { - return newService({ + return request({ url: '/assets/stock/manage/stockOperation', method: 'post', data, @@ -223,7 +223,7 @@ export interface OperationLogInfo { // 查询操作日志 export function listLogs(params: LogQueryParams) { - return newService({ + return request({ url: '/assets/log/listLogs', method: 'get', params, @@ -238,7 +238,7 @@ export interface SubscribeAssetParams { // 订阅/开通资产服务 export function subscribeAsset(data: SubscribeAssetParams) { - return newService({ + return request({ url: '/assets/asset/subscribe', method: 'post', data, diff --git a/src/api/assets/category/index.ts b/src/api/assets/category/index.ts index 357785d..6378544 100644 --- a/src/api/assets/category/index.ts +++ b/src/api/assets/category/index.ts @@ -1,10 +1,10 @@ // import request from '/@/utils/request'; -import request, { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 获取分类树 export function getCategoryTree(query?: Object) { - return newService({ + return request({ url: '/assets/category/getCategoryTree', method: 'get', params: query, @@ -13,7 +13,7 @@ export function getCategoryTree(query?: Object) { // 获取分类详情 export function getCategory(id: number | string) { - return newService({ + return request({ url: '/assets/category/getCategory', method: 'get', params: { id: id.toString() }, @@ -22,7 +22,7 @@ export function getCategory(id: number | string) { // 获取属性类型选项 export function getCategoryAttrTypeOptions() { - return newService({ + return request({ url: '/assets/enum/getCategoryAttrType', method: 'get', }); @@ -30,7 +30,7 @@ export function getCategoryAttrTypeOptions() { // 新增分类 export function addCategory(data: object) { - return newService({ + return request({ url: '/assets/category/createCategory', method: 'post', data: data, @@ -39,7 +39,7 @@ export function addCategory(data: object) { // 查询获取列表 export function listCategories(keyword: string) { - return newService({ + return request({ url: '/assets/category/listCategories', method: 'get', params: {keyword}, @@ -48,7 +48,7 @@ export function listCategories(keyword: string) { // 修改分类 export function updateCategory(data: object) { - return newService({ + return request({ url: '/assets/category/updateCategory', method: 'put', data: data, @@ -57,7 +57,7 @@ export function updateCategory(data: object) { // 删除分类 export function deleteCategory(id: number | string) { - return newService({ + return request({ url: '/assets/category/deleteCategory', method: 'delete', params: { id: id.toString() }, @@ -66,7 +66,7 @@ export function deleteCategory(id: number | string) { // 更新分类状态 export function updateCategoryStatus(id: number | string, status: number) { - return newService({ + return request({ url: '/assets/category/updateCategoryStatus', method: 'put', data: { id: id.toString(), status }, diff --git a/src/api/assets/location/index.ts b/src/api/assets/location/index.ts index 4cae51d..004e800 100644 --- a/src/api/assets/location/index.ts +++ b/src/api/assets/location/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 库位查询参数 export interface LocationQueryParams { @@ -28,7 +28,7 @@ export interface LocationData { // 获取库位列表 export function listLocations(params?: LocationQueryParams) { - return newService({ + return request({ url: '/assets/location/listLocations', method: 'get', params, @@ -37,7 +37,7 @@ export function listLocations(params?: LocationQueryParams) { // 获取库位详情 export function getLocation(id: string) { - return newService({ + return request({ url: '/assets/location/getLocation', method: 'get', params: { id }, @@ -46,7 +46,7 @@ export function getLocation(id: string) { // 创建库位 export function createLocation(data: LocationData) { - return newService({ + return request({ url: '/assets/location/createLocation', method: 'post', data, @@ -55,7 +55,7 @@ export function createLocation(data: LocationData) { // 更新库位 export function updateLocation(data: LocationData) { - return newService({ + return request({ url: '/assets/location/updateLocation', method: 'put', data, @@ -64,7 +64,7 @@ export function updateLocation(data: LocationData) { // 删除库位 export function deleteLocation(id: string) { - return newService({ + return request({ url: '/assets/location/deleteLocation', method: 'delete', params: { id }, @@ -73,7 +73,7 @@ export function deleteLocation(id: string) { // 更新库位状态 export function updateLocationStatus(data: { id: string; status: string }) { - return newService({ + return request({ url: '/assets/location/updateLocationStatus', method: 'put', data, @@ -82,7 +82,7 @@ export function updateLocationStatus(data: { id: string; status: string }) { // 获取容量单位类型 export function getCapacityUnitType() { - return newService({ + return request({ url: '/assets/location/getCapacityUnitType', method: 'get', }); diff --git a/src/api/assets/operation/count/index.ts b/src/api/assets/operation/count/index.ts index 3ecb8a1..610e776 100644 --- a/src/api/assets/operation/count/index.ts +++ b/src/api/assets/operation/count/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 盘点任务查询参数 export interface InventoryCountQueryParams { @@ -30,7 +30,7 @@ export interface InventoryCountParams { // 获取盘点任务列表 export function listInventoryCounts(params?: InventoryCountQueryParams) { - return newService({ + return request({ url: 'assets/inventory/count/listInventoryCounts', method: 'get', params, @@ -39,7 +39,7 @@ export function listInventoryCounts(params?: InventoryCountQueryParams) { // 获取盘点任务详情 export function getInventoryCount(id: string) { - return newService({ + return request({ url: 'assets/inventory/count/getInventoryCount', method: 'get', params: { id }, @@ -48,7 +48,7 @@ export function getInventoryCount(id: string) { // 创建盘点任务 export function createInventoryCount(data: InventoryCountParams) { - return newService({ + return request({ url: 'assets/inventory/count/createInventoryCount', method: 'post', data, @@ -57,7 +57,7 @@ export function createInventoryCount(data: InventoryCountParams) { // 更新盘点任务 export function updateInventoryCount(data: InventoryCountParams) { - return newService({ + return request({ url: 'assets/inventory/count/updateInventoryCount', method: 'put', data, @@ -66,7 +66,7 @@ export function updateInventoryCount(data: InventoryCountParams) { // 删除盘点任务 export function deleteInventoryCount(id: string) { - return newService({ + return request({ url: 'assets/inventory/count/deleteInventoryCount', method: 'delete', params: { id }, @@ -75,7 +75,7 @@ export function deleteInventoryCount(id: string) { // 完成盘点 export function completeInventoryCount(id: string) { - return newService({ + return request({ url: 'assets/inventory/count/completeInventoryCount', method: 'post', data: { id }, @@ -84,7 +84,7 @@ export function completeInventoryCount(id: string) { // 取消盘点 export function cancelInventoryCount(id: string[], reason?: string) { - return newService({ + return request({ url: 'assets/inventory/count/cancelInventoryCount', method: 'post', data: { id, reason }, @@ -93,7 +93,7 @@ export function cancelInventoryCount(id: string[], reason?: string) { // 导出盘点 export function exportInventoryCount(id: string) { - return newService({ + return request({ url: 'assets/inventory/count/exportInventoryCount', method: 'get', params: { id }, @@ -106,7 +106,7 @@ export function importInventoryCount(id: string, file: File) { const formData = new FormData(); formData.append('id', id); formData.append('file', file); - return newService({ + return request({ url: 'assets/inventory/count/importInventoryCount', method: 'post', data: formData, diff --git a/src/api/assets/warehouse/index.ts b/src/api/assets/warehouse/index.ts index a6c6d6a..21368a8 100644 --- a/src/api/assets/warehouse/index.ts +++ b/src/api/assets/warehouse/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 仓库查询参数 export interface WarehouseQueryParams { @@ -22,7 +22,7 @@ export interface WarehouseData { // 获取仓库列表 export function listWarehouses(params?: WarehouseQueryParams) { - return newService({ + return request({ url: '/assets/warehouse/listWarehouses', method: 'get', params, @@ -31,7 +31,7 @@ export function listWarehouses(params?: WarehouseQueryParams) { // 获取仓库详情 export function getWarehouse(id: string) { - return newService({ + return request({ url: '/assets/warehouse/getWarehouse', method: 'get', params: { id }, @@ -40,7 +40,7 @@ export function getWarehouse(id: string) { // 创建仓库 export function createWarehouse(data: WarehouseData) { - return newService({ + return request({ url: '/assets/warehouse/createWarehouse', method: 'post', data, @@ -49,7 +49,7 @@ export function createWarehouse(data: WarehouseData) { // 更新仓库 export function updateWarehouse(data: WarehouseData) { - return newService({ + return request({ url: '/assets/warehouse/updateWarehouse', method: 'put', data, @@ -58,7 +58,7 @@ export function updateWarehouse(data: WarehouseData) { // 删除仓库 export function deleteWarehouse(id: string) { - return newService({ + return request({ url: '/assets/warehouse/deleteWarehouse', method: 'delete', params: { id }, @@ -67,7 +67,7 @@ export function deleteWarehouse(id: string) { // 更新仓库状态 export function updateWarehouseStatus(data: { id: string; status: string }) { - return newService({ + return request({ url: '/assets/warehouse/updateWarehouseStatus', method: 'put', data, diff --git a/src/api/assets/zone/index.ts b/src/api/assets/zone/index.ts index 04cfdcf..4350d20 100644 --- a/src/api/assets/zone/index.ts +++ b/src/api/assets/zone/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 库区查询参数 export interface ZoneQueryParams { @@ -23,7 +23,7 @@ export interface ZoneData { // 获取库区列表 export function listZones(params?: ZoneQueryParams) { - return newService({ + return request({ url: '/assets/zone/listZones', method: 'get', params, @@ -32,7 +32,7 @@ export function listZones(params?: ZoneQueryParams) { // 获取库区详情 export function getZone(id: string) { - return newService({ + return request({ url: '/assets/zone/getZone', method: 'get', params: { id }, @@ -41,7 +41,7 @@ export function getZone(id: string) { // 创建库区 export function createZone(data: ZoneData) { - return newService({ + return request({ url: '/assets/zone/createZone', method: 'post', data, @@ -50,7 +50,7 @@ export function createZone(data: ZoneData) { // 更新库区 export function updateZone(data: ZoneData) { - return newService({ + return request({ url: '/assets/zone/updateZone', method: 'put', data, @@ -59,7 +59,7 @@ export function updateZone(data: ZoneData) { // 删除库区 export function deleteZone(id: string) { - return newService({ + return request({ url: '/assets/zone/deleteZone', method: 'delete', params: { id }, @@ -68,7 +68,7 @@ export function deleteZone(id: string) { // 更新库区状态 export function updateZoneStatus(data: { id: string; status: string }) { - return newService({ + return request({ url: '/assets/zone/updateZoneStatus', method: 'put', data, diff --git a/src/api/cid/apis/index.ts b/src/api/cid/apis/index.ts index 1360694..0eceac4 100644 --- a/src/api/cid/apis/index.ts +++ b/src/api/cid/apis/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 接口查询参数 export interface ApiInterfaceQueryParams { @@ -58,7 +58,7 @@ export interface ApiInterfaceInfo { // 获取接口列表 export function listApiInterfaces(params: ApiInterfaceQueryParams) { - return newService({ + return request({ url: '/api/interface/controller/listApiInterfaces', method: 'get', params, @@ -67,7 +67,7 @@ export function listApiInterfaces(params: ApiInterfaceQueryParams) { // 获取接口详情 export function getApiInterface(id: string) { - return newService({ + return request({ url: '/api/interface/controller/getApiInterface', method: 'get', params: { id }, @@ -76,7 +76,7 @@ export function getApiInterface(id: string) { // 创建接口 export function createApiInterface(data: CreateApiInterfaceParams) { - return newService({ + return request({ url: '/api/interface/controller/createApiInterface', method: 'post', data, @@ -85,7 +85,7 @@ export function createApiInterface(data: CreateApiInterfaceParams) { // 修改接口 export function updateApiInterface(data: UpdateApiInterfaceParams) { - return newService({ + return request({ url: '/api/interface/controller/updateApiInterface', method: 'put', data, @@ -94,7 +94,7 @@ export function updateApiInterface(data: UpdateApiInterfaceParams) { // 更新接口状态 export function updateApiInterfaceStatus(data: UpdateApiInterfaceStatusParams) { - return newService({ + return request({ url: '/api/interface/controller/updateApiInterfaceStatus', method: 'put', data, @@ -103,7 +103,7 @@ export function updateApiInterfaceStatus(data: UpdateApiInterfaceStatusParams) { // 删除接口 export function deleteApiInterface(id: string) { - return newService({ + return request({ url: '/api/interface/controller/deleteApiInterface', method: 'delete', params: { id }, diff --git a/src/api/cid/datasource/index.ts b/src/api/cid/datasource/index.ts index 8dfc19e..cb2631a 100644 --- a/src/api/cid/datasource/index.ts +++ b/src/api/cid/datasource/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 平台查询参数 export interface DatasourcePlatformQueryParams { @@ -68,7 +68,7 @@ export interface DatasourcePlatformInfo { // 获取平台列表 export function listDatasourcePlatforms(params: DatasourcePlatformQueryParams) { - return newService({ + return request({ url: '/datasource/platform/controller/listDatasourcePlatforms', method: 'get', params, @@ -77,7 +77,7 @@ export function listDatasourcePlatforms(params: DatasourcePlatformQueryParams) { // 创建平台 export function createDatasourcePlatform(data: CreateDatasourcePlatformParams) { - return newService({ + return request({ url: '/datasource/platform/controller/createDatasourcePlatform', method: 'post', data, @@ -86,7 +86,7 @@ export function createDatasourcePlatform(data: CreateDatasourcePlatformParams) { // 更新平台 export function updateDatasourcePlatform(data: UpdateDatasourcePlatformParams) { - return newService({ + return request({ url: '/datasource/platform/controller/updateDatasourcePlatform', method: 'put', data, @@ -95,7 +95,7 @@ export function updateDatasourcePlatform(data: UpdateDatasourcePlatformParams) { // 删除平台 export function deleteDatasourcePlatform(id: string) { - return newService({ + return request({ url: '/datasource/platform/controller/deleteDatasourcePlatform', method: 'delete', params: { id }, @@ -104,7 +104,7 @@ export function deleteDatasourcePlatform(id: string) { // 获取平台详情 export function getDatasourcePlatform(id: string) { - return newService({ + return request({ url: '/datasource/platform/controller/getDatasourcePlatform', method: 'get', params: { id }, @@ -113,7 +113,7 @@ export function getDatasourcePlatform(id: string) { // 根据编码获取平台信息 export function getPlatformByCode(platformCode: string) { - return newService({ + return request({ url: '/datasource/platform/controller/getPlatformByCode', method: 'get', params: { platformCode }, @@ -122,7 +122,7 @@ export function getPlatformByCode(platformCode: string) { // 更新平台状态 export function updateDatasourcePlatformStatus(data: UpdateDatasourcePlatformStatusParams) { - return newService({ + return request({ url: '/datasource/platform/controller/updateDatasourcePlatformStatus', method: 'put', data, diff --git a/src/api/cid/field/index.ts b/src/api/cid/field/index.ts index e687d17..20c01a5 100644 --- a/src/api/cid/field/index.ts +++ b/src/api/cid/field/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 字典映射查询参数 export interface FieldMappingQueryParams { @@ -78,7 +78,7 @@ export interface FieldMappingInfo { // 查询字典映射列表 export function listFieldMappingConfigs(params: FieldMappingQueryParams) { - return newService({ + return request({ url: '/field/mapping/config/controller/field-mapping-configs', method: 'get', params, @@ -87,7 +87,7 @@ export function listFieldMappingConfigs(params: FieldMappingQueryParams) { // 创建字典映射 export function createFieldMappingConfig(data: CreateFieldMappingParams) { - return newService({ + return request({ url: '/field/mapping/config/controller/field-mapping-configs', method: 'post', data, @@ -96,7 +96,7 @@ export function createFieldMappingConfig(data: CreateFieldMappingParams) { // 根据ID查询字典映射详情 export function getFieldMappingConfig(id: string) { - return newService({ + return request({ url: `/field/mapping/config/controller/field-mapping-configs/${id}`, method: 'get', }); @@ -104,7 +104,7 @@ export function getFieldMappingConfig(id: string) { // 根据ID修改字典映射 export function updateFieldMappingConfig(id: string, data: UpdateFieldMappingParams) { - return newService({ + return request({ url: `/field/mapping/config/controller/field-mapping-configs/${id}`, method: 'put', data, @@ -113,7 +113,7 @@ export function updateFieldMappingConfig(id: string, data: UpdateFieldMappingPar // 根据ID修改字典映射状态 export function updateFieldMappingConfigStatus(id: string, isActive: boolean) { - return newService({ + return request({ url: `/field/mapping/config/controller/field-mapping-configs/${id}/status`, method: 'put', data: { id, isActive }, @@ -122,7 +122,7 @@ export function updateFieldMappingConfigStatus(id: string, isActive: boolean) { // 根据ID删除字典映射 export function deleteFieldMappingConfig(id: string) { - return newService({ + return request({ url: `/field/mapping/config/controller/field-mapping-configs/${id}`, method: 'delete', }); @@ -137,7 +137,7 @@ export interface QueryFieldMappingParams { } export function queryFieldMappingConfigs(params: QueryFieldMappingParams) { - return newService({ + return request({ url: '/field/mapping/config/controller/field-mapping-configs/query', method: 'get', params, @@ -154,7 +154,7 @@ export interface ValidateFieldMappingParams { } export function validateFieldMappingConfig(data: ValidateFieldMappingParams) { - return newService({ + return request({ url: '/field/mapping/config/controller/field-mapping-configs/validate', method: 'post', data, diff --git a/src/api/customerService/account/index.ts b/src/api/customerService/account/index.ts index 6b36f9d..95d7fae 100644 --- a/src/api/customerService/account/index.ts +++ b/src/api/customerService/account/index.ts @@ -1,8 +1,8 @@ -import request, { newService } from '/@/utils/request'; +import request from '/@/utils/request'; //获取账号列表 export function getaccountList(data: object) { - return newService({ + return request({ url: '/customer-server/customer/service/account/list', method: 'get', params: data, @@ -11,7 +11,7 @@ export function getaccountList(data: object) { //添加客服账号 export function addAccount(data: object) { - return newService({ + return request({ url: '/customer-server/customer/service/account/add', method: 'post', data: data, @@ -20,7 +20,7 @@ export function addAccount(data: object) { //禁用账号 export function updatestate(data: object) { - return newService({ + return request({ url: '/customer-server/customer/service/account/toggleStatus', method: 'post', data: data, @@ -29,7 +29,7 @@ export function updatestate(data: object) { //更新账号 export function updateAccount(data: object) { - return newService({ + return request({ url: '/customer-server/customer/service/account/update', method: 'post', data: data, @@ -38,7 +38,7 @@ export function updateAccount(data: object) { //获取RAGFlow配置（提示词） export function getRAGFlowConfig(params: object) { - return newService({ + return request({ url: '/customer-server/ragflow/config/get', method: 'get', params: params, @@ -47,7 +47,7 @@ export function getRAGFlowConfig(params: object) { //更新提示词 export function updatePrompt(data: object) { - return newService({ + return request({ url: '/customer-server/ragflow/config/updatePrompt', method: 'post', data: data, diff --git a/src/api/customerService/product/index.ts b/src/api/customerService/product/index.ts index c07a838..98d8246 100644 --- a/src/api/customerService/product/index.ts +++ b/src/api/customerService/product/index.ts @@ -1,8 +1,8 @@ -import request, { newService } from '/@/utils/request'; +import request from '/@/utils/request'; //添加产品 export function addProduct(data: object) { - return newService({ + return request({ url: '/customer-server/product/add', method: 'post', data: data, @@ -11,7 +11,7 @@ export function addProduct(data: object) { //删除产品 export function deleteProduct(data: object) { - return newService({ + return request({ url: '/customer-server/product/delete', method: 'post', data: data, @@ -20,7 +20,7 @@ export function deleteProduct(data: object) { //获取产品列表 export function getList(data: object) { - return newService({ + return request({ url: '/customer-server/product/list', method: 'get', params: data, @@ -29,7 +29,7 @@ export function getList(data: object) { //更新产品 export function updateProduct(data: object) { - return newService({ + return request({ url: '/customer-server/product/update', method: 'post', data: data, @@ -38,7 +38,7 @@ export function updateProduct(data: object) { // 导出产品 export function exportProduct(data: object) { - return newService({ + return request({ url: '/customer-server/product/export', responseType: 'blob', method: 'get', @@ -48,7 +48,7 @@ export function exportProduct(data: object) { //导入产品 export function importProduct(data: FormData) { - return newService({ + return request({ url: '/customer-server/product/import', method: 'post', data: data, diff --git a/src/api/customerService/report/index.ts b/src/api/customerService/report/index.ts index 950936b..09b2e16 100644 --- a/src/api/customerService/report/index.ts +++ b/src/api/customerService/report/index.ts @@ -1,8 +1,8 @@ -import request, { newService } from '/@/utils/request'; +import request from '/@/utils/request'; //获取数据列表 export function getDataList(data: object) { - return newService({ + return request({ url: '/customer-server/data/statistics/list', method: 'get', params: data, @@ -11,7 +11,7 @@ export function getDataList(data: object) { // 导出报表 export function exportReport(data: object) { - return newService({ + return request({ url: '/customer-server/data/statistics/export', responseType: 'blob', method: 'get', diff --git a/src/api/customerService/script/index.ts b/src/api/customerService/script/index.ts index c94bee6..a8b57d2 100644 --- a/src/api/customerService/script/index.ts +++ b/src/api/customerService/script/index.ts @@ -1,8 +1,8 @@ -import request, { newService } from '/@/utils/request'; +import request from '/@/utils/request'; //获取话术列表 export function getscriptList(data: object) { - return newService({ + return request({ url: '/customer-server/speechcraft/list', method: 'get', params: data, @@ -11,7 +11,7 @@ export function getscriptList(data: object) { //增加话术 export function addScript(data: object) { - return newService({ + return request({ url: '/customer-server/speechcraft/add', method: 'post', data: data, @@ -20,7 +20,7 @@ export function addScript(data: object) { //删除话术列表 export function deleteScript(data: object) { - return newService({ + return request({ url: '/customer-server/speechcraft/delete', method: 'post', data: data, @@ -29,7 +29,7 @@ export function deleteScript(data: object) { //更新话术列表 export function updateScript(data: object) { - return newService({ + return request({ url: '/customer-server/speechcraft/update', method: 'post', data: data, diff --git a/src/api/knowledge/dataset/index.ts b/src/api/knowledge/dataset/index.ts index 1289313..5e78574 100644 --- a/src/api/knowledge/dataset/index.ts +++ b/src/api/knowledge/dataset/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 数据集查询参数 export interface knowledgeQueryParams { @@ -33,7 +33,7 @@ export interface knowledgeInfo { // 获取知识库列表 export function listknowledges(params: knowledgeQueryParams) { - return newService({ + return request({ url: '/rag-knowledge/dataset/listDataset', method: 'get', params, @@ -42,7 +42,7 @@ export function listknowledges(params: knowledgeQueryParams) { // 创建知识库 export function createknowledge(data: CreateknowledgeParams) { - return newService({ + return request({ url: '/rag-knowledge/dataset/createDataset', method: 'post', data, @@ -51,7 +51,7 @@ export function createknowledge(data: CreateknowledgeParams) { // 更新知识库 export function updateknowledge(data: UpdateknowledgeParams) { - return newService({ + return request({ url: '/rag-knowledge/dataset/updateDataset', method: 'put', data, @@ -60,7 +60,7 @@ export function updateknowledge(data: UpdateknowledgeParams) { // 删除知识库 export function deleteknowledge(id: string) { - return newService({ + return request({ url: '/rag-knowledge/dataset/deleteDataset', method: 'delete', params: { id }, diff --git a/src/api/knowledge/document/index.ts b/src/api/knowledge/document/index.ts index 2b83f80..e23b39d 100644 --- a/src/api/knowledge/document/index.ts +++ b/src/api/knowledge/document/index.ts @@ -1,4 +1,4 @@ -import { newService } from '/@/utils/request'; +import request from '/@/utils/request'; // 文档查询参数 export interface DocumentQueryParams { @@ -44,7 +44,7 @@ export interface DocumentInfo { // 获取文档列表 export function listDocuments(params: DocumentQueryParams) { - return newService({ + return request({ url: '/rag-knowledge/document/listDocument', method: 'get', params, @@ -53,7 +53,7 @@ export function listDocuments(params: DocumentQueryParams) { // 获取文档详情 export function getDocument(id: string) { - return newService({ + return request({ url: '/rag-knowledge/document/getDocument', method: 'get', params: { id }, @@ -62,7 +62,7 @@ export function getDocument(id: string) { // 创建文档 export function createDocument(data: CreateDocumentParams) { - return newService({ + return request({ url: '/rag-knowledge/document/createDocument', method: 'post', data, @@ -71,7 +71,7 @@ export function createDocument(data: CreateDocumentParams) { // 更新文档 export function updateDocument(data: UpdateDocumentParams) { - return newService({ + return request({ url: '/rag-knowledge/document/updateDocument', method: 'put', data, @@ -82,7 +82,7 @@ export function updateDocument(data: UpdateDocumentParams) { export function uploadFile(file: File) { const formData = new FormData(); formData.append('file', file); - return newService({ + return request({ url: '/oss/file/uploadFile', method: 'post', data: formData, @@ -92,7 +92,7 @@ export function uploadFile(file: File) { // 上传文档 export function uploadDocument(data: FormData) { - return newService({ + return request({ url: '/rag-knowledge/document/createDocument', method: 'post', data, @@ -104,7 +104,7 @@ export function uploadDocument(data: FormData) { // 删除文档 export function deleteDocument(id: string) { - return newService({ + return request({ url: '/rag-knowledge/document/deleteDocument', method: 'delete', params: { id }, @@ -113,7 +113,7 @@ export function deleteDocument(id: string) { // 获取文件向量化处理进度 export function getDocumentProcess(id: string) { - return newService({ + return request({ url: '/rag-knowledge/document/getProcess', method: 'get', params: { id }, diff --git a/src/utils/request.ts b/src/utils/request.ts index efb1153..96f5df1 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -14,12 +14,12 @@ const ERROR_MESSAGE_INTERVAL = 2000; // 2秒内只显示一个错误 const showErrorMessage = (message: string) => { const now = Date.now(); - + // 2秒内只显示一个错误消息（不管内容是否相同） if (now - lastErrorTime < ERROR_MESSAGE_INTERVAL) { return; // 跳过 } - + lastErrorTime = now; ElMessage.error(message); }; @@ -29,7 +29,7 @@ const showErrorMessage = (message: string) => { // 地址配置见 .env.development 文件 // ============================================================ -// 主服务实例（端口8808）- 系统管理、用户认证、权限、模块开通等 +// 统一服务实例（端口8000）- 全部模块共用 const service: AxiosInstance = axios.create({ baseURL: import.meta.env.VITE_API_URL, timeout: 50000, @@ -41,18 +41,6 @@ const service: AxiosInstance = axios.create({ }, }); -// 新功能服务实例（端口8000）- 资产管理、分类、SKU、订单等新模块 -const newService: AxiosInstance = axios.create({ - baseURL: import.meta.env.VITE_NEW_API_URL, - timeout: 50000, - headers: { 'Content-Type': 'application/json' }, - paramsSerializer: { - serialize(params) { - return qs.stringify(params, { allowDots: true, arrayFormat: 'brackets' }); - }, - }, -}); - // token 过期处理函数 const handleTokenExpired = () => { if (isHandlingTokenExpired) return; @@ -64,7 +52,7 @@ const handleTokenExpired = () => { showClose: false, closeOnClickModal: false, closeOnPressEscape: false, - beforeClose: (action, instance, done) => { + beforeClose: (action, _instance, done) => { if (action === 'confirm') { done(); performLogout(); @@ -98,21 +86,21 @@ const requestInterceptor = (config: InternalAxiosRequestConfig) => { // 可以在这里添加 token 有效性检查（如果需要） config.headers!['Authorization'] = `Bearer ${token}`; } - + // PUT 请求最小化传参处理 // 如果请求数据中包含 _originalData，则自动计算差异，只传递修改过的字段 if (config.method?.toLowerCase() === 'put' && config.data && typeof config.data === 'object') { const { _originalData, ...currentData } = config.data; - + if (_originalData && typeof _originalData === 'object') { // 获取 id 字段（必须保留） const idField = currentData.id || currentData.Id || currentData.ID; - + // 计算差异 const changedFields = getChangedFields(_originalData, currentData, { exclude: ['_originalData', 'id', 'Id', 'ID'], }); - + // 如果有变化，只传递 id + 变化的字段 if (Object.keys(changedFields).length > 0) { config.data = { id: idField, ...changedFields }; @@ -120,11 +108,11 @@ const requestInterceptor = (config: InternalAxiosRequestConfig) => { // 没有变化，只传递 id config.data = { id: idField }; } - + console.log('[最小化传参] 原始字段数:', Object.keys(currentData).length, '-> 传递字段数:', Object.keys(config.data).length); } } - + return config; }; @@ -222,7 +210,7 @@ const responseErrorHandler = (error: any) => { showErrorMessage(responseMessage || '服务开通中，请稍后刷新页面'); return Promise.reject(new Error('模块开通中')); } - + const currentPath = window.location.hash.replace('#', '') || window.location.pathname; console.log('[responseErrorHandler] 检测到HTTP 402错误，当前路径:', currentPath); handleModuleNotEnabled(currentPath); @@ -262,9 +250,6 @@ const responseErrorHandler = (error: any) => { service.interceptors.request.use(requestInterceptor, requestErrorHandler); service.interceptors.response.use(responseInterceptor, responseErrorHandler); -newService.interceptors.request.use(requestInterceptor, requestErrorHandler); -newService.interceptors.response.use(responseInterceptor, responseErrorHandler); - // 导出 export default service; -export { newService, showErrorMessage }; +export { showErrorMessage }; diff --git a/src/views/cid/apis/index.vue b/src/views/report-engine/apis/index.vue similarity index 98% rename from src/views/cid/apis/index.vue rename to src/views/report-engine/apis/index.vue index 6209f1d..d1cb80e 100644 --- a/src/views/cid/apis/index.vue +++ b/src/views/report-engine/apis/index.vue @@ -206,11 +206,13 @@ const onRowDel = (row: any) => { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', - }).then(() => { - // TODO: 调用删除接口 - ElMessage.success('删除成功'); - getList(); - }).catch(() => {}); + }) + .then(() => { + // TODO: 调用删除接口 + ElMessage.success('删除成功'); + getList(); + }) + .catch(() => {}); }; onMounted(() => { diff --git a/src/views/cid/datasource/index.vue b/src/views/report-engine/datasource/index.vue similarity index 88% rename from src/views/cid/datasource/index.vue rename to src/views/report-engine/datasource/index.vue index bf37e00..2d56658 100644 --- a/src/views/cid/datasource/index.vue +++ b/src/views/report-engine/datasource/index.vue @@ -76,9 +76,8 @@ /> - - + @@ -165,7 +164,7 @@ export default { name: 'cidDatasource' }; \ No newline at end of file + diff --git a/src/views/cid/field/index.vue b/src/views/report-engine/field/index.vue similarity index 97% rename from src/views/cid/field/index.vue rename to src/views/report-engine/field/index.vue index 886f5e6..7f13bba 100644 --- a/src/views/cid/field/index.vue +++ b/src/views/report-engine/field/index.vue @@ -185,11 +185,13 @@ const onRowDel = (row: any) => { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', - }).then(() => { - // TODO: 调用删除接口 - ElMessage.success('删除成功'); - getList(); - }).catch(() => {}); + }) + .then(() => { + // TODO: 调用删除接口 + ElMessage.success('删除成功'); + getList(); + }) + .catch(() => {}); }; onMounted(() => {