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

rev:驱动

Browse Source
This commit is contained in:
gengby
2024-05-22 10:34:36 +08:00
parent d1bad23400
commit 565a068711
9 changed files with 360 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue
View File

@@ -52,7 +52,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
<el-input v-model="form.address"/>
</el-form-item>
</el-col>
</el-row>
@@ -85,29 +85,48 @@
</el-col>
<el-col :span="6">
<el-form-item label="当前排：" label-width="90px" prop="currentX">
<el-input v-model.number="form.currentX" />
<el-input v-model.number="form.currentX"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前列：" label-width="90px" prop="currentY">
<el-input v-model.number="form.currentY" />
<el-input v-model.number="form.currentY"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前层：" label-width="90px" prop="currentZ">
<el-input v-model.number="form.currentZ" />
<el-input v-model.number="form.currentZ"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="拣选台缓存设备：" prop="cacheDeviceCode" label-width="130px">
<el-form-item label="出库缓存设备：" prop="cacheDeviceCode" label-width="130px">
<el-select
v-model="form.cacheDeviceCode"
filterable
clearable
reserve-keyword
placeholder="拣选台缓存设备"
placeholder="出库缓存设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="出库禁止查找设备：" prop="checkoutStartDeviceCode" label-width="150px">
<el-select
v-model="form.checkoutStartDeviceCode"
filterable
clearable
multiple
reserve-keyword
placeholder="出库禁止查找设备"
>
<el-option
v-for=" item in deviceList"
@@ -148,12 +167,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="取货">
<el-switch v-model="form.is_pickup" />
<el-switch v-model="form.is_pickup"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="放货">
<el-switch v-model="form.is_release" />
<el-switch v-model="form.is_release"/>
</el-form-item>
</el-col>
</el-row>
@@ -173,8 +192,8 @@
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="name" label="用途"/>
<el-table-column prop="code" label="别名要求"/>
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
@@ -190,7 +209,7 @@
<el-link type="primary" :underline="false" @click.native="test_read1()">测试读</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input" />
<el-input v-model="data1[scope.$index].dbr_value" size="mini" class="edit-input"/>
</template>
</el-table-column>
</el-table>
@@ -210,8 +229,8 @@
style="width: 100%;margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="name" label="用途"/>
<el-table-column prop="code" label="别名要求"/>
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
@@ -227,7 +246,7 @@
<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" />
<el-input v-model="data2[scope.$index].dbr_value" size="mini" class="edit-input"/>
</template>
</el-table-column>
<el-table-column prop="dbw_value">
@@ -235,7 +254,7 @@
<el-link type="primary" :underline="false" @click.native="test_write1()">测试写</el-link>
</template>
<template slot-scope="scope">
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input" />
<el-input v-model="data2[scope.$index].dbw_value" size="mini" class="edit-input"/>
</template>
</el-table-column>
</el-table>
@@ -244,7 +263,7 @@
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span" />
<span class="role-span"/>
<el-button
:loading="false"
icon="el-icon-check"
@@ -267,9 +286,9 @@ import {
testRead,
testwrite
} from '@/api/acs/device/driverConfig'
import { selectOpcList } from '@/api/acs/device/opc'
import { selectPlcList } from '@/api/acs/device/opcPlc'
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import {selectOpcList} from '@/api/acs/device/opc'
import {selectPlcList} from '@/api/acs/device/opcPlc'
import {selectListByOpcID} from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
@@ -307,7 +326,8 @@ export default {
currentZ: '',
address: '',
cacheDeviceCode: '',
pinkDeviceCode: ''
pinkDeviceCode: '',
checkoutStartDeviceCode: null
},
rules: {}
}

66
nladmin-ui/src/views/acs/device/driver/standard_stacker_device.vue
View File

@@ -58,7 +58,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.address" />
<el-input v-model="form.address"/>
</el-form-item>
</el-col>
</el-row>
@@ -157,12 +157,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="前叉禁止列：" label-width="110px" prop="frontNoY">
<el-input v-model="form.frontNoY" placeholder="以英文, 分隔" />
<el-input v-model="form.frontNoY" placeholder="以英文, 分隔"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="后叉禁止列：" label-width="110px" prop="backNoY">
<el-input v-model="form.backNoY" placeholder="以英文, 分隔" />
<el-input v-model="form.backNoY" placeholder="以英文, 分隔"/>
</el-form-item>
</el-col>
</el-row>
@@ -185,6 +185,44 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="特殊取货设备：" prop="specialGetDevice" label-width="110px">
<el-select
v-model="form.specialGetDevice"
filterable
multiple
clearable
reserve-keyword
placeholder="请选择输送线设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="特殊放货设备：" prop="specialPutDevice" label-width="110px">
<el-select
v-model="form.specialPutDevice"
filterable
multiple
clearable
reserve-keyword
placeholder="请选择输送线设备"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
@@ -208,8 +246,8 @@
size="small"
style="width: 100%; margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="name" label="用途"/>
<el-table-column prop="code" label="别名要求"/>
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
@@ -260,8 +298,8 @@
size="small"
style="width: 100%; margin-bottom: 15px"
>
<el-table-column prop="name" label="用途" />
<el-table-column prop="code" label="别名要求" />
<el-table-column prop="name" label="用途"/>
<el-table-column prop="code" label="别名要求"/>
<el-table-column prop="db" label="DB块">
<template slot-scope="scope">
<el-input
@@ -312,7 +350,7 @@
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span" />
<span class="role-span"/>
<el-button
:loading="false"
icon="el-icon-check"
@@ -335,13 +373,13 @@ import {
testwrite,
getStrategy
} from '@/api/acs/device/driverConfig'
import { selectOpcList } from '@/api/acs/device/opc'
import { selectPlcList } from '@/api/acs/device/opcPlc'
import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import {selectOpcList} from '@/api/acs/device/opc'
import {selectPlcList} from '@/api/acs/device/opcPlc'
import {selectListByOpcID} from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device'
import { findDeviceStrategyOption } from '@/api/acs/device/customPolicyType'
import {findDeviceStrategyOption} from '@/api/acs/device/customPolicyType'
export default {
name: 'DoubleStationStacker',
@@ -386,7 +424,9 @@ export default {
backNoY: '',
address: '',
xDeviceCodeList: '',
stackerNum: ''
stackerNum: '',
specialPutDevice: '',
specialGetDevice: ''
},
rules: {}
}