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

rev:一楼优化

Browse Source
This commit is contained in:
tuqiang
2024-08-19 18:37:03 +08:00
parent 4512ea7f83
commit 0e6e8eeef9
20 changed files with 290 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
acs2/nladmin-ui/src/i18n/langs/monitor/en.js
View File

@@ -140,7 +140,8 @@ export default {
'Current_command_information': 'Current command information',
'The_signal_is_successfully_marked': 'The signal is successfully marked',
'Complement_information': 'Complement information',
'agv_task_type': 'task type'
'agv_task_type': 'task type',
'vehicle_code2': 'Box number'
}
}
}

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

@@ -140,7 +140,8 @@ export default {
'Current_command_information': 'Informasi perintah saat ini',
'The_signal_is_successfully_marked': 'Sinyal berhasil ditandai',
'Complement_information': 'Informasi pelengkap',
'agv_task_type': 'Jenis tugas'
'agv_task_type': 'Jenis tugas',
'vehicle_code2': 'Nomor kotak kayu'
}
}
}

3
acs2/nladmin-ui/src/i18n/langs/monitor/zh.js
View File

@@ -140,7 +140,8 @@ export default {
'Current_command_information': '当前指令信息',
'The_signal_is_successfully_marked': '信号成功标记',
'Complement_information': '补码信息',
'agv_task_type': '任务类型'
'agv_task_type': '任务类型',
'vehicle_code2': '木箱号'
}
}
}

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

@@ -9,7 +9,7 @@
/>
</el-select>
<el-row>
<div id="container" className="container" style="min-height: 100%" />
<div id="container" className="container" style="min-height: 100%"/>
</el-row>
<!--点击设备显示信息-->
<el-dialog
@@ -41,10 +41,10 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
<el-input v-model="form.hand_barcode" :disabled="false"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -62,7 +62,7 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible3" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.device_status')" label-width="80px">
<el-radio-group v-model="form.hasGoodStatus">
@@ -72,7 +72,7 @@
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('monitor.click.material_code')" prop="material_type" label-width="80px">
<el-input v-model="form.material_type" />
<el-input v-model="form.material_type"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -85,7 +85,7 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible4" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.disabled_manipulator')" prop="is_disable" label-width="120px">
<el-radio-group v-model="form.is_disable">
@@ -109,7 +109,7 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible5" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -127,10 +127,10 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible7" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
<el-input v-model="form.hand_barcode" :disabled="false"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -154,7 +154,7 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible6" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item label="申请指令标记" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -179,11 +179,11 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible1" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="80px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" prop="device_code" label-width="80px">
<el-input v-model="form.barcode" :disabled="false" />
<el-input v-model="form.barcode" :disabled="false"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -196,7 +196,7 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible8" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.job_command')" prop="toCommand" label-width="120px">
<el-radio-group v-model="form.toCommand">
@@ -206,13 +206,13 @@
</el-radio-group>
</el-form-item>
<el-form-item :label="$t('monitor.click.keep_out_of_storage')" prop="prohibitInWarehouse" label-width="120px">
<el-switch v-model="form.prohibitInWarehouse" />
<el-switch v-model="form.prohibitInWarehouse"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.no_release')" prop="prohibitOutWarehouse" label-width="120px">
<el-switch v-model="form.prohibitOutWarehouse" />
<el-switch v-model="form.prohibitOutWarehouse"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.stop_task')" prop="stopReceiveTask" label-width="120px">
<el-switch v-model="form.stopReceiveTask" />
<el-switch v-model="form.stopReceiveTask"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.requireSucess')" prop="applySucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -229,13 +229,13 @@
<el-dialog :title="$t('monitor.click.device_setup')" :visible.sync="dialogFormVisible10" width="35%">
<el-form :model="form" size="small">
<el-form-item :label="$t('monitor.click.equipment_number')" prop="device_code" label-width="120px">
<el-input v-model="form.device_code" :disabled="true" />
<el-input v-model="form.device_code" :disabled="true"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.bar_code')" label-width="120px">
<el-input v-model="form.hand_barcode" :disabled="false" />
<el-input v-model="form.hand_barcode" :disabled="false"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.material_code')" label-width="120px">
<el-input v-model="form.hand_material_barcode" :disabled="false" />
<el-input v-model="form.hand_material_barcode" :disabled="false"/>
</el-form-item>
<el-form-item :label="$t('monitor.click.request_flag')" prop="requireSucess" label-width="120px">
<el-radio-group v-model="form.requireSucess">
@@ -805,6 +805,9 @@ export default {
} else if (val === 'agv_task_type') {
const obj = { name: i18n.t('monitor.click.agv_task_type'), value: data[val] }
this.arr.push(obj)
} else if (val === 'vehicle_code2') {
const obj = { name: i18n.t('monitor.click.vehicle_code2'), value: data[val] }
this.arr.push(obj)
}
}
}