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

rev：修改

Browse Source
This commit is contained in:
liuxy
2025-07-17 17:55:27 +08:00
parent b4b9e674cb
commit d58e529521
19 changed files with 190 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/standard_ordinary_site/StandardOrdinarySiteDefination.java
View File

@@ -43,7 +43,7 @@ public class StandardOrdinarySiteDefination implements DeviceDriverDefination {
@Override
public List<DeviceType> getFitDeviceTypes() {
List<DeviceType> types = new LinkedList();
types.add(DeviceType.conveyor);
types.add(DeviceType.station);
return types;
}
}

2
acs/nladmin-ui/src/views/acs/device/index.vue
View File

@@ -174,7 +174,7 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="device_id" :label="$t('device.device_table_title.device_identification')" />
<el-table-column sortable prop="device_code" :label="$t('device.device_table_title.device_encoding')" :min-width="flexWidth('device_code',crud.data,$t('device.device_table_title.device_encoding'))" />
<el-table-column sortable :label="$t('device.device_table_title.device_name')" :prop="$langPre.computedProp('device_name')" :min-width="flexWidth($langPre.computedProp('device_name'),crud.data,$t('device.device_table_title.device_name'))" />
<el-table-column sortable prop="device_name" :label="$t('device.device_table_title.device_name')" :min-width="flexWidth('device_name',crud.data,$t('device.device_table_title.device_name'))" />
<el-table-column prop="device_type_name" :label="$t('device.device_table_title.device_type')" :min-width="flexWidth('device_type_name',crud.data,$t('device.device_table_title.device_type'))">
<template slot-scope="scope">
<div>{{ scope.row.device_type_name }}</div>