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

监控页面修改 设备锁页面修改

Browse Source
This commit is contained in:
liuhanqing
2025-11-05 15:48:05 +08:00
parent 1a70460257
commit ee86fbe37f
5 changed files with 600 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
View File

@@ -69,7 +69,8 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
for (MsgDdj msgDdj : ddjCodeList.get(type)) { for (MsgDdj msgDdj : ddjCodeList.get(type)) {
try { try {
if (ObjUtil.isNotNull(msgDdj)) { if (ObjUtil.isNotNull(msgDdj)) {
if (0 == msgDdj.getSpare1()) { MsgDdj currentMsgDdj = msgDdjService.selectMsgDdjById(Convert.toLong(msgDdj.getId()));
if (0 == currentMsgDdj.getSpare1()) {
generateInBoundPickQueue(msgDdj); generateInBoundPickQueue(msgDdj);
generateInBoundLoadQueue(msgDdj); generateInBoundLoadQueue(msgDdj);
generateOutBoundQueue(msgDdj); generateOutBoundQueue(msgDdj);

1
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/monit/MonitoringThread.java
View File

@@ -31,6 +31,7 @@ public class MonitoringThread implements Runnable {
while (isRun){ while (isRun){
for (String ssjCode : PlcSsjRead.deviceSsjMap.keySet()) { for (String ssjCode : PlcSsjRead.deviceSsjMap.keySet()) {
DeviceSsj deviceSsj = PlcSsjRead.deviceSsjMap.get(ssjCode); DeviceSsj deviceSsj = PlcSsjRead.deviceSsjMap.get(ssjCode);
deviceSsj.setTraySize(deviceSsj.getModel());
deviceSsjService.updateDeviceSsj(deviceSsj); deviceSsjService.updateDeviceSsj(deviceSsj);
} }
for (String ddjCode : PlcDdjRead.deviceDdjMap.keySet()) { for (String ddjCode : PlcDdjRead.deviceDdjMap.keySet()) {

451
ruoyi-ui/src/views/device/ddj/index.vue
View File

@@ -1,167 +1,169 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">--> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!--&lt;!&ndash; <el-form-item label="堆垛机名称" prop="name">--> <el-form-item label="堆垛机名" prop="name">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.name"--> v-model="queryParams.name"
<!-- placeholder="请输入堆垛机名称"--> placeholder="请输入堆垛机名称"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>&ndash;&gt;--> </el-form-item>
<!-- <el-form-item label="任务号" prop="rwh">--> <!-- <el-form-item label="任务号" prop="rwh">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.rwh"--> v-model="queryParams.rwh"
<!-- placeholder="请输入任务号"--> placeholder="请输入任务号"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="阶段标志" prop="jdbz">--> <el-form-item label="阶段标志" prop="jdbz">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.jdbz"--> v-model="queryParams.jdbz"
<!-- placeholder="请输入阶段标志"--> placeholder="请输入阶段标志"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="状态" prop="sbzt">--> <el-form-item label="状态" prop="sbzt">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.sbzt"--> v-model="queryParams.sbzt"
<!-- placeholder="请输入状态"--> placeholder="请输入状态"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="操作方式" prop="czfs">--> <el-form-item label="操作方式" prop="czfs">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.czfs"--> v-model="queryParams.czfs"
<!-- placeholder="请输入操作方式"--> placeholder="请输入操作方式"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="允许下发" prop="yxxf">--> <!-- <el-form-item label="允许下发" prop="yxxf">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.yxxf"--> v-model="queryParams.yxxf"
<!-- placeholder="请输入允许下发"--> placeholder="请输入允许下发"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>&ndash;&gt;--> </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="原排" prop="yph">--> <!-- <el-form-item label="原排" prop="yph">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.yph"--> v-model="queryParams.yph"
<!-- placeholder="请输入原排"--> placeholder="请输入原排"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="原列" prop="ylh">--> <el-form-item label="原列" prop="ylh">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.ylh"--> v-model="queryParams.ylh"
<!-- placeholder="请输入原列"--> placeholder="请输入原列"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="原层" prop="ych">--> <el-form-item label="原层" prop="ych">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.ych"--> v-model="queryParams.ych"
<!-- placeholder="请输入原层"--> placeholder="请输入原层"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="目标排" prop="mbph">--> <el-form-item label="目标排" prop="mbph">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.mbph"--> v-model="queryParams.mbph"
<!-- placeholder="请输入目标排"--> placeholder="请输入目标排"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="目标列" prop="mblh">--> <el-form-item label="目标列" prop="mblh">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.mblh"--> v-model="queryParams.mblh"
<!-- placeholder="请输入目标列"--> placeholder="请输入目标列"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="目标层" prop="mbch">--> <el-form-item label="目标层" prop="mbch">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.mbch"--> v-model="queryParams.mbch"
<!-- placeholder="请输入目标层"--> placeholder="请输入目标层"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="心跳信号" prop="xtxh">--> <el-form-item label="心跳信号" prop="xtxh">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.xtxh"--> v-model="queryParams.xtxh"
<!-- placeholder="请输入心跳信号"--> placeholder="请输入心跳信号"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="当前巷道" prop="dqxd">--> <el-form-item label="当前巷道" prop="dqxd">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.dqxd"--> v-model="queryParams.dqxd"
<!-- placeholder="请输入当前巷道"--> placeholder="请输入当前巷道"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>&ndash;&gt;--> </el-form-item>-->
<!-- <el-form-item label="货叉状态" prop="hczt">--> <!-- <el-form-item label="货叉状态" prop="hczt">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.hczt"--> v-model="queryParams.hczt"
<!-- placeholder="请输入货叉状态"--> placeholder="请输入货叉状态"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="备用字段1" prop="spare1">--> <el-form-item label="是否可用" prop="spare1">
<!-- <el-input--> <el-select>
<!-- v-model="queryParams.spare1"--> <el-option
<!-- placeholder="请输入备用字段1"--> v-for="dict in dict.type.device_lock"
<!-- clearable--> :key="dict.value"
<!-- @keyup.enter.native="handleQuery"--> :label="dict.label"
<!-- />--> :value="dict.value"
<!-- </el-form-item>--> />
<!-- <el-form-item label="备用字段2" prop="spare2">--> </el-select>
<!-- <el-input--> </el-form-item>
<!-- v-model="queryParams.spare2"--> <!-- <el-form-item label="备用字段2" prop="spare2">
<!-- placeholder="请输入备用字段2"--> <el-input
<!-- clearable--> v-model="queryParams.spare2"
<!-- @keyup.enter.native="handleQuery"--> placeholder="请输入备用字段2"
<!-- />--> clearable
<!-- </el-form-item>--> @keyup.enter.native="handleQuery"
<!-- <el-form-item label="备用字段3" prop="spare3">--> />
<!-- <el-input--> </el-form-item>
<!-- v-model="queryParams.spare3"--> <el-form-item label="备用字段3" prop="spare3">
<!-- placeholder="请输入备用字段3"--> <el-input
<!-- clearable--> v-model="queryParams.spare3"
<!-- @keyup.enter.native="handleQuery"--> placeholder="请输入备用字段3"
<!-- />--> clearable
<!-- </el-form-item>&ndash;&gt;--> @keyup.enter.native="handleQuery"
<!-- <el-form-item>--> />
<!-- <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>--> </el-form-item>-->
<!-- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>--> <el-form-item>
<!-- </el-form-item>--> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<!-- </el-form>--> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<!-- <el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
icon="el-icon-plus" icon="el-icon-plus"
size="mini" size="mini"
@click="handleAdd" @click="handleAdd"
v-hasPermi="['device:ddj:add']" v-hasPermi="['device:ddj:add']"
>新增</el-button> >新增</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="success" type="success"
@@ -173,17 +175,17 @@
v-hasPermi="['device:ddj:edit']" v-hasPermi="['device:ddj:edit']"
>修改</el-button> >修改</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <!-- <el-col :span="1.5">
<el-button <el-button
type="danger" type="danger"
plain plain
icon="el-icon-delete" icon="el-icon-delete"
size="mini" size="mini"
:disabled="multiple" :disabled="multiple"
@click="handleDelete" @click="handleDelete"
v-hasPermi="['device:ddj:remove']" v-hasPermi="['device:ddj:remove']"
>删除</el-button> >删除</el-button>
</el-col> </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@@ -195,29 +197,34 @@
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>--> </el-row>
<el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="ddjList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="id" /> <el-table-column label="id" align="center" prop="id" />
<el-table-column label="堆垛机名称" align="center" prop="name" /> <el-table-column label="堆垛机名称" align="center" prop="name" />
<el-table-column label="任务号" align="center" prop="rwh" /> <el-table-column label="当前巷道" align="center" prop="dqxd"/>
<el-table-column label="阶段标志" align="center" prop="jdbz" />
<el-table-column label="状态" align="center" prop="sbzt" /> <!-- <el-table-column label="任务号" align="center" prop="rwh" />
<el-table-column label="操作方式" align="center" prop="czfs" /> <el-table-column label="阶段标志" align="center" prop="jdbz" />
<el-table-column label="允许下发" align="center" prop="yxxf" /> <el-table-column label="状态" align="center" prop="sbzt" />
<el-table-column label="原排" align="center" prop="yph" /> <el-table-column label="操作方式" align="center" prop="czfs" />
<el-table-column label="原列" align="center" prop="ylh" /> <el-table-column label="允许下发" align="center" prop="yxxf" />
<el-table-column label="原层" align="center" prop="ych" /> <el-table-column label="原排" align="center" prop="yph" />
<el-table-column label="目标排" align="center" prop="mbph" /> <el-table-column label="原列" align="center" prop="ylh" />
<el-table-column label="目标列" align="center" prop="mblh" /> <el-table-column label="原层" align="center" prop="ych" />
<el-table-column label="目标层" align="center" prop="mbch" /> <el-table-column label="目标排" align="center" prop="mbph" />
<el-table-column label="心跳信号" align="center" prop="xtxh" /> <el-table-column label="目标列" align="center" prop="mblh" />
<el-table-column label="当前巷道" align="center" prop="dqxd" /> <el-table-column label="目标层" align="center" prop="mbch" />
<el-table-column label="货叉状态" align="center" prop="hczt" /> <el-table-column label="心跳信号" align="center" prop="xtxh" />
<el-table-column label="备用字段1" align="center" prop="spare1" /> <el-table-column label="货叉状态" align="center" prop="hczt" />-->
<el-table-column label="备用字段2" align="center" prop="spare2" /> <el-table-column label="设备锁" align="center" prop="spare1">
<el-table-column label="备用字段3" align="center" prop="spare3" /> <template slot-scope="scope">
<dict-tag :options="dict.type.device_lock" :value="scope.row.spare1"/>
</template>
</el-table-column>
<!-- <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"> <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
@@ -248,60 +255,19 @@
<!-- 添加或修改堆垛机监控对话框 --> <!-- 添加或修改堆垛机监控对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <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 ref="form" :model="form" :rules="rules" label-width="90px">
<el-form-item label="堆垛机名称" prop="name"> <el-form-item label="堆垛机名称" prop="name">
<el-input v-model="form.name" placeholder="请输入堆垛机名称" /> <el-input v-model="form.name" placeholder="请输入堆垛机名称" />
</el-form-item> </el-form-item>
<el-form-item label="任务号" prop="rwh"> <el-form-item label="设备锁" prop="spare1">
<el-input v-model="form.rwh" placeholder="请输入任务号" /> <el-select v-model="form.spare1" placeholder="请选择设备状态">
</el-form-item> <el-option
<el-form-item label="阶段标志" prop="jdbz"> v-for="dict in dict.type.device_lock"
<el-input v-model="form.jdbz" placeholder="请输入阶段标志" /> :key="dict.value"
</el-form-item> :label="dict.label"
<el-form-item label="状态" prop="sbzt"> :value="dict.value"
<el-input v-model="form.sbzt" placeholder="请输入状态" /> />
</el-form-item> </el-select>
<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-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -313,10 +279,11 @@
</template> </template>
<script> <script>
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/device/ddj" import {addDdj, delDdj, getDdj, listDdj, updateDdj} from "@/api/device/ddj"
export default { export default {
name: "Ddj", name: "Ddj",
dicts: ['device_lock'],
data() { data() {
return { return {
// 遮罩层 // 遮罩层

743
ruoyi-ui/src/views/device/ssj/index.vue
View File

@@ -1,397 +1,332 @@
<template> <template>
<div class="app-container"> <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-input
v-model="queryParams.deviceCode"
:placeholder="'请输入设备唯一编码'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'设备名称'" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="'请输入设备名称'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'设备IP'" prop="ipAddress">
<el-input
v-model="queryParams.ipAddress"
:placeholder="'请输入设备IP'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'PLC读取地址'" prop="plcDbReadAddress">
<el-input
v-model="queryParams.plcDbReadAddress"
:placeholder="'请输入PLC读取地址'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'PLC写入地址'" prop="plcDbWriteAddress">
<el-input
v-model="queryParams.plcDbWriteAddress"
:placeholder="'请输入PLC写入地址'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'是否可用'" prop="isActive">
<el-input
v-model="queryParams.isActive"
:placeholder="'请输入0-F 1-T'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'入库请求'" prop="rkqq">
<el-input
v-model="queryParams.rkqq"
:placeholder="'请输入入库请求'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'空闲'" prop="kx">
<el-input
v-model="queryParams.kx"
:placeholder="'请输入空闲'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'到位'" prop="dw">
<el-input
v-model="queryParams.dw"
:placeholder="'请输入到位'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'条码'" prop="trayCode">
<el-input
v-model="queryParams.trayCode"
:placeholder="'请输入条码'"
clearable
size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item :label="'任务号'" prop="taskNo">
<el-input
v-model="queryParams.taskNo"
:placeholder="'请输入任务号'"
clearable
size="small"
@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"> <!-- 7个表格区域 -->
<el-button <el-row :gutter="20" class="table-container">
type="primary" <el-col :span="24" class="table-col">
plain <div class="table-card">
icon="el-icon-plus" <div class="table-header">
size="mini" <span class="table-title">堆垛机监控</span>
@click="handleAdd" <el-tag type="success" size="mini">总计: 6 台</el-tag>
v-hasPermi="['device:ssj:add']" </div>
>新增</el-button> <el-table :data="ddjData" size="mini" style="width: 100%">
<el-table-column label="id" align="center" prop="id"/>
<el-table-column label="堆垛机名称" align="center" prop="name"/>
<el-table-column label="当前巷道" align="center" prop="dqxd"/>
<el-table-column label="任务号" align="center" prop="rwh"/>
<el-table-column label="阶段标志" align="center" prop="jdbz">
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_task_status" :value="scope.row.jdbz"/>
</template>
</el-table-column>
<el-table-column label="设备状态" align="center" prop="sbzt">
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_sbzt" :value="scope.row.sbzt"/>
</template>
</el-table-column>
<el-table-column label="操作方式" align="center" prop="czfs">
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_czfs" :value="scope.row.czfs"/>
</template>
</el-table-column>
<el-table-column label="允许下发" align="center" prop="yxxf">
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_yxxf" :value="scope.row.yxxf"/>
</template>
</el-table-column>
<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>
</div>
</el-col> </el-col>
<el-col :span="1.5"> </el-row>
<el-button <el-row :gutter="20" class="table-container">
type="success" <!-- 表格1：入库输送机 -->
plain <el-col :span="8" class="table-col">
icon="el-icon-edit" <div class="table-card">
size="mini" <div class="table-header">
@click="handleUpdate" <span class="table-title">巷道1输送机</span>
v-hasPermi="['device:ssj:edit']" <el-tag type="success" size="mini">{{ table1Data.length }}台</el-tag>
>修改</el-button> </div>
<el-table :data="table1Data" size="mini" style="width: 100%">
<el-table-column label="设备编码" prop="deviceCode"/>
<!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="到位" prop="dw">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
</template>
</el-table-column>
<el-table-column label="空闲" prop="kx">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
</template>
</el-table-column>
<el-table-column label="异常" prop="exception">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
</template>
</el-table-column>
<el-table-column label="模式" prop="traySize">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
</template>
</el-table-column>
</el-table>
</div>
</el-col> </el-col>
<el-col :span="1.5">
<el-button <!-- 表格2：出库输送机 -->
type="danger" <el-col :span="8" class="table-col">
plain <div class="table-card">
icon="el-icon-delete" <div class="table-header">
size="mini" <span class="table-title">巷道2输送机</span>
@click="handleDelete" <el-tag type="success" size="mini">{{ table2Data.length }}台</el-tag>
v-hasPermi="['device:ssj:remove']" </div>
>删除</el-button> <el-table :data="table2Data" size="mini" style="width: 100%">
<el-table-column label="设备编码" prop="deviceCode"/>
<!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="到位" prop="dw">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
</template>
</el-table-column>
<el-table-column label="空闲" prop="kx">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
</template>
</el-table-column>
<el-table-column label="异常" prop="exception">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
</template>
</el-table-column>
<el-table-column label="模式" prop="traySize">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
</template>
</el-table-column>
</el-table>
</div>
</el-col> </el-col>
<el-col :span="1.5">
<el-button <!-- 表格3：分拣输送机 -->
type="warning" <el-col :span="8" class="table-col">
plain <div class="table-card">
icon="el-icon-download" <div class="table-header">
size="mini" <span class="table-title">巷道3输送机</span>
@click="handleExport" <el-tag type="success" size="mini">{{ table3Data.length }}台</el-tag>
v-hasPermi="['device:ssj:export']" </div>
>导出</el-button> <el-table :data="table3Data" size="mini" style="width: 100%">
<el-table-column label="设备编码" prop="deviceCode"/>
<!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="到位" prop="dw">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
</template>
</el-table-column>
<el-table-column label="空闲" prop="kx">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
</template>
</el-table-column>
<el-table-column label="异常" prop="exception">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
</template>
</el-table-column>
<el-table-column label="模式" prop="traySize">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
</template>
</el-table-column>
</el-table>
</div>
</el-col> </el-col>
</el-row> </el-row>
<el-table v-loading="loading" :data="ssjList"> <el-row :gutter="20" class="table-container">
<el-table-column label="设备编码" align="center" prop="deviceCode" /> <!-- 表格4：提升机 -->
<el-table-column label="设备名称" align="center" prop="name" /> <el-col :span="8" class="table-col">
<el-table-column label="类型" align="center" prop="type" /> <div class="table-card">
<el-table-column label="设备IP" align="center" prop="ipAddress" /> <div class="table-header">
<el-table-column label="PLC读取地址" align="center" prop="plcDbReadAddress" /> <span class="table-title">巷道4输送机</span>
<el-table-column label="PLC写入地址" align="center" prop="plcDbWriteAddress" /> <el-tag type="success" size="mini">{{ table4Data.length }}台</el-tag>
<el-table-column label="是否可用" align="center" prop="isActive" /> </div>
<el-table-column label="入库请求" align="center" prop="rkqq" /> <el-table :data="table4Data" size="mini" style="width: 100%">
<el-table-column label="空闲" align="center" prop="kx" /> <el-table-column label="设备编码" prop="deviceCode"/>
<el-table-column label="到位" align="center" prop="dw" /> <!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="条码" align="center" prop="trayCode" /> <el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="任务号" align="center" prop="taskNo" /> <el-table-column label="到位" prop="dw">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <template slot-scope="scope">
<template slot-scope="scope"> <dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
<el-button </template>
size="mini" </el-table-column>
type="text" <el-table-column label="空闲" prop="kx">
icon="el-icon-edit" <template slot-scope="scope">
@click="handleUpdate(scope.row)" <dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
v-hasPermi="['device:ssj:edit']" </template>
>修改</el-button> </el-table-column>
<el-button <el-table-column label="异常" prop="exception">
size="mini" <template slot-scope="scope">
type="text" <dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
icon="el-icon-delete" </template>
@click="handleDelete(scope.row)" </el-table-column>
v-hasPermi="['device:ssj:remove']" <el-table-column label="模式" prop="traySize">
>删除</el-button> <template slot-scope="scope">
</template> <dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
</el-table-column> </template>
</el-table> </el-table-column>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改输送机对话框 --> </el-table>
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> </div>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> </el-col>
<el-form-item label="设备编码" prop="deviceCode">
<el-input v-model="form.deviceCode" placeholder="请输入设备唯一编码" /> <!-- 表格5：移载机 -->
</el-form-item> <el-col :span="8" class="table-col">
<el-form-item label="设备名称" prop="name"> <div class="table-card">
<el-input v-model="form.name" placeholder="请输入设备名称" /> <div class="table-header">
</el-form-item> <span class="table-title">巷道5输送机</span>
<el-form-item label="类型" prop="type"> <el-tag type="success" size="mini">{{ table5Data.length }}台</el-tag>
<el-input v-model="form.type" placeholder="请输入类型" /> </div>
</el-form-item> <el-table :data="table5Data" size="mini" style="width: 100%">
<el-form-item label="设备IP" prop="ipAddress"> <el-table-column label="设备编码" prop="deviceCode"/>
<el-input v-model="form.ipAddress" placeholder="请输入设备IP" /> <!-- <el-table-column label="设备名称" prop="name"/>-->
</el-form-item> <el-table-column label="任务号" prop="taskNo"/>
<el-form-item label="PLC读取地址" prop="plcDbReadAddress"> <el-table-column label="到位" prop="dw">
<el-input v-model="form.plcDbReadAddress" placeholder="请输入PLC读取地址" /> <template slot-scope="scope">
</el-form-item> <dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
<el-form-item label="PLC写入地址" prop="plcDbWriteAddress"> </template>
<el-input v-model="form.plcDbWriteAddress" placeholder="请输入PLC写入地址" /> </el-table-column>
</el-form-item> <el-table-column label="空闲" prop="kx">
<el-form-item label="是否可用" prop="isActive"> <template slot-scope="scope">
<el-input v-model="form.isActive" placeholder="请输入0-F 1-T" /> <dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
</el-form-item> </template>
<el-form-item label="入库请求" prop="rkqq"> </el-table-column>
<el-input v-model="form.rkqq" placeholder="请输入入库请求" /> <el-table-column label="异常" prop="exception">
</el-form-item> <template slot-scope="scope">
<el-form-item label="空闲" prop="kx"> <dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
<el-input v-model="form.kx" placeholder="请输入空闲" /> </template>
</el-form-item> </el-table-column>
<el-form-item label="到位" prop="dw"> <el-table-column label="模式" prop="traySize">
<el-input v-model="form.dw" placeholder="请输入到位" /> <template slot-scope="scope">
</el-form-item> <dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
<el-form-item label="条码" prop="trayCode"> </template>
<el-input v-model="form.trayCode" placeholder="请输入条码" /> </el-table-column>
</el-form-item>
<el-form-item label="任务号" prop="taskNo">
<el-input v-model="form.taskNo" placeholder="请输入任务号" /> </el-table>
</el-form-item> </div>
</el-form> </el-col>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button> <!-- 表格6：旋转台 -->
<el-button @click="cancel">取 消</el-button> <el-col :span="8" class="table-col">
</div> <div class="table-card">
</el-dialog> <div class="table-header">
<span class="table-title">巷道6输送机</span>
<el-tag size="success">{{ table6Data.length }}台</el-tag>
</div>
<el-table :data="table6Data" size="mini" style="width: 100%">
<el-table-column label="设备编码" prop="deviceCode"/>
<!-- <el-table-column label="设备名称" prop="name"/>-->
<el-table-column label="任务号" prop="taskNo"/>
<el-table-column label="到位" prop="dw">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_dw" :value="scope.row.dw"/>
</template>
</el-table-column>
<el-table-column label="空闲" prop="kx">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_kx" :value="scope.row.kx"/>
</template>
</el-table-column>
<el-table-column label="异常" prop="exception">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_ex" :value="scope.row.exception"/>
</template>
</el-table-column>
<el-table-column label="模式" prop="traySize">
<template slot-scope="scope">
<dict-tag :options="dict.type.ssj_model" :value="scope.row.traySize"/>
</template>
</el-table-column>
</el-table>
</div>
</el-col>
</el-row>
</div> </div>
</template> </template>
<script> <script>
import { listSsj, getSsj, delSsj, addSsj, updateSsj } from "@/api/device/ssj"; import {listSsj} from "@/api/device/ssj";
import "@/assets/styles/index.scss"; import "@/assets/styles/index.scss";
import {listDdj} from "@/api/device/ddj"
export default { export default {
name: "Ssj", name: "deviceMonitor",
dicts: ['ddj_task_status', 'ddj_sbzt', 'ddj_czfs', 'ddj_yxxf', 'ddj_hczt', 'ssj_dw', 'ssj_kx', 'ssj_model', 'ssj_ex'],
data() { data() {
return { return {
// 遮罩层
loading: true,
// 选中数组
ids: [],
// 非单个禁用
single: true,
// 非多个禁用
multiple: true,
// 显示搜索条件
showSearch: true,
// 总条数
total: 0,
// 输送机表格数据
ssjList: [],
// 弹出层标题
title: '',
// 是否显示弹出层
open: false,
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 99
deviceCode: null,
name: null,
type: null,
ipAddress: null,
plcDbReadAddress: null,
plcDbWriteAddress: null,
isActive: null,
rkqq: null,
kx: null,
dw: null,
trayCode: null,
taskNo: null
}, },
// 表单参数 // 7个表格的模拟数据
form: {}, table1Data: [], // 入库输送机
// 表单校验 table2Data: [], // 出库输送机
rules: { table3Data: [], // 分拣输送机
deviceCode: [ table4Data: [], // 提升机
{ required: true, message: '设备编码不能为空', trigger: 'blur' } table5Data: [], // 移载机
], table6Data: [], // 旋转台
name: [ ddjData: [], // 汇总统计
{ required: true, message: '设备名称不能为空', trigger: 'blur' } timer: null
]
}
}; };
}, },
created() { created() {
this.getList() this.initMockData()
},
mounted() {
this.timer = setInterval(() => {
this.initMockData();
}, 1000); // 每1秒刷新一次
},
beforeDestroy() {
clearInterval(this.timer);
this.timer = null;
}, },
methods: { methods: {
/** 查询输送机列表 */ /** 初始化模拟数据 */
getList() { initMockData() {
this.loading = true; listDdj().then(response => {
this.ddjData = response.rows
})
listSsj(this.queryParams).then(response => { listSsj(this.queryParams).then(response => {
this.ssjList = response.rows; this.table1Data = response.rows.filter(item => item.deviceCode === 'L2001' || item.deviceCode === 'L2002' || item.deviceCode === 'L2007' || item.deviceCode === 'L2008')
this.total = response.total; this.table2Data = response.rows.filter(item => item.deviceCode === 'L2003' || item.deviceCode === 'L2004' || item.deviceCode === 'L2009' || item.deviceCode === 'L2010')
this.loading = false; this.table3Data = response.rows.filter(item => item.deviceCode === 'L2005' || item.deviceCode === 'L2006' || item.deviceCode === 'L2011' || item.deviceCode === 'L2012')
}); this.table4Data = response.rows.filter(item => item.deviceCode === 'L1001' || item.deviceCode === 'L1002')
}, this.table5Data = response.rows.filter(item => item.deviceCode === 'L1003' || item.deviceCode === 'L1004')
// 取消按钮 this.table6Data = response.rows.filter(item => item.deviceCode === 'L1005' || item.deviceCode === 'L1006')
cancel() { })
this.open = false;
this.reset();
},
// 表单重置
reset() {
this.form = {
id: null,
deviceCode: null,
name: null,
type: null,
ipAddress: null,
plcDbReadAddress: null,
plcDbWriteAddress: null,
isActive: null,
rkqq: null,
kx: null,
dw: null,
trayCode: null,
taskNo: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加输送机";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id || this.ids;
getSsj(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) {
updateSsj(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addSsj(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 delSsj(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('device/ssj/export', {
...this.queryParams
}, `输送机_${new Date().getTime()}.xlsx`);
} }
} }
} }
@@ -402,4 +337,84 @@ export default {
width: auto; width: auto;
min-width: fit-content; min-width: fit-content;
} }
/* 表格容器样式 */
.table-container {
margin-bottom: 20px;
}
.table-col {
margin-bottom: 20px;
}
/* 表格卡片样式 */
.table-card {
background: #fff;
border-radius: 8px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
overflow: hidden;
transition: all 0.3s ease;
}
.table-card:hover {
box-shadow: 0 4px 16px 0 rgba(0, 0, 0, 0.15);
transform: translateY(-2px);
}
/* 表格头部样式 */
.table-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px 20px;
background: #ffffff; /* Element UI 主题蓝 */
color: rgb(0, 0, 0);
border-bottom: 1px solid #ebeef5;
}
.table-title {
font-size: 16px;
font-weight: 600;
margin: 0;
}
/* 表格样式调整 */
.el-table {
border-radius: 0 0 8px 8px;
}
.el-table--mini {
font-size: 12px;
}
/* 响应式布局 */
@media (max-width: 1200px) {
.el-col-8 {
width: 50% !important;
}
}
@media (max-width: 768px) {
.el-col-8 {
width: 100% !important;
}
.table-header {
padding: 12px 15px;
}
.table-title {
font-size: 14px;
}
}
/* 标签样式优化 */
.el-tag {
font-weight: 500;
}
/* 进度条样式 */
.el-progress {
width: 100%;
}
</style> </style>

18
ruoyi-ui/src/views/job/mydoJob/index.vue
View File

@@ -107,14 +107,14 @@
<!-- @keyup.enter.native="handleQuery"--> <!-- @keyup.enter.native="handleQuery"-->
<!-- />--> <!-- />-->
<!-- </el-form-item>--> <!-- </el-form-item>-->
<!--&lt;!&ndash; <el-form-item label="仓库ID" prop="warehouseId">--> <el-form-item label="仓库ID" prop="warehouseId">
<!-- <el-input--> <el-input
<!-- v-model="queryParams.warehouseId"--> v-model="queryParams.warehouseId"
<!-- placeholder="请输入仓库ID"--> placeholder="请输入仓库ID"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<!-- <el-form-item label="重分标志" prop="faultFlag">--> <!-- <el-form-item label="重分标志" prop="faultFlag">-->
<!-- <el-input--> <!-- <el-input-->
<!-- v-model="queryParams.faultFlag"--> <!-- v-model="queryParams.faultFlag"-->
@@ -198,7 +198,7 @@
<el-table-column label="结束时间" align="center" prop="finishTime" /> <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="entranceId" />
<el-table-column label="出口ID" align="center" prop="exitId" /> <el-table-column label="出口ID" align="center" prop="exitId" />
<!-- <el-table-column label="仓库ID" align="center" prop="warehouseId" />--> <el-table-column label="仓库ID" align="center" prop="warehouseId" />
<!-- <el-table-column label="重分标志" align="center" prop="faultFlag" />--> <!-- <el-table-column label="重分标志" align="center" prop="faultFlag" />-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">