diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java
index f2d61b6..adec384 100644
--- a/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java
+++ b/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/standard_manipulator_stacking_site/StandardManipulatorStackingSiteDeviceDriver.java
@@ -513,7 +513,7 @@ public class StandardManipulatorStackingSiteDeviceDriver extends AbstractOpcDevi
&& standardManipulatorStackingSiteDeviceDriver.getMode() != 0
&& standardManipulatorStackingSiteDeviceDriver.move != 0
&& ObjectUtil.isEmpty(taskserver.findByNextCode(start_device_code))
- && ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))) {
+ /*&& ObjectUtil.isEmpty(taskserver.findByStartCode(this.device_code))*/) {
break;
} else {
start_device_code = "";
diff --git a/hd/nladmin-system/src/main/resources/config/application-dev.yml b/hd/nladmin-system/src/main/resources/config/application-dev.yml
index e25419b..fc8ea6e 100644
--- a/hd/nladmin-system/src/main/resources/config/application-dev.yml
+++ b/hd/nladmin-system/src/main/resources/config/application-dev.yml
@@ -8,11 +8,11 @@ spring:
druid:
db-type: com.alibaba.druid.pool.DruidDataSource
driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
- url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
+ url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wsw_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true&allowPublicKeyRetrieval=true
# url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:ssj1_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
username: ${DB_USER:root}
# password: ${DB_PWD:P@ssw0rd}
- password: ${DB_PWD:Root.123456}
+ password: ${DB_PWD:password}
# password: ${DB_PWD:123456}
# 初始连接数
initial-size: 5
diff --git a/qd/src/views/acs/instruction/index.vue b/qd/src/views/acs/instruction/index.vue
index 5dd70a2..13b2eba 100644
--- a/qd/src/views/acs/instruction/index.vue
+++ b/qd/src/views/acs/instruction/index.vue
@@ -111,6 +111,11 @@
+
+
+ {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+
+
就绪
@@ -213,7 +218,7 @@ const defaultForm = {
update_time: null
}
export default {
- dicts: ['task_status'],
+ dicts: ['task_status', 'vehicle_type'],
name: 'Instruction',
components: { crudOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
diff --git a/qd/src/views/acs/task/index.vue b/qd/src/views/acs/task/index.vue
index ffd80bc..497931c 100644
--- a/qd/src/views/acs/task/index.vue
+++ b/qd/src/views/acs/task/index.vue
@@ -32,7 +32,7 @@
style="width: 190px"
@change="crud.toQuery"
>
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+ {{ dict.label.vehicle_type[scope.row.vehicle_type] }}
+
+
就绪
@@ -268,28 +277,30 @@
暂停
-
-
-
-
-
+
+
+
+
+
否
是
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
完成
@@ -301,7 +312,7 @@
-
+
@@ -338,10 +349,10 @@ const defaultForm = {
export default {
name: 'Task',
components: { pagination, crudOperation },
- dicts: ['task_status', 'task_type'],
+ dicts: ['task_status', 'task_type', 'vehicle_type'],
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
- return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask }})
+ return CRUD({ title: '任务', url: 'api/task', idField: 'task_id', sort: 'task_id,desc', crudMethod: { ...crudTask } })
},
data() {
const checkFromY = (rule, value, callback) => {
@@ -624,6 +635,7 @@ export default {
cursor: pointer;
color: #409EFF;
}
+
.el-icon-arrow-down {
font-size: 12px;
}