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

add:新增字段展示以及优化监控信息展示

Browse Source
This commit is contained in:
tuqiang
2024-08-15 21:08:13 +08:00
parent d95c863598
commit 4b63e7541b
37 changed files with 530 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs2/nladmin-ui/src/i18n/langs/instruction/en.js
View File

@@ -5,6 +5,7 @@ export default {
'instruction_type': 'Instruction Type',
'task_code': 'Task Code',
'vehicle_code': 'Vehicle Code',
'vehicle_code2': 'Box Code',
'instruction_status': 'Instruction Status',
'send_status': 'Send Status',
'start_point_code': 'Start Device Code',
@@ -21,6 +22,7 @@ export default {
'update_time': 'Update Time',
'input_taskCode_or_instCode': 'Input TaskCode Or InstCode',
'input_vehicleCode': 'Input VehicleCode',
'input_vehicleCode2': 'Input BoxCode',
'material': 'Material Type',
'task_status': 'Task Status',
'input_startCode_or_nextCode': 'Input StartCode Or NextCode',

2
acs2/nladmin-ui/src/i18n/langs/instruction/in.js
View File

@@ -5,6 +5,7 @@ export default {
'instruction_type': 'Jenis Instruksi',
'task_code': 'Nomor Tugas',
'vehicle_code': 'Nomor Kendaraan',
'vehicle_code2': 'Nomor kotak kayu',
'instruction_status': 'Status Perintah',
'send_status': 'Status Pengiriman',
'start_point_code': 'Titik Penjemputan',
@@ -21,6 +22,7 @@ export default {
'update_time': 'Ubah Waktu',
'input_taskCode_or_instCode': 'Masukkan Nomor Tugas Atau Nomor Instruksi',
'input_vehicleCode': 'Masukkan Nomor Kendaraan',
'input_vehicleCode2': 'Masukkan Nomor kotak kayu',
'material': 'Jenis Barang',
'task_status': 'Status Tugas',
'input_startCode_or_nextCode': 'Jenis Barang',

2
acs2/nladmin-ui/src/i18n/langs/instruction/zh.js
View File

@@ -5,6 +5,7 @@ export default {
'instruction_type': '指令类型',
'task_code': '任务号',
'vehicle_code': '载具号',
'vehicle_code2': '木箱号',
'instruction_status': '指令状态',
'send_status': '下发状态',
'start_point_code': '取货点',
@@ -21,6 +22,7 @@ export default {
'update_time': '修改时间',
'input_taskCode_or_instCode': '输入任务号或指令号',
'input_vehicleCode': '输入载具号',
'input_vehicleCode2': '输入木箱号',
'material': '物料类型',
'task_status': '任务状态',
'input_startCode_or_nextCode': '输入起点或终点',

2
acs2/nladmin-ui/src/i18n/langs/task/zh.js
View File

@@ -3,6 +3,7 @@ export default {
'txt_box': {
'Enter_task_number': '输入任务号',
'Vehicle_registration_number': '输入载具号',
'Vehicle2_registration_number': '输入木箱号',
'Material_type': '物料类型',
'Task_status': '任务状态',
'Origin_or_destination': '输入起点或终点',
@@ -18,6 +19,7 @@ export default {
'agv_action_type': 'agv二次分配类型',
'Priority': '优先级',
'Vehicle_number': '载具号',
'Vehicle_number2': '木箱号',
'Task_code': '任务号',
'Task': '任务',
'start_or_end': '起点或终点',

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

@@ -32,6 +32,17 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Vehicle_number2')">
<el-input
v-model="query.vehicle_code2"
size="small"
clearable
:placeholder="$t('task.txt_box.Vehicle2_registration_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="query.material_type"
@@ -149,6 +160,7 @@
</template>
</el-table-column>
<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="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))" />
<el-table-column prop="instruction_status" :label="$t('TaskRecord.table.Instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('TaskRecord.table.Instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('task.select.Ready') }}</span>
@@ -299,6 +311,7 @@ export default {
const params = {
code: this.query.task_code,
vehicle_code: this.query.vehicle_code,
vehicle_code2: this.query.vehicle_code2,
material_type: this.query.material_type,
status: this.query.status,
point_code: this.crud.pointCode,

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

@@ -32,6 +32,17 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Vehicle_number2')">
<el-input
v-model="query.vehicle_code2"
size="small"
clearable
:placeholder="$t('task.txt_box.Vehicle2_registration_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="query.material_type"
@@ -277,8 +288,8 @@
<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="vehicle_code" :label="$t('task.txt_box.Vehicle_number')" />
<el-table-column prop="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
debugger
<template slot-scope="scope">
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2 ">{{ dict.label.task_type[scope.row.class_type] }}</span>
<span v-else>{{ dict.label.task_type[scope.row.task_type] }}</span>
@@ -327,6 +338,7 @@ import { downloadFile } from '@/utils'
const defaultForm = {
task_id: null,
vehicle_code: null,
vehicle_code2: null,
vehicle_type: null,
task_type: null,
class_type: null,
@@ -493,6 +505,7 @@ export default {
const params = {
task_code: this.query.task_code,
vehicle_code: this.query.vehicle_code,
vehicle_code2: this.query.vehicle_code2,
material_type: this.query.material_type,
status: this.query.status,
point_code: this.crud.pointCode,

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

@@ -32,6 +32,17 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Vehicle_number2')">
<el-input
v-model="query.vehicle_code2"
size="small"
clearable
:placeholder="$t('task.txt_box.Vehicle2_registration_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="query.material_type"
@@ -123,6 +134,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="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))" />
<el-table-column prop="task_type" :label="$t('task.txt_box.Task_type')" width="100px">
<template slot-scope="scope">
<span v-if="scope.row.class_type!=null && scope.row.class_type.length===2">{{ dict.label.task_type[scope.row.class_type] }}</span>
@@ -182,6 +194,7 @@ import { downloadFile } from '@/utils'
const defaultForm = {
task_id: null,
vehicle_code: null,
vehicle_code2: null,
vehicle_type: null,
task_type: null,
task_status: null,
@@ -262,6 +275,7 @@ export default {
const params = {
task_code: this.query.task_code,
vehicle_code: this.query.vehicle_code,
vehicle_code2: this.query.vehicle_code2,
material_type: this.query.material_type,
status: this.query.is_over,
point_code: this.crud.pointCode,

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

@@ -32,6 +32,17 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('Inst.table.vehicle_code2')">
<el-input
v-model="query.vehicle_code2"
size="small"
clearable
:placeholder="$t('task.txt_box.Vehicle2_registration_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('Inst.table.material')">
<el-select
v-model="query.material_type"
@@ -159,6 +170,7 @@
<!-- <el-table-column prop="link_num" label="关联编号" />-->
<el-table-column prop="task_code" :label="$t('Inst.table.task_code')" :min-width="flexWidth('task_code',crud.data,$t('Inst.table.task_code'))" />
<el-table-column prop="vehicle_code" :label="$t('Inst.table.vehicle_code')" :min-width="flexWidth('vehicle_code',crud.data,$t('Inst.table.vehicle_code'))" />
<el-table-column prop="vehicle_code2" :label="$t('Inst.table.vehicle_code2')" :min-width="flexWidth('vehicle_code2',crud.data,$t('Inst.table.vehicle_code2'))" />
<el-table-column prop="instruction_status" :label="$t('Inst.table.instruction_status')" :min-width="flexWidth('instruction_status',crud.data,$t('Inst.table.instruction_status'))">
<template slot-scope="scope">
<span v-if="scope.row.instruction_status=='0' ">{{ $t('Inst.table.ready') }}</span>
@@ -235,6 +247,8 @@ const defaultForm = {
instruction_id: null,
task_id: null,
instruction_code: null,
vehicle_code: null,
vehicle_code2: null,
execute_device_code: null,
execute_status: null,
execute_status_description: null,

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

@@ -46,6 +46,17 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Vehicle_number2')">
<el-input
v-model="query.vehicle_code2"
size="small"
clearable
:placeholder="$t('task.txt_box.Vehicle2_registration_number')"
style="width: 200px;"
class="filter-item"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<el-form-item :label="$t('task.txt_box.Material_type')">
<el-select
v-model="query.material_type"
@@ -546,6 +557,9 @@
<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="vehicle_code2" :label="$t('task.txt_box.Vehicle_number2')"
:min-width="flexWidth('vehicle_code2',crud.data,$t('task.txt_box.Vehicle_number2'))"
/>
<el-table-column prop="task_status" :label="$t('task.txt_box.Task_status')" width="150px">
<template slot-scope="scope">
<span v-if="scope.row.task_status==='0' ">{{ $t('task.select.Ready') }}</span>
@@ -724,6 +738,7 @@ export default {
form: {
task_id: null,
vehicle_code: null,
vehicle_code2: null,
vehicle_type: null,
task_type: '1',
storage_task_type: '',