rev:更新

This commit is contained in:
2024-09-18 08:50:33 +08:00
parent 8bb6ffc3ef
commit 0e78fa55ae
21 changed files with 1489 additions and 483 deletions

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,13 +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-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>
@@ -338,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>
@@ -362,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
@@ -379,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>
@@ -399,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
@@ -416,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">
@@ -424,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>
@@ -433,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"
@@ -456,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'

View File

@@ -3,80 +3,60 @@
<div>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">设备协议</span>
<span class="role-span">指令相关</span>
</div>
<el-row>
<el-col :span="12">
OpcServer:
<el-select
v-model="opc_id"
placeholder="无"
clearable
filterable
@change="changeOpc"
>
<el-option
v-for="item in dataOpcservers"
:key="item.opc_id"
:label="item.opc_name"
:value="item.opc_id"
/>
</el-select>
</el-col>
<el-col :span="12">
PLC:
<el-select
v-model="plc_id"
placeholder="无"
clearable
@change="changePlc"
>
<el-option
v-for="item in dataOpcPlcs"
:key="item.plc_id"
:label="item.plc_name"
:value="item.plc_id"
/>
</el-select>
</el-col>
</el-row>
</el-card>
<el-card class="box-card" shadow="never">
<div slot="header" class="clearfix">
<span class="role-span">输送系统</span>
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-form ref="form" :inline="true" :model="form" size="small" label-width="95px">
<el-row>
<el-col :span="8">
<el-form-item label="电气调度号" label-width="150px">
<el-input v-model="form.OPCServer" />
<el-col :span="12">
<el-form-item label="ip地址:" prop="ip_address">
<el-input
v-model="form.ip_address"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="ip端口号:" prop="ip_port">
<el-input
v-model="form.ip_port"
/>
</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>
<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="关联设备" prop="device_code">
<el-col :span="12">
<el-form-item label="任务起点:" prop="startDevices">
<el-select
v-model="form.link_device_code"
v-model="form.startDevices"
filterable
multiple
clearable
placeholder="请选择"
multiple
reserve-keyword
placeholder="请选择要查询的任务起点"
style="width: 170px"
>
<el-option
v-for="item in deviceList"
:key="item.device_code"
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="12">
<el-form-item label="任务终点:" prop="nextDevices">
<el-select
v-model="form.nextDevices"
filterable
clearable
multiple
reserve-keyword
placeholder="请选择要查询的任务终点"
style="width: 170px"
>
<el-option
v-for=" item in deviceList"
:key="item.device_id"
:label="item.device_name"
:value="item.device_code"
/>
@@ -84,11 +64,77 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="可进可出:" prop="inOut">
<el-switch v-model="form.inOut"/>
</el-form-item>
</el-col>
<span v-if="!form.inOut">
<el-col :span="12">
<el-form-item label="出入模式:" prop="inOutMode">
<el-input
v-model="form.inOutMode"
/>
</el-form-item>
</el-col>
</span>
<span v-if="form.inOut">
<el-col :span="12">
<el-form-item label="关联输送线:" prop="linkSSX">
<el-select
v-model="form.linkSSX"
filterable
clearable
reserve-keyword
placeholder="请选择所属输送线"
style="width: 170px"
>
<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>
</span>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="报警设备:" prop="errorDevices">
<el-select
v-model="form.errorDevices"
filterable
clearable
multiple
reserve-keyword
placeholder="请选择要关联的报警设备"
style="width: 170px"
>
<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="12">
<el-form-item label="刷新时间:" prop="upTime">
<el-input
v-model="form.upTime"
/>
</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 class="role-span"/>
<el-button
:loading="false"
icon="el-icon-check"
@@ -111,9 +157,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'
@@ -143,17 +189,15 @@ export default {
data1: [],
data2: [],
form: {
inspect_in_stocck: true,
ignore_pickup_check: true,
ignore_release_check: true,
apply_task: true,
link_three_lamp: '',
manual_create_task: true,
is_pickup: true,
is_release: true,
link_device_code: [],
get_device_code: [],
put_device_code: []
inOut: true,
inOutMode: '',
ip_address: '',
ip_port: 0,
nextDevices: [],
startDevices: [],
linkSSX: '',
errorDevices: [],
upTime: 60
},
rules: {}
}

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>
@@ -245,7 +245,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="对接位坐标:" label-width="110px" prop="originPoint">
<el-input v-model="form.originPoint" placeholder="排列层以,分隔"/>
<el-input v-model="form.originPoint" placeholder="排列层以,分隔" />
</el-form-item>
</el-col>
</el-row>
@@ -259,7 +259,7 @@
<div class="crud-opts2" style="margin-bottom: 5px;">
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left"/>
<slot name="left" />
<el-button
slot="left"
class="filter-item"
@@ -361,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
@@ -413,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
@@ -465,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"
@@ -488,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',
@@ -569,7 +569,7 @@ export default {
{
label: '3L->1L->2L',
value: '3,1,2'
},
}
],
form: {
strategyValue: '',
@@ -639,9 +639,9 @@ export default {
methods: {
insertdtl() {
if (!Array.isArray(this.form.floorPoint)) {
this.$set(this.form, 'floorPoint', []);
this.$set(this.form, 'floorPoint', [])
}
this.form.floorPoint.push({floor: '', inPoints: [], outPoints: []});
this.form.floorPoint.push({ floor: '', inPoints: [], outPoints: [] })
},
deleteRow(index, rows) {
rows.splice(index, 1)

View File

@@ -851,6 +851,9 @@ export default {
let storage_obj = {}
deviceCrud.queryStorageExtra(obj.device_code).then(data => {
storage_obj = data
console.log(111)
console.log(storage_obj)
console.log(111)
const n1 = storage_obj.minY
const n2 = storage_obj.maxY
const m1 = storage_obj.minZ
@@ -879,7 +882,7 @@ export default {
}
this.fromYList = from_y
this.fromZList = from_z
this.form.from_x = storage_obj.tunnel
this.form.from_x = storage_obj.x
})
} else {
this.start_flag = false
@@ -899,6 +902,9 @@ export default {
let storage_obj = {}
deviceCrud.queryStorageExtra(obj.device_code).then(data => {
storage_obj = data
console.log(222)
console.log(storage_obj)
console.log(222)
const n1 = storage_obj.minY
const n2 = storage_obj.maxY
const m1 = storage_obj.minZ
@@ -927,7 +933,7 @@ export default {
}
this.toYList = to_y
this.toZList = to_z
this.form.to_x = storage_obj.tunnel
this.form.to_x = storage_obj.x
})
} else {
this.end_flag = false