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

add:申请任务开关

Browse Source
This commit is contained in:
gengby
2024-05-22 11:21:13 +08:00
parent 414a212eaa
commit 2d7b4c616b
4 changed files with 87 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,8 +65,8 @@
</div>
<el-form ref="form" :inline="true" :model="form" :rules="rules" size="small" label-width="78px">
<el-row>
<el-col :span="6">
<el-form-item label="关联设备：" prop="getLinkDeviceCode" label-width="105px">
<el-col :span="8">
<el-form-item label="关联设备：" prop="getLinkDeviceCode" label-width="150px">
<el-select
v-model="form.getLinkDeviceCode"
filterable
@@ -83,25 +83,32 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="当前排：" label-width="90px" prop="currentX">
<el-col :span="8">
<el-form-item label="自动申请AGV任务:" label-width="150px">
<el-switch v-model="form.applyTask"/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="当前排：" label-width="150px" prop="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-col :span="8">
<el-form-item label="当前列：" label-width="150px" prop="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-col :span="8">
<el-form-item label="当前层：" label-width="150px" prop="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="150px">
<el-select
v-model="form.cacheDeviceCode"
filterable
@@ -138,7 +145,7 @@
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="关联拣选台设备：" prop="pinkDeviceCode" label-width="130px">
<el-form-item label="关联拣选台设备：" prop="pinkDeviceCode" label-width="150px">
<el-select
v-model="form.pinkDeviceCode"
filterable

34
nladmin-ui/src/views/acs/device/driver/with_station_device.vue
View File

@@ -9,7 +9,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>
@@ -24,17 +24,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="检验有货">
<el-switch v-model="form.inspect_in_stocck" />
<el-switch v-model="form.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-switch v-model="form.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-switch v-model="form.ignore_release_check"/>
</el-form-item>
</el-col>
</el-row>
@@ -42,12 +42,17 @@
<el-row>
<el-col :span="8">
<el-form-item label="呼叫">
<el-switch v-model="form.apply_task" />
<el-switch v-model="form.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-switch v-model="form.manual_create_task"/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="申请任务" label-width="150px">
<el-switch v-model="form.applyTask"/>
</el-form-item>
</el-col>
</el-row>
@@ -72,7 +77,7 @@
</el-col>
<el-col :span="8">
<el-form-item label="申请任务时间 (秒)" label-width="150px">
<el-input v-model="form.apply_time" />
<el-input v-model="form.apply_time"/>
</el-form-item>
</el-col>
</el-row>
@@ -87,12 +92,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>
@@ -100,7 +105,7 @@
</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"
@@ -123,9 +128,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'
@@ -165,7 +170,8 @@ export default {
is_pickup: true,
is_release: true,
apply_time: '',
link_device_code: []
link_device_code: [],
applyTask: false
},
rules: {}
}