堆垛机监控界面 任务接收界面 堆垛机队列界面
This commit is contained in:
liuhanqing
@@ -162,4 +162,8 @@ public interface IApiService
|
||||
public AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param);
|
||||
|
||||
public AjaxResult requestEnterByEnterIdAndTrayCode();
|
||||
|
||||
AjaxResult receiveOutMydoJob(ReceiveJob receiveOutJob);
|
||||
|
||||
AjaxResult receiveInMydoJob(ReceiveJob receiveInJob);
|
||||
}
|
||||
|
||||
@@ -429,6 +429,16 @@ public class ApiServiceImpl implements IApiService {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult receiveOutMydoJob(ReceiveJob receiveOutJob) {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public AjaxResult receiveInMydoJob(ReceiveJob receiveInJob) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public AjaxResult selectMydoJobByNoTrayCode(Map<String, Object> param) {
|
||||
|
||||
44
ruoyi-ui/src/api/device/ddj.js
Normal file
44
ruoyi-ui/src/api/device/ddj.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询堆垛机监控列表
|
||||
export function listDdj(query) {
|
||||
return request({
|
||||
url: '/device/ddj/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询堆垛机监控详细
|
||||
export function getDdj(id) {
|
||||
return request({
|
||||
url: '/device/ddj/' + id,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增堆垛机监控
|
||||
export function addDdj(data) {
|
||||
return request({
|
||||
url: '/device/ddj',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改堆垛机监控
|
||||
export function updateDdj(data) {
|
||||
return request({
|
||||
url: '/device/ddj',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除堆垛机监控
|
||||
export function delDdj(id) {
|
||||
return request({
|
||||
url: '/device/ddj/' + id,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
44
ruoyi-ui/src/api/job/mydoJob.js
Normal file
44
ruoyi-ui/src/api/job/mydoJob.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询作业信息列表
|
||||
export function listMydoJob(query) {
|
||||
return request({
|
||||
url: '/job/mydoJob/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询作业信息详细
|
||||
export function getMydoJob(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJob/' + jobId,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增作业信息
|
||||
export function addMydoJob(data) {
|
||||
return request({
|
||||
url: '/job/mydoJob',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改作业信息
|
||||
export function updateMydoJob(data) {
|
||||
return request({
|
||||
url: '/job/mydoJob',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除作业信息
|
||||
export function delMydoJob(jobId) {
|
||||
return request({
|
||||
url: '/job/mydoJob/' + jobId,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
44
ruoyi-ui/src/api/queue/ddj.js
Normal file
44
ruoyi-ui/src/api/queue/ddj.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询堆垛机执行队列列表
|
||||
export function listDdj(query) {
|
||||
return request({
|
||||
url: '/queue/ddj/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询堆垛机执行队列详细
|
||||
export function getDdj(uuid) {
|
||||
return request({
|
||||
url: '/queue/ddj/' + uuid,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增堆垛机执行队列
|
||||
export function addDdj(data) {
|
||||
return request({
|
||||
url: '/queue/ddj',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改堆垛机执行队列
|
||||
export function updateDdj(data) {
|
||||
return request({
|
||||
url: '/queue/ddj',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除堆垛机执行队列
|
||||
export function delDdj(uuid) {
|
||||
return request({
|
||||
url: '/queue/ddj/' + uuid,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@@ -169,7 +169,7 @@ export default {
|
||||
deleteConfirm: '是否确认删除{content}的数据项？'
|
||||
},
|
||||
login: {
|
||||
title: '福莱瑞达WMS系统',
|
||||
title: '福莱瑞达WCS系统',
|
||||
logIn: '登录',
|
||||
username: '账号',
|
||||
password: '密码',
|
||||
|
||||
483
ruoyi-ui/src/views/device/ddj/index.vue
Normal file
483
ruoyi-ui/src/views/device/ddj/index.vue
Normal file
@@ -0,0 +1,483 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">-->
|
||||
<!--<!– <el-form-item label="堆垛机名称" prop="name">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.name"-->
|
||||
<!-- placeholder="请输入堆垛机名称"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>–>-->
|
||||
<!-- <el-form-item label="任务号" prop="rwh">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.rwh"-->
|
||||
<!-- placeholder="请输入任务号"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="阶段标志" prop="jdbz">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.jdbz"-->
|
||||
<!-- placeholder="请输入阶段标志"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="状态" prop="sbzt">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.sbzt"-->
|
||||
<!-- placeholder="请输入状态"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="操作方式" prop="czfs">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.czfs"-->
|
||||
<!-- placeholder="请输入操作方式"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!--<!– <el-form-item label="允许下发" prop="yxxf">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.yxxf"-->
|
||||
<!-- placeholder="请输入允许下发"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>–>-->
|
||||
<!--<!– <el-form-item label="原排" prop="yph">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.yph"-->
|
||||
<!-- placeholder="请输入原排"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="原列" prop="ylh">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.ylh"-->
|
||||
<!-- placeholder="请输入原列"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="原层" prop="ych">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.ych"-->
|
||||
<!-- placeholder="请输入原层"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标排" prop="mbph">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.mbph"-->
|
||||
<!-- placeholder="请输入目标排"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标列" prop="mblh">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.mblh"-->
|
||||
<!-- placeholder="请输入目标列"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标层" prop="mbch">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.mbch"-->
|
||||
<!-- placeholder="请输入目标层"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="心跳信号" prop="xtxh">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.xtxh"-->
|
||||
<!-- placeholder="请输入心跳信号"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="当前巷道" prop="dqxd">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.dqxd"-->
|
||||
<!-- placeholder="请输入当前巷道"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>–>-->
|
||||
<!-- <el-form-item label="货叉状态" prop="hczt">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.hczt"-->
|
||||
<!-- placeholder="请输入货叉状态"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!--<!– <el-form-item label="备用字段1" prop="spare1">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.spare1"-->
|
||||
<!-- placeholder="请输入备用字段1"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段2" prop="spare2">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.spare2"-->
|
||||
<!-- placeholder="请输入备用字段2"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="备用字段3" prop="spare3">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.spare3"-->
|
||||
<!-- placeholder="请输入备用字段3"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>–>-->
|
||||
<!-- <el-form-item>-->
|
||||
<!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>-->
|
||||
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- </el-form>-->
|
||||
|
||||
<!-- <el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['device:ddj:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['device:ddj:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['device:ddj:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['device:ddj:export']"
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>-->
|
||||
|
||||
<el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="id" align="center" prop="id" />
|
||||
<el-table-column label="堆垛机名称" align="center" prop="name" />
|
||||
<el-table-column label="任务号" align="center" prop="rwh" />
|
||||
<el-table-column label="阶段标志" align="center" prop="jdbz" />
|
||||
<el-table-column label="状态" align="center" prop="sbzt" />
|
||||
<el-table-column label="操作方式" align="center" prop="czfs" />
|
||||
<el-table-column label="允许下发" align="center" prop="yxxf" />
|
||||
<el-table-column label="原排" align="center" prop="yph" />
|
||||
<el-table-column label="原列" align="center" prop="ylh" />
|
||||
<el-table-column label="原层" align="center" prop="ych" />
|
||||
<el-table-column label="目标排" align="center" prop="mbph" />
|
||||
<el-table-column label="目标列" align="center" prop="mblh" />
|
||||
<el-table-column label="目标层" align="center" prop="mbch" />
|
||||
<el-table-column label="心跳信号" align="center" prop="xtxh" />
|
||||
<el-table-column label="当前巷道" align="center" prop="dqxd" />
|
||||
<el-table-column label="货叉状态" align="center" prop="hczt" />
|
||||
<el-table-column label="备用字段1" align="center" prop="spare1" />
|
||||
<el-table-column label="备用字段2" align="center" prop="spare2" />
|
||||
<el-table-column label="备用字段3" align="center" prop="spare3" />
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['device:ddj:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['device:ddj:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改堆垛机监控对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="堆垛机名称" prop="name">
|
||||
<el-input v-model="form.name" placeholder="请输入堆垛机名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务号" prop="rwh">
|
||||
<el-input v-model="form.rwh" placeholder="请输入任务号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="阶段标志" prop="jdbz">
|
||||
<el-input v-model="form.jdbz" placeholder="请输入阶段标志" />
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="sbzt">
|
||||
<el-input v-model="form.sbzt" placeholder="请输入状态" />
|
||||
</el-form-item>
|
||||
<el-form-item label="操作方式" prop="czfs">
|
||||
<el-input v-model="form.czfs" placeholder="请输入操作方式" />
|
||||
</el-form-item>
|
||||
<el-form-item label="允许下发" prop="yxxf">
|
||||
<el-input v-model="form.yxxf" placeholder="请输入允许下发" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原排" prop="yph">
|
||||
<el-input v-model="form.yph" placeholder="请输入原排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原列" prop="ylh">
|
||||
<el-input v-model="form.ylh" placeholder="请输入原列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原层" prop="ych">
|
||||
<el-input v-model="form.ych" placeholder="请输入原层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标排" prop="mbph">
|
||||
<el-input v-model="form.mbph" placeholder="请输入目标排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标列" prop="mblh">
|
||||
<el-input v-model="form.mblh" placeholder="请输入目标列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标层" prop="mbch">
|
||||
<el-input v-model="form.mbch" placeholder="请输入目标层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="心跳信号" prop="xtxh">
|
||||
<el-input v-model="form.xtxh" placeholder="请输入心跳信号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="当前巷道" prop="dqxd">
|
||||
<el-input v-model="form.dqxd" placeholder="请输入当前巷道" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货叉状态" prop="hczt">
|
||||
<el-input v-model="form.hczt" placeholder="请输入货叉状态" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段1" prop="spare1">
|
||||
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段2" prop="spare2">
|
||||
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
|
||||
</el-form-item>
|
||||
<el-form-item label="备用字段3" prop="spare3">
|
||||
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/device/ddj"
|
||||
|
||||
export default {
|
||||
name: "Ddj",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 堆垛机监控表格数据
|
||||
ddjList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
name: null,
|
||||
rwh: null,
|
||||
jdbz: null,
|
||||
sbzt: null,
|
||||
czfs: null,
|
||||
yxxf: null,
|
||||
yph: null,
|
||||
ylh: null,
|
||||
ych: null,
|
||||
mbph: null,
|
||||
mblh: null,
|
||||
mbch: null,
|
||||
xtxh: null,
|
||||
dqxd: null,
|
||||
hczt: null,
|
||||
spare1: null,
|
||||
spare2: null,
|
||||
spare3: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 查询堆垛机监控列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
listDdj(this.queryParams).then(response => {
|
||||
this.ddjList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
id: null,
|
||||
name: null,
|
||||
rwh: null,
|
||||
jdbz: null,
|
||||
sbzt: null,
|
||||
czfs: null,
|
||||
yxxf: null,
|
||||
yph: null,
|
||||
ylh: null,
|
||||
ych: null,
|
||||
mbph: null,
|
||||
mblh: null,
|
||||
mbch: null,
|
||||
xtxh: null,
|
||||
dqxd: null,
|
||||
hczt: null,
|
||||
spare1: null,
|
||||
spare2: null,
|
||||
spare3: null
|
||||
}
|
||||
this.resetForm("form")
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm")
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.id)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = "添加堆垛机监控"
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const id = row.id || this.ids
|
||||
getDdj(id).then(response => {
|
||||
this.form = response.data
|
||||
this.open = true
|
||||
this.title = "修改堆垛机监控"
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.id != null) {
|
||||
updateDdj(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addDdj(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const ids = row.id || this.ids
|
||||
this.$modal.confirm('是否确认删除堆垛机监控编号为"' + ids + '"的数据项？').then(function() {
|
||||
return delDdj(ids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('device/ddj/export', {
|
||||
...this.queryParams
|
||||
}, `ddj_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -87,10 +87,10 @@
|
||||
<dict-tag :options="dict.type.ssj_type" :value="scope.row.type"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('device.ssj.ipAddress')" align="center" prop="ipAddress" />
|
||||
<!-- <el-table-column :label="$t('device.ssj.ipAddress')" align="center" prop="ipAddress" />
|
||||
<el-table-column :label="$t('device.ssj.plcDbReadAddress')" align="center" prop="plcDbReadAddress" />
|
||||
<el-table-column :label="$t('device.ssj.isActive')" align="center" prop="isActive" />
|
||||
<el-table-column :label="$t('device.ssj.plcDbWriteAddress')" align="center" prop="plcDbWriteAddress" />
|
||||
<el-table-column :label="$t('device.ssj.plcDbWriteAddress')" align="center" prop="plcDbWriteAddress" />-->
|
||||
<el-table-column :label="$t('device.ssj.rkqq')" align="center" prop="rkqq" />
|
||||
<el-table-column :label="$t('device.ssj.kx')" align="center" prop="kx" />
|
||||
<el-table-column :label="$t('device.ssj.dw')" align="center" prop="dw" />
|
||||
@@ -133,7 +133,7 @@
|
||||
<el-form-item :label="$t('device.ssj.name')" prop="name ">
|
||||
<el-input v-model="form.name " :placeholder="$t('device.ssj.placeholder.name')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('device.ssj.ipAddress')" prop="ipAddress">
|
||||
<!-- <el-form-item :label="$t('device.ssj.ipAddress')" prop="ipAddress">
|
||||
<el-input v-model="form.ipAddress" :placeholder="$t('device.ssj.placeholder.ipAddress')" />
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('device.ssj.plcDbReadAddress')" prop="plcDbReadAddress">
|
||||
@@ -144,7 +144,7 @@
|
||||
</el-form-item>
|
||||
<el-form-item :label="$t('device.ssj.plcDbWriteAddress')" prop="plcDbWriteAddress">
|
||||
<el-input v-model="form.plcDbWriteAddress" :placeholder="$t('device.ssj.placeholder.plcDbWriteAddress')" />
|
||||
</el-form-item>
|
||||
</el-form-item>-->
|
||||
<el-form-item :label="$t('device.ssj.rkqq')" prop="rkqq">
|
||||
<el-input v-model="form.rkqq" :placeholder="$t('device.ssj.placeholder.rkqq')" />
|
||||
</el-form-item>
|
||||
|
||||
437
ruoyi-ui/src/views/job/mydoJob/index.vue
Normal file
437
ruoyi-ui/src/views/job/mydoJob/index.vue
Normal file
@@ -0,0 +1,437 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="任务号" prop="taskNo">
|
||||
<el-input
|
||||
v-model="queryParams.taskNo"
|
||||
placeholder="请输入任务号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="巷道ID" prop="roadwayId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.roadwayId"-->
|
||||
<!-- placeholder="请输入巷道ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="货位ID" prop="cargoSpaceId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.cargoSpaceId"-->
|
||||
<!-- placeholder="请输入货位ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="去向" prop="targetRoadwayId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.targetRoadwayId"-->
|
||||
<!-- placeholder="请输入去向"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标货位ID" prop="targetCargoSpaceId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.targetCargoSpaceId"-->
|
||||
<!-- placeholder="请输入目标货位ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="优先级" prop="priority">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.priority"-->
|
||||
<!-- placeholder="请输入优先级"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="执行阶段" prop="executionPhase">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.executionPhase"-->
|
||||
<!-- placeholder="请输入执行阶段"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="任务类型" prop="inOrOut">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.inOrOut"-->
|
||||
<!-- placeholder="请输入任务类型"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="开始时间" prop="startTime">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.startTime"-->
|
||||
<!-- placeholder="请输入开始时间"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="结束时间" prop="finishTime">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.finishTime"-->
|
||||
<!-- placeholder="请输入结束时间"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="入口ID" prop="entranceId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.entranceId"-->
|
||||
<!-- placeholder="请输入入口ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="出口ID" prop="exitId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.exitId"-->
|
||||
<!-- placeholder="请输入出口ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!--<!– <el-form-item label="仓库ID" prop="warehouseId">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.warehouseId"-->
|
||||
<!-- placeholder="请输入仓库ID"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="重分标志" prop="faultFlag">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.faultFlag"-->
|
||||
<!-- placeholder="请输入重分标志"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>–>-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<!-- <el-row :gutter="10" class="mb8">-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-plus"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleAdd"-->
|
||||
<!-- v-hasPermi="['job:mydoJob:add']"-->
|
||||
<!-- >新增</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="success"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-edit"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="single"-->
|
||||
<!-- @click="handleUpdate"-->
|
||||
<!-- v-hasPermi="['job:mydoJob:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="danger"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- :disabled="multiple"-->
|
||||
<!-- @click="handleDelete"-->
|
||||
<!-- v-hasPermi="['job:mydoJob:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="warning"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-download"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleExport"-->
|
||||
<!-- v-hasPermi="['job:mydoJob:export']"-->
|
||||
<!-- >导出</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>-->
|
||||
<!-- </el-row>-->
|
||||
|
||||
<el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="任务ID" align="center" prop="jobId" />
|
||||
<el-table-column label="任务状态" align="center" prop="status" />
|
||||
<el-table-column label="任务号" align="center" prop="taskNo" />
|
||||
<el-table-column label="巷道ID" align="center" prop="roadwayId" />
|
||||
<el-table-column label="货位ID" align="center" prop="cargoSpaceId" />
|
||||
<el-table-column label="去向" align="center" prop="targetRoadwayId" />
|
||||
<!-- <el-table-column label="目标货位ID" align="center" prop="targetCargoSpaceId" />-->
|
||||
<el-table-column label="优先级" align="center" prop="priority" />
|
||||
<el-table-column label="执行阶段" align="center" prop="executionPhase" />
|
||||
<el-table-column label="任务类型" align="center" prop="inOrOut" />
|
||||
<el-table-column label="开始时间" align="center" prop="startTime" />
|
||||
<el-table-column label="结束时间" align="center" prop="finishTime" />
|
||||
<el-table-column label="入口ID" align="center" prop="entranceId" />
|
||||
<el-table-column label="出口ID" align="center" prop="exitId" />
|
||||
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
|
||||
<el-table-column label="重分标志" align="center" prop="faultFlag" />
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['job:mydoJob:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['job:mydoJob:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改作业信息对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="任务号" prop="taskNo">
|
||||
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="巷道ID" prop="roadwayId">
|
||||
<el-input v-model="form.roadwayId" placeholder="请输入巷道ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="货位ID" prop="cargoSpaceId">
|
||||
<el-input v-model="form.cargoSpaceId" placeholder="请输入货位ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="去向" prop="targetRoadwayId">
|
||||
<el-input v-model="form.targetRoadwayId" placeholder="请输入去向" />
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="目标货位ID" prop="targetCargoSpaceId">
|
||||
<el-input v-model="form.targetCargoSpaceId" placeholder="请输入目标货位ID" />
|
||||
</el-form-item>-->
|
||||
<el-form-item label="优先级" prop="priority">
|
||||
<el-input v-model="form.priority" placeholder="请输入优先级" />
|
||||
</el-form-item>
|
||||
<el-form-item label="执行阶段" prop="executionPhase">
|
||||
<el-input v-model="form.executionPhase" placeholder="请输入执行阶段" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型" prop="inOrOut">
|
||||
<el-input v-model="form.inOrOut" placeholder="请输入任务类型" />
|
||||
</el-form-item>
|
||||
<el-form-item label="开始时间" prop="startTime">
|
||||
<el-input v-model="form.startTime" placeholder="请输入开始时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="finishTime">
|
||||
<el-input v-model="form.finishTime" placeholder="请输入结束时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="入口ID" prop="entranceId">
|
||||
<el-input v-model="form.entranceId" placeholder="请输入入口ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="出口ID" prop="exitId">
|
||||
<el-input v-model="form.exitId" placeholder="请输入出口ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="仓库ID" prop="warehouseId">
|
||||
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
|
||||
</el-form-item>
|
||||
<el-form-item label="重分标志" prop="faultFlag">
|
||||
<el-input v-model="form.faultFlag" placeholder="请输入重分标志" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listMydoJob, getMydoJob, delMydoJob, addMydoJob, updateMydoJob } from "@/api/job/mydoJob"
|
||||
|
||||
export default {
|
||||
name: "MydoJob",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 作业信息表格数据
|
||||
mydoJobList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
status: null,
|
||||
taskNo: null,
|
||||
roadwayId: null,
|
||||
cargoSpaceId: null,
|
||||
targetRoadwayId: null,
|
||||
targetCargoSpaceId: null,
|
||||
priority: null,
|
||||
executionPhase: null,
|
||||
inOrOut: null,
|
||||
startTime: null,
|
||||
finishTime: null,
|
||||
entranceId: null,
|
||||
exitId: null,
|
||||
warehouseId: null,
|
||||
faultFlag: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
status: [
|
||||
{ required: true, message: "任务状态不能为空", trigger: "change" }
|
||||
],
|
||||
taskNo: [
|
||||
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 查询作业信息列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
listMydoJob(this.queryParams).then(response => {
|
||||
this.mydoJobList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
jobId: null,
|
||||
status: null,
|
||||
taskNo: null,
|
||||
roadwayId: null,
|
||||
cargoSpaceId: null,
|
||||
targetRoadwayId: null,
|
||||
targetCargoSpaceId: null,
|
||||
priority: null,
|
||||
executionPhase: null,
|
||||
inOrOut: null,
|
||||
createTime: null,
|
||||
startTime: null,
|
||||
finishTime: null,
|
||||
entranceId: null,
|
||||
exitId: null,
|
||||
warehouseId: null,
|
||||
faultFlag: null
|
||||
}
|
||||
this.resetForm("form")
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm")
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.jobId)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = "添加作业信息"
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const jobId = row.jobId || this.ids
|
||||
getMydoJob(jobId).then(response => {
|
||||
this.form = response.data
|
||||
this.open = true
|
||||
this.title = "修改作业信息"
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.jobId != null) {
|
||||
updateMydoJob(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addMydoJob(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const jobIds = row.jobId || this.ids
|
||||
this.$modal.confirm('是否确认删除作业信息编号为"' + jobIds + '"的数据项？').then(function() {
|
||||
return delMydoJob(jobIds)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('job/mydoJob/export', {
|
||||
...this.queryParams
|
||||
}, `mydoJob_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
501
ruoyi-ui/src/views/queue/ddj/index.vue
Normal file
501
ruoyi-ui/src/views/queue/ddj/index.vue
Normal file
@@ -0,0 +1,501 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="任务号" prop="rwh">
|
||||
<el-input
|
||||
v-model="queryParams.rwh"
|
||||
placeholder="请输入任务号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备id" prop="devId">
|
||||
<el-input
|
||||
v-model="queryParams.devId"
|
||||
placeholder="请输入设备id"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="设备名称" prop="devName">
|
||||
<el-input
|
||||
v-model="queryParams.devName"
|
||||
placeholder="请输入设备名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="任务状态" prop="rwzt">
|
||||
<el-input
|
||||
v-model="queryParams.rwzt"
|
||||
placeholder="请输入任务状态"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原排" prop="yph">
|
||||
<el-input
|
||||
v-model="queryParams.yph"
|
||||
placeholder="请输入原排"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原列" prop="ylh">
|
||||
<el-input
|
||||
v-model="queryParams.ylh"
|
||||
placeholder="请输入原列"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原层" prop="ych">
|
||||
<el-input
|
||||
v-model="queryParams.ych"
|
||||
placeholder="请输入原层"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标排" prop="mbph">
|
||||
<el-input
|
||||
v-model="queryParams.mbph"
|
||||
placeholder="请输入目标排"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标列" prop="mblh">
|
||||
<el-input
|
||||
v-model="queryParams.mblh"
|
||||
placeholder="请输入目标列"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标层" prop="mbch">
|
||||
<el-input
|
||||
v-model="queryParams.mbch"
|
||||
placeholder="请输入目标层"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="堆垛机下发" prop="ddjxf">
|
||||
<el-input
|
||||
v-model="queryParams.ddjxf"
|
||||
placeholder="请输入堆垛机下发"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型" prop="rwlx">
|
||||
<el-input
|
||||
v-model="queryParams.rwlx"
|
||||
placeholder="请输入任务类型"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="生成时间" prop="scsj">
|
||||
<el-input
|
||||
v-model="queryParams.scsj"
|
||||
placeholder="请输入生成时间"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="下发时间" prop="xfsj">
|
||||
<el-input
|
||||
v-model="queryParams.xfsj"
|
||||
placeholder="请输入下发时间"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="jssj">
|
||||
<el-input
|
||||
v-model="queryParams.jssj"
|
||||
placeholder="请输入结束时间"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="命令方式" prop="mlfs">
|
||||
<el-input
|
||||
v-model="queryParams.mlfs"
|
||||
placeholder="请输入命令方式"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare1">
|
||||
<el-input
|
||||
v-model="queryParams.spare1"
|
||||
placeholder="请输入${comment}"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare2">
|
||||
<el-input
|
||||
v-model="queryParams.spare2"
|
||||
placeholder="请输入${comment}"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare3">
|
||||
<el-input
|
||||
v-model="queryParams.spare3"
|
||||
placeholder="请输入${comment}"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>-->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<!-- <el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="el-icon-plus"
|
||||
size="mini"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['queue:ddj:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="el-icon-edit"
|
||||
size="mini"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['queue:ddj:edit']"
|
||||
>修改</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="el-icon-delete"
|
||||
size="mini"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['queue:ddj:remove']"
|
||||
>删除</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="el-icon-download"
|
||||
size="mini"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['queue:ddj:export']"
|
||||
>导出</el-button>
|
||||
</el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<el-table-column label="uuid" align="center" prop="uuid" />
|
||||
<el-table-column label="任务号" align="center" prop="rwh" />
|
||||
<el-table-column label="设备名称" align="center" prop="devName" />
|
||||
<el-table-column label="设备id" align="center" prop="devId" />
|
||||
<el-table-column label="任务状态" align="center" prop="rwzt" />
|
||||
<el-table-column label="原排" align="center" prop="yph" />
|
||||
<el-table-column label="原列" align="center" prop="ylh" />
|
||||
<el-table-column label="原层" align="center" prop="ych" />
|
||||
<el-table-column label="目标排" align="center" prop="mbph" />
|
||||
<el-table-column label="目标列" align="center" prop="mblh" />
|
||||
<el-table-column label="目标层" align="center" prop="mbch" />
|
||||
<el-table-column label="堆垛机下发" align="center" prop="ddjxf" />
|
||||
<el-table-column label="任务类型" align="center" prop="rwlx" />
|
||||
<el-table-column label="生成时间" align="center" prop="scsj" />
|
||||
<el-table-column label="下发时间" align="center" prop="xfsj" />
|
||||
<el-table-column label="结束时间" align="center" prop="jssj" />
|
||||
<el-table-column label="命令方式" align="center" prop="mlfs" />
|
||||
<!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['queue:ddj:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['queue:ddj:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
:page.sync="queryParams.pageNum"
|
||||
:limit.sync="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- 添加或修改堆垛机执行队列对话框 -->
|
||||
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
|
||||
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
||||
<el-form-item label="任务号" prop="rwh">
|
||||
<el-input v-model="form.rwh" placeholder="请输入任务号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="devName">
|
||||
<el-input v-model="form.devName" placeholder="请输入设备名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备id" prop="devId">
|
||||
<el-input v-model="form.devId" placeholder="请输入设备id" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务状态" prop="rwzt">
|
||||
<el-input v-model="form.rwzt" placeholder="请输入任务状态" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原排" prop="yph">
|
||||
<el-input v-model="form.yph" placeholder="请输入原排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原列" prop="ylh">
|
||||
<el-input v-model="form.ylh" placeholder="请输入原列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原层" prop="ych">
|
||||
<el-input v-model="form.ych" placeholder="请输入原层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标排" prop="mbph">
|
||||
<el-input v-model="form.mbph" placeholder="请输入目标排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标列" prop="mblh">
|
||||
<el-input v-model="form.mblh" placeholder="请输入目标列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标层" prop="mbch">
|
||||
<el-input v-model="form.mbch" placeholder="请输入目标层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="堆垛机下发" prop="ddjxf">
|
||||
<el-input v-model="form.ddjxf" placeholder="请输入堆垛机下发" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型" prop="rwlx">
|
||||
<el-input v-model="form.rwlx" placeholder="请输入任务类型" />
|
||||
</el-form-item>
|
||||
<el-form-item label="生成时间" prop="scsj">
|
||||
<el-input v-model="form.scsj" placeholder="请输入生成时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下发时间" prop="xfsj">
|
||||
<el-input v-model="form.xfsj" placeholder="请输入下发时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="结束时间" prop="jssj">
|
||||
<el-input v-model="form.jssj" placeholder="请输入结束时间" />
|
||||
</el-form-item>
|
||||
<el-form-item label="命令方式" prop="mlfs">
|
||||
<el-input v-model="form.mlfs" placeholder="请输入命令方式" />
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare1">
|
||||
<el-input v-model="form.spare1" placeholder="请输入${comment}" />
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare2">
|
||||
<el-input v-model="form.spare2" placeholder="请输入${comment}" />
|
||||
</el-form-item>
|
||||
<el-form-item label="${comment}" prop="spare3">
|
||||
<el-input v-model="form.spare3" placeholder="请输入${comment}" />
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/queue/ddj"
|
||||
|
||||
export default {
|
||||
name: "Ddj",
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 堆垛机执行队列表格数据
|
||||
ddjList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
rwh: null,
|
||||
devName: null,
|
||||
devId: null,
|
||||
rwzt: null,
|
||||
yph: null,
|
||||
ylh: null,
|
||||
ych: null,
|
||||
mbph: null,
|
||||
mblh: null,
|
||||
mbch: null,
|
||||
ddjxf: null,
|
||||
rwlx: null,
|
||||
scsj: null,
|
||||
xfsj: null,
|
||||
jssj: null,
|
||||
mlfs: null,
|
||||
spare1: null,
|
||||
spare2: null,
|
||||
spare3: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
rwh: [
|
||||
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
||||
],
|
||||
devName: [
|
||||
{ required: true, message: "设备名称不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 查询堆垛机执行队列列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
listDdj(this.queryParams).then(response => {
|
||||
this.ddjList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
uuid: null,
|
||||
rwh: null,
|
||||
devName: null,
|
||||
devId: null,
|
||||
rwzt: null,
|
||||
yph: null,
|
||||
ylh: null,
|
||||
ych: null,
|
||||
mbph: null,
|
||||
mblh: null,
|
||||
mbch: null,
|
||||
ddjxf: null,
|
||||
rwlx: null,
|
||||
scsj: null,
|
||||
xfsj: null,
|
||||
jssj: null,
|
||||
mlfs: null,
|
||||
spare1: null,
|
||||
spare2: null,
|
||||
spare3: null
|
||||
}
|
||||
this.resetForm("form")
|
||||
},
|
||||
/** 搜索按钮操作 */
|
||||
handleQuery() {
|
||||
this.queryParams.pageNum = 1
|
||||
this.getList()
|
||||
},
|
||||
/** 重置按钮操作 */
|
||||
resetQuery() {
|
||||
this.resetForm("queryForm")
|
||||
this.handleQuery()
|
||||
},
|
||||
// 多选框选中数据
|
||||
handleSelectionChange(selection) {
|
||||
this.ids = selection.map(item => item.uuid)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = "添加堆垛机执行队列"
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const uuid = row.uuid || this.ids
|
||||
getDdj(uuid).then(response => {
|
||||
this.form = response.data
|
||||
this.open = true
|
||||
this.title = "修改堆垛机执行队列"
|
||||
})
|
||||
},
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.uuid != null) {
|
||||
updateDdj(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addDdj(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const uuids = row.uuid || this.ids
|
||||
this.$modal.confirm('是否确认删除堆垛机执行队列编号为"' + uuids + '"的数据项？').then(function() {
|
||||
return delDdj(uuids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('queue/ddj/export', {
|
||||
...this.queryParams
|
||||
}, `ddj_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
Reference in New Issue
Block a user