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-08-22 16:38:50 +08:00
parent d428fefcd9
commit 8bb6ffc3ef
13 changed files with 734 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
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>
@@ -67,23 +67,23 @@
<el-row>
<el-col :span="6">
<el-form-item label="堆垛机对接位：" label-width="110px" prop="stackerDock">
<el-switch v-model="form.stackerDock" />
<el-switch v-model="form.stackerDock"/>
</el-form-item>
</el-col>
<span v-if="form.stackerDock">
<el-col :span="6">
<el-form-item label="当前排：" label-width="110px" 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="150px" prop="currentY">
<el-input v-model.number="form.currentY" style="width: 130px" />
<el-input v-model.number="form.currentY" style="width: 130px"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前层：" label-width="110px" prop="currentZ">
<el-input v-model.number="form.currentZ" style="width: 170px" />
<el-input v-model.number="form.currentZ" style="width: 170px"/>
</el-form-item>
</el-col>
</span>
@@ -91,7 +91,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="堆垛机双任务：" label-width="110px" prop="stackerDoubleTask">
<el-switch v-model="form.stackerDoubleTask" />
<el-switch v-model="form.stackerDoubleTask"/>
</el-form-item>
</el-col>
<span v-if="form.stackerDoubleTask">
@@ -119,7 +119,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="输送指令起点：" label-width="110px" prop="conveyorStartPoint">
<el-switch v-model="form.conveyorStartPoint" />
<el-switch v-model="form.conveyorStartPoint"/>
</el-form-item>
</el-col>
<span v-if="form.conveyorStartPoint">
@@ -145,7 +145,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="关联拣选台：" label-width="150px" prop="linkPinkDevice">
<el-switch v-model="form.linkPinkDevice" />
<el-switch v-model="form.linkPinkDevice"/>
</el-form-item>
</el-col>
<span v-if="form.linkPinkDevice">
@@ -174,7 +174,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="输送指令终点：" label-width="110px" prop="conveyorEndPoint">
<el-switch v-model="form.conveyorEndPoint" />
<el-switch v-model="form.conveyorEndPoint"/>
</el-form-item>
</el-col>
<span v-if="form.conveyorEndPoint">
@@ -200,12 +200,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="扫码申请AGV任务:" label-width="150px">
<el-switch v-model="form.scanApplyTask" />
<el-switch v-model="form.scanApplyTask"/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="自动申请AGV任务:" label-width="150px">
<el-switch v-model="form.applyTask" />
<el-switch v-model="form.applyTask"/>
</el-form-item>
</el-col>
</span>
@@ -213,7 +213,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="输送缓存设备：" label-width="110px" prop="conveyorCachePoint">
<el-switch v-model="form.conveyorCachePoint" />
<el-switch v-model="form.conveyorCachePoint"/>
</el-form-item>
</el-col>
<span v-if="form.conveyorCachePoint">
@@ -241,7 +241,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="拣选台设备：" label-width="110px" prop="pinkDevicePoint">
<el-switch v-model="form.pinkDevicePoint" />
<el-switch v-model="form.pinkDevicePoint"/>
</el-form-item>
</el-col>
<span v-if="form.pinkDevicePoint">
@@ -269,7 +269,7 @@
<el-row>
<el-col :span="6">
<el-form-item label="双向点位：" label-width="110px" prop="toWay">
<el-switch v-model="form.toWay" />
<el-switch v-model="form.toWay"/>
</el-form-item>
</el-col>
<span v-if="form.toWay">
@@ -295,7 +295,7 @@
</span>
<el-col :span="6">
<el-form-item label="同一出入点：" label-width="110px" prop="samePoint">
<el-switch v-model="form.samePoint" />
<el-switch v-model="form.samePoint"/>
</el-form-item>
</el-col>
<span v-if="!form.samePoint">
@@ -320,6 +320,13 @@
</el-col>
</span>
</el-row>
<!-- <el-row>-->
<!-- <el-col :span="6">-->
<!-- <el-form-item label="靠近前叉：" label-width="110px" prop="isFront">-->
<!-- <el-switch v-model="form.isFront"/>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
</el-form>
</el-card>
@@ -331,12 +338,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>
@@ -355,8 +362,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
@@ -372,7 +379,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>
@@ -392,8 +399,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
@@ -409,7 +416,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">
@@ -417,7 +424,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>
@@ -426,7 +433,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"
@@ -449,9 +456,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'
@@ -504,7 +511,8 @@ export default {
linkInOutDevice: '',
samePoint: false,
scanApplyTask: false,
applyTask: false
applyTask: false,
isFront: false
},
rules: {}
}

199
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,18 +157,18 @@
</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>
<el-row>
<el-col :span="8">
<el-form-item label="叉数量：" label-width="110px" prop="backNoY">
<el-form-item label="堆垛机类型：" label-width="110px" prop="backNoY">
<el-select
v-model="form.stackerNum"
filterable
@@ -224,9 +224,124 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="楼层优先级：" prop="floorPriority" label-width="110px">
<el-select
v-model="form.floorPriority"
filterable
clearable
reserve-keyword
placeholder="请选择楼层优先级"
>
<el-option
v-for=" item in floorPriorityList"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="对接位坐标：" label-width="110px" prop="originPoint">
<el-input v-model="form.originPoint" placeholder="排列层以,分隔"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">对接位相关：</span>
</div>
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<el-button
slot="left"
class="filter-item"
type="primary"
icon="el-icon-plus"
size="mini"
@click="insertdtl()"
>
新增一行
</el-button>
</span>
</div>
<div class="app-container">
<el-table :data="form.floorPoint" border fit highlight-current-row style="width: 100%;" class="tb-edit">
<el-table-column label="楼层" prop="floor">
<template scope="scope">
<el-select
v-model="scope.row.floor"
filterable
clearable
placeholder="请选择"
>
<el-option
v-for="item in floorList"
:label="item.label"
:value="item.value"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="入库对接点" prop="inPoints">
<template scope="scope">
<el-select
v-model="scope.row.inPoints"
filterable
clearable
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</template>
</el-table-column>
<el-table-column label="出库对接点" prop="outPoints">
<template scope="scope">
<el-select
v-model="scope.row.outPoints"
filterable
clearable
multiple
placeholder="请选择"
>
<el-option
v-for="item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
</el-select>
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="170">
<template scope="scope">
<el-button
type="danger"
class="filter-item"
size="mini"
icon="el-icon-delete"
@click.native.prevent="deleteRow(scope.$index, form.floorPoint)"
/>
</template>
</el-table-column>
</el-table>
</div>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">PLC读取字段：</span>
@@ -246,8 +361,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
@@ -298,8 +413,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
@@ -350,7 +465,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"
@@ -373,13 +488,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',
@@ -408,14 +523,54 @@ export default {
data2: [],
stackerNums: [
{
label: '1',
label: '单叉',
value: '1'
},
{
label: '2',
label: '双叉',
value: '2'
}
],
floorList: [
{
label: '一楼',
value: '1'
},
{
label: '二楼',
value: '2'
},
{
label: '三楼',
value: '3'
}
],
floorPriorityList: [
{
label: '1L->2L->3L',
value: '1,2,3'
},
{
label: '1L->3L->2L',
value: '1,3,2'
},
{
label: '2L->1L->3L',
value: '2,1,3'
},
{
label: '2L->3L->1L',
value: '2,3,1'
},
{
label: '3L->2L->1L',
value: '3,2,1'
},
{
label: '3L->1L->2L',
value: '3,1,2'
},
],
form: {
strategyValue: '',
backDeviceCodeList: [],
@@ -426,7 +581,10 @@ export default {
xDeviceCodeList: '',
stackerNum: '',
specialPutDevice: '',
specialGetDevice: ''
specialGetDevice: '',
floorPoint: [],
floorPriority: null,
originPoint: ''
},
rules: {}
}
@@ -479,6 +637,15 @@ export default {
})
},
methods: {
insertdtl() {
if (!Array.isArray(this.form.floorPoint)) {
this.$set(this.form, 'floorPoint', []);
}
this.form.floorPoint.push({floor: '', inPoints: [], outPoints: []});
},
deleteRow(index, rows) {
rows.splice(index, 1)
},
finishReadEdit(data) {
// 编辑的是code列,并且值包含mode
if (data.code.indexOf('mode') !== -1) {