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

更新

Browse Source
This commit is contained in:
gengby
2022-11-26 18:14:13 +08:00
parent 1c3c153ed9
commit 37dc4606bc
25 changed files with 721 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
acs/nladmin-ui/src/views/acs/instruction/index.vue
View File

@@ -127,9 +127,11 @@
<span v-if="scope.row.send_status=='2' ">失败</span>
</template>
</el-table-column>
<el-table-column prop="start_point_code" label="取货点" />
<el-table-column prop="start_point_code" label="取货点1" />
<el-table-column prop="put_point_code" label="倒料点" />
<el-table-column prop="next_point_code" label="放货点" />
<el-table-column prop="next_point_code" label="放货点1" />
<el-table-column prop="start_point_code2" label="取货点2" />
<el-table-column prop="next_point_code2" label="放货点2" />
<el-table-column prop="carno" label="车号" />
<el-table-column prop="compound_inst" label="复合指令">
<template slot-scope="scope">

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

@@ -117,6 +117,23 @@
/>
</el-select>
</el-form-item>
<el-form-item label="agv系统">
<el-select
v-model="form.agv_system_type"
style="width: 370px;"
filterable
clearable
placeholder="请选择"
@change="isDisabled=false"
>
<el-option
v-for="item in dict.agv_system_type"
: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"
@@ -231,6 +248,36 @@
/>
</el-select>
</el-form-item>
<el-form-item label="起点2" prop="start_point_code2">
<el-select
v-model="form.start_point_code2"
style="width: 370px;"
filterable
placeholder="请选择"
>
<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="终点2" prop="next_point_code2">
<el-select
v-model="form.next_point_code2"
style="width: 370px;"
filterable
placeholder="请选择"
>
<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="优先级">
<el-input v-model="form.priority" style="width: 370px;" @change="isDisabled=false" />
</el-form-item>
@@ -266,10 +313,12 @@
{{ dict.label.task_type[scope.row.task_type] }}
</template>
</el-table-column>-->
<el-table-column prop="priority" label="任务优先级" />
<el-table-column prop="start_point_code" label="取货点" width="120px" />
<el-table-column prop="priority" label="任务优先级" width="120px" />
<el-table-column prop="start_point_code" label="取货点1" width="120px" />
<el-table-column prop="put_point_code" label="倒料点" />
<el-table-column prop="next_point_code" label="放货点" width="120px" />
<el-table-column prop="next_point_code" label="放货点1" width="120px" />
<el-table-column prop="start_point_code2" label="取货点2" width="120px" />
<el-table-column prop="next_point_code2" label="放货点2" width="120px" />
<el-table-column prop="compound_task" label="复合任务">
<template slot-scope="scope">
<span v-if="scope.row.compound_task==='0' ">否</span>
@@ -315,7 +364,7 @@ import { getDicts } from '@/api/system/dict'
export default {
name: 'Task',
components: { pagination, crudOperation },
dicts: ['task_status', 'task_type'],
dicts: ['task_status', 'task_type', 'agv_system_type'],
mixins: [presenter(), header(), crud()],
cruds() {
return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc',
@@ -400,8 +449,11 @@ export default {
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,
remark: null,
material: null,
route_plan_code: 'normal',
@@ -410,7 +462,8 @@ export default {
from_z: null,
to_x: null,
to_y: null,
to_z: null
to_z: null,
agv_system_type: ''
},
rules: {
start_point_code: [