no message
							parent
							
								
									2e0ce2853d
								
							
						
					
					
						commit
						60bf29b32a
					
				| 
						 | 
					@ -1,8 +1,8 @@
 | 
				
			||||||
ENV = 'development'
 | 
					ENV = 'development'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# 接口地址
 | 
					# 接口地址
 | 
				
			||||||
VUE_APP_BASE_API  = 'http://localhost:8010'
 | 
					VUE_APP_BASE_API  = 'http://localhost:8000'
 | 
				
			||||||
VUE_APP_WS_API = 'ws://localhost:8010'
 | 
					VUE_APP_WS_API = 'ws://localhost:8000'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#VUE_APP_BASE_API  = 'http://115.159.67.99:8000'
 | 
					#VUE_APP_BASE_API  = 'http://115.159.67.99:8000'
 | 
				
			||||||
#VUE_APP_WS_API = 'ws://115.159.67.99:8000'
 | 
					#VUE_APP_WS_API = 'ws://115.159.67.99:8000'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -47,5 +47,11 @@ export function agvTaskCallback(data) {
 | 
				
			||||||
    data
 | 
					    data
 | 
				
			||||||
  })
 | 
					  })
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					export function sendReAgvTask(ids) {
 | 
				
			||||||
export default { add, edit, del,missionStateCallback,agvTaskCallback,queryAgvTaskInfo }
 | 
					  return request({
 | 
				
			||||||
 | 
					    url: 'api/agvTask/sendReAgvTask',
 | 
				
			||||||
 | 
					    method: 'post',
 | 
				
			||||||
 | 
					    data: ids
 | 
				
			||||||
 | 
					  })
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					export default { add, edit, del,missionStateCallback,agvTaskCallback,queryAgvTaskInfo,sendReAgvTask }
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -498,6 +498,18 @@ function CRUD(options) {
 | 
				
			||||||
      return crud.vms.find(vm => vm && vm.type === type).vm
 | 
					      return crud.vms.find(vm => vm && vm.type === type).vm
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    notify(title, type = CRUD.NOTIFICATION_TYPE.INFO) {
 | 
					    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({
 | 
					      crud.vms[0].vm.$notify({
 | 
				
			||||||
        title,
 | 
					        title,
 | 
				
			||||||
        type,
 | 
					        type,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -59,7 +59,18 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      </div>
 | 
					      </div>
 | 
				
			||||||
      <!--如果想在工具栏加入更多按钮,可以使用插槽方式, slot = 'left' or 'right'-->
 | 
					      <!--如果想在工具栏加入更多按钮,可以使用插槽方式, 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-dialog title="顶升" :visible.sync="agvTaskCallbackStatus" width="400px">
 | 
				
			||||||
        <el-form ref="form1" :model="form1" :rules="rules" size="small" label-width="80px">
 | 
					        <el-form ref="form1" :model="form1" :rules="rules" size="small" label-width="80px">
 | 
				
			||||||
| 
						 | 
					@ -297,6 +308,14 @@ export default {
 | 
				
			||||||
    formatter(row, column) {
 | 
					    formatter(row, column) {
 | 
				
			||||||
      return row.endSlotCode;
 | 
					      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) {
 | 
					    toAgvTaskFinish(data) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      this.MissionStateCallback.containerCode = data.stockCode
 | 
					      this.MissionStateCallback.containerCode = data.stockCode
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue