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

多选

Browse Source
This commit is contained in:
gengby
2022-11-25 11:15:28 +08:00
parent a2920e0b49
commit 858e82a2c7
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCreateInst.java
View File

@@ -102,18 +102,18 @@ public class AutoCreateInst {
String startDriverCode = startdevice.getDeviceDriverDefination().getDriverCode(); String startDriverCode = startdevice.getDeviceDriverDefination().getDriverCode();
String nextDriverCode = nextdevice.getDeviceDriverDefination().getDriverCode(); String nextDriverCode = nextdevice.getDeviceDriverDefination().getDriverCode();
if (StrUtil.isNotEmpty(startDriverCode)){ if (StrUtil.isNotEmpty(startDriverCode)){
DriverDeviceService deviceService = applicationContext.getBean(startDriverCode, DriverDeviceService.class); // DriverDeviceService deviceService = applicationContext.getBean(startDriverCode, DriverDeviceService.class);
Boolean checkStartPoint = deviceService.createInstCheckStartPoint(startdevice, acsTask); // Boolean checkStartPoint = deviceService.createInstCheckStartPoint(startdevice, acsTask);
if (!checkStartPoint){ // if (!checkStartPoint){
continue; // continue;
} // }
} }
if (StrUtil.isNotEmpty(nextDriverCode)){ if (StrUtil.isNotEmpty(nextDriverCode)){
DriverDeviceService deviceService = applicationContext.getBean(nextDriverCode, DriverDeviceService.class); // DriverDeviceService deviceService = applicationContext.getBean(nextDriverCode, DriverDeviceService.class);
Boolean checkNextPoint = deviceService.createInstCheckNextPoint(nextdevice, acsTask); // Boolean checkNextPoint = deviceService.createInstCheckNextPoint(nextdevice, acsTask);
if (!checkNextPoint){ // if (!checkNextPoint){
continue; // continue;
} // }
} }
Instruction instdto = new Instruction(); Instruction instdto = new Instruction();
instdto.setInstruction_type(acsTask.getTask_type()); instdto.setInstruction_type(acsTask.getTask_type());

9
qd/src/views/acs/route/routeLine/index.vue
View File

@@ -159,7 +159,7 @@
> >
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="line_uuid" label="路线标识" /> <el-table-column v-if="false" prop="line_uuid" label="路线标识" />
<el-table-column prop="device_code" label="设备编码" width="120"/> <el-table-column prop="device_code" label="设备编码" width="120" />
<el-table-column v-if="false" prop="device_code" label="设备名称" /> <el-table-column v-if="false" prop="device_code" label="设备名称" />
<el-table-column prop="route_plan_id" label="路由方案" width="140"> <el-table-column prop="route_plan_id" label="路由方案" width="140">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -310,6 +310,11 @@ export default {
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
return true return true
}, },
[CRUD.HOOK.beforeToEdit](data) {
this.form.device_code = Array.of(data.form.device_code.split('').join(''))
this.form.next_device_code = Array.of(data.form.next_device_code.split('').join(''))
return true
},
// 改变状态 // 改变状态
changeEnabled(data) { changeEnabled(data) {
var msg = '停用' var msg = '停用'
@@ -337,7 +342,7 @@ export default {
}).catch(err => { }).catch(err => {
console.log(err.response.data.message) console.log(err.response.data.message)
}) })
}, }
} }
} }
</script> </script>