diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorDefination.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorDefination.java
index 1c2ae19fb..d951f54be 100644
--- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorDefination.java
+++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorDefination.java
@@ -14,17 +14,17 @@ import java.util.List;
public class VolumeTwoManipulatorDefination implements OpcDeviceDriverDefination {
@Override
public String getDriverCode() {
- return "trapped_manipulator";
+ return "volume_two_manipulator";
}
@Override
public String getDriverName() {
- return "堆叠行架";
+ return "二楼到一楼子卷搬运行架行架";
}
@Override
public String getDriverDescription() {
- return "堆叠行架";
+ return "二楼到一楼子卷搬运行架行架";
}
@Override
diff --git a/acs2/nladmin-ui/package.json b/acs2/nladmin-ui/package.json
index 4a758ddde..4e7289587 100644
--- a/acs2/nladmin-ui/package.json
+++ b/acs2/nladmin-ui/package.json
@@ -59,6 +59,7 @@
"mavon-editor": "^2.9.0",
"normalize.css": "7.0.0",
"nprogress": "0.2.0",
+ "particles.js": "^2.0.0",
"path-to-regexp": "2.4.0",
"qrcodejs2": "0.0.2",
"qs": "^6.9.1",
@@ -123,6 +124,7 @@
"serve-static": "^1.13.2",
"svg-sprite-loader": "4.1.3",
"svgo": "1.2.0",
+ "vue-particles": "^1.0.9",
"vue-template-compiler": "2.6.10"
},
"engines": {
diff --git a/acs2/nladmin-ui/src/App.vue b/acs2/nladmin-ui/src/App.vue
index 583814934..0bbe067db 100644
--- a/acs2/nladmin-ui/src/App.vue
+++ b/acs2/nladmin-ui/src/App.vue
@@ -34,3 +34,4 @@ export default {
}
}
+
diff --git a/acs2/nladmin-ui/src/main.js b/acs2/nladmin-ui/src/main.js
index e4e0e81c0..8bce37da6 100644
--- a/acs2/nladmin-ui/src/main.js
+++ b/acs2/nladmin-ui/src/main.js
@@ -9,6 +9,10 @@ import 'font-awesome/css/font-awesome.css'
import mavonEditor from 'mavon-editor'
import 'mavon-editor/dist/css/index.css'
+
+import VueParticles from 'vue-particles'
+Vue.use(VueParticles)
+
// 数据字典
import dict from './components/Dict'
diff --git a/acs2/nladmin-ui/src/views/acs/device/config.vue b/acs2/nladmin-ui/src/views/acs/device/config.vue
index 8248b018d..4ee8ce4ef 100644
--- a/acs2/nladmin-ui/src/views/acs/device/config.vue
+++ b/acs2/nladmin-ui/src/views/acs/device/config.vue
@@ -122,6 +122,7 @@ import trapped_manipulator from '@/views/acs/device/driver/one_manipulator/trapp
import box_package_manipulator from '@/views/acs/device/driver/one_manipulator/box_package_manipulator.vue'
import box_storage_manipulator from '@/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue'
import return_good_manipulator from '@/views/acs/device/driver/one_manipulator/return_good_manipulator.vue'
+import volume_two_manipulator from '@/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue'
import box_storage_out_conveyor from '@/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue'
import box_subvolumes_conveyor from '@/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue'
import finished_product_out_with_bind_lable_conveyor from '@/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue'
@@ -186,7 +187,8 @@ export default {
green_foil_machine_button,
xg_agv_car,
oven_inspect_site,
- manipulator_agv_station
+ manipulator_agv_station,
+ volume_two_manipulator
},
dicts: ['device_type'],
mixins: [crud],
diff --git a/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue
new file mode 100644
index 000000000..a2d26dd1f
--- /dev/null
+++ b/acs2/nladmin-ui/src/views/acs/device/driver/one_manipulator/volume_two_manipulator.vue
@@ -0,0 +1,582 @@
+
+
+
+
+
+ 设备协议：
+
+
+
+
+ OpcServer:
+
+
+
+
+
+ PLC:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 输送系统：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 指令相关：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ AGV相关：
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ PLC读取字段：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 测试读
+
+
+
+
+
+
+
+
+
+
+
+ PLC写入字段：
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 测试读
+
+
+
+
+
+
+
+ 测试写
+
+
+
+
+
+
+
+
+
+
+
+
+ 保存
+
+
+
+
+
+
+
{{ title }}
@@ -207,6 +226,16 @@ export default {
align-items: center;
height: 100%;
background-size: cover;
+ z-index: 999;
+}
+
+.lizi {
+ background-size: cover;
+ position: fixed;
+ top: 0;
+ left: 0;
+ width: 100%;
+ height: 100%;
}
.title {
margin: 0 auto 30px auto;