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-02-29 10:30:48 +08:00
parent 42e572a003
commit 544e5dfaea
24 changed files with 365 additions and 265 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

@@ -9,6 +9,8 @@ export default {
'send_status': 'Send Status',
'start_point_code': 'Start Device Code',
'next_point_code': 'Next Device Code',
'start_point_code2': 'Start Device Code 2',
'next_point_code2': 'Next Device Code 2',
'put_point_code': 'Put Point Code',
'execute_device_code': 'Execute Device Code',
'carno': 'Carno',

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

@@ -9,6 +9,8 @@ export default {
'send_status': 'Status Pengiriman',
'start_point_code': 'Titik Penjemputan',
'next_point_code': 'Titik Pengantaran',
'start_point_code2': 'Titik Penjemputan 2',
'next_point_code2': 'Titik Pengantaran 2',
'put_point_code': 'Titik Pembuangan',
'execute_device_code': 'Perangkat Eksekusi',
'carno': 'Nomor Kendaraan',

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

@@ -9,6 +9,8 @@ export default {
'send_status': '下发状态',
'start_point_code': '取货点',
'next_point_code': '放货点',
'start_point_code2': '取货点2',
'next_point_code2': '放货点2',
'put_point_code': '倒料点',
'execute_device_code': '当前执行设备',
'carno': '车号',

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

@@ -166,11 +166,10 @@
</el-table-column>
<el-table-column prop="start_point_code" :label="$t('Inst.table.start_point_code')" :min-width="flexWidth('start_point_code',crud.data,$t('Inst.table.start_point_code'))" />
<el-table-column prop="next_point_code" :label="$t('Inst.table.next_point_code')" :min-width="flexWidth('next_point_code',crud.data,$t('Inst.table.next_point_code'))" />
<!-- <el-table-column prop="start_point_code2" label="取货点2" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" />-->
<el-table-column prop="start_point_code2" :label="$t('Inst.table.start_point_code2')" :min-width="flexWidth('start_point_code2',crud.data,$t('Inst.table.start_point_code2'))" />
<el-table-column prop="next_point_code2" :label="$t('Inst.table.next_point_code2')" :min-width="flexWidth('next_point_code2',crud.data,$t('Inst.table.snext_point_code2'))" />
<el-table-column prop="put_point_code" :label="$t('Inst.table.put_point_code')" :min-width="flexWidth('put_point_code',crud.data,$t('Inst.table.put_point_code'))" />
<el-table-column prop="execute_device_code" :label="$t('Inst.table.execute_device_code')" :min-width="flexWidth('execute_device_code',crud.data,$t('Inst.table.execute_device_code'))" />
<el-table-column prop="carno" :label="$t('Inst.table.carno')" :min-width="flexWidth('carno',crud.data,$t('Inst.table.carno'))" />
<el-table-column prop="remark" :label="$t('Inst.table.remark')" :min-width="flexWidth('remark',crud.data,$t('Inst.table.remark'))" />
<el-table-column prop="create_by" :label="$t('Inst.table.create_by')" :min-width="flexWidth('create_by',crud.data,$t('Inst.table.create_by'))" />

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

@@ -494,8 +494,8 @@
<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="put_point_code" label="倒料点" width="100" />-->
<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="取货点2" width="120px" />-->
<!-- <el-table-column prop="next_point_code2" label="放货点2" width="120px" />-->
<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="compound_task" label="复合任务">-->
<!-- <template slot-scope="scope">-->
<!-- <span v-if="scope.row.compound_task==='0' ">否</span>-->

24
acs2/nladmin-ui/src/views/system/monitor/device/index.vue
View File

@@ -1,5 +1,13 @@
<template>
<div style="overflow: hidden">
<el-select v-model="value" :placeholder="$t('auto.common.please')" @change="initStageData">
<el-option
v-for="item in stageParam"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<el-row>
<div id="container" className="container" style="min-height: 100%" />
</el-row>
@@ -232,7 +240,7 @@ export default {
name: 'MonitorDevice',
data() {
return {
stageParam: 'age', // 舞台参数
// stageParam: 'stage_code', // 舞台参数
dialogDeviceMsgVisible: false, // 显示设备信息的dialog
device_code: null,
tops: '20vh', // 初始top
@@ -247,6 +255,15 @@ export default {
dialogFormVisible6: false,
dialogFormVisible7: false,
dialogFormVisible8: false,
stageParam: [{// 舞台参数
value: 'age',
label: 'age'
}, {
value: 'stage_code',
label: 'stage_code'
}],
value: '',
stage_code: '',
form: {
device_code: '',
hasGoodStatus: null,
@@ -342,9 +359,10 @@ export default {
lf.render(data)
this.initStageData()
},
initStageData() {
initStageData(var1) {
// 获取舞台数据
crudStage.getNewStageDataByCode(this.stageParam).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
this.stage_code = var1
crudStage.getNewStageDataByCode(this.stage_code).then(res => { // 通过舞台编码获取舞台数据并且赋值到lf对象
data = JSON.parse(res.stage_data)
lf.render(data)
this.initStatus() // 初始化状态