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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lishuai
2024-07-04 09:58:07 +08:00
parent 260e796ac5 053fac27f3
commit 54b9140e64
7 changed files with 106 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs2/nladmin-ui/src/i18n/langs/history/en.js
View File

@@ -11,6 +11,7 @@ export default {
'Endpoint_two': 'Endpoint Two',
'Material': 'Material',
'Quantity': 'Quantity',
'agv_action_type': 'The type of AGV secondary distribution',
'Numbering': 'Numbering',
'Value': 'Value',
'Input_task_instruction_number': 'Enter Task Number Or Instruction Number',

3
acs2/nladmin-ui/src/i18n/langs/history/in.js
View File

@@ -10,7 +10,8 @@ export default {
'Transit_point': 'Titik transit',
'Endpoint_two': 'Titik Akhir Dua',
'Material': 'Bahan',
'Quantity': 'Jumlah',
'Quantity': 'Jenis distribusi sekunder AGV',
'agv_action_type': 'agv二次分配类型',
'Numbering': 'Nomor',
'Value': 'Nilai',
'Input_task_instruction_number': 'Masukkan Nomor Tugas Atau Nomor Instruksi',

1
acs2/nladmin-ui/src/i18n/langs/history/zh.js
View File

@@ -11,6 +11,7 @@ export default {
'Endpoint_two': '终点2',
'Material': '物料',
'Quantity': '数量',
'agv_action_type': 'agv二次分配类型',
'Numbering': '编号',
'Value': '值',
'Input_task_instruction_number': '输入任务号或指令号',

13
acs2/nladmin-ui/src/views/acs/history/taskRecord/index.vue
View File

@@ -275,9 +275,9 @@
@selection-change="crud.selectionChangeHandler"
>
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('task.txt_box.Task_code')" />
<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="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
@@ -290,9 +290,9 @@
<span v-if="scope.row.task_status=='3' ">{{ $t('task.select.Cancel') }}</span>
</template>
</el-table-column>
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" />
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" />
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" />
<el-table-column prop="priority" :label="$t('TaskRecord.table.Priority')" :min-width="flexWidth('priority',crud.data,$t('TaskRecord.table.Priority'))" />
<el-table-column prop="start_point_code" :label="$t('task.select.Start_point')" :min-width="flexWidth('start_point_code',crud.data,$t('task.select.Start_point'))" />
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" :min-width="flexWidth('next_point_code',crud.data,$t('task.select.Destination'))" />
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" :show-overflow-tooltip="true" width="150px" />
@@ -301,6 +301,8 @@
<el-table-column prop="remark" :label="$t('task.select.Remark')" />
<el-table-column prop="create_by" :label="$t('task.select.Creator')" />
<el-table-column prop="create_time" :label="$t('task.select.Create_time')" width="135" />
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))" />
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))" />
</el-table>
<!--分页组件-->
<pagination />
@@ -330,7 +332,6 @@ const defaultForm = {
start_point_code: null,
start_device_code: null,
next_point_code: null,
start_point_code: null,
remark: null,
material: null,
route_plan_code: 'normal',

13
acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
View File

@@ -123,7 +123,7 @@
<el-table-column v-if="false" prop="task_id" label="任务标识" />
<el-table-column prop="task_code" :label="$t('TaskRecord.table.Task_number')" :min-width="flexWidth('task_code',crud.data,$t('TaskRecord.table.Task_number'))" />
<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="task_type" :label="$t('task.txt_box.Task_type')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
@@ -142,11 +142,22 @@
<el-table-column prop="start_point_code2" :label="$t('TaskRecord.table.Starting_point_two')" :min-width="flexWidth('start_point_code2',crud.data,$t('TaskRecord.table.Starting_point_two'))" />
<el-table-column prop="next_point_code2" :label="$t('TaskRecord.table.Endpoint_two')" :min-width="flexWidth('next_point_code2',crud.data,$t('TaskRecord.table.Endpoint_two'))" />
<el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_point'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" width="150px" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" :min-width="flexWidth('matarial',crud.data,$t('TaskRecord.table.Material'))" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" :min-width="flexWidth('quantity',crud.data,$t('TaskRecord.table.Quantity'))" />
<el-table-column prop="agv_action_type" :label="$t('TaskRecord.table.agv_action_type')" :min-width="flexWidth('agv_action_type',crud.data,$t('TaskRecord.table.agv_action_type'))">
<template slot-scope="scope">
<span v-if="scope.row.agv_action_type===1 ">{{ $t('task.txt_box.ORDINARY') }}</span>
<span v-if="scope.row.agv_action_type===2 ">{{ $t('task.txt_box.IN_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===3 ">{{ $t('task.txt_box.OUT_STOCK') }}</span>
<span v-if="scope.row.agv_action_type===4 ">{{ $t('task.txt_box.IN_OUT_STOCK') }}</span>
</template>
</el-table-column>
<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')" width="135" :min-width="flexWidth('create_time',crud.data,$t('task.select.Create_time'))" />
<el-table-column prop="update_by" :label="$t('TaskRecord.table.Update_by')" :min-width="flexWidth('update_by',crud.data,$t('TaskRecord.table.Update_by'))" />
<el-table-column prop="update_time" :label="$t('TaskRecord.table.Update_time')" :min-width="flexWidth('update_time',crud.data,$t('task.select.Update_time'))" />
</el-table>
<!--分页组件-->
<pagination />

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

@@ -505,7 +505,7 @@
<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')" :min-width="flexWidth('task_type',crud.data,$t('task.txt_box.Task_type'))">
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
{{ dict.label.task_type[scope.row.task_type] }}
</template>
@@ -533,6 +533,11 @@
<el-table-column prop="start_point_code2" :label="$t('task.select.Start_point2')" :min-width="flexWidth('start_point_code2',crud.data,$t('task.select.Start_point2'))" />
<el-table-column prop="next_point_code2" :label="$t('task.select.Destination2')" :min-width="flexWidth('next_point_code2',crud.data,$t('task.select.Destination2'))" />
<el-table-column prop="interaction_json" :label="$t('task.select.Interaction_json')" show-overflow-tooltip="true" width="150px" />
<el-table-column prop="agv_system_type" :label="$t('task.txt_box.AGV_system')" show-overflow-tooltip="true" width="150px">
<template slot-scope="scope">
{{ getAgvSystemLabel(scope.row.agv_system_type) }}
</template>
</el-table-column>
<el-table-column prop="put_point_code" :label="$t('TaskRecord.table.Transit_point')" :min-width="flexWidth('put_point_code',crud.data,$t('TaskRecord.table.Transit_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'))" />
@@ -771,6 +776,10 @@ export default {
})
},
methods: {
getAgvSystemLabel(value) {
const item = this.dict.label.agv_system_type[value]
return item
},
addNewRow() {
this.extension.push({
name: '',