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

Merge branch 'master' of http://121.40.234.130:8899/root/hl_one

Browse Source 
# Conflicts:
#	mes/hd/nladmin-system/src/main/java/org/nl/wms/ext/bigScreen/wql/QDEVICE_SCREEN.wql
This commit is contained in:
ldj_willow
2022-08-08 17:10:06 +08:00
parent 41cc3c502b 5c86b3808a
commit 02f5ec1bd3
70 changed files with 5164 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wcs/qd/src/views/acs/device/config.vue
View File

@@ -43,8 +43,8 @@
<el-col :span="12">
<el-form-item label="设备驱动" prop="driver_code">
<el-select
filterable
v-model="form.driver_code"
filterable
placeholder=""
@change="changeDriver"
>
@@ -111,6 +111,10 @@ import agv_ndc_one from '@/views/acs/device/driver/agv/agv_ndc_one'
import agv_ndc_two from '@/views/acs/device/driver/agv/agv_ndc_two'
import hailiang_xj_plc_test from '@/views/acs/device/driver/hailiang_one/hailiang_xj_plc_test'
import hailiang_smart_plc_test from '@/views/acs/device/driver/hailiang_one/hailiang_smart_plc_test'
import hailiang_threestation_smart from '@/views/acs/device/driver/hailiang_one/hailiang_threestation_smart'
import hailiang_foldingDisc_smart from '@/views/acs/device/driver/hailiang_one/hailiang_foldingDisc_smart'
import hailiang_elevator_wiring from '@/views/acs/device/driver/hailiang_one/hailiang_elevator_wiring'
import hailiang_paint_line from '@/views/acs/device/driver/hailiang_one/hailiang_paint_line'
export default {
name: 'DeviceConfig',
@@ -122,7 +126,8 @@ export default {
standard_photoelectric_inspect_site, agv_ndc_two, agv_ndc_one, hailiang_packer_station, hailiang_engraving_cache,
hailiang_special_pick_station, hailiang_special_empty_station, hailiang_special_full_station, hailiang_special_pour_station, hailiang_special_device,
hailiang_engraving_machine, hailiang_auto_cache_line, hailiang_cleaning_feeding_line, hailiang_cleaning_machine, hailiang_cleaning_machine_storage_station,
hailiang_xj_plc_test, hailiang_smart_plc_test },
hailiang_xj_plc_test, hailiang_smart_plc_test, hailiang_threestation_smart, hailiang_foldingDisc_smart, hailiang_elevator_wiring,
hailiang_paint_line },
dicts: ['device_type'],
mixins: [crud],
data() {