diff --git a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
index 0220ad90f..f6a6afb16 100644
--- a/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
+++ b/acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java
@@ -224,6 +224,7 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
random *= 1000;
if (this.all_null < 3) {
if (log.isWarnEnabled()) {
+ log.warn(tag + "1重新创建server");
log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
}
@@ -231,14 +232,14 @@ public class DeviceOpcProtocolRunable implements Runnable, DataCallback, ServerC
break start;
} else if (this.all_null < 6) {
if (log.isWarnEnabled()) {
- log.warn(tag + "重新创建server");
+ log.warn(tag + "2重新创建server");
log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
}
ThreadUtl.sleep(3000);
break start;
} else if (this.all_null < 12) {
if (log.isWarnEnabled()) {
- log.warn(tag + "重新创建server");
+ log.warn(tag + "3重新创建server");
log.warn("{} 所有内容都为空, all_null:{} ,暂定{}s", tag, all_null,3);
}
ThreadUtl.sleep(3000);
diff --git a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
index 76f95f2be..986b7f28c 100644
--- a/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
+++ b/acs/nladmin-system/src/main/resources/log/AcsToLk.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
index b7b3978eb..6388f813e 100644
--- a/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
+++ b/acs/nladmin-system/src/main/resources/log/AcsToWms.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
index 8abb83afb..ab61b9b7f 100644
--- a/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
+++ b/acs/nladmin-system/src/main/resources/log/AgvNdcOneDeviceDriver.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
index 60427e421..bc8b49dde 100644
--- a/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
+++ b/acs/nladmin-system/src/main/resources/log/AgvNdcTwoDeviceDriver.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
index 7dda9dfd5..449ee9eb9 100644
--- a/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
+++ b/acs/nladmin-system/src/main/resources/log/AutoCreateInst.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
index 9f827c3d3..d06be707c 100644
--- a/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
+++ b/acs/nladmin-system/src/main/resources/log/LkToAcs.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
index 016b46e9c..ede1c7a66 100644
--- a/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
+++ b/acs/nladmin-system/src/main/resources/log/NDCAgvServiceImpl.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
index ca3f78791..f80c20f81 100644
--- a/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
index 63531d7ba..b7234fa2f 100644
--- a/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
+++ b/acs/nladmin-system/src/main/resources/log/OpcUtil.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
index 4eec0b7a0..461ac1ac4 100644
--- a/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/TwoNDC2SocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
index 4ea34f9f4..650f7cc3b 100644
--- a/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
+++ b/acs/nladmin-system/src/main/resources/log/TwoNDCSocketConnectionAutoRun.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
index 03c1a31d6..46aade8b0 100644
--- a/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
+++ b/acs/nladmin-system/src/main/resources/log/WmsToAcs.xml
@@ -10,7 +10,7 @@
15
- 200MB
+ 50MB
2GB
diff --git a/acs/nladmin-system/src/main/resources/logback-spring.xml b/acs/nladmin-system/src/main/resources/logback-spring.xml
index cf9b0947f..347dcd797 100644
--- a/acs/nladmin-system/src/main/resources/logback-spring.xml
+++ b/acs/nladmin-system/src/main/resources/logback-spring.xml
@@ -64,7 +64,7 @@ https://juejin.cn/post/6844903775631572999
15
- 200MB
+ 50MB
20GB
@@ -117,7 +117,7 @@ https://juejin.cn/post/6844903775631572999
15
- 200MB
+ 50MB
20GB
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/en.js b/acs2/nladmin-ui/src/i18n/langs/history/en.js
index 8234a71ab..d57bafa2f 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/en.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/en.js
@@ -7,6 +7,7 @@ export default {
'Status': 'Status',
'Priority': 'Task Priority',
'Starting_point_two': 'Starting Point Two',
+ 'Transit_point': 'Transit Point',
'Endpoint_two': 'Endpoint Two',
'Material': 'Material',
'Quantity': 'Quantity',
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/in.js b/acs2/nladmin-ui/src/i18n/langs/history/in.js
index b20a7beac..b0a5ab1d6 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/in.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/in.js
@@ -7,6 +7,7 @@ export default {
'Status': 'Status',
'Priority': 'Prioritas Tugas',
'Starting_point_two': 'Titik Awalan Dua',
+ 'Transit_point': 'Titik transit',
'Endpoint_two': 'Titik Akhir Dua',
'Material': 'Bahan',
'Quantity': 'Jumlah',
diff --git a/acs2/nladmin-ui/src/i18n/langs/history/zh.js b/acs2/nladmin-ui/src/i18n/langs/history/zh.js
index 2e24ecab9..e332c0678 100644
--- a/acs2/nladmin-ui/src/i18n/langs/history/zh.js
+++ b/acs2/nladmin-ui/src/i18n/langs/history/zh.js
@@ -7,6 +7,7 @@ export default {
'Status': '状态',
'Priority': '任务优先级',
'Starting_point_two': '起点2',
+ 'Transit_point': '中转点',
'Endpoint_two': '终点2',
'Material': '物料',
'Quantity': '数量',
diff --git a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
index 41583bfde..69635b565 100644
--- a/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue
@@ -122,6 +122,7 @@
+
diff --git a/acs2/nladmin-ui/src/views/acs/task/index.vue b/acs2/nladmin-ui/src/views/acs/task/index.vue
index 8dea858d5..2cc2345b7 100644
--- a/acs2/nladmin-ui/src/views/acs/task/index.vue
+++ b/acs2/nladmin-ui/src/views/acs/task/index.vue
@@ -483,7 +483,6 @@
{{ dict.label.task_type[scope.row.task_type] }}
-
@@ -494,35 +493,15 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
More