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

opt:前端优化

Browse Source
This commit is contained in:
zds
2024-12-23 13:24:43 +08:00
parent ede8329ef0
commit 46a639e51f
13 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
acs/nladmin-ui/src/views/acs/device/config.vue
View File

@@ -11,6 +11,7 @@
<el-col :span="12">
<el-form-item label="设备类型" prop="device_type">
<el-select
id="device_type"
v-model="form.device_type"
placeholder=""
disabled
@@ -27,7 +28,7 @@
</el-col>
<el-col :span="12">
<el-form-item label="设备编号" prop="device_code">
<el-input v-model="form.device_code" disabled />
<el-input v-model="form.device_code" disabled id="device_code" />
<span style="color: #C0C0C0;margin-left: 10px;" />
</el-form-item>
</el-col>
@@ -36,13 +37,14 @@
<el-row>
<el-col :span="12">
<el-form-item label="设备名称" prop="device_name">
<el-input v-model="form.device_name" disabled />
<el-input v-model="form.device_name" id="device_name" disabled />
<span style="color: #C0C0C0;margin-left: 10px;" />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="设备驱动" prop="driver_code">
<el-select
id="driver_code"
v-model="form.driver_code"
filterable
placeholder=""
@@ -78,6 +80,7 @@ import standard_inspect_site from './driver/standard_inspect_site'
import standard_ordinary_site from './driver/standard_ordinary_site'
import standard_storage from '@/views/acs/device/driver/standard_storage'
import standard_scanner from '@/views/acs/device/driver/standard_scanner'
import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
import standard_conveyor_control_with_scanner from '@/views/acs/device/driver/standard_conveyor_control_with_scanner'
import standard_conveyor_control from '@/views/acs/device/driver/standard_conveyor_control'
import standard_conveyor_monitor from '@/views/acs/device/driver/standard_conveyor_monitor'
@@ -111,6 +114,7 @@ export default {
agv_ndc_one,
xg_agv,
ssx_site,
lamp_three_color,
fold_disc_site
},
dicts: ['device_type'],
@@ -157,6 +161,7 @@ export default {
},
methods: {
changeDriver(val) {
console.log(val)
this.currentComponent = val
}
}

2
acs/nladmin-ui/src/views/acs/device/driver/cargo_lift_conveyor.vue
View File

@@ -303,7 +303,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'CargoLiftConveyor',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/empty_vehicle_stacking_position.vue
View File

@@ -272,7 +272,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'EmptyVehicleStackingPosition',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue
View File

@@ -291,7 +291,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'LnshFoldDisc',
name: 'FoldDiscSite',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/hailiang_smart_plc_test.vue
View File

@@ -267,7 +267,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'HailiangSmartPlcTest',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue
View File

@@ -275,7 +275,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
name: 'HongxiangConveyor',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue
View File

@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
name: 'HongxiangDevice',
mixins: [crud],
props: {
parentForm: {

18
acs/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue
View File

@@ -105,6 +105,14 @@
/>
</template>
</el-table-column>
<el-table-column prop="dbr_value2">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_read2()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input" />
</template>
</el-table-column>
<el-table-column prop="dbw_value">
<template slot="header">
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
@@ -278,6 +286,15 @@ export default {
}
})
},
test_read2() {
testRead(this.data2, this.opc_id).then(data => {
this.data2 = data
console.log(this.data2)
this.notify('操作成功!', 'success')
}).catch(err => {
console.log(err.response.data.message)
})
},
test_read1() {
testRead(this.data1, this.opc_id).then(data => {
this.data1 = data
@@ -341,4 +358,3 @@ export default {
<style scoped>
</style>

2
acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue
View File

@@ -281,7 +281,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'SiemensConveyor',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue
View File

@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'SiemensConveyorCkk',
mixins: [crud],
props: {
parentForm: {

2
acs/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue
View File

@@ -274,7 +274,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardConveyorControl',
name: 'SiemensConveyorLabeling',
mixins: [crud],
props: {
parentForm: {

44
acs/nladmin-ui/src/views/acs/device/driver/ssx_site.vue
View File

@@ -51,8 +51,8 @@
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
<el-form-item label="电气调度号" label-width="150px" prop="address">
<el-input v-model="form.address" id="address" />
</el-form-item>
</el-col>
</el-row>
@@ -66,39 +66,40 @@
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
<el-form-item label="检验有货" prop="inspect_in_stocck">
<el-switch v-model="form.inspect_in_stocck" id="inspect_in_stocck" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视取货校验" label-width="150px">
<el-switch v-model="form.ignore_pickup_check" />
<el-form-item label="忽视取货校验" label-width="150px" prop="ignore_pickup_check">
<el-switch v-model="form.ignore_pickup_check" id="ignore_pickup_check" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="忽视放货校验" label-width="150px">
<el-switch v-model="form.ignore_release_check" />
<el-form-item label="忽视放货校验" label-width="150px" prop="ignore_release_check">
<el-switch v-model="form.ignore_release_check" id="ignore_release_check" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-switch v-model="form.apply_task" />
<el-form-item label="呼叫" prop="apply_task">
<el-switch v-model="form.apply_task" id="apply_task" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="响应" label-width="150px">
<el-switch v-model="form.manual_create_task" />
<el-form-item label="响应" label-width="150px" prop="manual_create_task">
<el-switch v-model="form.manual_create_task" id="manual_create_task" />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="关联设备" prop="device_code">
<el-form-item label="关联设备" prop="link_device_code">
<el-select
id="link_device_code"
v-model="form.link_device_code"
filterable
multiple
@@ -114,8 +115,9 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联三色灯" prop="device_code" label-width="100px">
<el-form-item label="关联三色灯" prop="link_three_lamp" label-width="100px">
<el-select
id="link_three_lamp"
v-model="form.link_three_lamp"
filterable
clearable
@@ -131,8 +133,8 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否输入物料" label-width="150px">
<el-switch v-model="form.input_material" />
<el-form-item label="是否输入物料" label-width="150px" prop="input_material">
<el-switch v-model="form.input_material" id="input_material" />
</el-form-item>
</el-col>
</el-row>
@@ -146,13 +148,13 @@
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
<el-form-item label="取货" prop="is_pickup">
<el-switch v-model="form.is_pickup" id="is_pickup" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货">
<el-switch v-model="form.is_release" />
<el-form-item label="放货" prop="is_release">
<el-switch v-model="form.is_release" id="is_release" />
</el-form-item>
</el-col>
</el-row>
@@ -266,7 +268,7 @@ import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
export default {
name: 'StandardInspectSite',
name: 'SsxSite',
mixins: [crud],
props: {
parentForm: {

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

@@ -195,7 +195,7 @@ const defaultForm = {
remark: null
}
export default {
name: 'Device',
name: 'OvenManipulator',
components: { pagination, crudOperation, rrOperation, udOperation, UploadDialog },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {