Compare commits

..

No commits in common. "50713ea57e313884fd4715f330e2e23a38399d30" and "2ab8f7ca26e6e157a416adda8e70cb3a4d368ca8" have entirely different histories.

5 changed files with 49 additions and 77 deletions

View File

@ -1,4 +1,4 @@
import request, {requestWcs} from '@/utils/request'
import request from '@/utils/request'
// 查询出库任务列表
export function listTASK(query) {
@ -58,12 +58,3 @@ export function autoRunTASK(wmsOutTaskId) {
method: 'put'
})
}
// 下发任务至 WCS
export function issueWmsOutTaskToWcs(data) {
return requestWcs({
url: '/StackerCraneCK',
method: 'post',
data
})
}

View File

@ -1,4 +1,4 @@
import request, {requestWcs} from '@/utils/request'
import request from '@/utils/request'
// 查询入库任务列表
export function listWmsInTask(query) {
@ -46,16 +46,9 @@ export function delWmsInTask(id) {
// 批量执行入库任务
export function issueBatchWmsInTask(data) {
return request({
url: '/wm/wmsInTask/open/issueBatch/' + data,
method: 'post',
})
}
// 下发任务至 WCS
export function issueWmsInTaskToWcs(data) {
return requestWcs({
url: '/StackerCraneRK',
url: '/wm/wmsInTask/open/issueBatch',
method: 'post',
data
})
}

View File

@ -20,13 +20,6 @@ const service = axios.create({
timeout: 30000
})
const serviceWcs = axios.create({
// axios中请求配置有baseURL选项表示请求URL公共部分
baseURL: "http://192.168.8.60:1880",
// 超时
timeout: 30000
})
// request拦截器
service.interceptors.request.use(config => {
// 是否需要设置 token
@ -120,9 +113,11 @@ service.interceptors.response.use(res => {
let { message } = error;
if (message == "Network Error") {
message = "后端接口连接异常";
} else if (message.includes("timeout")) {
}
else if (message.includes("timeout")) {
message = "系统接口请求超时";
} else if (message.includes("Request failed with status code")) {
}
else if (message.includes("Request failed with status code")) {
message = "系统接口" + message.substr(message.length - 3) + "异常";
}
Message({
@ -136,15 +131,9 @@ service.interceptors.response.use(res => {
// 通用下载方法
export function download(url, params, filename) {
downloadLoadingInstance = Loading.service({
text: "正在下载数据,请稍候",
spinner: "el-icon-loading",
background: "rgba(0, 0, 0, 0.7)",
})
downloadLoadingInstance = Loading.service({ text: "正在下载数据,请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
transformRequest: [(params) => {
return tansParams(params)
}],
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
responseType: 'blob'
}).then(async (data) => {
@ -167,5 +156,3 @@ export function download(url, params, filename) {
}
export default service
export const requestWcs = serviceWcs

View File

@ -190,16 +190,17 @@
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="24">-->
<!-- <div style="display: flex">-->
<!-- <el-form-item label="上级库位" prop="attr1">-->
<!-- <div style="display: flex">-->
<!-- <el-input v-model="form.superiorName" placeholder="请选择上级库位" />-->
<!-- <el-button @click="selecareaVisible=true" icon="el-icon-search"></el-button>-->
<!-- </div>-->
<!-- </el-form-item>-->
<!-- </div>-->
<!-- </el-col>-->
<el-col :span="24">
<div style="display: flex">
<el-form-item label="上级库位" prop="attr1">
<div style="display: flex">
<el-input v-model="form.superiorName" placeholder="请选择上级库位" />
<el-button @click="selecareaVisible=true" icon="el-icon-search"></el-button>
</div>
</el-form-item>
</div>
</el-col>
</el-row>
</el-col>
</el-row>

View File

@ -35,7 +35,7 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://localhost:8081`,
target: `http://localhost:8080`,
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''