监控页面修改 设备锁页面修改
This commit is contained in:
liuhanqing
@@ -1,167 +1,169 @@
|
||||
<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-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="是否可用" prop="spare1">
|
||||
<el-select>
|
||||
<el-option
|
||||
v-for="dict in dict.type.device_lock"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</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-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"
|
||||
@@ -173,17 +175,17 @@
|
||||
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="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"
|
||||
@@ -195,29 +197,34 @@
|
||||
>导出</el-button>
|
||||
</el-col>
|
||||
<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-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" prop="dqxd"/>
|
||||
|
||||
<!-- <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="hczt" />-->
|
||||
<el-table-column label="设备锁" align="center" prop="spare1">
|
||||
<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">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
@@ -248,60 +255,19 @@
|
||||
|
||||
<!-- 添加或修改堆垛机监控对话框 -->
|
||||
<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-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 label="设备锁" prop="spare1">
|
||||
<el-select v-model="form.spare1" placeholder="请选择设备状态">
|
||||
<el-option
|
||||
v-for="dict in dict.type.device_lock"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div slot="footer" class="dialog-footer">
|
||||
@@ -313,10 +279,11 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/device/ddj"
|
||||
import {addDdj, delDdj, getDdj, listDdj, updateDdj} from "@/api/device/ddj"
|
||||
|
||||
export default {
|
||||
name: "Ddj",
|
||||
dicts: ['device_lock'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
|
||||
Reference in New Issue
Block a user