no message

main
暴炳林 2024-05-28 09:21:51 +08:00
parent 2e0ce2853d
commit 60bf29b32a
4 changed files with 42 additions and 5 deletions

View File

@ -1,8 +1,8 @@
ENV = 'development'
# 接口地址
VUE_APP_BASE_API = 'http://localhost:8010'
VUE_APP_WS_API = 'ws://localhost:8010'
VUE_APP_BASE_API = 'http://localhost:8000'
VUE_APP_WS_API = 'ws://localhost:8000'
#VUE_APP_BASE_API = 'http://115.159.67.99:8000'
#VUE_APP_WS_API = 'ws://115.159.67.99:8000'

View File

@ -47,5 +47,11 @@ export function agvTaskCallback(data) {
data
})
}
export default { add, edit, del,missionStateCallback,agvTaskCallback,queryAgvTaskInfo }
export function sendReAgvTask(ids) {
return request({
url: 'api/agvTask/sendReAgvTask',
method: 'post',
data: ids
})
}
export default { add, edit, del,missionStateCallback,agvTaskCallback,queryAgvTaskInfo,sendReAgvTask }

View File

@ -498,6 +498,18 @@ function CRUD(options) {
return crud.vms.find(vm => vm && vm.type === type).vm
},
notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) {
if (type === 200) {
type = CRUD.NOTIFICATION_TYPE.SUCCESS
}
if (type === 201) {
type = CRUD.NOTIFICATION_TYPE.WARNING
}
if (type === 500) {
type = CRUD.NOTIFICATION_TYPE.ERROR
}
if (type === 400) {
type = CRUD.NOTIFICATION_TYPE.INFO
}
crud.vms[0].vm.$notify({
title,
type,

View File

@ -59,7 +59,18 @@
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission" :tableKey="this.$options.name"/>
<crudOperation :permission="permission" :tableKey="this.$options.name">
<template slot="left">
<el-button
class="filter-item"
size="mini"
type="success"
icon="el-icon-check"
@click="sendReAgvTask(crud.selections)">
发送
</el-button>
</template>
</crudOperation>
<!-- 顶升 -->
<el-dialog title="顶升" :visible.sync="agvTaskCallbackStatus" width="400px">
<el-form ref="form1" :model="form1" :rules="rules" size="small" label-width="80px">
@ -297,6 +308,14 @@ export default {
formatter(row, column) {
return row.endSlotCode;
},
sendReAgvTask(datas) {
const ids = datas.map(v => v.id);
crudAgvTask.sendReAgvTask(ids).then(res => {
this.crud.notify(res.message, CRUD.NOTIFICATION_TYPE.SUCCESS)
this.crud.toQuery()
})
},
toAgvTaskFinish(data) {
this.MissionStateCallback.containerCode = data.stockCode