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

修改页面显示

Browse Source
This commit is contained in:
liuhanqing
2025-09-28 16:40:00 +08:00
parent 4d6e3e8107
commit 109e65730a
11 changed files with 156 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
ruoyi-ui/src/views/queue/ddj/index.vue
View File

@@ -9,13 +9,25 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="设备id" prop="devId">
<el-input
v-model="queryParams.devId"
placeholder="请输入设备id"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="任务状态" prop="rwzt">
<el-select v-model="queryParams.rwzt" placeholder="请选择任务状态" clearable>
<el-option
v-for="dict in dict.type.ddj_task_status"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型" prop="rwlx">
<el-select v-model="queryParams.rwlx" placeholder="请选择任务类型" clearable>
<el-option
v-for="dict in dict.type.ddj_rwlx"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="设备名称" prop="devName">
<el-input
@@ -26,14 +38,7 @@
/>
</el-form-item>
<el-form-item label="任务状态" prop="rwzt">
<el-input
v-model="queryParams.rwzt"
placeholder="请输入任务状态"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="原排" prop="yph">
<el-input
v-model="queryParams.yph"
@@ -90,14 +95,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="任务类型" prop="rwlx">
<el-input
v-model="queryParams.rwlx"
placeholder="请输入任务类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="生成时间" prop="scsj">
<el-input
v-model="queryParams.scsj"
@@ -210,9 +208,13 @@
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="uuid" align="center" prop="uuid" />
<el-table-column label="任务号" align="center" prop="rwh" />
<el-table-column label="设备名称" align="center" prop="devName" />
<el-table-column label="设备id" align="center" prop="devId" />
<el-table-column label="任务状态" align="center" prop="rwzt" />
<el-table-column label="设备名称" align="center" prop="devName" />
<el-table-column label="任务状态" align="center" prop="rwzt" >
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_task_status" :value="scope.row.rwzt"/>
</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" />
@@ -220,7 +222,11 @@
<el-table-column label="目标列" align="center" prop="mblh" />
<el-table-column label="目标层" align="center" prop="mbch" />
<el-table-column label="堆垛机下发" align="center" prop="ddjxf" />
<el-table-column label="任务类型" align="center" prop="rwlx" />
<el-table-column label="任务类型" align="center" prop="rwlx" >
<template slot-scope="scope">
<dict-tag :options="dict.type.ddj_rwlx" :value="scope.row.rwlx"/>
</template>
</el-table-column>
<el-table-column label="生成时间" align="center" prop="scsj" />
<el-table-column label="下发时间" align="center" prop="xfsj" />
<el-table-column label="结束时间" align="center" prop="jssj" />
@@ -259,9 +265,7 @@
<el-form-item label="任务号" prop="rwh">
<el-input v-model="form.rwh" placeholder="请输入任务号" />
</el-form-item>
<el-form-item label="设备名称" prop="devName">
<el-input v-model="form.devName" placeholder="请输入设备名称" />
</el-form-item>
<el-form-item label="设备id" prop="devId">
<el-input v-model="form.devId" placeholder="请输入设备id" />
</el-form-item>
@@ -323,10 +327,11 @@
</template>
<script>
import { listDdj, getDdj, delDdj, addDdj, updateDdj } from "@/api/queue/ddj"
import { listDdj, getDdj, delDdj, addDdj, updateDdj ,listFinishDdj} from "@/api/queue/ddj"
export default {
name: "Ddj",
dicts: ['ddj_task_status','ddj_rwlx'],
data() {
return {
// 遮罩层
@@ -391,11 +396,20 @@ export default {
/** 查询堆垛机执行队列列表 */
getList() {
this.loading = true
listDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
console.log(this.queryParams)
if (this.queryParams.rwzt==null ||!this.queryParams.rwzt === '5' ){
listDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
}else {
listFinishDdj(this.queryParams).then(response => {
this.ddjList = response.rows
this.total = response.total
this.loading = false
})
}
},
// 取消按钮
cancel() {