修改监控页面样式、添加修改提升机与四向车执行队列
This commit is contained in:
猫猫guowen
44
ruoyi-ui/src/api/queue/srgv.js
Normal file
44
ruoyi-ui/src/api/queue/srgv.js
Normal file
@@ -0,0 +1,44 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 查询四向小车任务队列列表
|
||||
export function listSrgv(query) {
|
||||
return request({
|
||||
url: '/queue/srgv/list',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询四向小车任务队列详细
|
||||
export function getSrgv(guid) {
|
||||
return request({
|
||||
url: '/queue/srgv/' + guid,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 新增四向小车任务队列
|
||||
export function addSrgv(data) {
|
||||
return request({
|
||||
url: '/queue/srgv',
|
||||
method: 'post',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 修改四向小车任务队列
|
||||
export function updateSrgv(data) {
|
||||
return request({
|
||||
url: '/queue/srgv',
|
||||
method: 'put',
|
||||
data: data
|
||||
})
|
||||
}
|
||||
|
||||
// 删除四向小车任务队列
|
||||
export function delSrgv(guid) {
|
||||
return request({
|
||||
url: '/queue/srgv/' + guid,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
@@ -1,86 +1,95 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in Sagv" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
<div class="group-section">
|
||||
<div class="group-title">四向车</div>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in Sagv" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl2" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in SSJ" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl2" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div class="group-section">
|
||||
<div class="group-title">输送机</div>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in SSJ" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl1" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in TSJ" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl1" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
<div class="group-section">
|
||||
<div class="group-title">提升机</div>
|
||||
<el-row :gutter="20">
|
||||
<el-col v-for="dev in TSJ" :key="dev.id" :span="12">
|
||||
<el-card shadow="always" class="device-card">
|
||||
<div slot="header" class="card-header gradient">
|
||||
<span class="device-title">{{ dev.name }}</span>
|
||||
<div class="header-tags">
|
||||
<el-tag size="small" type="info">{{ tagLeft(dev) }}</el-tag>
|
||||
<el-tag size="small" type="success">{{ tagRight(dev) }}</el-tag>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl3" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="10" class="card-body">
|
||||
<el-col :span="16">
|
||||
<el-row class="data-grid">
|
||||
<el-col :span="12" v-for="item in dataItems(dev)" :key="item.key" class="data-item">
|
||||
<span class="data-label">{{ item.label }}</span>
|
||||
<span v-if="!item.dict" class="data-value" :class="valueClass(item.key)">{{ item.value }}</span>
|
||||
<dict-tag v-else :options="dict.type[item.dict]" :value="item.value" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-col>
|
||||
<el-col :span="8" class="image-wrap">
|
||||
<el-image :src="imageUrl3" fit="contain" class="device-image" />
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -196,12 +205,25 @@ export default {
|
||||
this.Sagv = srgvRows.map(it => ({ id: it.deviceId || it.guid || it.id, name: it.deviceName || it.name, kind: 'srgv', raw: it }))
|
||||
this.SSJ = ssjRows.map(it => ({ id: it.id || it.deviceCode, name: it.name, kind: 'ssj', raw: it }))
|
||||
this.TSJ = tsjRows.map(it => ({ id: it.id, name: it.name, kind: 'tsj', raw: it }))
|
||||
console.log(srgvRows)
|
||||
}).catch(() => {})
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<style scoped>
|
||||
.group-section {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
.group-title {
|
||||
font-weight: 600;
|
||||
font-size: 18px;
|
||||
padding: 8px 12px;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 6px;
|
||||
background: linear-gradient(90deg, rgba(16,108,123,0.12), rgba(255,255,255,0));
|
||||
color: #106c7b;
|
||||
}
|
||||
.device-card {
|
||||
margin-bottom: 20px;
|
||||
border-radius: 10px;
|
||||
|
||||
374
ruoyi-ui/src/views/queue/srgv/index.vue
Normal file
374
ruoyi-ui/src/views/queue/srgv/index.vue
Normal file
@@ -0,0 +1,374 @@
|
||||
<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="agv编号" prop="agvId">
|
||||
<el-input
|
||||
v-model="queryParams.agvId"
|
||||
placeholder="请输入agv编号"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务类型" prop="taskType">
|
||||
<el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.srgv_task_type"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="任务模式" prop="priority">
|
||||
<el-select v-model="queryParams.priority" placeholder="请选择任务模式" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.priority"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="搬货任务" prop="cargo">
|
||||
<el-select v-model="queryParams.cargo" placeholder="请选择搬货任务" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.cargo"
|
||||
:key="dict.value"
|
||||
:label="dict.label"
|
||||
:value="dict.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="下发状态" prop="issued">
|
||||
<el-select v-model="queryParams.issued" placeholder="请选择下发状态" clearable>
|
||||
<el-option
|
||||
v-for="dict in dict.type.issued"
|
||||
: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="['queue:srgv: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:srgv: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:srgv: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:srgv:export']"-->
|
||||
<!-- >导出</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="srgvList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="唯一id" align="center" prop="guid" />-->
|
||||
<el-table-column label="任务号" align="center" prop="taskNo" />
|
||||
<el-table-column label="agv编号" align="center" prop="agvId" />
|
||||
<el-table-column label="任务类型" align="center" prop="taskType" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.srgv_task_type" :value="scope.row.taskType"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="任务模式" align="center" prop="priority" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.priority" :value="scope.row.priority"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="搬货任务" align="center" prop="cargo" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.cargo" :value="scope.row.cargo"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="下发状态" align="center" prop="issued" >
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.issued" :value="scope.row.issued"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="路径" align="center" prop="pathInfo" />
|
||||
<el-table-column label="执行状态" align="center" prop="executionStatus" />
|
||||
<el-table-column label="取货地址" align="center" prop="cargoPickSite" />
|
||||
<el-table-column label="放货地址" align="center" prop="cargoPlaceSite" />
|
||||
<el-table-column label="开始地址" align="center" prop="startSite" />
|
||||
<el-table-column label="结束地址" align="center" prop="endSite" />
|
||||
<el-table-column label="层" align="center" prop="theFloor" />
|
||||
<el-table-column label="拐点" align="center" prop="trunPath" />
|
||||
<el-table-column label="提升机地址" align="center" prop="upDownSite" />
|
||||
<!-- <el-table-column label="1入库；2出库 3充电 4点到点；5盘库；6放货阶段异常重分；7移库；8换层" align="center" prop="default02" />-->
|
||||
<el-table-column label="已经完成规划路径" align="center" prop="default03" />
|
||||
<el-table-column label="点到点原始任务" align="center" prop="default04" />
|
||||
<el-table-column label="原任务类型" align="center" prop="default05" />
|
||||
<el-table-column label="其他任务guid" align="center" prop="default06" />
|
||||
<!-- <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:srgv:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['queue:srgv: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"
|
||||
/>
|
||||
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listSrgv, getSrgv, delSrgv, addSrgv, updateSrgv } from "@/api/queue/srgv"
|
||||
import {updateDdj} from "@/api/queue/ddj";
|
||||
|
||||
export default {
|
||||
name: "Srgv",
|
||||
dicts: ['srgv_task_type','priority','cargo','issued'],
|
||||
data() {
|
||||
return {
|
||||
// 遮罩层
|
||||
loading: true,
|
||||
// 选中数组
|
||||
ids: [],
|
||||
// 非单个禁用
|
||||
single: true,
|
||||
// 非多个禁用
|
||||
multiple: true,
|
||||
// 显示搜索条件
|
||||
showSearch: true,
|
||||
// 总条数
|
||||
total: 0,
|
||||
// 四向小车任务队列表格数据
|
||||
srgvList: [],
|
||||
// 弹出层标题
|
||||
title: "",
|
||||
// 是否显示弹出层
|
||||
open: false,
|
||||
// 查询参数
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
taskNo: null,
|
||||
taskType: null,
|
||||
priority: null,
|
||||
cargo: null,
|
||||
issued: null,
|
||||
pathInfo: null,
|
||||
executionStatus: null,
|
||||
cargoPickSite: null,
|
||||
cargoPlaceSite: null,
|
||||
startSite: null,
|
||||
endSite: null,
|
||||
theFloor: null,
|
||||
trunPath: null,
|
||||
upDownSite: null,
|
||||
createDate: null,
|
||||
startDate: null,
|
||||
finishDate: null,
|
||||
agvId: null,
|
||||
default02: null,
|
||||
default03: null,
|
||||
default04: null,
|
||||
default05: null,
|
||||
default06: null,
|
||||
default07: null,
|
||||
default08: null
|
||||
},
|
||||
// 表单参数
|
||||
form: {},
|
||||
// 表单校验
|
||||
rules: {
|
||||
taskNo: [
|
||||
{ required: true, message: "任务号不能为空", trigger: "blur" }
|
||||
],
|
||||
}
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getList()
|
||||
},
|
||||
methods: {
|
||||
/** 查询四向小车任务队列列表 */
|
||||
getList() {
|
||||
this.loading = true
|
||||
listSrgv(this.queryParams).then(response => {
|
||||
this.srgvList = response.rows
|
||||
this.total = response.total
|
||||
this.loading = false
|
||||
})
|
||||
},
|
||||
// 取消按钮
|
||||
cancel() {
|
||||
this.open = false
|
||||
this.reset()
|
||||
},
|
||||
// 表单重置
|
||||
reset() {
|
||||
this.form = {
|
||||
guid: null,
|
||||
taskNo: null,
|
||||
taskType: null,
|
||||
priority: null,
|
||||
cargo: null,
|
||||
issued: null,
|
||||
pathInfo: null,
|
||||
executionStatus: null,
|
||||
cargoPickSite: null,
|
||||
cargoPlaceSite: null,
|
||||
startSite: null,
|
||||
endSite: null,
|
||||
theFloor: null,
|
||||
trunPath: null,
|
||||
upDownSite: null,
|
||||
createDate: null,
|
||||
startDate: null,
|
||||
finishDate: null,
|
||||
agvId: null,
|
||||
default02: null,
|
||||
default03: null,
|
||||
default04: null,
|
||||
default05: null,
|
||||
default06: null,
|
||||
default07: null,
|
||||
default08: 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.guid)
|
||||
this.single = selection.length!==1
|
||||
this.multiple = !selection.length
|
||||
},
|
||||
/** 新增按钮操作 */
|
||||
handleAdd() {
|
||||
this.reset()
|
||||
this.open = true
|
||||
this.title = "添加四向小车任务队列"
|
||||
},
|
||||
/** 修改按钮操作 */
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const guid = row.guid || this.ids
|
||||
this.form.uuid = guid[0]
|
||||
this.form.issued = 0
|
||||
updateSrgv(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
if (valid) {
|
||||
if (this.form.guid != null) {
|
||||
updateSrgv(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
} else {
|
||||
addSrgv(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
/** 删除按钮操作 */
|
||||
handleDelete(row) {
|
||||
const guids = row.guid || this.ids
|
||||
this.$modal.confirm('是否确认删除四向小车任务队列编号为"' + guids + '"的数据项？').then(function() {
|
||||
return delSrgv(guids)
|
||||
}).then(() => {
|
||||
this.getList()
|
||||
this.$modal.msgSuccess("删除成功")
|
||||
}).catch(() => {})
|
||||
},
|
||||
/** 导出按钮操作 */
|
||||
handleExport() {
|
||||
this.download('queue/srgv/export', {
|
||||
...this.queryParams
|
||||
}, `srgv_${new Date().getTime()}.xlsx`)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -9,14 +9,14 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input
|
||||
v-model="queryParams.deviceName"
|
||||
placeholder="请输入设备名称"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="设备名称" prop="deviceName">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.deviceName"-->
|
||||
<!-- placeholder="请输入设备名称"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="任务号" prop="taskNo">
|
||||
<el-input
|
||||
v-model="queryParams.taskNo"
|
||||
@@ -25,102 +25,102 @@
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原排" prop="srcRow">
|
||||
<el-input
|
||||
v-model="queryParams.srcRow"
|
||||
placeholder="请输入原排"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原列" prop="srcColumn">
|
||||
<el-input
|
||||
v-model="queryParams.srcColumn"
|
||||
placeholder="请输入原列"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原层" prop="srcLayer">
|
||||
<el-input
|
||||
v-model="queryParams.srcLayer"
|
||||
placeholder="请输入原层"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标排" prop="tarRow">
|
||||
<el-input
|
||||
v-model="queryParams.tarRow"
|
||||
placeholder="请输入目标排"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标列" prop="tarColumn">
|
||||
<el-input
|
||||
v-model="queryParams.tarColumn"
|
||||
placeholder="请输入目标列"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标层" prop="tarLayer">
|
||||
<el-input
|
||||
v-model="queryParams.tarLayer"
|
||||
placeholder="请输入目标层"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="原地址" prop="srcSite">
|
||||
<el-input
|
||||
v-model="queryParams.srcSite"
|
||||
placeholder="请输入原地址"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="目标地址" prop="tarSite">
|
||||
<el-input
|
||||
v-model="queryParams.tarSite"
|
||||
placeholder="请输入目标地址"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="下发" prop="sendFlag">
|
||||
<el-input
|
||||
v-model="queryParams.sendFlag"
|
||||
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 label="原排" prop="srcRow">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.srcRow"-->
|
||||
<!-- placeholder="请输入原排"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="原列" prop="srcColumn">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.srcColumn"-->
|
||||
<!-- placeholder="请输入原列"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="原层" prop="srcLayer">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.srcLayer"-->
|
||||
<!-- placeholder="请输入原层"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标排" prop="tarRow">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.tarRow"-->
|
||||
<!-- placeholder="请输入目标排"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标列" prop="tarColumn">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.tarColumn"-->
|
||||
<!-- placeholder="请输入目标列"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标层" prop="tarLayer">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.tarLayer"-->
|
||||
<!-- placeholder="请输入目标层"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="原地址" prop="srcSite">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.srcSite"-->
|
||||
<!-- placeholder="请输入原地址"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="目标地址" prop="tarSite">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.tarSite"-->
|
||||
<!-- placeholder="请输入目标地址"-->
|
||||
<!-- clearable-->
|
||||
<!-- @keyup.enter.native="handleQuery"-->
|
||||
<!-- />-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="下发" prop="sendFlag">-->
|
||||
<!-- <el-input-->
|
||||
<!-- v-model="queryParams.sendFlag"-->
|
||||
<!-- 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 label="任务类型" prop="rwlx">
|
||||
<el-select v-model="queryParams.rwlx" placeholder="请选择任务类型" clearable>
|
||||
<el-option
|
||||
@@ -138,16 +138,16 @@
|
||||
</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:tsj:add']"
|
||||
>新增</el-button>
|
||||
</el-col>
|
||||
<!-- <el-col :span="1.5">-->
|
||||
<!-- <el-button-->
|
||||
<!-- type="primary"-->
|
||||
<!-- plain-->
|
||||
<!-- icon="el-icon-plus"-->
|
||||
<!-- size="mini"-->
|
||||
<!-- @click="handleAdd"-->
|
||||
<!-- v-hasPermi="['queue:tsj:add']"-->
|
||||
<!-- >新增</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
@@ -157,29 +157,29 @@
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['queue:tsj: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:tsj: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:tsj:export']"
|
||||
>导出</el-button>
|
||||
>重新下发</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:tsj: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:tsj:export']"-->
|
||||
<!-- >导出</el-button>-->
|
||||
<!-- </el-col>-->
|
||||
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
@@ -203,34 +203,34 @@
|
||||
<el-table-column label="创建时间" align="center" prop="createDate" />
|
||||
<el-table-column label="开始时间" align="center" prop="startDate" />
|
||||
<el-table-column label="完成时间" align="center" prop="finishDate" />
|
||||
<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="备用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="rwlx">
|
||||
<template slot-scope="scope">
|
||||
<dict-tag :options="dict.type.tsj_rwlx" :value="scope.row.rwlx"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<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:tsj:edit']"
|
||||
>修改</el-button>
|
||||
<el-button
|
||||
size="mini"
|
||||
type="text"
|
||||
icon="el-icon-delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['queue:tsj:remove']"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- <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:tsj:edit']"-->
|
||||
<!-- >修改</el-button>-->
|
||||
<!-- <el-button-->
|
||||
<!-- size="mini"-->
|
||||
<!-- type="text"-->
|
||||
<!-- icon="el-icon-delete"-->
|
||||
<!-- @click="handleDelete(scope.row)"-->
|
||||
<!-- v-hasPermi="['queue:tsj:remove']"-->
|
||||
<!-- >删除</el-button>-->
|
||||
<!-- </template>-->
|
||||
<!-- </el-table-column>-->
|
||||
</el-table>
|
||||
|
||||
|
||||
<pagination
|
||||
v-show="total>0"
|
||||
:total="total"
|
||||
@@ -239,75 +239,13 @@
|
||||
@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="deviceId">
|
||||
<el-input v-model="form.deviceId" placeholder="请输入设备编号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="设备名称" prop="deviceName">
|
||||
<el-input v-model="form.deviceName" placeholder="请输入设备名称" />
|
||||
</el-form-item>
|
||||
<el-form-item label="任务号" prop="taskNo">
|
||||
<el-input v-model="form.taskNo" placeholder="请输入任务号" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原排" prop="srcRow">
|
||||
<el-input v-model="form.srcRow" placeholder="请输入原排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原列" prop="srcColumn">
|
||||
<el-input v-model="form.srcColumn" placeholder="请输入原列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原层" prop="srcLayer">
|
||||
<el-input v-model="form.srcLayer" placeholder="请输入原层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标排" prop="tarRow">
|
||||
<el-input v-model="form.tarRow" placeholder="请输入目标排" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标列" prop="tarColumn">
|
||||
<el-input v-model="form.tarColumn" placeholder="请输入目标列" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标层" prop="tarLayer">
|
||||
<el-input v-model="form.tarLayer" placeholder="请输入目标层" />
|
||||
</el-form-item>
|
||||
<el-form-item label="原地址" prop="srcSite">
|
||||
<el-input v-model="form.srcSite" placeholder="请输入原地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="目标地址" prop="tarSite">
|
||||
<el-input v-model="form.tarSite" placeholder="请输入目标地址" />
|
||||
</el-form-item>
|
||||
<el-form-item label="下发" prop="sendFlag">
|
||||
<el-input v-model="form.sendFlag" 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 label="任务类型" prop="rwlx">
|
||||
<el-select v-model="form.rwlx" placeholder="请选择任务类型">
|
||||
<el-option
|
||||
v-for="dict in dict.type.tsj_rwlx"
|
||||
: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>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</el-dialog>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { listTsj, getTsj, delTsj, addTsj, updateTsj } from "@/api/queue/tsj"
|
||||
import {updateDdj} from "@/api/queue/ddj";
|
||||
|
||||
export default {
|
||||
name: "Tsj",
|
||||
@@ -437,12 +375,15 @@ export default {
|
||||
handleUpdate(row) {
|
||||
this.reset()
|
||||
const guid = row.guid || this.ids
|
||||
getTsj(guid).then(response => {
|
||||
this.form = response.data
|
||||
this.open = true
|
||||
this.title = "修改提升机执行队列"
|
||||
this.form.uuid = guid[0]
|
||||
this.form.sendFlag = 0
|
||||
updateTsj(this.form).then(response => {
|
||||
this.$modal.msgSuccess("修改成功")
|
||||
this.open = false
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
|
||||
/** 提交按钮 */
|
||||
submitForm() {
|
||||
this.$refs["form"].validate(valid => {
|
||||
|
||||
Reference in New Issue
Block a user