root/acs_niudixiya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 自动门对接逻辑

Browse Source
This commit is contained in:
zhoujj
2025-01-21 17:03:25 +08:00
parent b1b2fda309
commit ed73cf7c3b
11 changed files with 411 additions and 1166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

654
acs/nladmin-ui/src/views/acs/task/index.vue
View File

@@ -4,276 +4,308 @@
<div class="head-container">
<div v-if="crud.props.searchToggle">
<!-- 搜索 -->
<el-form
:inline="true"
class="demo-form-inline"
label-position="right"
label-suffix=":"
<el-input
v-model="query.task_code"
size="small"
clearable
placeholder="输入任务号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-input
v-model="query.vehicle_code"
size="small"
clearable
placeholder="输入载具号"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.material_type"
clearable
filterable
size="small"
placeholder="物料类型"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-form-item :label="$t('task.txt_box.Task_status')">
<el-select
v-model="query.status"
clearable
filterable
size="small"
:placeholder="$t('task.txt_box.Task_status')"
class="filter-item"
style="width: 200px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_code')">
<el-input
v-model="query.task_code"
size="small"
clearable
:placeholder="$t('task.txt_box.Enter_task_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_type')">
<el-select
v-model="query.task_type"
clearable
filterable
size="small"
:placeholder="$t('task.txt_box.Task_type')"
class="filter-item"
style="width: 200px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_type" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-form-item :label="$t('task.txt_box.start_or_end')">
<el-input
v-model="query.point_code"
size="small"
clearable
:placeholder="$t('task.txt_box.Origin_or_destination')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
</el-form-item>
<rrOperation />
</el-form>
<el-option v-for="item in materialList" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-select
v-model="query.status"
clearable
filterable
size="small"
placeholder="任务状态"
class="filter-item"
style="width: 190px"
@change="crud.toQuery"
>
<el-option v-for="item in dict.task_status" :key="item.id" :label="item.label" :value="item.value" />
</el-select>
<el-input
v-model="query.point_code"
size="small"
clearable
placeholder="输入起点或终点"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<el-button
slot="left"
v-permission="['admin','task:add']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-plus"
@click="formDia=true"
>
{{ $t('auto.common.Create') }}
新增
</el-button>
<el-button
<!-- <el-button
slot="right"
v-permission="['admin','task:synchronous']"
class="filter-item"
size="mini"
type="primary"
icon="el-icon-refresh"
@click="reload"
>
{{ $t('auto.common.synchronous') }}
</el-button>
同步
</el-button> -->
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="1100px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="135px">
<el-row>
<el-col :span="12">
<div class="grid-content bg-purple" />
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 240px;" />
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="form.material"
style="width: 370px;"
filterable
:placeholder="$t('task.select.Placeholder')"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Task_type')">
<el-select
v-model="form.task_type"
style="width: 370px;"
filterable
:placeholder="$t('task.select.Placeholder')"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.task_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Routing_scheme')">
<el-select
v-model="form.route_plan_code"
style="width: 370px;"
filterable
:placeholder="$t('task.select.Placeholder')"
default-first-option
@change="isDisabled=false"
>
<el-option
v-for="item in routeList"
:key="item.plan_code"
:label="item.plan_name"
:value="item.plan_code"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.select.Start_point')" prop="start_point_code">
<el-select
v-model="form.start_point_code"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
@change="showStartStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('task.select.Destination')" prop="next_point_code">
<el-select
v-model="form.next_point_code"
style="width: 370px;"
filterable
clearable
:placeholder="$t('task.select.Placeholder')"
@change="showEndStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="grid-content bg-purple-light" />
<el-form-item :label="$t('task.txt_box.Priority')">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item :label="$t('task.txt_box.Vehicle_number')">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item :label="$t('task.select.Description')" prop="description">
<el-input v-model="form.remark" style="width: 370px;" type="textarea" @change="isDisabled=false" />
</el-form-item>
</el-col>
</el-row>
<el-dialog :close-on-click-modal="false" :visible.sync="formDia" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item v-if="false" label="任务标识" prop="task_id">
<el-input v-model="form.task_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="物料类型">
<el-select
v-model="form.material"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.material_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="任务类型">
<el-select
v-model="form.task_type"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.task_type"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="移动方向">
<el-select
v-model="form.task_direction"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.task_direction"
:key="item.id"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="路由方案">
<el-select
v-model="form.route_plan_code"
style="width: 370px;"
filterable
placeholder="请选择"
default-first-option
@change="isDisabled=false"
>
<el-option
v-for="item in routeList"
:key="item.plan_code"
:label="item.plan_name"
:value="item.plan_code"
/>
</el-select>
</el-form-item>
<el-form-item label="起点" prop="start_point_code">
<el-select
v-model="form.start_point_code"
style="width: 370px;"
filterable
placeholder="请选择"
@change="showStartStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item v-show="start_flag" label="起点-列" prop="from_y">
<el-select
v-model="form.from_y"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in fromYList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-show="start_flag" label="起点-层" prop="from_z">
<el-select
v-model="form.from_z"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in fromZList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item label="终点" prop="next_point_code">
<el-select
v-model="form.next_point_code"
style="width: 370px;"
filterable
placeholder="请选择"
@change="showEndStorage"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
:label="item.device_code"
:value="item.device_code"
/>
</el-select>
</el-form-item>
<el-form-item v-show="end_flag" label="终点-列" prop="to_y">
<el-select
v-model="form.to_y"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in toYList"
:key="item.id"
:label="item.value"
:value="item.id"
/>
</el-select>
</el-form-item>
<el-form-item v-show="end_flag" label="终点-层" prop="to_z">
<el-select
v-model="form.to_z"
style="width: 370px;"
filterable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in toZList"
:key="item.id"
:label="item.value"
:value="item.id"
@change="isDisabled=false"
/>
</el-select>
</el-form-item>
<el-form-item label="优先级">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="载具号">
<el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
<el-form-item label="描述信息" prop="description">
<el-input v-model="form.remark" style="width: 380px;" rows="5" type="textarea" @change="isDisabled=false" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="text" @click="formDia=false">{{ $t('task.select.Cancel') }}</el-button>
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="saveBtn">
{{ $t('task.select.Confirm') }}
</el-button>
<el-button type="text" @click="formDia=false">取消</el-button>
<el-button :loading="crud.cu === 2" :disabled="isDisabled" type="primary" @click="saveBtn">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<el-table
ref="table"
v-loading="crud.loading"
:data="crud.data"
size="small"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="25" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column
prop="task_code"
:label="$t('task.txt_box.Task_code')"
:min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))"
/>
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="task_status" label="任务状态">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
<span v-if="scope.row.task_status==='0' ">就绪</span>
<span v-if="scope.row.task_status==='1' ">执行中</span>
<span v-if="scope.row.task_status==='2' ">完成</span>
</template>
</el-table-column>
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
<el-table-column prop="priority" label="任务优先级" min-width="100" show-overflow-tooltip />
<el-table-column prop="start_point_code" label="起点" min-width="100" show-overflow-tooltip />
<!-- <el-table-column prop="start_parent_code" label="父起点点位" min-width="100" show-overflow-tooltip />-->
<el-table-column prop="next_point_code" label="终点" min-width="100" show-overflow-tooltip />
<!-- <el-table-column prop="next_parent_code" label="父终点点位" min-width="100" show-overflow-tooltip />-->
<el-table-column prop="start_point_code2" label="起点2" min-width="100" show-overflow-tooltip />
<el-table-column prop="next_point_code2" label="终点2" min-width="100" show-overflow-tooltip />
<el-table-column prop="put_device_code" label="放货位" min-width="100" show-overflow-tooltip />
<el-table-column prop="compound_task" label="复合任务">
<template slot-scope="scope">
<span v-if="scope.row.task_status==='0' ">{{ $t('task.select.Ready') }}</span>
<span v-if="scope.row.task_status==='1' ">{{ $t('task.select.In_progress') }}</span>
<span v-if="scope.row.task_status==='2' ">{{ $t('task.select.Completed') }}</span>
<span v-if="scope.row.compound_task==='0' ">否</span>
<span v-if="scope.row.compound_task==='1' ">是</span>
</template>
</el-table-column>
<el-table-column
prop="priority"
:label="$t('task.txt_box.Priority')"
:min-width="flexWidth('priority',crud.data,$t('task.txt_box.Priority'))"
/>
<el-table-column
prop="start_point_code"
:label="$t('task.select.Pickup_point')"
:min-width="flexWidth('start_point_code',crud.data,$t('task.select.Pickup_point'))"
/>
<el-table-column
prop="next_point_code"
:label="$t('task.select.Delivery_point')"
:min-width="flexWidth('next_point_code',crud.data,$t('task.select.Delivery_point'))"
/>
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.Remark'))" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column prop="update_by" :label="$t('Inst.table.update_by')" :min-width="flexWidth('update_by',crud.data,$t('Inst.table.update_by'))" />
<el-table-column prop="update_time" :label="$t('Inst.table.update_time')" :min-width="flexWidth('update_time',crud.data,$t('Inst.table.update_time'))" />
<el-table-column v-permission="['admin','task:edit','task:del']" :label="$t('task.select.Operation')" width="150px" align="center" fixed="right">
<el-table-column prop="compound_task_data" width="200" label="复合路线" />
<el-table-column prop="matarial" label="物料" />
<el-table-column prop="quantity" label="数量" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" width="135" />
<el-table-column v-permission="['admin','task:edit','task:del']" fixed="left" label="操作" width="80px" align="center">
<template slot-scope="scope">
<el-button
type="text"
icon="el-icon-finished"
@click="handleCommand(scope.$index, scope.row,'a')"
>
{{ $t('Inst.table.Finish') }}
</el-button>
<el-dropdown size="mini">
<el-button size="mini" type="text" icon="el-icon-d-arrow-right">{{ $t('user.other.More') }}</el-button>
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item icon="el-icon-circle-close"><span @click="handleCommand(scope.$index, scope.row,'b')">
{{ $t('auto.common.Cancel') }}</span>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-folder-add"><span @click="handleCommand(scope.$index, scope.row,'c')">
{{ $t('task.select.Create_command') }}</span>
</el-dropdown-item>
<el-dropdown-item icon="el-icon-finished"><span @click="handleCommand(scope.$index, scope.row,'d')">
{{ $t('task.select.Forced_Completed') }}
</span></el-dropdown-item>
<el-dropdown-item icon="el-icon-circle-close"><span @click="handleCommand(scope.$index, scope.row,'e')">
{{ $t('task.select.Cancel_Tasks_And_Commands') }}
</span></el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">完成</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">取消</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'c')">创建指令</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
@@ -286,39 +318,35 @@
</template>
<script>
import crudTask, { cancelAndInst } from '@/api/acs/task/task'
import crudTask from '@/api/acs/task/task'
import CRUD, { crud, header, presenter } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import rrOperation from '@crud/RR.operation'
import pagination from '@crud/Pagination'
import deviceCrud from '@/api/acs/device/device'
import routeCurd from '@/api/acs/route/routePlan'
import { getDicts } from '@/views/system/dict/dict'
import i18n from '@/i18n'
import { getDicts } from '@/api/system/dict'
export default {
name: 'Task',
components: { pagination, crudOperation, rrOperation },
dicts: ['task_status', 'task_type', 'agv_system_type', 'storage_task_type', 'kezhuan', 'empty_shaft_position'],
components: { pagination, crudOperation },
dicts: ['task_status', 'task_type','task_direction'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({
title: i18n.t('task.txt_box.Task'), url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
optShow: {
add: false,
edit: true,
del: true,
reset: false,
download: false
download: true
},
crudMethod: { ...crudTask }
})
crudMethod: { ...crudTask }})
},
data() {
const checkFromY = (rule, value, callback) => {
if (this.start_flag) {
if (!value) {
callback(new Error(this.$t('task.select.please_enter_origin_column')))
callback(new Error('请选择起点-列！'))
} else {
callback()
}
@@ -329,7 +357,7 @@ export default {
const checkFromZ = (rule, value, callback) => {
if (this.start_flag) {
if (!value) {
callback(new Error(this.$t('task.select.please_enter_origin_level')))
callback(new Error('请选择起点-层！'))
} else {
callback()
}
@@ -340,7 +368,7 @@ export default {
const checkToY = (rule, value, callback) => {
if (this.end_flag) {
if (!value) {
callback(new Error(this.$t('task.select.please_select_destination_column')))
callback(new Error('请选择终点-列！'))
} else {
callback()
}
@@ -351,7 +379,7 @@ export default {
const checkToZ = (rule, value, callback) => {
if (this.end_flag) {
if (!value) {
callback(new Error(this.$t('task.select.please_select_destination_level')))
callback(new Error('请选择终点-列！'))
} else {
callback()
}
@@ -363,18 +391,11 @@ export default {
formDia: false,
isDisabled: false,
deviceList: [],
empty_shaft_position: [],
materialList: [],
statusList: [],
routeList: [],
agvActionList: [
{ key: '普通任务', value: 1 },
{ key: '取货二次分配', value: 2 },
{ key: '防货二次分配', value: 3 },
{ key: '取放货二次分配', value: 4 }
],
task_type: [],
class_type: [],
task_direction: [],
fromYList: [],
fromZList: [],
toYList: [],
@@ -386,51 +407,27 @@ export default {
edit: ['admin', 'task:edit'],
del: ['admin', 'task:del']
},
showAddRowButton: true,
form: {
task_id: null,
vehicle_code: null,
vehicle_code2: null,
vehicle_type: null,
task_type: '1',
storage_task_type: '',
task_direction: null,
task_status: null,
priority: 1,
start_point_code: null,
start_point_code2: null,
start_device_code: null,
start_device_code2: null,
next_point_code: null,
next_point_code2: null,
interaction_json: null,
remark: null,
material: null,
route_plan_code: 'normal',
agv_action_type: 1,
from_x: null,
from_y: null,
from_z: null,
to_x: null,
to_y: null,
to_z: null,
from_x2: null,
from_y2: null,
from_z2: null,
to_x2: null,
to_y2: null,
to_z2: null,
agv_system_type: '',
interactionJson: null
to_z: null
},
taskStatus: {
task_status: '',
task_id: null
},
extension: [{
name: '',
value: ''
}],
dialogVisible: false,
rules: {
start_point_code: [
{ required: true, message: '起点不能为空', trigger: 'change' }
@@ -439,16 +436,16 @@ export default {
{ required: true, message: '终点不能为空', trigger: 'change' }
],
from_y: [
{ required: true, message: 'y 不能为空', trigger: 'change' }
{ validator: checkFromY, trigger: 'change' }
],
from_z: [
{ required: true, message: 'Z 不能为空', trigger: 'change' }
{ validator: checkFromZ, trigger: 'change' }
],
to_y: [
{ required: true, message: 'y 不能为空', trigger: 'change' }
{ validator: checkToY, trigger: 'change' }
],
to_z: [
{ required: true, message: 'Z 不能为空', trigger: 'change' }
{ validator: checkToZ, trigger: 'change' }
]
}
}
@@ -465,71 +462,19 @@ export default {
})
},
methods: {
getAgvSystemLabel(value) {
const item = this.dict.label.agv_system_type[value]
return item
},
addNewRow() {
this.extension.push({
name: '',
value: ''
})
},
deleteField(index) { // 添加字段的时候删除一条数据
if (this.extension.length > 1) {
this.extension.splice(index, 1)
}
},
cancelForm() {
// 清空表单数据
this.extension = [{
name: '',
value: ''
}]
this.dialogVisible = false
},
saveForm() {
// 保存表单数据
// 你可以在这里处理保存逻辑，并发送请求保存表单数据
this.form.interactionJson = this.extension.reduce((extension, item) => {
extension[item.name] = item.value
return extension
}, {})
this.dialogVisible = false
},
saveBtn() {
// 禁用按钮
this.isDisabled = true
crudTask.add(this.form).then(res => {
// 请求完成后启用按钮
this.isDisabled = false
this.crud.toQuery()
this.formDia = false
this.isDisabled = true
})
this.extension = [{
name: '',
value: ''
}]
// 设置定时器，等待一定时间后再次允许请求
setTimeout(() => {
this.isDisabled = false // 可根据具体需求进行调整
}, 1000) // 5000 毫秒，即 5 秒钟
},
openDialog() {
this.dialogVisible = true
},
closeDialog() {
this.dialogVisible = false
},
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
[CRUD.HOOK.beforeRefresh]() {
return true
},
finish(index, row) {
this.taskStatus.task_id = row.task_id
this.taskStatus.task_status = index
crudTask.finish(this.taskStatus).then(res => {
crudTask.finish(row.task_id).then(res => {
this.crud.toQuery()
this.crud.notify('完成成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
@@ -544,14 +489,6 @@ export default {
console.log(err.response.data.message)
})
},
cancelAndInst(index, row) {
crudTask.cancelAndInst(row.task_id).then(res => {
this.crud.toQuery()
this.crud.notify('取消成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
console.log(err.response.data.message)
})
},
createInst(index, row) {
crudTask.createInst(row.task_id).then(res => {
this.crud.toQuery()
@@ -575,22 +512,16 @@ export default {
'command': command
}
},
handleCommand(index, row, command) {
switch (command) {
handleCommand(command) {
switch (command.command) {
case 'a':// 完成
this.finish('2', row)
this.finish(command.index, command.row)
break
case 'b':// 取消
this.cancel(index, row)
this.cancel(command.index, command.row)
break
case 'c':// 创建指令
this.createInst(index, row)
break
case 'd':// 强制完成
this.finish('4', row)
break
case 'e':// 取消任务和指令
this.cancelAndInst('3', row)
this.createInst(command.index, command.row)
break
}
},
@@ -699,14 +630,7 @@ export default {
cursor: pointer;
color: #409EFF;
}
.el-icon-arrow-down {
font-size: 12px;
}
.button-container {
display: flex;
justify-content: flex-end;
align-items: flex-end;
}
</style>

87
acs/nladmin-ui/src/views/acs/task/taskFeedback/index.vue
View File

@@ -5,7 +5,7 @@
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu" :title="crud.status.title" width="500px">
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="任务反馈标识" prop="taskback_id">
<el-input v-model="form.taskback_id" style="width: 370px;" />
@@ -90,51 +90,38 @@
</el-dialog>
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="small" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column v-if="false" prop="taskback_id" label="任务反馈标识" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" :min-width="flexWidth('task_code',crud.data,$t('task.txt_box.Task_code'))" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" min-width="150px" />
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" :min-width="flexWidth('task_status',crud.data,$t('task.txt_box.Task_status'))" />
<el-table-column prop="start_point_code" :label="$t('task.select.Starting_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.txt_box.Starting_point'))" />
<el-table-column prop="next_point_code" :label="$t('task.select.Target_point')" :min-width="flexWidth('next_point_code',crud.data,$t('task.txt_box.Target_point'))" />
<el-table-column prop="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" :min-width="flexWidth('vehicle_code',crud.data,$t('task.txt_box.Vehicle_number'))" />
<el-table-column prop="is_finished" :label="$t('task.select.Is_it_completed')" :min-width="flexWidth('is_finished',crud.data,$t('task.select.Is_it_completed'))" />
<el-table-column prop="error_code" :label="$t('task.select.error_code')" :min-width="flexWidth('error_code',crud.data,$t('task.select.error_code'))" />
<el-table-column prop="start_time" :label="$t('task.select.start_time')" :min-width="flexWidth('start_time',crud.data,$t('task.select.start_time'))" />
<el-table-column prop="finish_time" :label="$t('task.select.finish_time')" :min-width="flexWidth('finish_time',crud.data,$t('task.select.finish_time'))" />
<el-table-column prop="create_type" :label="$t('task.select.create_type')" :min-width="flexWidth('create_type',crud.data,$t('task.select.create_type'))" />
<el-table-column prop="finish_type" :label="$t('task.select.finish_type')" :min-width="flexWidth('finish_type',crud.data,$t('task.select.finish_type'))" />
<el-table-column prop="retry_times" :label="$t('task.select.retry_times')" :min-width="flexWidth('retry_times',crud.data,$t('task.select.retry_times'))" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" :min-width="flexWidth('remark',crud.data,$t('task.select.remark'))" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column v-permission="['admin','taskFeedback:edit','taskFeedback:del']" :label="$t('task.select.Operation')" width="200px" align="center">
<el-table-column type="selection" width="55" />
<el-table-column v-permission="['admin','taskFeedback:edit','taskFeedback:del']" fixed="left" label="操作" width="100px" align="center">
<template slot-scope="scope">
<!-- <el-dropdown trigger="click" @command="handleCommand">-->
<!-- <span class="el-dropdown-link">-->
<!-- <i class="el-icon-menu" />-->
<!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">{{ $t('task.select.Reset') }}</el-dropdown-item>-->
<!-- <el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">{{ $t('task.select.Void') }}</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<el-button
type="text"
icon="el-icon-refresh"
@click="handleCommand(scope.$index, scope.row,'a')"
>
{{ $t('task.select.Reset') }}
</el-button>
<el-button
type="text"
icon="el-icon-circle-close"
@click="handleCommand(scope.$index, scope.row,'b')"
>
{{ $t('task.select.Void') }}
</el-button>
<el-dropdown trigger="click" @command="handleCommand">
<span class="el-dropdown-link">
<i class="el-icon-menu" />
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'a')">重置</el-dropdown-item>
<el-dropdown-item :command="beforeHandleCommand(scope.$index, scope.row,'b')">作废</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</template>
</el-table-column>
<el-table-column v-if="false" prop="taskback_id" label="任务反馈标识" />
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" label="任务号" />
<el-table-column prop="task_type" label="任务类型" />
<el-table-column prop="task_status" label="任务状态" />
<el-table-column prop="start_point_code" label="起始点位" />
<el-table-column prop="next_point_code" label="目标点位" />
<el-table-column prop="vehicle_code" label="载具号" />
<el-table-column prop="is_finished" label="是否完成" />
<el-table-column prop="error_code" label="错误编码" />
<el-table-column prop="start_time" label="开始时间" />
<el-table-column prop="finish_time" label="完成时间" />
<el-table-column prop="create_type" label="创建类型" />
<el-table-column prop="finish_type" label="完成类型" />
<el-table-column prop="retry_times" label="重试次数" />
<el-table-column prop="remark" label="备注" />
<el-table-column prop="create_by" label="创建者" />
<el-table-column prop="create_time" label="创建时间" />
</el-table>
<!--分页组件-->
<pagination />
@@ -143,11 +130,11 @@
</template>
<script>
import crudTaskFeedback /* { invalid } */ from '@/api/acs/task/taskFeedback'
import crudTaskFeedback, { invalid } from '@/api/acs/task/taskFeedback'
import CRUD, { presenter, header, form, crud } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation'
import pagination from '@crud/Pagination'
// import crudTask from '@/api/acs/task/task'
import crudTask from '@/api/acs/task/task'
const defaultForm = { taskback_id: null, task_id: null, task_code: null, vehicle_code: null, vehicle_type: null, task_type: null, task_status: null, is_finished: null, error_code: null, start_time: null, finish_time: null, create_type: null, finish_type: null, retry_times: null, start_point_code: null, start_device_code: null, next_point_code: null, next_device_code: null, remark: null, is_active: null, is_delete: null, create_by: null, create_time: null, update_by: null, update_time: null }
export default {
@@ -207,7 +194,7 @@ export default {
create_time: [
{ required: true, message: '创建时间不能为空', trigger: 'blur' }
]
}}
} }
},
methods: {
// 钩子：在获取表格数据之前执行，false 则代表不获取数据
@@ -237,13 +224,13 @@ export default {
'command': command
}
},
handleCommand(index, row, command) {
switch (command) {
handleCommand(command) {
switch (command.command) {
case 'a':// 重置
this.retry(index, row)
this.retry(command.index, command.row)
break
case 'b':// 作废
this.invalid(index, row)
this.invalid(command.index, command.row)
break
}
}