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

add:新增交互字段显示

Browse Source
This commit is contained in:
tuqiang
2024-06-15 13:36:06 +08:00
parent 549e9650cb
commit 72cfb31714
5 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,6 +27,7 @@ export default {
'Starting_layer': 'Starting Layer', 'Starting_layer': 'Starting Layer',
'Destination': 'Destination', 'Destination': 'Destination',
'Destination2': 'Destination 2', 'Destination2': 'Destination 2',
'Interaction_json': 'Interaction Fields',
'Ending_column': 'Ending Column', 'Ending_column': 'Ending Column',
'Ending_layer': 'Ending Layer', 'Ending_layer': 'Ending Layer',
'Description': 'Description', 'Description': 'Description',

1
acs2/nladmin-ui/src/i18n/langs/task/in.js
View File

@@ -27,6 +27,7 @@ export default {
'Starting_layer': 'Lapisan Awal', 'Starting_layer': 'Lapisan Awal',
'Destination': 'Tujuan', 'Destination': 'Tujuan',
'Destination2': 'Tujuan 2', 'Destination2': 'Tujuan 2',
'Interaction_json': 'Bidang Interaksi',
'Ending_column': 'Kolom Akhir', 'Ending_column': 'Kolom Akhir',
'Ending_layer': 'Lapisan Akhir', 'Ending_layer': 'Lapisan Akhir',
'Description': 'Deskripsi', 'Description': 'Deskripsi',

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

@@ -27,6 +27,7 @@ export default {
'Starting_layer': '起点-层', 'Starting_layer': '起点-层',
'Destination': '终点', 'Destination': '终点',
'Destination2': '终点2', 'Destination2': '终点2',
'Interaction_json': '交互字段',
'Ending_column': '终点-列', 'Ending_column': '终点-列',
'Ending_layer': '终点-层', 'Ending_layer': '终点-层',
'Description': '描述信息', 'Description': '描述信息',

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

@@ -295,6 +295,7 @@
<el-table-column prop="next_point_code" :label="$t('task.select.Destination')" /> <el-table-column prop="next_point_code" :label="$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="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="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" />
<el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" /> <el-table-column prop="matarial" :label="$t('TaskRecord.table.Material')" />
<el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" /> <el-table-column prop="quantity" :label="$t('TaskRecord.table.Quantity')" />
<el-table-column prop="remark" :label="$t('task.select.Remark')" /> <el-table-column prop="remark" :label="$t('task.select.Remark')" />
@@ -329,6 +330,7 @@ const defaultForm = {
start_point_code: null, start_point_code: null,
start_device_code: null, start_device_code: null,
next_point_code: null, next_point_code: null,
start_point_code: null,
remark: null, remark: null,
material: null, material: null,
route_plan_code: 'normal', route_plan_code: 'normal',

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

@@ -502,6 +502,7 @@
<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="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="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="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="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" />
<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="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="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_by" :label="$t('task.select.Creator')" :min-width="flexWidth('create_by',crud.data,$t('task.select.Creator'))" />
@@ -671,6 +672,7 @@ export default {
start_device_code2: null, start_device_code2: null,
next_point_code: null, next_point_code: null,
next_point_code2: null, next_point_code2: null,
interaction_json: null,
remark: null, remark: null,
material: null, material: null,
route_plan_code: 'normal', route_plan_code: 'normal',