lhq/FT501-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

页面展示修改

Browse Source
This commit is contained in:
liuhanqing
2025-07-30 11:37:24 +08:00
parent a0f975e6fa
commit 405a8771d8
26 changed files with 611 additions and 1377 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
ruoyi-ui/src/api/bas/cachePort.js
View File

@@ -1,44 +0,0 @@
import request from '@/utils/request'
// 查询缓存点管理列表
export function listCachePort(query) {
return request({
url: '/bas/cachePort/list',
method: 'get',
params: query
})
}
// 查询缓存点管理详细
export function getCachePort(id) {
return request({
url: '/bas/cachePort/' + id,
method: 'get'
})
}
// 新增缓存点管理
export function addCachePort(data) {
return request({
url: '/bas/cachePort',
method: 'post',
data: data
})
}
// 修改缓存点管理
export function updateCachePort(data) {
return request({
url: '/bas/cachePort',
method: 'put',
data: data
})
}
// 删除缓存点管理
export function delCachePort(id) {
return request({
url: '/bas/cachePort/' + id,
method: 'delete'
})
}

44
ruoyi-ui/src/api/bas/fluent.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询流利架位置管理列表
export function listFluent(query) {
return request({
url: '/bas/fluent/list',
method: 'get',
params: query
})
}
// 查询流利架位置管理详细
export function getFluent(id) {
return request({
url: '/bas/fluent/' + id,
method: 'get'
})
}
// 新增流利架位置管理
export function addFluent(data) {
return request({
url: '/bas/fluent',
method: 'post',
data: data
})
}
// 修改流利架位置管理
export function updateFluent(data) {
return request({
url: '/bas/fluent',
method: 'put',
data: data
})
}
// 删除流利架位置管理
export function delFluent(id) {
return request({
url: '/bas/fluent/' + id,
method: 'delete'
})
}

44
ruoyi-ui/src/api/device/ssj.js Normal file
View File

@@ -0,0 +1,44 @@
import request from '@/utils/request'
// 查询输送机列表
export function listSsj(query) {
return request({
url: '/device/ssj/list',
method: 'get',
params: query
})
}
// 查询输送机详细
export function getSsj(id) {
return request({
url: '/device/ssj/' + id,
method: 'get'
})
}
// 新增输送机
export function addSsj(data) {
return request({
url: '/device/ssj',
method: 'post',
data: data
})
}
// 修改输送机
export function updateSsj(data) {
return request({
url: '/device/ssj',
method: 'put',
data: data
})
}
// 删除输送机
export function delSsj(id) {
return request({
url: '/device/ssj/' + id,
method: 'delete'
})
}

242
ruoyi-ui/src/views/agv/queue/index.vue
View File

@@ -1,81 +1,16 @@
<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="reqTime">
<el-date-picker clearable
v-model="queryParams.reqTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入请求时间截">
</el-date-picker>
</el-form-item>
<el-form-item label="起点 " prop="positionCode1">
<el-form-item label="任务单号" prop="taskCode">
<el-input
v-model="queryParams.positionCode1"
placeholder="请输入起点 "
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="终点" prop="positionCode2">
<el-input
v-model="queryParams.positionCode2"
placeholder="请输入终点"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="容器编号" prop="ctnrCode">
<el-input
v-model="queryParams.ctnrCode"
placeholder="请输入容器编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="容器数量" prop="ctnrNum">
<el-input
v-model="queryParams.ctnrNum"
placeholder="请输入容器数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务模式" prop="taskMode">
<el-input
v-model="queryParams.taskMode"
placeholder="请输入任务模式"
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="request">
<el-input
v-model="queryParams.request"
placeholder="请输入继续请求"
v-model="queryParams.taskCode"
placeholder="请输入任务单号 "
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="结束时间" prop="finishTime">
<el-date-picker clearable
v-model="queryParams.finishTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请输入结束时间">
</el-date-picker>
</el-form-item>
<el-form-item label="wms托盘码/容器码" prop="wmsTraycode">
<el-form-item label="容器码" prop="wmsTraycode">
<el-input
v-model="queryParams.wmsTraycode"
placeholder="请输入wms托盘码/容器码"
@@ -91,75 +26,62 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="wms任务类型" prop="wmsTaskType">
<el-select v-model="queryParams.wmsTaskType" placeholder="请选择wms任务类型" clearable>
<el-option
v-for="dict in dict.type.wms_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</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="['agv:queue: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="['agv:queue: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="['agv:queue: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="['agv:queue:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="queueList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="请求编号" align="left" prop="reqCode" />
<el-table-column label="请求时间截" align="left" prop="reqTime" />
<el-table-column label="起点 " align="left" prop="positionCode1" />
<el-table-column label="终点" align="left" prop="positionCode2" />
<el-table-column label="任务类型 " align="left" prop="taskType" />
<el-table-column label="容器类型" align="left" prop="ctnrType" />
<el-table-column label="容器编号" align="left" prop="ctnrCode" />
<el-table-column label="容器数量" align="left" prop="ctnrNum" />
<el-table-column label="任务模式" align="left" prop="taskMode" />
<el-table-column label="优先级" align="left" prop="priority" />
<el-table-column label="设备类型" align="left" prop="agvType" />
<el-table-column label="继续请求" align="left" prop="request" />
<el-table-column label="结束时间" align="left" prop="finishTime" />
<el-table-column label="wms托盘码/容器码" align="left" prop="wmsTraycode" />
<el-table-column label="wms任务号" align="left" prop="wmsTaskNo" />
<el-table-column label="请求编号" align="center" prop="reqCode" />
<el-table-column label="请求时间" align="center" prop="reqTime" />
<el-table-column label="起点 " align="center" prop="positionCode1" />
<el-table-column label="终点" align="center" prop="positionCode2" />
<el-table-column label="任务类型 " align="center" prop="taskType" />
<el-table-column label="容器类型" align="center" prop="ctnrType" />
<el-table-column label="容器编号" align="center" prop="ctnrCode" />
<el-table-column label="容器数量" align="center" prop="ctnrNum" />
<el-table-column label="任务模式" align="center" prop="taskMode" />
<el-table-column label="优先级" align="center" prop="priority" />
<el-table-column label="设备类型" align="center" prop="agvType" />
<el-table-column label="继续请求" align="center" prop="request" />
<el-table-column label="结束时间 " align="center" prop="finishTime" />
<el-table-column label="wms托盘码/容器码" align="center" prop="wmsTraycode" />
<el-table-column label="wms任务号" align="center" prop="wmsTaskNo" />
<el-table-column label="任务单号" align="center" prop="taskCode" />
<el-table-column label="任务状态" align="center" prop="status" >
<template slot-scope="scope">
<dict-tag :options="dict.type.task_status" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="wms任务类型" align="center" prop="wmsTaskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_task_type" :value="scope.row.wmsTaskType"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -191,8 +113,8 @@
<!-- 添加或修改AGV任务队列对话框 -->
<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="请求时间截 yyyy-MM-dd HH:mm:ss" prop="reqTime">
<el-input v-model="form.reqTime" placeholder="请输入请求时间截" />
<el-form-item label="请求时间" prop="reqTime">
<el-input v-model="form.reqTime" placeholder="请输入请求时间" />
</el-form-item>
<el-form-item label="起点 " prop="positionCode1">
<el-input v-model="form.positionCode1" placeholder="请输入起点 " />
@@ -215,8 +137,8 @@
<el-form-item label="继续请求" prop="request">
<el-input v-model="form.request" placeholder="请输入继续请求" />
</el-form-item>
<el-form-item label="结束时间 yyyy-MM-dd HH:mm:ss" prop="finishTime">
<el-input v-model="form.finishTime" placeholder="请输入结束时间" />
<el-form-item label="结束时间 " prop="finishTime">
<el-input v-model="form.finishTime" placeholder="请输入结束时间 " />
</el-form-item>
<el-form-item label="wms托盘码/容器码" prop="wmsTraycode">
<el-input v-model="form.wmsTraycode" placeholder="请输入wms托盘码/容器码" />
@@ -224,6 +146,19 @@
<el-form-item label="wms任务号" prop="wmsTaskNo">
<el-input v-model="form.wmsTaskNo" placeholder="请输入wms任务号" />
</el-form-item>
<el-form-item label="任务单号" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请输入任务单号" />
</el-form-item>
<el-form-item label="wms任务类型" prop="wmsTaskType">
<el-select v-model="form.wmsTaskType" placeholder="请选择wms任务类型">
<el-option
v-for="dict in dict.type.wms_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
></el-option>
</el-select>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -235,9 +170,11 @@
<script>
import { listQueue, getQueue, delQueue, addQueue, updateQueue } from "@/api/agv/queue"
import { listQueueFinish } from "@/api/agv/queueFinish"
export default {
name: "Queue",
dicts: ['wms_task_type','task_status'],
data() {
return {
// 遮罩层
@@ -275,7 +212,10 @@ export default {
request: null,
finishTime: null,
wmsTraycode: null,
wmsTaskNo: null
wmsTaskNo: null,
taskCode: null,
status: null,
wmsTaskType: null
},
// 表单参数
form: {},
@@ -291,11 +231,20 @@ export default {
/** 查询AGV任务队列列表 */
getList() {
this.loading = true
listQueue(this.queryParams).then(response => {
this.queueList = response.rows
this.total = response.total
this.loading = false
})
if (this.queryParams.status !=='4'){
listQueue(this.queryParams).then(response => {
this.queueList = response.rows
this.total = response.total
this.loading = false
})
}else {
listQueueFinish(this.queryParams).then(response => {
this.queueList = response.rows
this.total = response.total
this.loading = false
})
}
},
// 取消按钮
cancel() {
@@ -319,7 +268,10 @@ export default {
request: null,
finishTime: null,
wmsTraycode: null,
wmsTaskNo: null
wmsTaskNo: null,
taskCode: null,
status: null,
wmsTaskType: null
}
this.resetForm("form")
},
@@ -394,13 +346,3 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

8
ruoyi-ui/src/views/bas/port/index.vue
View File

@@ -27,7 +27,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位区域" prop="portRegion">
<!-- <el-form-item label="点位区域" prop="portRegion">
<el-input
v-model="queryParams.portRegion"
placeholder="请输入点位区域"
@@ -58,7 +58,7 @@
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
</el-form-item>-->
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="请选择状态" clearable>
<el-option
@@ -131,10 +131,10 @@
<dict-tag :options="dict.type.port_type" :value="scope.row.portType"/>
</template>
</el-table-column>
<el-table-column label="点位区域" align="left" prop="portRegion" />
<!-- <el-table-column label="点位区域" align="left" prop="portRegion" />
<el-table-column label="备用字段" align="left" prop="spare1" />
<el-table-column label="备用字段" align="left" prop="spare2" />
<el-table-column label="备用字段" align="left" prop="spare3" />
<el-table-column label="备用字段" align="left" prop="spare3" />-->
<el-table-column label="状态" align="left" prop="status">
<template slot-scope="scope">
<dict-tag :options="dict.type.cache_port_status" :value="scope.row.status"/>

156
ruoyi-ui/src/views/device/DeviceCar/index.vue
View File

@@ -1,86 +1,22 @@
<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="deviceCode ">
<el-form-item label="设备编码" prop="deviceCode">
<el-input
v-model="queryParams.deviceCode "
placeholder="请输入设备唯一编码"
v-model="queryParams.deviceCode"
placeholder="请输入设备编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备名称" prop="name ">
<el-form-item label="设备名称" prop="name">
<el-input
v-model="queryParams.name "
v-model="queryParams.name"
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备IP" prop="ipAddress">
<el-input
v-model="queryParams.ipAddress"
placeholder="请输入设备IP"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="类型" prop="ipAddress">
<el-input
v-model="queryParams.type"
placeholder="请输入设备类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="关联缓冲区" prop="bufferAreaId ">
<el-input
v-model="queryParams.bufferAreaId "
placeholder="请输入关联缓冲区"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="0-F 1-T" prop="isActive">
<el-input
v-model="queryParams.isActive"
placeholder="请输入0-F 1-T"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare1">
<el-input
v-model="queryParams.spare1"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare3">
<el-input
v-model="queryParams.spare3"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare4">
<el-input
v-model="queryParams.spare4"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
@@ -151,20 +87,16 @@
<el-table v-loading="loading" :data="DeviceCarList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="left" prop="id" />
<el-table-column label="设备唯一编码" align="left" prop="deviceCode" />
<el-table-column label="设备名称" align="left" prop="name" />
<el-table-column label="类型" align="left" prop="type" />
<el-table-column label="设备IP" align="left" prop="ipAddress" />
<el-table-column label="关联缓冲区" align="left" prop="bufferAreaId" />
<el-table-column label="0-F 1-T" align="left" prop="isActive" />
<el-table-column label="状态" align="left" prop="status" />
<el-table-column label="备用字段" align="left" prop="spare1" />
<el-table-column label="备用字段" align="left" prop="spare2" />
<el-table-column label="备用字段" align="left" prop="spare3" />
<el-table-column label="备用字段" align="left" prop="spare4" />
<el-table-column label="任务号" align="left" prop="taskNo" />
<el-table-column label="执行阶段" align="left" prop="zxjd" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="设备编码" align="center" prop="deviceCode" />
<el-table-column label="设备名称" align="center" prop="name" />
<el-table-column label="类型" align="center" prop="type" />
<el-table-column label="设备IP" align="center" prop="ipAddress" />
<el-table-column label="关联缓冲区" align="center" prop="bufferAreaId" />
<el-table-column label="是否可用" align="center" prop="isActive" />
<el-table-column label="状态" align="center" prop="status" />
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="执行阶段" align="center" prop="zxjd" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -196,35 +128,32 @@
<!-- 添加或修改设备信息对话框 -->
<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="deviceCode ">
<el-input v-model="form.deviceCode " placeholder="请输入设备唯一编码" />
<el-form-item label="设备编码" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备编码" />
</el-form-item>
<el-form-item label="设备名称" prop="name ">
<el-input v-model="form.name " placeholder="请输入设备名称" />
<el-form-item label="设备名称" prop="name">
<el-input v-model="form.name" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备IP" prop="ipAddress">
<el-input v-model="form.ipAddress" placeholder="请输入设备IP" />
</el-form-item>
<el-form-item label="设备类型" prop="type">
<el-input v-model="form.type" placeholder="请输入设备类型" />
<el-form-item label="关联缓冲区" prop="bufferAreaId">
<el-input v-model="form.bufferAreaId" placeholder="请输入关联缓冲区" />
</el-form-item>
<el-form-item label="关联缓冲区" prop="bufferAreaId ">
<el-input v-model="form.bufferAreaId " placeholder="请输入关联缓冲区" />
<el-form-item label="是否可用" prop="isActive">
<el-input v-model="form.isActive" placeholder="请输入是否可用" />
</el-form-item>
<el-form-item label="0-F 1-T" prop="isActive">
<el-input v-model="form.isActive" placeholder="请输入0-F 1-T" />
<el-form-item label="备用字段1" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用字段1" />
</el-form-item>
<el-form-item label="备用字段" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用字段" />
<el-form-item label="备用字段2" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用字段2" />
</el-form-item>
<el-form-item label="备用字段" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用字段" />
<el-form-item label="备用字段3" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用字段3" />
</el-form-item>
<el-form-item label="备用字段" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用字段" />
</el-form-item>
<el-form-item label="备用字段" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入备用字段" />
<el-form-item label="备用字段4" prop="spare4">
<el-input v-model="form.spare4" placeholder="请输入备用字段4" />
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
@@ -270,11 +199,11 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
deviceCode : null,
name : null,
deviceCode: null,
name: null,
type: null,
ipAddress: null,
bufferAreaId : null,
bufferAreaId: null,
isActive: null,
status: null,
spare1: null,
@@ -299,7 +228,6 @@ export default {
getList() {
this.loading = true
listDeviceCar(this.queryParams).then(response => {
console.log(response)
this.DeviceCarList = response.rows
this.total = response.total
this.loading = false
@@ -314,11 +242,11 @@ export default {
reset() {
this.form = {
id: null,
deviceCode : null,
name : null,
deviceCode: null,
name: null,
type: null,
ipAddress: null,
bufferAreaId : null,
bufferAreaId: null,
isActive: null,
createTime: null,
status: null,
@@ -402,13 +330,3 @@ export default {
}
}
</script>
<style scoped>
.el-table >>> .current-row {
background-color: #f0f9eb;
}
.el-form-item >>> .el-form-item__label {
white-space: nowrap;
width: auto;
min-width: fit-content;
}
</style>

192
ruoyi-ui/src/views/bas/cachePort/index.vue → ruoyi-ui/src/views/device/ssj/index.vue
View File

@@ -1,50 +1,26 @@
<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="portCode">
<el-form-item label="设备编码" prop="deviceCode ">
<el-input
v-model="queryParams.portCode"
placeholder="请输入点位编码"
v-model="queryParams.deviceCode "
placeholder="请输入设备唯一编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="点位名称" prop="portName">
<el-form-item label="设备名称" prop="name ">
<el-input
v-model="queryParams.portName"
placeholder="请输入点位名称"
v-model="queryParams.name "
placeholder="请输入设备名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="点位区域" prop="portRegion">
<el-form-item label="任务号" prop="taskNo">
<el-input
v-model="queryParams.portRegion"
placeholder="请输入点位区域"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare1">
<el-input
v-model="queryParams.spare1"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare2">
<el-input
v-model="queryParams.spare2"
placeholder="请输入备用字段"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="备用字段" prop="spare3">
<el-input
v-model="queryParams.spare3"
placeholder="请输入备用字段"
v-model="queryParams.taskNo"
placeholder="请输入任务号"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -63,7 +39,7 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['bas:cachePort:add']"
v-hasPermi="['device:ssj:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
@@ -74,7 +50,7 @@
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['bas:cachePort:edit']"
v-hasPermi="['device:ssj:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
@@ -85,7 +61,7 @@
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['bas:cachePort:remove']"
v-hasPermi="['device:ssj:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
@@ -95,23 +71,27 @@
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['bas:cachePort:export']"
v-hasPermi="['device:ssj:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="cachePortList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="ssjList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键" align="left" prop="id" />
<el-table-column label="点位编码" align="left" prop="portCode" />
<el-table-column label="点位名称" align="left" prop="portName" />
<el-table-column label="点位类型" align="left" prop="portType" />
<el-table-column label="点位区域" align="left" prop="portRegion" />
<el-table-column label="备用字段" align="left" prop="spare1" />
<el-table-column label="备用字段" align="left" prop="spare2" />
<el-table-column label="备用字段" align="left" prop="spare3" />
<el-table-column label="点位状态" align="left" prop="status" />
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="设备编码" align="center" prop="deviceCode" />
<el-table-column label="设备名称" align="center" prop="name" />
<el-table-column label="类型" align="center" prop="type" />
<el-table-column label="设备IP" align="center" prop="ipAddress" />
<el-table-column label="PLC读取地址" align="center" prop="plcDbReadAddress" />
<el-table-column label="是否可用" align="center" prop="isActive" />
<el-table-column label="PLC写入地址" align="center" prop="plcDbWriteAddress" />
<el-table-column label="入库请求" align="center" prop="rkqq" />
<el-table-column label="空闲" align="center" prop="kx" />
<el-table-column label="到位" align="center" prop="dw" />
<el-table-column label="条码" align="center" prop="trayCode" />
<el-table-column label="任务号" align="center" prop="taskNo" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
@@ -119,14 +99,14 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['bas:cachePort:edit']"
v-hasPermi="['device:ssj:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['bas:cachePort:remove']"
v-hasPermi="['device:ssj:remove']"
>删除</el-button>
</template>
</el-table-column>
@@ -140,26 +120,41 @@
@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="portCode">
<el-input v-model="form.portCode" placeholder="请输入点位编码" />
<el-form-item label="设备唯一编码" prop="deviceCode ">
<el-input v-model="form.deviceCode " placeholder="请输入设备唯一编码" />
</el-form-item>
<el-form-item label="点位名称" prop="portName">
<el-input v-model="form.portName" placeholder="请输入点位名称" />
<el-form-item label="设备名称" prop="name ">
<el-input v-model="form.name " placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="点位区域" prop="portRegion">
<el-input v-model="form.portRegion" placeholder="请输入点位区域" />
<el-form-item label="设备IP" prop="ipAddress">
<el-input v-model="form.ipAddress" placeholder="请输入设备IP" />
</el-form-item>
<el-form-item label="备用字段" prop="spare1">
<el-input v-model="form.spare1" placeholder="请输入备用字段" />
<el-form-item label="PLC读取地址" prop="plcDbReadAddress">
<el-input v-model="form.plcDbReadAddress" placeholder="请输入PLC读取地址" />
</el-form-item>
<el-form-item label="备用字段" prop="spare2">
<el-input v-model="form.spare2" placeholder="请输入备用字段" />
<el-form-item label="0-F 1-T" prop="isActive">
<el-input v-model="form.isActive" placeholder="请输入0-F 1-T" />
</el-form-item>
<el-form-item label="备用字段" prop="spare3">
<el-input v-model="form.spare3" placeholder="请输入备用字段" />
<el-form-item label="PLC写入地址" prop="plcDbWriteAddress">
<el-input v-model="form.plcDbWriteAddress" placeholder="请输入PLC写入地址" />
</el-form-item>
<el-form-item label="入库请求" prop="rkqq">
<el-input v-model="form.rkqq" placeholder="请输入入库请求" />
</el-form-item>
<el-form-item label="空闲" prop="kx">
<el-input v-model="form.kx" placeholder="请输入空闲" />
</el-form-item>
<el-form-item label="到位" prop="dw">
<el-input v-model="form.dw" placeholder="请输入到位" />
</el-form-item>
<el-form-item label="条码" prop="trayCode">
<el-input v-model="form.trayCode" placeholder="请输入条码" />
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -171,10 +166,10 @@
</template>
<script>
import { listCachePort, getCachePort, delCachePort, addCachePort, updateCachePort } from "@/api/bas/cachePort"
import { listSsj, getSsj, delSsj, addSsj, updateSsj } from "@/api/device/ssj"
export default {
name: "CachePort",
name: "Ssj",
data() {
return {
// 遮罩层
@@ -189,8 +184,8 @@ export default {
showSearch: true,
// 总条数
total: 0,
// 缓存点管理表格数据
cachePortList: [],
// 输送机表格数据
ssjList: [],
// 弹出层标题
title: "",
// 是否显示弹出层
@@ -199,14 +194,18 @@ export default {
queryParams: {
pageNum: 1,
pageSize: 10,
portCode: null,
portName: null,
portType: null,
portRegion: null,
spare1: null,
spare2: null,
spare3: null,
status: null
deviceCode : null,
name : null,
type: null,
ipAddress: null,
plcDbReadAddress: null,
isActive: null,
plcDbWriteAddress: null,
rkqq: null,
kx: null,
dw: null,
trayCode: null,
taskNo: null
},
// 表单参数
form: {},
@@ -219,11 +218,11 @@ export default {
this.getList()
},
methods: {
/** 查询缓存点管理列表 */
/** 查询输送机列表 */
getList() {
this.loading = true
listCachePort(this.queryParams).then(response => {
this.cachePortList = response.rows
listSsj(this.queryParams).then(response => {
this.ssjList = response.rows
this.total = response.total
this.loading = false
})
@@ -237,14 +236,19 @@ export default {
reset() {
this.form = {
id: null,
portCode: null,
portName: null,
portType: null,
portRegion: null,
spare1: null,
spare2: null,
spare3: null,
status: null
deviceCode : null,
name : null,
type: null,
ipAddress: null,
plcDbReadAddress: null,
isActive: null,
createTime: null,
plcDbWriteAddress: null,
rkqq: null,
kx: null,
dw: null,
trayCode: null,
taskNo: null
}
this.resetForm("form")
},
@@ -268,16 +272,16 @@ export default {
handleAdd() {
this.reset()
this.open = true
this.title = "添加缓存点管理"
this.title = "添加输送机"
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset()
const id = row.id || this.ids
getCachePort(id).then(response => {
getSsj(id).then(response => {
this.form = response.data
this.open = true
this.title = "修改缓存点管理"
this.title = "修改输送机"
})
},
/** 提交按钮 */
@@ -285,13 +289,13 @@ export default {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.id != null) {
updateCachePort(this.form).then(response => {
updateSsj(this.form).then(response => {
this.$modal.msgSuccess("修改成功")
this.open = false
this.getList()
})
} else {
addCachePort(this.form).then(response => {
addSsj(this.form).then(response => {
this.$modal.msgSuccess("新增成功")
this.open = false
this.getList()
@@ -303,8 +307,8 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const ids = row.id || this.ids
this.$modal.confirm('是否确认删除缓存点管理编号为"' + ids + '"的数据项？').then(function() {
return delCachePort(ids)
this.$modal.confirm('是否确认删除输送机编号为"' + ids + '"的数据项？').then(function() {
return delSsj(ids)
}).then(() => {
this.getList()
this.$modal.msgSuccess("删除成功")
@@ -312,9 +316,9 @@ export default {
},
/** 导出按钮操作 */
handleExport() {
this.download('bas/cachePort/export', {
this.download('device/ssj/export', {
...this.queryParams
}, `cachePort_${new Date().getTime()}.xlsx`)
}, `ssj_${new Date().getTime()}.xlsx`)
}
}
}