Browse Source

rev:更新

master
gengby 2 months ago
parent
commit
47e6b24c83
  1. 2
      nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue
  2. 40
      nladmin-ui/src/views/acs/device/driver/led_screen.vue

2
nladmin-ui/src/views/acs/device/driver/appearance_inspection_scanner_conveyor_device.vue

@ -323,7 +323,7 @@
<el-row> <el-row>
<el-col :span="6"> <el-col :span="6">
<el-form-item label="靠近前叉:" label-width="110px" prop="isFront"> <el-form-item label="靠近前叉:" label-width="110px" prop="isFront">
<el-switch v-model="form.isFront"/> <el-switch v-model="form.isFront" />
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>

40
nladmin-ui/src/views/acs/device/driver/led_screen.vue

@ -67,7 +67,7 @@
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="可进可出:" prop="inOut"> <el-form-item label="可进可出:" prop="inOut">
<el-switch v-model="form.inOut"/> <el-switch v-model="form.inOut" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<span v-if="!form.inOut"> <span v-if="!form.inOut">
@ -82,21 +82,21 @@
<span v-if="form.inOut"> <span v-if="form.inOut">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="关联输送线:" prop="linkSSX"> <el-form-item label="关联输送线:" prop="linkSSX">
<el-select <el-select
v-model="form.linkSSX" v-model="form.linkSSX"
filterable filterable
clearable clearable
reserve-keyword reserve-keyword
placeholder="请选择所属输送线" placeholder="请选择所属输送线"
style="width: 170px" style="width: 170px"
> >
<el-option <el-option
v-for=" item in deviceList" v-for=" item in deviceList"
:key="item.device_id" :key="item.device_id"
:label="item.device_name" :label="item.device_name"
:value="item.device_code" :value="item.device_code"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
</span> </span>
@ -134,7 +134,7 @@
</el-card> </el-card>
<el-card class="box-card" shadow="never"> <el-card class="box-card" shadow="never">
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span class="role-span"/> <span class="role-span" />
<el-button <el-button
:loading="false" :loading="false"
icon="el-icon-check" icon="el-icon-check"
@ -157,9 +157,9 @@ import {
testRead, testRead,
testwrite testwrite
} from '@/api/acs/device/driverConfig' } from '@/api/acs/device/driverConfig'
import {selectOpcList} from '@/api/acs/device/opc' import { selectOpcList } from '@/api/acs/device/opc'
import {selectPlcList} from '@/api/acs/device/opcPlc' import { selectPlcList } from '@/api/acs/device/opcPlc'
import {selectListByOpcID} from '@/api/acs/device/opcPlc' import { selectListByOpcID } from '@/api/acs/device/opcPlc'
import crud from '@/mixins/crud' import crud from '@/mixins/crud'
import deviceCrud from '@/api/acs/device/device' import deviceCrud from '@/api/acs/device/device'

Loading…
Cancel
Save