From fe1c64845e48d7ab67e3a993207d0aac06e3e62c Mon Sep 17 00:00:00 2001 From: Fanzink <460995166@qq.com> Date: Wed, 16 Feb 2022 19:32:54 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=98=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E5=8F=A3=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/basicData/Cache/area.js | 4 ++-- src/api/basicData/Cache/shelf.js | 13 +++++++------ src/api/basicData/Equipment/equipmentGroup.js | 3 ++- src/api/basicData/Equipment/equipmentInfo.js | 6 ++++-- src/api/basicData/Equipment/equipmentInfoAttr.js | 6 ++++-- src/api/basicData/Equipment/equipmentType.js | 3 ++- vue.config.js | 4 ++-- 7 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/api/basicData/Cache/area.js b/src/api/basicData/Cache/area.js index ec39efc..18e995f 100644 --- a/src/api/basicData/Cache/area.js +++ b/src/api/basicData/Cache/area.js @@ -9,7 +9,7 @@ import request from '@/utils/request' export function areaList(data) { // 获取缓存区区域信息列表 return request({ - url: '/api/wms/area/shelf', + url: '/api/wms/area/page', method: 'post', data }) @@ -17,7 +17,7 @@ export function areaList(data) { // 获取缓存区区域信息列表 export function areaDetail(id) { // 获取缓存区区域信息单条数据 return request({ - url: '/api/wms/area/get', + url: '/api/wms/area/getById', method: 'post', data: { id } }) diff --git a/src/api/basicData/Cache/shelf.js b/src/api/basicData/Cache/shelf.js index e1ceb3a..b4e5d4b 100644 --- a/src/api/basicData/Cache/shelf.js +++ b/src/api/basicData/Cache/shelf.js @@ -9,7 +9,7 @@ import request from '@/utils/request' export function shelfList(data) { // 获取货架信息列表 return request({ - url: '/basic/shelf/page', + url: '/api/wms/area/shelf', method: 'post', data }) @@ -17,7 +17,7 @@ export function shelfList(data) { // 获取货架信息列表 export function shelfDetail(id) { // 获取货架信息单条数据 return request({ - url: '/basic/shelf/get', + url: '/api/wms/area/shelfById', method: 'post', data: { id } }) @@ -25,7 +25,8 @@ export function shelfDetail(id) { // 获取货架信息单条数据 export function shelfUpdate(data) { // 更新货架信息单条数据 return request({ - url: '/basic/shelf/update', + // url: '/basic/shelf/update', + url: '/api/wms/area/updateshelf', method: 'post', data }) @@ -33,7 +34,7 @@ export function shelfUpdate(data) { // 更新货架信息单条数据 export function shelfAdd(data) { // 新增货架信息单条数据 return request({ - url: '/basic/shelf/add', + url: '/api/wms/area/addshelf', method: 'post', data }) @@ -41,14 +42,14 @@ export function shelfAdd(data) { // 新增货架信息单条数据 export function shelfCode() { // 获取货架信息code return request({ - url: '/basic/shelf/get-code', + url: '/api/wms/area/getCode', method: 'post' }) } export function shelfDelete(id) { // 删除货架信息单条数据 return request({ - url: '/basic/shelf/delete', + url: '/api/wms/area/deleteshelf', method: 'post', data: { id } }) diff --git a/src/api/basicData/Equipment/equipmentGroup.js b/src/api/basicData/Equipment/equipmentGroup.js index 360fd86..b3a27e3 100644 --- a/src/api/basicData/Equipment/equipmentGroup.js +++ b/src/api/basicData/Equipment/equipmentGroup.js @@ -10,7 +10,8 @@ import request from '@/utils/request' export function equipmentGroupList(data) { // 获取设备分组列表 return request({ - url: '/equipment/equipment-group/findAll', + // url: '/equipment/equipment-group/findAll', + url: '/api/wms/equipment/page', method: 'post', data }) diff --git a/src/api/basicData/Equipment/equipmentInfo.js b/src/api/basicData/Equipment/equipmentInfo.js index fee35a8..449d2e9 100644 --- a/src/api/basicData/Equipment/equipmentInfo.js +++ b/src/api/basicData/Equipment/equipmentInfo.js @@ -64,8 +64,10 @@ export function equipmentInfoFileAdd(data) { // 设备信息上传 export function getEquipmentInfoFile(data) { // 设备信息下载 return request({ - url: '/api/wms/equipment-file/get-by-param', - method: 'post', + // url: '/api/wms/equipment-file/get-by-param', + url: '/api/common/attachment/downloadFile', + // method: 'post', + method: 'get', data }) } diff --git a/src/api/basicData/Equipment/equipmentInfoAttr.js b/src/api/basicData/Equipment/equipmentInfoAttr.js index e7ed725..572e245 100644 --- a/src/api/basicData/Equipment/equipmentInfoAttr.js +++ b/src/api/basicData/Equipment/equipmentInfoAttr.js @@ -9,7 +9,8 @@ import request from '@/utils/request' export function equipmentInfoAttrList(data) { // 获取设备属性列表 return request({ - url: '/basic/equipment-attr/page', + // url: '/basic/equipment-attr/page', + url: '/api/wms/equipment/page', method: 'post', data }) @@ -17,7 +18,8 @@ export function equipmentInfoAttrList(data) { // 获取设备属性列表 export function equipmentInfoAttrDetail(id) { // 获取设备属性单条数据 return request({ - url: '/basic/equipment-attr/get', + // url: '/basic/equipment-attr/get', + url: '/api/wms/equipment/attrById', method: 'post', data: { id } }) diff --git a/src/api/basicData/Equipment/equipmentType.js b/src/api/basicData/Equipment/equipmentType.js index 3f075b7..6a44a7e 100644 --- a/src/api/basicData/Equipment/equipmentType.js +++ b/src/api/basicData/Equipment/equipmentType.js @@ -9,7 +9,8 @@ import request from '@/utils/request' export function equipmentTypeList(data) { // 获取设备类型列表 return request({ - url: '/basic/equipment-type/page', + // url: '/basic/equipment-type/page', + url: '/api/wms/equipment/page', method: 'post', data }) diff --git a/vue.config.js b/vue.config.js index 0dedbbf..4663d2a 100644 --- a/vue.config.js +++ b/vue.config.js @@ -46,8 +46,8 @@ module.exports = { // 这里写入需要代理的api和对应的目标地址 proxy: { '/api': { - // target: 'http://localhost:8080', - target: 'http://192.168.0.148:8080', + target: 'http://localhost:8080', + // target: 'http://192.168.0.148:8080', // target: 'http://192.168.0.127:8080', // target: 'http://192.168.0.165:8080', // target: 'http://192.168.43.105:8080',