From 7180e7e7c548c78f327a9f66c2bc89af64039e7e Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期三, 12 六月 2024 13:10:38 +0800 Subject: [PATCH] # --- zy-asrs-flow/src/pages/base/motionCtg/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/locSts/index.jsx | 0 zy-asrs-flow/src/pages/base/taskSerialNo/index.jsx | 0 zy-asrs-flow/src/pages/task/motion/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/taskSts/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/index.jsx | 0 zy-asrs-flow/src/pages/base/loc/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basLed/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/motionSts/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basConveyor/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/deviceType/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/devicePlc/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/loc/index.jsx | 0 zy-asrs-flow/src/pages/base/motionCtg/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basLed/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/deviceType/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/index.jsx | 0 zy-asrs-flow/src/pages/base/locCtg/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/taskCtg/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/devicePlc/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/device/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/taskSts/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/taskCtg/components/edit.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/device/index.jsx | 0 /dev/null | 9 --------- zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx | 0 zy-asrs-flow/src/pages/deviceConfig/basConveyor/index.jsx | 0 zy-asrs-flow/src/pages/base/motionSts/index.jsx | 0 zy-asrs-flow/src/pages/base/taskSerialNo/components/edit.jsx | 0 zy-asrs-flow/src/pages/task/motion/index.jsx | 0 zy-asrs-flow/src/pages/base/locCtg/index.jsx | 0 zy-asrs-flow/src/pages/log/deviceDataLog/components/edit.jsx | 0 zy-asrs-flow/src/pages/base/locSts/components/edit.jsx | 0 35 files changed, 0 insertions(+), 9 deletions(-) diff --git a/zy-asrs-flow/src/pages/task/loc/components/edit.jsx b/zy-asrs-flow/src/pages/base/loc/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/loc/components/edit.jsx rename to zy-asrs-flow/src/pages/base/loc/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/loc/index.jsx b/zy-asrs-flow/src/pages/base/loc/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/loc/index.jsx rename to zy-asrs-flow/src/pages/base/loc/index.jsx diff --git a/zy-asrs-flow/src/pages/task/locCtg/components/edit.jsx b/zy-asrs-flow/src/pages/base/locCtg/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/locCtg/components/edit.jsx rename to zy-asrs-flow/src/pages/base/locCtg/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/locCtg/index.jsx b/zy-asrs-flow/src/pages/base/locCtg/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/locCtg/index.jsx rename to zy-asrs-flow/src/pages/base/locCtg/index.jsx diff --git a/zy-asrs-flow/src/pages/task/locSts/components/edit.jsx b/zy-asrs-flow/src/pages/base/locSts/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/locSts/components/edit.jsx rename to zy-asrs-flow/src/pages/base/locSts/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/locSts/index.jsx b/zy-asrs-flow/src/pages/base/locSts/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/locSts/index.jsx rename to zy-asrs-flow/src/pages/base/locSts/index.jsx diff --git a/zy-asrs-flow/src/pages/device/motionCtg/components/edit.jsx b/zy-asrs-flow/src/pages/base/motionCtg/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motionCtg/components/edit.jsx rename to zy-asrs-flow/src/pages/base/motionCtg/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/motionCtg/index.jsx b/zy-asrs-flow/src/pages/base/motionCtg/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motionCtg/index.jsx rename to zy-asrs-flow/src/pages/base/motionCtg/index.jsx diff --git a/zy-asrs-flow/src/pages/device/motionSts/components/edit.jsx b/zy-asrs-flow/src/pages/base/motionSts/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motionSts/components/edit.jsx rename to zy-asrs-flow/src/pages/base/motionSts/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/motionSts/index.jsx b/zy-asrs-flow/src/pages/base/motionSts/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motionSts/index.jsx rename to zy-asrs-flow/src/pages/base/motionSts/index.jsx diff --git a/zy-asrs-flow/src/pages/task/taskCtg/components/edit.jsx b/zy-asrs-flow/src/pages/base/taskCtg/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskCtg/components/edit.jsx rename to zy-asrs-flow/src/pages/base/taskCtg/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/taskCtg/index.jsx b/zy-asrs-flow/src/pages/base/taskCtg/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskCtg/index.jsx rename to zy-asrs-flow/src/pages/base/taskCtg/index.jsx diff --git a/zy-asrs-flow/src/pages/task/taskSerialNo/components/edit.jsx b/zy-asrs-flow/src/pages/base/taskSerialNo/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskSerialNo/components/edit.jsx rename to zy-asrs-flow/src/pages/base/taskSerialNo/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/taskSerialNo/index.jsx b/zy-asrs-flow/src/pages/base/taskSerialNo/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskSerialNo/index.jsx rename to zy-asrs-flow/src/pages/base/taskSerialNo/index.jsx diff --git a/zy-asrs-flow/src/pages/task/taskSts/components/edit.jsx b/zy-asrs-flow/src/pages/base/taskSts/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskSts/components/edit.jsx rename to zy-asrs-flow/src/pages/base/taskSts/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/task/taskSts/index.jsx b/zy-asrs-flow/src/pages/base/taskSts/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/task/taskSts/index.jsx rename to zy-asrs-flow/src/pages/base/taskSts/index.jsx diff --git a/zy-asrs-flow/src/pages/device/basConveyor/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/basConveyor/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basConveyor/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basConveyor/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/basConveyor/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/basConveyor/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basConveyor/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basConveyor/index.jsx diff --git a/zy-asrs-flow/src/pages/device/basConveyorSta/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basConveyorSta/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/basConveyorSta/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basConveyorSta/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basConveyorSta/index.jsx diff --git a/zy-asrs-flow/src/pages/device/basLed/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/basLed/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basLed/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basLed/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/basLed/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/basLed/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/basLed/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/basLed/index.jsx diff --git a/zy-asrs-flow/src/pages/device/device/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/device/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/device/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/device/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/device/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/device/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/device/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/device/index.jsx diff --git a/zy-asrs-flow/src/pages/device/devicePlc/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/devicePlc/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/devicePlc/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/devicePlc/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/devicePlc/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/devicePlc/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/devicePlc/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/devicePlc/index.jsx diff --git a/zy-asrs-flow/src/pages/device/deviceType/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/deviceType/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/deviceType/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/deviceType/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/deviceType/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/deviceType/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/deviceType/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/deviceType/index.jsx diff --git a/zy-asrs-flow/src/pages/device/shuttleDeviceStatus/components/edit.jsx b/zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/shuttleDeviceStatus/components/edit.jsx rename to zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/shuttleDeviceStatus/index.jsx b/zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/shuttleDeviceStatus/index.jsx rename to zy-asrs-flow/src/pages/deviceConfig/shuttleDeviceStatus/index.jsx diff --git a/zy-asrs-flow/src/pages/device/deviceDataLog/components/edit.jsx b/zy-asrs-flow/src/pages/log/deviceDataLog/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/deviceDataLog/components/edit.jsx rename to zy-asrs-flow/src/pages/log/deviceDataLog/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/deviceDataLog/index.jsx b/zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/deviceDataLog/index.jsx rename to zy-asrs-flow/src/pages/log/deviceDataLog/index.jsx diff --git a/zy-asrs-flow/src/pages/device/motion/components/edit.jsx b/zy-asrs-flow/src/pages/task/motion/components/edit.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motion/components/edit.jsx rename to zy-asrs-flow/src/pages/task/motion/components/edit.jsx diff --git a/zy-asrs-flow/src/pages/device/motion/index.jsx b/zy-asrs-flow/src/pages/task/motion/index.jsx similarity index 100% rename from zy-asrs-flow/src/pages/device/motion/index.jsx rename to zy-asrs-flow/src/pages/task/motion/index.jsx diff --git a/zy-asrs-wcs/src/main/java/deviceDataLog.sql b/zy-asrs-wcs/src/main/java/deviceDataLog.sql deleted file mode 100644 index 6355e11..0000000 --- a/zy-asrs-wcs/src/main/java/deviceDataLog.sql +++ /dev/null @@ -1,9 +0,0 @@ --- save deviceDataLog record --- mysql -insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `host_id`, `status`) values ( '璁惧鏃ュ織璁板綍绠$悊', '0', '/rcs/deviceDataLog', '/rcs/deviceDataLog', '0' , '0', '1' , '1'); - -insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鏌ヨ璁惧鏃ュ織璁板綍', '', '1', 'rcs:deviceDataLog:list', '0', '1', '1'); -insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '娣诲姞璁惧鏃ュ織璁板綍', '', '1', 'rcs:deviceDataLog:save', '1', '1', '1'); -insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '淇敼璁惧鏃ュ織璁板綍', '', '1', 'rcs:deviceDataLog:update', '2', '1', '1'); -insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `host_id`, `status`) values ( '鍒犻櫎璁惧鏃ュ織璁板綍', '', '1', 'rcs:deviceDataLog:remove', '3', '1', '1'); - -- Gitblit v1.9.1