From 9f050bd0ed04b7dc0ce5a9a0efc76a1ca5e8861b Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Wed, 29 May 2024 18:26:09 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20acs=20api=E4=BD=8D=E7=BD=AE=E6=8C=AA?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nladmin-ui/src/api/acs/lucene/log.js | 10 ---------- .../src/{api => views}/acs/angle/acsPointAngle.js | 0 nladmin-ui/src/views/acs/angle/index.vue | 2 +- nladmin-ui/src/views/acs/config/assigned/index.vue | 4 ++-- .../src/{api => views}/acs/config/deviceAssigned.js | 0 .../src/views/acs/config/trafficControl/index.vue | 4 ++-- nladmin-ui/src/views/acs/device/UploadDialog.vue | 2 +- .../{api => views}/acs/device/acsDeviceErpmapping.js | 0 nladmin-ui/src/views/acs/device/acsToERP/index.vue | 4 ++-- .../{api/acs => views/acs/device/address}/Address.js | 0 nladmin-ui/src/views/acs/device/address/index.vue | 2 +- nladmin-ui/src/views/acs/device/config.vue | 2 +- .../acs/device/customPolicy}/customPolicy.js | 0 .../acs/device/customPolicy}/customPolicyType.js | 0 .../src/views/acs/device/customPolicy/index.vue | 4 ++-- .../src/views/acs/device/customPolicy/task/index.vue | 6 +++--- nladmin-ui/src/{api => views}/acs/device/device.js | 0 .../acs/device/deviceDbitem}/deviceDbitem.js | 0 .../src/views/acs/device/deviceDbitem/index.vue | 2 +- .../{api => views}/acs/device/deviceStageMonitor.js | 0 .../src/views/acs/device/driver/agv/agv_ndc_one.vue | 2 +- .../src/views/acs/device/driver/agv/agv_ndc_two.vue | 4 ++-- .../src/views/acs/device/driver/agv/xg_agv.vue | 10 +++++----- .../src/views/acs/device/driver/belt_conveyor.vue | 10 +++++----- .../views/acs/device/driver/blank_manipulator.vue | 10 +++++----- .../src/views/acs/device/driver/blanking_button.vue | 10 +++++----- .../src/views/acs/device/driver/box_manipulator.vue | 10 +++++----- .../views/acs/device/driver/box_manipulator_site.vue | 10 +++++----- .../device/driver/box_palletizing_manipulator.vue | 10 +++++----- .../device/driver/conveyor_with_scanner_weight.vue | 10 +++++----- .../views/acs/device/driver/double_belt_conveyor.vue | 10 +++++----- .../acs/device/driver/double_station_stacker.vue | 12 ++++++------ .../src/views/acs/device/driver/dry_manipulator.vue | 10 +++++----- .../src/views/acs/device/driver/fold_disc_site.vue | 10 +++++----- .../acs/device/driver/green_foil_machine_button.vue | 10 +++++----- .../views/acs/device/driver/hongxiang_conveyor.vue | 10 +++++----- .../src/views/acs/device/driver/hongxiang_device.vue | 10 +++++----- .../src/views/acs/device/driver/lamp_three_color.vue | 10 +++++----- .../src/views/acs/device/driver/led_screen.vue | 10 +++++----- .../driver/one_conveyor/box_storage_out_conveyor.vue | 10 +++++----- .../driver/one_conveyor/box_subvolumes_conveyor.vue | 10 +++++----- ...finished_product_out_with_bind_lable_conveyor.vue | 10 +++++----- .../device/driver/one_conveyor/fold_disc_site.vue | 10 +++++----- .../driver/one_conveyor/scanner_weight_conveyor.vue | 10 +++++----- .../driver/one_conveyor/un_box_lable_conveyor.vue | 10 +++++----- .../one_manipulator/box_package_manipulator.vue | 10 +++++----- .../one_manipulator/box_storage_manipulator.vue | 10 +++++----- .../one_manipulator/return_good_manipulator.vue | 10 +++++----- .../driver/one_manipulator/trapped_manipulator.vue | 10 +++++----- .../src/views/acs/device/driver/oven_manipulator.vue | 10 +++++----- .../views/acs/device/driver/paper_tube_conveyor2.vue | 10 +++++----- .../acs/device/driver/plug_pull_device_site.vue | 10 +++++----- nladmin-ui/src/views/acs/device/driver/rgv.vue | 10 +++++----- .../src/views/acs/device/driver/siemens_conveyor.vue | 10 +++++----- .../views/acs/device/driver/siemens_conveyor_ckk.vue | 10 +++++----- .../acs/device/driver/siemens_conveyor_labeling.vue | 10 +++++----- .../views/acs/device/driver/slit_two_manipulator.vue | 10 +++++----- .../views/acs/device/driver/standard_autodoor.vue | 8 ++++---- .../acs/device/driver/standard_conveyor_control.vue | 10 +++++----- .../standard_conveyor_control_with_scanner.vue | 10 +++++----- .../acs/device/driver/standard_conveyor_monitor.vue | 10 +++++----- .../acs/device/driver/standard_inspect_site.vue | 10 +++++----- .../views/acs/device/driver/standard_manipulator.vue | 10 +++++----- .../acs/device/driver/standard_ordinary_site.vue | 4 ++-- .../src/views/acs/device/driver/standard_scanner.vue | 4 ++-- .../src/views/acs/device/driver/standard_stacker.vue | 12 ++++++------ .../src/views/acs/device/driver/standard_station.vue | 10 +++++----- .../src/views/acs/device/driver/standard_storage.vue | 10 +++++----- .../acs/device/driver/subvolume_weighing_station.vue | 10 +++++----- .../views/acs/device/driver/with_station_device.vue | 10 +++++----- .../src/{api => views}/acs/device/driverConfig.js | 0 nladmin-ui/src/views/acs/device/index.vue | 2 +- nladmin-ui/src/views/acs/device/opc/index.vue | 2 +- .../{api/acs/device => views/acs/device/opc}/opc.js | 0 .../acs/device => views/acs/device/opc}/opcPlc.js | 0 nladmin-ui/src/views/acs/device/protocol/index.vue | 2 +- .../src/views/acs/device/storageCell/index.vue | 2 +- .../acs/device/storageCell}/storageCell.js | 0 .../{api => views}/acs/history/acsDeviceErrorLog.js | 0 .../src/views/acs/history/deviceErrorInfo/index.vue | 2 +- .../src/views/acs/history/instRecord/index.vue | 2 +- .../src/views/acs/history/taskRecord/index.vue | 6 +++--- .../src/views/acs/history/taskTreeRecord/index.vue | 8 ++++---- nladmin-ui/src/{api => views}/acs/history/udwData.js | 0 nladmin-ui/src/views/acs/history/udwData/index.vue | 2 +- nladmin-ui/src/views/acs/instruction/index.vue | 2 +- .../{api => views}/acs/instruction/instruction.js | 0 nladmin-ui/src/views/acs/monitor/device/index.vue | 4 ++-- nladmin-ui/src/views/acs/monitor/device/index2.vue | 4 ++-- nladmin-ui/src/views/acs/protocolConfig/config.vue | 2 +- nladmin-ui/src/views/acs/protocolConfig/index.vue | 2 +- nladmin-ui/src/views/acs/route/routeChart/index.vue | 4 ++-- nladmin-ui/src/views/acs/route/routeLine/index.vue | 6 +++--- .../route => views/acs/route/routeLine}/routeLine.js | 0 nladmin-ui/src/views/acs/route/routeLoc/index.vue | 2 +- .../route => views/acs/route/routeLoc}/routeLoc.js | 0 nladmin-ui/src/views/acs/route/routePlan/index.vue | 2 +- .../route => views/acs/route/routePlan}/routePlan.js | 0 nladmin-ui/src/{api => views}/acs/stage/actor.js | 0 nladmin-ui/src/views/acs/stage/actor/index.vue | 2 +- nladmin-ui/src/views/acs/stage/editor/index.vue | 6 +++--- nladmin-ui/src/views/acs/stage/editor/index2.vue | 6 +++--- nladmin-ui/src/views/acs/stage/image/index.vue | 2 +- nladmin-ui/src/views/acs/stage/index.vue | 2 +- nladmin-ui/src/{api => views}/acs/stage/stage.js | 0 .../src/{api => views}/acs/stage/stageImage.js | 0 .../src/views/acs/task/deviceAskTask/index.vue | 6 +++--- nladmin-ui/src/views/acs/task/index.vue | 6 +++--- nladmin-ui/src/{api => views}/acs/task/task.js | 0 nladmin-ui/src/views/acs/task/taskFeedback/index.vue | 2 +- .../acs/task/taskFeedback}/taskFeedback.js | 0 nladmin-ui/src/views/acs/test/hailiang/index.vue | 2 +- nladmin-ui/src/{api => views}/acs/test/test.js | 0 113 files changed, 299 insertions(+), 309 deletions(-) delete mode 100644 nladmin-ui/src/api/acs/lucene/log.js rename nladmin-ui/src/{api => views}/acs/angle/acsPointAngle.js (100%) rename nladmin-ui/src/{api => views}/acs/config/deviceAssigned.js (100%) rename nladmin-ui/src/{api => views}/acs/device/acsDeviceErpmapping.js (100%) rename nladmin-ui/src/{api/acs => views/acs/device/address}/Address.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/customPolicy}/customPolicy.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/customPolicy}/customPolicyType.js (100%) rename nladmin-ui/src/{api => views}/acs/device/device.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/deviceDbitem}/deviceDbitem.js (100%) rename nladmin-ui/src/{api => views}/acs/device/deviceStageMonitor.js (100%) rename nladmin-ui/src/{api => views}/acs/device/driverConfig.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/opc}/opc.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/opc}/opcPlc.js (100%) rename nladmin-ui/src/{api/acs/device => views/acs/device/storageCell}/storageCell.js (100%) rename nladmin-ui/src/{api => views}/acs/history/acsDeviceErrorLog.js (100%) rename nladmin-ui/src/{api => views}/acs/history/udwData.js (100%) rename nladmin-ui/src/{api => views}/acs/instruction/instruction.js (100%) rename nladmin-ui/src/{api/acs/route => views/acs/route/routeLine}/routeLine.js (100%) rename nladmin-ui/src/{api/acs/route => views/acs/route/routeLoc}/routeLoc.js (100%) rename nladmin-ui/src/{api/acs/route => views/acs/route/routePlan}/routePlan.js (100%) rename nladmin-ui/src/{api => views}/acs/stage/actor.js (100%) rename nladmin-ui/src/{api => views}/acs/stage/stage.js (100%) rename nladmin-ui/src/{api => views}/acs/stage/stageImage.js (100%) rename nladmin-ui/src/{api => views}/acs/task/task.js (100%) rename nladmin-ui/src/{api/acs/task => views/acs/task/taskFeedback}/taskFeedback.js (100%) rename nladmin-ui/src/{api => views}/acs/test/test.js (100%) diff --git a/nladmin-ui/src/api/acs/lucene/log.js b/nladmin-ui/src/api/acs/lucene/log.js deleted file mode 100644 index 0b7ef0a..0000000 --- a/nladmin-ui/src/api/acs/lucene/log.js +++ /dev/null @@ -1,10 +0,0 @@ -import request from '@/utils/request' - -export function delAll(id) { - return request({ - url: 'api/lucene/' + id, - method: 'delete' - }) -} - -export default { delAll } diff --git a/nladmin-ui/src/api/acs/angle/acsPointAngle.js b/nladmin-ui/src/views/acs/angle/acsPointAngle.js similarity index 100% rename from nladmin-ui/src/api/acs/angle/acsPointAngle.js rename to nladmin-ui/src/views/acs/angle/acsPointAngle.js diff --git a/nladmin-ui/src/views/acs/angle/index.vue b/nladmin-ui/src/views/acs/angle/index.vue index 3240cd3..e58cac1 100644 --- a/nladmin-ui/src/views/acs/angle/index.vue +++ b/nladmin-ui/src/views/acs/angle/index.vue @@ -137,7 +137,7 @@ import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import crudAcsPointAngle from '@/api/acs/angle/acsPointAngle' +import crudAcsPointAngle from '@/views/acs/angle/acsPointAngle' const defaultForm = { id: null, diff --git a/nladmin-ui/src/views/acs/config/assigned/index.vue b/nladmin-ui/src/views/acs/config/assigned/index.vue index 6b8baf8..96f5624 100644 --- a/nladmin-ui/src/views/acs/config/assigned/index.vue +++ b/nladmin-ui/src/views/acs/config/assigned/index.vue @@ -141,12 +141,12 @@ </template> <script> -import crudAcsDeviceAssigned from '@/api/acs/config/deviceAssigned' +import crudAcsDeviceAssigned from '@/views/acs/config/deviceAssigned' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' import i18n from '@/i18n' const defaultForm = { diff --git a/nladmin-ui/src/api/acs/config/deviceAssigned.js b/nladmin-ui/src/views/acs/config/deviceAssigned.js similarity index 100% rename from nladmin-ui/src/api/acs/config/deviceAssigned.js rename to nladmin-ui/src/views/acs/config/deviceAssigned.js diff --git a/nladmin-ui/src/views/acs/config/trafficControl/index.vue b/nladmin-ui/src/views/acs/config/trafficControl/index.vue index 894c43a..2e7d11e 100644 --- a/nladmin-ui/src/views/acs/config/trafficControl/index.vue +++ b/nladmin-ui/src/views/acs/config/trafficControl/index.vue @@ -128,12 +128,12 @@ </template> <script> -import crudAcsDeviceAssigned from '@/api/acs/config/deviceAssigned' +import crudAcsDeviceAssigned from '@/views/acs/config/deviceAssigned' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' import i18n from '@/i18n' const defaultForm = { diff --git a/nladmin-ui/src/views/acs/device/UploadDialog.vue b/nladmin-ui/src/views/acs/device/UploadDialog.vue index b299a0e..7e6d059 100644 --- a/nladmin-ui/src/views/acs/device/UploadDialog.vue +++ b/nladmin-ui/src/views/acs/device/UploadDialog.vue @@ -38,7 +38,7 @@ </template> <script> -import crudDevice from '@/api/acs/device/device' +import crudDevice from '@/views/acs/device/device' import CRUD, { crud } from '@crud/crud' export default { diff --git a/nladmin-ui/src/api/acs/device/acsDeviceErpmapping.js b/nladmin-ui/src/views/acs/device/acsDeviceErpmapping.js similarity index 100% rename from nladmin-ui/src/api/acs/device/acsDeviceErpmapping.js rename to nladmin-ui/src/views/acs/device/acsDeviceErpmapping.js diff --git a/nladmin-ui/src/views/acs/device/acsToERP/index.vue b/nladmin-ui/src/views/acs/device/acsToERP/index.vue index c8b90a0..ac82034 100644 --- a/nladmin-ui/src/views/acs/device/acsToERP/index.vue +++ b/nladmin-ui/src/views/acs/device/acsToERP/index.vue @@ -96,13 +96,13 @@ </template> <script> -import crudAcsDeviceErpmapping from '@/api/acs/device/acsDeviceErpmapping' +import crudAcsDeviceErpmapping from '@/views/acs/device/acsDeviceErpmapping' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' const defaultForm = { device_id: null, diff --git a/nladmin-ui/src/api/acs/Address.js b/nladmin-ui/src/views/acs/device/address/Address.js similarity index 100% rename from nladmin-ui/src/api/acs/Address.js rename to nladmin-ui/src/views/acs/device/address/Address.js diff --git a/nladmin-ui/src/views/acs/device/address/index.vue b/nladmin-ui/src/views/acs/device/address/index.vue index ec117f4..4ac817e 100644 --- a/nladmin-ui/src/views/acs/device/address/index.vue +++ b/nladmin-ui/src/views/acs/device/address/index.vue @@ -70,7 +70,7 @@ </template> <script> -import crudAddress from '@/api/acs/Address' +import crudAddress from '@/views/acs/device/address/Address' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/acs/device/config.vue b/nladmin-ui/src/views/acs/device/config.vue index 50eea62..cda3f43 100644 --- a/nladmin-ui/src/views/acs/device/config.vue +++ b/nladmin-ui/src/views/acs/device/config.vue @@ -71,7 +71,7 @@ <script> import crud from '@/mixins/crud' -import { get, selectDriverCodeList } from '@/api/acs/device/driverConfig' +import { get, selectDriverCodeList } from '@/views/acs/device/driverConfig' import { getDicts } from '@/views/system/dict/dict' import standard_autodoor from '@/views/acs/device/driver/standard_autodoor' import standard_inspect_site from './driver/standard_inspect_site' diff --git a/nladmin-ui/src/api/acs/device/customPolicy.js b/nladmin-ui/src/views/acs/device/customPolicy/customPolicy.js similarity index 100% rename from nladmin-ui/src/api/acs/device/customPolicy.js rename to nladmin-ui/src/views/acs/device/customPolicy/customPolicy.js diff --git a/nladmin-ui/src/api/acs/device/customPolicyType.js b/nladmin-ui/src/views/acs/device/customPolicy/customPolicyType.js similarity index 100% rename from nladmin-ui/src/api/acs/device/customPolicyType.js rename to nladmin-ui/src/views/acs/device/customPolicy/customPolicyType.js diff --git a/nladmin-ui/src/views/acs/device/customPolicy/index.vue b/nladmin-ui/src/views/acs/device/customPolicy/index.vue index b03d1cb..092053d 100644 --- a/nladmin-ui/src/views/acs/device/customPolicy/index.vue +++ b/nladmin-ui/src/views/acs/device/customPolicy/index.vue @@ -74,13 +74,13 @@ </template> <script> -import crudCustomPolicy from '@/api/acs/device/customPolicy' +import crudCustomPolicy from '@/views/acs/device/customPolicy/customPolicy' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' import i18n from '@/i18n' const defaultForm = { id: null, create_time: null, update_time: null, key_code: null, unit_code: ' deviceCustomerDequeStrategy' } diff --git a/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue b/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue index fd453cf..8596e09 100644 --- a/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue +++ b/nladmin-ui/src/views/acs/device/customPolicy/task/index.vue @@ -123,10 +123,10 @@ <script> -import { updateConfig, selectById } from '@/api/acs/device/customPolicyType' +import { updateConfig, selectById } from '@/views/acs/device/customPolicy/customPolicyType' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' -import crudCustomPolicy from '@/api/acs/device/customPolicy' +import deviceCrud from '@/views/acs/device/device' +import crudCustomPolicy from '@/views/acs/device/customPolicy/customPolicy' import CRUD from '@crud/crud' export default { diff --git a/nladmin-ui/src/api/acs/device/device.js b/nladmin-ui/src/views/acs/device/device.js similarity index 100% rename from nladmin-ui/src/api/acs/device/device.js rename to nladmin-ui/src/views/acs/device/device.js diff --git a/nladmin-ui/src/api/acs/device/deviceDbitem.js b/nladmin-ui/src/views/acs/device/deviceDbitem/deviceDbitem.js similarity index 100% rename from nladmin-ui/src/api/acs/device/deviceDbitem.js rename to nladmin-ui/src/views/acs/device/deviceDbitem/deviceDbitem.js diff --git a/nladmin-ui/src/views/acs/device/deviceDbitem/index.vue b/nladmin-ui/src/views/acs/device/deviceDbitem/index.vue index 4784b2c..035db10 100644 --- a/nladmin-ui/src/views/acs/device/deviceDbitem/index.vue +++ b/nladmin-ui/src/views/acs/device/deviceDbitem/index.vue @@ -99,7 +99,7 @@ </template> <script> -import crudDeviceDbitem from '@/api/acs/device/deviceDbitem' +import crudDeviceDbitem from '@/views/acs/device/deviceDbitem/deviceDbitem' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/api/acs/device/deviceStageMonitor.js b/nladmin-ui/src/views/acs/device/deviceStageMonitor.js similarity index 100% rename from nladmin-ui/src/api/acs/device/deviceStageMonitor.js rename to nladmin-ui/src/views/acs/device/deviceStageMonitor.js diff --git a/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_one.vue b/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_one.vue index cac7f55..7c28552 100644 --- a/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_one.vue +++ b/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_one.vue @@ -39,7 +39,7 @@ import { queryDriverConfig, updateConfig -} from '@/api/acs/device/driverConfig' +} from '@/views/acs/device/driverConfig' import crud from '@/mixins/crud' export default { diff --git a/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_two.vue b/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_two.vue index 013bc25..1ede837 100644 --- a/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_two.vue +++ b/nladmin-ui/src/views/acs/device/driver/agv/agv_ndc_two.vue @@ -36,10 +36,10 @@ import { queryDriverConfig, updateConfig -} from '@/api/acs/device/driverConfig' +} from '@/views/acs/device/driverConfig' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardScanner', mixins: [crud], diff --git a/nladmin-ui/src/views/acs/device/driver/agv/xg_agv.vue b/nladmin-ui/src/views/acs/device/driver/agv/xg_agv.vue index 26832e4..71f8662 100644 --- a/nladmin-ui/src/views/acs/device/driver/agv/xg_agv.vue +++ b/nladmin-ui/src/views/acs/device/driver/agv/xg_agv.vue @@ -216,12 +216,12 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardAutodoor', diff --git a/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue index e325724..26e1713 100644 --- a/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/belt_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BeltConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/blank_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/blank_manipulator.vue index 121bc7c..f107b84 100644 --- a/nladmin-ui/src/views/acs/device/driver/blank_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/blank_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BlankManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/blanking_button.vue b/nladmin-ui/src/views/acs/device/driver/blanking_button.vue index 5676ca4..acd98b3 100644 --- a/nladmin-ui/src/views/acs/device/driver/blanking_button.vue +++ b/nladmin-ui/src/views/acs/device/driver/blanking_button.vue @@ -220,13 +220,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'WithStationDeviceDriver', diff --git a/nladmin-ui/src/views/acs/device/driver/box_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/box_manipulator.vue index f36f1c5..76ee0b9 100644 --- a/nladmin-ui/src/views/acs/device/driver/box_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/box_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/box_manipulator_site.vue b/nladmin-ui/src/views/acs/device/driver/box_manipulator_site.vue index ff36045..b1a12bb 100644 --- a/nladmin-ui/src/views/acs/device/driver/box_manipulator_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/box_manipulator_site.vue @@ -318,13 +318,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxManipulatorSite', diff --git a/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue index 07e38c9..c56698b 100644 --- a/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/box_palletizing_manipulator.vue @@ -295,13 +295,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxPalletizingManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/conveyor_with_scanner_weight.vue b/nladmin-ui/src/views/acs/device/driver/conveyor_with_scanner_weight.vue index 6079e15..68604a0 100644 --- a/nladmin-ui/src/views/acs/device/driver/conveyor_with_scanner_weight.vue +++ b/nladmin-ui/src/views/acs/device/driver/conveyor_with_scanner_weight.vue @@ -318,13 +318,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'ConveyorWithScannerWeight', diff --git a/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue index 7cacccd..c66623e 100644 --- a/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/double_belt_conveyor.vue @@ -293,13 +293,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'DoubleStandardConveyorControl', diff --git a/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue b/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue index 1968e06..8b56e05 100644 --- a/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue +++ b/nladmin-ui/src/views/acs/device/driver/double_station_stacker.vue @@ -285,14 +285,14 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' -import { findDeviceStrategyOption } from '@/api/acs/device/customPolicyType' +import deviceCrud from '@/views/acs/device/device' +import { findDeviceStrategyOption } from '@/views/acs/device/customPolicy/customPolicyType' export default { name: 'DoubleStationStacker', diff --git a/nladmin-ui/src/views/acs/device/driver/dry_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/dry_manipulator.vue index 237eb18..1f0ae05 100644 --- a/nladmin-ui/src/views/acs/device/driver/dry_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/dry_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'DryManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue b/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue index 95bbb02..a7a97d5 100644 --- a/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/fold_disc_site.vue @@ -318,13 +318,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'FoldDiscSite', diff --git a/nladmin-ui/src/views/acs/device/driver/green_foil_machine_button.vue b/nladmin-ui/src/views/acs/device/driver/green_foil_machine_button.vue index 5676ca4..acd98b3 100644 --- a/nladmin-ui/src/views/acs/device/driver/green_foil_machine_button.vue +++ b/nladmin-ui/src/views/acs/device/driver/green_foil_machine_button.vue @@ -220,13 +220,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'WithStationDeviceDriver', diff --git a/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue index e0d20f8..86b5dfd 100644 --- a/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/hongxiang_conveyor.vue @@ -266,13 +266,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardInspectSite', diff --git a/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue b/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue index fa78611..d09db53 100644 --- a/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue +++ b/nladmin-ui/src/views/acs/device/driver/hongxiang_device.vue @@ -265,13 +265,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardInspectSite', diff --git a/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue b/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue index bdb9079..89dacb6 100644 --- a/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue +++ b/nladmin-ui/src/views/acs/device/driver/lamp_three_color.vue @@ -141,13 +141,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'LampThreeColor', diff --git a/nladmin-ui/src/views/acs/device/driver/led_screen.vue b/nladmin-ui/src/views/acs/device/driver/led_screen.vue index 58ab2ec..fe67c1a 100644 --- a/nladmin-ui/src/views/acs/device/driver/led_screen.vue +++ b/nladmin-ui/src/views/acs/device/driver/led_screen.vue @@ -110,13 +110,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'LedScreen', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue index d420946..3fff1e6 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_storage_out_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxStorageOutConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue index 8b74e87..72664e2 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/box_subvolumes_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxSubvolumesConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue index 7889a38..79cbcd5 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/finished_product_out_with_bind_lable_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'FinishedProductOutWithBindLableConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue index c260bab..80a453b 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/fold_disc_site.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'FoldDiscSite', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue index d0ea367..92ab2c9 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/scanner_weight_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'ScannerWeightConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue index e30c085..06d77a9 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_conveyor/un_box_lable_conveyor.vue @@ -212,13 +212,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'UnBoxLableConveyor', diff --git a/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue index e4cb045..5f55b38 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_package_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxPackageManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue index 98b0b2f..3177265 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_manipulator/box_storage_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxStorageManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue index d553d9a..541c0f9 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_manipulator/return_good_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'ReturnGoodManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue index b71606f..61b07ef 100644 --- a/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/one_manipulator/trapped_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'TrappedManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/oven_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/oven_manipulator.vue index d988d3c..e08600b 100644 --- a/nladmin-ui/src/views/acs/device/driver/oven_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/oven_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'OvenGantryManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor2.vue b/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor2.vue index 032907b..3b16642 100644 --- a/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor2.vue +++ b/nladmin-ui/src/views/acs/device/driver/paper_tube_conveyor2.vue @@ -265,13 +265,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardInspectSite', diff --git a/nladmin-ui/src/views/acs/device/driver/plug_pull_device_site.vue b/nladmin-ui/src/views/acs/device/driver/plug_pull_device_site.vue index 01f79dc..6a551cd 100644 --- a/nladmin-ui/src/views/acs/device/driver/plug_pull_device_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/plug_pull_device_site.vue @@ -266,13 +266,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'PlugPullDeviceSite', diff --git a/nladmin-ui/src/views/acs/device/driver/rgv.vue b/nladmin-ui/src/views/acs/device/driver/rgv.vue index 5b8e3a1..9417086 100644 --- a/nladmin-ui/src/views/acs/device/driver/rgv.vue +++ b/nladmin-ui/src/views/acs/device/driver/rgv.vue @@ -318,13 +318,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'Rgv', diff --git a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue index 7ecfb7d..538ff70 100644 --- a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue +++ b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor.vue @@ -272,13 +272,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorControl', diff --git a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue index 54f6fd8..3b5c62b 100644 --- a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue +++ b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_ckk.vue @@ -265,13 +265,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorControl', diff --git a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue index 98c28fe..db828e6 100644 --- a/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue +++ b/nladmin-ui/src/views/acs/device/driver/siemens_conveyor_labeling.vue @@ -265,13 +265,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorControl', diff --git a/nladmin-ui/src/views/acs/device/driver/slit_two_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/slit_two_manipulator.vue index f593906..475c6e9 100644 --- a/nladmin-ui/src/views/acs/device/driver/slit_two_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/slit_two_manipulator.vue @@ -413,13 +413,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'SlitTwoManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue b/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue index 41e2f46..7a78bcb 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_autodoor.vue @@ -157,10 +157,10 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' diff --git a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue index 99611ca..8983016 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control.vue @@ -257,13 +257,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorControl', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue index 8b02578..980bba4 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_control_with_scanner.vue @@ -318,13 +318,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorControlWithScanner', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue index 62cd622..a1b54bc 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_conveyor_monitor.vue @@ -257,13 +257,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardConveyorMonitor', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue b/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue index 2a71c31..2243733 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_inspect_site.vue @@ -257,13 +257,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardInspectSite', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_manipulator.vue b/nladmin-ui/src/views/acs/device/driver/standard_manipulator.vue index 89ec131..7d9d359 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_manipulator.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_manipulator.vue @@ -303,13 +303,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue b/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue index 0cd0926..6ff37e5 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_ordinary_site.vue @@ -145,9 +145,9 @@ </template> <script> -import { updateConfig, queryDriverConfig } from '@/api/acs/device/driverConfig' +import { updateConfig, queryDriverConfig } from '@/views/acs/device/driverConfig' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardOrdinarySite', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_scanner.vue b/nladmin-ui/src/views/acs/device/driver/standard_scanner.vue index 21f4a7f..74e8ea0 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_scanner.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_scanner.vue @@ -35,10 +35,10 @@ import { queryDriverConfig, updateConfig -} from '@/api/acs/device/driverConfig' +} from '@/views/acs/device/driverConfig' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardScanner', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_stacker.vue b/nladmin-ui/src/views/acs/device/driver/standard_stacker.vue index dbc947e..577079b 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_stacker.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_stacker.vue @@ -272,14 +272,14 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' -import { findDeviceStrategyOption } from '@/api/acs/device/customPolicyType' +import deviceCrud from '@/views/acs/device/device' +import { findDeviceStrategyOption } from '@/views/acs/device/customPolicy/customPolicyType' export default { name: 'OvenGantryManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_station.vue b/nladmin-ui/src/views/acs/device/driver/standard_station.vue index c5a9488..fdc5805 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_station.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_station.vue @@ -347,13 +347,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'BoxPalletizingManipulator', diff --git a/nladmin-ui/src/views/acs/device/driver/standard_storage.vue b/nladmin-ui/src/views/acs/device/driver/standard_storage.vue index 3b3cd05..63f5e8c 100644 --- a/nladmin-ui/src/views/acs/device/driver/standard_storage.vue +++ b/nladmin-ui/src/views/acs/device/driver/standard_storage.vue @@ -82,13 +82,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'StandardStorage', diff --git a/nladmin-ui/src/views/acs/device/driver/subvolume_weighing_station.vue b/nladmin-ui/src/views/acs/device/driver/subvolume_weighing_station.vue index 5676ca4..acd98b3 100644 --- a/nladmin-ui/src/views/acs/device/driver/subvolume_weighing_station.vue +++ b/nladmin-ui/src/views/acs/device/driver/subvolume_weighing_station.vue @@ -220,13 +220,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'WithStationDeviceDriver', diff --git a/nladmin-ui/src/views/acs/device/driver/with_station_device.vue b/nladmin-ui/src/views/acs/device/driver/with_station_device.vue index 0f24ecc..7215c99 100644 --- a/nladmin-ui/src/views/acs/device/driver/with_station_device.vue +++ b/nladmin-ui/src/views/acs/device/driver/with_station_device.vue @@ -314,13 +314,13 @@ import { updateConfig, testRead, testwrite -} from '@/api/acs/device/driverConfig' -import { selectOpcList } from '@/api/acs/device/opc' -import { selectPlcList } from '@/api/acs/device/opcPlc' -import { selectListByOpcID } from '@/api/acs/device/opcPlc' +} from '@/views/acs/device/driverConfig' +import { selectOpcList } from '@/views/acs/device/opc/opc' +import { selectPlcList } from '@/views/acs/device/opc/opcPlc' +import { selectListByOpcID } from '@/views/acs/device/opc/opcPlc' import crud from '@/mixins/crud' -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' export default { name: 'WithStationDeviceDriver', diff --git a/nladmin-ui/src/api/acs/device/driverConfig.js b/nladmin-ui/src/views/acs/device/driverConfig.js similarity index 100% rename from nladmin-ui/src/api/acs/device/driverConfig.js rename to nladmin-ui/src/views/acs/device/driverConfig.js diff --git a/nladmin-ui/src/views/acs/device/index.vue b/nladmin-ui/src/views/acs/device/index.vue index d6b6d26..8744b80 100644 --- a/nladmin-ui/src/views/acs/device/index.vue +++ b/nladmin-ui/src/views/acs/device/index.vue @@ -190,7 +190,7 @@ </template> <script> -import crudDevice from '@/api/acs/device/device' +import crudDevice from '@/views/acs/device/device' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/acs/device/opc/index.vue b/nladmin-ui/src/views/acs/device/opc/index.vue index e269291..a596cf3 100644 --- a/nladmin-ui/src/views/acs/device/opc/index.vue +++ b/nladmin-ui/src/views/acs/device/opc/index.vue @@ -143,7 +143,7 @@ </template> <script> -import crudOpc from '@/api/acs/device/opc' +import crudOpc from '@/views/acs/device/opc/opc' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' diff --git a/nladmin-ui/src/api/acs/device/opc.js b/nladmin-ui/src/views/acs/device/opc/opc.js similarity index 100% rename from nladmin-ui/src/api/acs/device/opc.js rename to nladmin-ui/src/views/acs/device/opc/opc.js diff --git a/nladmin-ui/src/api/acs/device/opcPlc.js b/nladmin-ui/src/views/acs/device/opc/opcPlc.js similarity index 100% rename from nladmin-ui/src/api/acs/device/opcPlc.js rename to nladmin-ui/src/views/acs/device/opc/opcPlc.js diff --git a/nladmin-ui/src/views/acs/device/protocol/index.vue b/nladmin-ui/src/views/acs/device/protocol/index.vue index 9a22400..9756a45 100644 --- a/nladmin-ui/src/views/acs/device/protocol/index.vue +++ b/nladmin-ui/src/views/acs/device/protocol/index.vue @@ -137,7 +137,7 @@ import CRUD, { crud, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import { get } from '@/views/system/dict/dictDetail' -import { selectOpcList } from '@/api/acs/device/opc' +import { selectOpcList } from '@/views/acs/device/opc/opc' import { download } from '@/api/data' import { downloadFile } from '@/utils' import pagination from '@crud/Pagination' diff --git a/nladmin-ui/src/views/acs/device/storageCell/index.vue b/nladmin-ui/src/views/acs/device/storageCell/index.vue index 0a9102e..ed0e5ba 100644 --- a/nladmin-ui/src/views/acs/device/storageCell/index.vue +++ b/nladmin-ui/src/views/acs/device/storageCell/index.vue @@ -105,7 +105,7 @@ </template> <script> -import crudStorageCell from '@/api/acs/device/storageCell' +import crudStorageCell from '@/views/acs/device/storageCell/storageCell' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' diff --git a/nladmin-ui/src/api/acs/device/storageCell.js b/nladmin-ui/src/views/acs/device/storageCell/storageCell.js similarity index 100% rename from nladmin-ui/src/api/acs/device/storageCell.js rename to nladmin-ui/src/views/acs/device/storageCell/storageCell.js diff --git a/nladmin-ui/src/api/acs/history/acsDeviceErrorLog.js b/nladmin-ui/src/views/acs/history/acsDeviceErrorLog.js similarity index 100% rename from nladmin-ui/src/api/acs/history/acsDeviceErrorLog.js rename to nladmin-ui/src/views/acs/history/acsDeviceErrorLog.js diff --git a/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue b/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue index 59e0e4f..fc00ec6 100644 --- a/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue +++ b/nladmin-ui/src/views/acs/history/deviceErrorInfo/index.vue @@ -110,7 +110,7 @@ import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import crudAcsDeviceErrorLog from '@/api/acs/history/acsDeviceErrorLog' +import crudAcsDeviceErrorLog from '@/views/acs/history/acsDeviceErrorLog' import { download } from '@/api/data' import { downloadFile } from '@/utils' diff --git a/nladmin-ui/src/views/acs/history/instRecord/index.vue b/nladmin-ui/src/views/acs/history/instRecord/index.vue index 724d68c..f5086cc 100644 --- a/nladmin-ui/src/views/acs/history/instRecord/index.vue +++ b/nladmin-ui/src/views/acs/history/instRecord/index.vue @@ -156,7 +156,7 @@ <script> import Search from '@/views/lucene/time' import pagination from '@crud/Pagination' -import crudInstruction from '@/api/acs/instruction/instruction' +import crudInstruction from '@/views/acs/instruction/instruction' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import { getDicts } from '@/views/system/dict/dict' diff --git a/nladmin-ui/src/views/acs/history/taskRecord/index.vue b/nladmin-ui/src/views/acs/history/taskRecord/index.vue index a5b77b2..4c2be1b 100644 --- a/nladmin-ui/src/views/acs/history/taskRecord/index.vue +++ b/nladmin-ui/src/views/acs/history/taskRecord/index.vue @@ -287,12 +287,12 @@ <script> import Search from '@/views/lucene/time' -import crudTask from '@/api/acs/task/task' +import crudTask from '@/views/acs/task/task' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' -import routeCurd from '@/api/acs/route/routePlan' +import deviceCrud from '@/views/acs/device/device' +import routeCurd from '@/views/acs/route/routePlan/routePlan' import { getDicts } from '@/views/system/dict/dict' import { download } from '@/api/data' import { downloadFile } from '@/utils' diff --git a/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue b/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue index 6409bb9..d233cc5 100644 --- a/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue +++ b/nladmin-ui/src/views/acs/history/taskTreeRecord/index.vue @@ -135,13 +135,13 @@ <script> import Search from '@/views/lucene/time' -import crudTask from '@/api/acs/task/task' -import crudInstruction from '@/api/acs/instruction/instruction' +import crudTask from '@/views/acs/task/task' +import crudInstruction from '@/views/acs/instruction/instruction' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' -import routeCurd from '@/api/acs/route/routePlan' +import deviceCrud from '@/views/acs/device/device' +import routeCurd from '@/views/acs/route/routePlan/routePlan' import { getDicts } from '@/views/system/dict/dict' import { download } from '@/api/data' import { downloadFile } from '@/utils' diff --git a/nladmin-ui/src/api/acs/history/udwData.js b/nladmin-ui/src/views/acs/history/udwData.js similarity index 100% rename from nladmin-ui/src/api/acs/history/udwData.js rename to nladmin-ui/src/views/acs/history/udwData.js diff --git a/nladmin-ui/src/views/acs/history/udwData/index.vue b/nladmin-ui/src/views/acs/history/udwData/index.vue index 14383c2..3725268 100644 --- a/nladmin-ui/src/views/acs/history/udwData/index.vue +++ b/nladmin-ui/src/views/acs/history/udwData/index.vue @@ -109,7 +109,7 @@ <script> import pagination from '@crud/Pagination' -import crudUdwData from '@/api/acs/history/udwData' +import crudUdwData from '@/views/acs/history/udwData' import CRUD, { crud, form, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import { getDicts } from '@/views/system/dict/dict' diff --git a/nladmin-ui/src/views/acs/instruction/index.vue b/nladmin-ui/src/views/acs/instruction/index.vue index 56fcaa7..65fd45a 100644 --- a/nladmin-ui/src/views/acs/instruction/index.vue +++ b/nladmin-ui/src/views/acs/instruction/index.vue @@ -233,7 +233,7 @@ </template> <script> -import crudInstruction from '@/api/acs/instruction/instruction' +import crudInstruction from '@/views/acs/instruction/instruction' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import { getDicts } from '@/views/system/dict/dict' diff --git a/nladmin-ui/src/api/acs/instruction/instruction.js b/nladmin-ui/src/views/acs/instruction/instruction.js similarity index 100% rename from nladmin-ui/src/api/acs/instruction/instruction.js rename to nladmin-ui/src/views/acs/instruction/instruction.js diff --git a/nladmin-ui/src/views/acs/monitor/device/index.vue b/nladmin-ui/src/views/acs/monitor/device/index.vue index d800fc2..7930bc0 100644 --- a/nladmin-ui/src/views/acs/monitor/device/index.vue +++ b/nladmin-ui/src/views/acs/monitor/device/index.vue @@ -219,10 +219,10 @@ <script> // 导入draggable组件 -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' import draggable from 'vuedraggable' import crud from '@/mixins/crud' -import actorCrud from '@/api/acs/stage/actor' +import actorCrud from '@/views/acs/stage/actor' import XJDeviceMonitor from '@/views/acs/monitor/device/XJDeviceMonitor' export default { diff --git a/nladmin-ui/src/views/acs/monitor/device/index2.vue b/nladmin-ui/src/views/acs/monitor/device/index2.vue index febabca..246b49c 100644 --- a/nladmin-ui/src/views/acs/monitor/device/index2.vue +++ b/nladmin-ui/src/views/acs/monitor/device/index2.vue @@ -219,10 +219,10 @@ <script> // 导入draggable组件 -import deviceCrud from '@/api/acs/device/device' +import deviceCrud from '@/views/acs/device/device' import draggable from 'vuedraggable' import crud from '@/mixins/crud' -import actorCrud from '@/api/acs/stage/actor' +import actorCrud from '@/views/acs/stage/actor' import XJDeviceMonitor from '@/views/acs/monitor/device/XJDeviceMonitor' export default { diff --git a/nladmin-ui/src/views/acs/protocolConfig/config.vue b/nladmin-ui/src/views/acs/protocolConfig/config.vue index 23c2721..885d59c 100644 --- a/nladmin-ui/src/views/acs/protocolConfig/config.vue +++ b/nladmin-ui/src/views/acs/protocolConfig/config.vue @@ -83,7 +83,7 @@ import { downloadProtocolConfig, queryDBInfoByDriverCode -} from '@/api/acs/device/driverConfig' +} from '@/views/acs/device/driverConfig' import crud from '@/mixins/crud' import { downloadFile } from '@/utils' diff --git a/nladmin-ui/src/views/acs/protocolConfig/index.vue b/nladmin-ui/src/views/acs/protocolConfig/index.vue index 840ba27..ffa1583 100644 --- a/nladmin-ui/src/views/acs/protocolConfig/index.vue +++ b/nladmin-ui/src/views/acs/protocolConfig/index.vue @@ -71,7 +71,7 @@ <script> import crud from '@/mixins/crud' -import { getAllDriverCodeList } from '@/api/acs/device/driverConfig' +import { getAllDriverCodeList } from '@/views/acs/device/driverConfig' import { getDicts } from '@/views/system/dict/dict' import config from './config' diff --git a/nladmin-ui/src/views/acs/route/routeChart/index.vue b/nladmin-ui/src/views/acs/route/routeChart/index.vue index ad0f1a5..2f35f0e 100644 --- a/nladmin-ui/src/views/acs/route/routeChart/index.vue +++ b/nladmin-ui/src/views/acs/route/routeChart/index.vue @@ -61,8 +61,8 @@ </template> <script> -import deviceCrud from '@/api/acs/device/device' -import crudRoutePlan from '@/api/acs/route/routePlan' +import deviceCrud from '@/views/acs/device/device' +import crudRoutePlan from '@/views/acs/route/routePlan/routePlan' export default { name: 'RouteChart', data() { diff --git a/nladmin-ui/src/views/acs/route/routeLine/index.vue b/nladmin-ui/src/views/acs/route/routeLine/index.vue index 31fb3ad..e322690 100644 --- a/nladmin-ui/src/views/acs/route/routeLine/index.vue +++ b/nladmin-ui/src/views/acs/route/routeLine/index.vue @@ -230,14 +230,14 @@ </template> <script> -import crudRouteLine from '@/api/acs/route/routeLine' +import crudRouteLine from '@/views/acs/route/routeLine/routeLine' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' import pagination from '@crud/Pagination' -import { selectList } from '@/api/acs/route/routePlan' -import deviceCrud from '@/api/acs/device/device' +import { selectList } from '@/views/acs/route/routePlan/routePlan' +import deviceCrud from '@/views/acs/device/device' import i18n from '@/i18n' const defaultForm = { diff --git a/nladmin-ui/src/api/acs/route/routeLine.js b/nladmin-ui/src/views/acs/route/routeLine/routeLine.js similarity index 100% rename from nladmin-ui/src/api/acs/route/routeLine.js rename to nladmin-ui/src/views/acs/route/routeLine/routeLine.js diff --git a/nladmin-ui/src/views/acs/route/routeLoc/index.vue b/nladmin-ui/src/views/acs/route/routeLoc/index.vue index 86bdb57..4e07a8c 100644 --- a/nladmin-ui/src/views/acs/route/routeLoc/index.vue +++ b/nladmin-ui/src/views/acs/route/routeLoc/index.vue @@ -94,7 +94,7 @@ </template> <script> -import crudRouteLoc from '@/api/acs/route/routeLoc' +import crudRouteLoc from '@/views/acs/route/routeLoc/routeLoc' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/api/acs/route/routeLoc.js b/nladmin-ui/src/views/acs/route/routeLoc/routeLoc.js similarity index 100% rename from nladmin-ui/src/api/acs/route/routeLoc.js rename to nladmin-ui/src/views/acs/route/routeLoc/routeLoc.js diff --git a/nladmin-ui/src/views/acs/route/routePlan/index.vue b/nladmin-ui/src/views/acs/route/routePlan/index.vue index 9628ecc..f691247 100644 --- a/nladmin-ui/src/views/acs/route/routePlan/index.vue +++ b/nladmin-ui/src/views/acs/route/routePlan/index.vue @@ -70,7 +70,7 @@ </template> <script> -import crudRoutePlan from '@/api/acs/route/routePlan' +import crudRoutePlan from '@/views/acs/route/routePlan/routePlan' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import udOperation from '@crud/UD.operation' diff --git a/nladmin-ui/src/api/acs/route/routePlan.js b/nladmin-ui/src/views/acs/route/routePlan/routePlan.js similarity index 100% rename from nladmin-ui/src/api/acs/route/routePlan.js rename to nladmin-ui/src/views/acs/route/routePlan/routePlan.js diff --git a/nladmin-ui/src/api/acs/stage/actor.js b/nladmin-ui/src/views/acs/stage/actor.js similarity index 100% rename from nladmin-ui/src/api/acs/stage/actor.js rename to nladmin-ui/src/views/acs/stage/actor.js diff --git a/nladmin-ui/src/views/acs/stage/actor/index.vue b/nladmin-ui/src/views/acs/stage/actor/index.vue index 5a2cd72..07de23f 100644 --- a/nladmin-ui/src/views/acs/stage/actor/index.vue +++ b/nladmin-ui/src/views/acs/stage/actor/index.vue @@ -84,7 +84,7 @@ </template> <script> -import crudStageActor from '@/api/acs/stage/actor' +import crudStageActor from '@/views/acs/stage/actor' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/acs/stage/editor/index.vue b/nladmin-ui/src/views/acs/stage/editor/index.vue index f85330e..64c1572 100644 --- a/nladmin-ui/src/views/acs/stage/editor/index.vue +++ b/nladmin-ui/src/views/acs/stage/editor/index.vue @@ -192,9 +192,9 @@ <script> import draggable from 'vuedraggable' -import crudStage from '@/api/acs/stage/stage' -import actorCrud from '@/api/acs/stage/actor' -import deviceCrud from '@/api/acs/device/device' +import crudStage from '@/views/acs/stage/stage' +import actorCrud from '@/views/acs/stage/actor' +import deviceCrud from '@/views/acs/device/device' import del from '@/assets/acs/del_new.png' import crud from '@/mixins/crud' diff --git a/nladmin-ui/src/views/acs/stage/editor/index2.vue b/nladmin-ui/src/views/acs/stage/editor/index2.vue index 36004f5..54a4804 100644 --- a/nladmin-ui/src/views/acs/stage/editor/index2.vue +++ b/nladmin-ui/src/views/acs/stage/editor/index2.vue @@ -8,9 +8,9 @@ <script> import draggable from 'vuedraggable' -import crudStage from '@/api/acs/stage/stage' -import actorCrud from '@/api/acs/stage/actor' -import deviceCrud from '@/api/acs/device/device' +import crudStage from '@/views/acs/stage/stage' +import actorCrud from '@/views/acs/stage/actor' +import deviceCrud from '@/views/acs/device/device' import del from '@/assets/acs/del_new.png' import crud from '@/mixins/crud' diff --git a/nladmin-ui/src/views/acs/stage/image/index.vue b/nladmin-ui/src/views/acs/stage/image/index.vue index 4aea3a7..a4ca754 100644 --- a/nladmin-ui/src/views/acs/stage/image/index.vue +++ b/nladmin-ui/src/views/acs/stage/image/index.vue @@ -109,7 +109,7 @@ </template> <script> -import crudStageImage from '@/api/acs/stage/stageImage' +import crudStageImage from '@/views/acs/stage/stageImage' import CRUD, { crud, form, header, presenter } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/views/acs/stage/index.vue b/nladmin-ui/src/views/acs/stage/index.vue index fbf6475..a82708c 100644 --- a/nladmin-ui/src/views/acs/stage/index.vue +++ b/nladmin-ui/src/views/acs/stage/index.vue @@ -65,7 +65,7 @@ </template> <script> -import crudStage from '@/api/acs/stage/stage' +import crudStage from '@/views/acs/stage/stage' import CRUD, { presenter, header, form, crud } from '@crud/crud' import rrOperation from '@crud/RR.operation' import crudOperation from '@crud/CRUD.operation' diff --git a/nladmin-ui/src/api/acs/stage/stage.js b/nladmin-ui/src/views/acs/stage/stage.js similarity index 100% rename from nladmin-ui/src/api/acs/stage/stage.js rename to nladmin-ui/src/views/acs/stage/stage.js diff --git a/nladmin-ui/src/api/acs/stage/stageImage.js b/nladmin-ui/src/views/acs/stage/stageImage.js similarity index 100% rename from nladmin-ui/src/api/acs/stage/stageImage.js rename to nladmin-ui/src/views/acs/stage/stageImage.js diff --git a/nladmin-ui/src/views/acs/task/deviceAskTask/index.vue b/nladmin-ui/src/views/acs/task/deviceAskTask/index.vue index fe2e8aa..e86e72a 100644 --- a/nladmin-ui/src/views/acs/task/deviceAskTask/index.vue +++ b/nladmin-ui/src/views/acs/task/deviceAskTask/index.vue @@ -70,9 +70,9 @@ </template> <script> -import deviceCrud from '@/api/acs/device/device' -import { selectList } from '@/api/acs/route/routePlan' -import crudTask from '@/api/acs/task/task' +import deviceCrud from '@/views/acs/device/device' +import { selectList } from '@/views/acs/route/routePlan/routePlan' +import crudTask from '@/views/acs/task/task' export default { name: 'DeviceAskTask', diff --git a/nladmin-ui/src/views/acs/task/index.vue b/nladmin-ui/src/views/acs/task/index.vue index 1e51222..b34feac 100644 --- a/nladmin-ui/src/views/acs/task/index.vue +++ b/nladmin-ui/src/views/acs/task/index.vue @@ -504,12 +504,12 @@ </template> <script> -import crudTask from '@/api/acs/task/task' +import crudTask from '@/views/acs/task/task' import CRUD, { crud, header, presenter } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' -import deviceCrud from '@/api/acs/device/device' -import routeCurd from '@/api/acs/route/routePlan' +import deviceCrud from '@/views/acs/device/device' +import routeCurd from '@/views/acs/route/routePlan/routePlan' import { getDicts } from '@/views/system/dict/dict' import i18n from '@/i18n' diff --git a/nladmin-ui/src/api/acs/task/task.js b/nladmin-ui/src/views/acs/task/task.js similarity index 100% rename from nladmin-ui/src/api/acs/task/task.js rename to nladmin-ui/src/views/acs/task/task.js diff --git a/nladmin-ui/src/views/acs/task/taskFeedback/index.vue b/nladmin-ui/src/views/acs/task/taskFeedback/index.vue index d52604d..b95796b 100644 --- a/nladmin-ui/src/views/acs/task/taskFeedback/index.vue +++ b/nladmin-ui/src/views/acs/task/taskFeedback/index.vue @@ -143,7 +143,7 @@ </template> <script> -import crudTaskFeedback /* { invalid } */ from '@/api/acs/task/taskFeedback' +import crudTaskFeedback /* { invalid } */ from '@/views/acs/task/taskFeedback/taskFeedback' import CRUD, { presenter, header, form, crud } from '@crud/crud' import crudOperation from '@crud/CRUD.operation' import pagination from '@crud/Pagination' diff --git a/nladmin-ui/src/api/acs/task/taskFeedback.js b/nladmin-ui/src/views/acs/task/taskFeedback/taskFeedback.js similarity index 100% rename from nladmin-ui/src/api/acs/task/taskFeedback.js rename to nladmin-ui/src/views/acs/task/taskFeedback/taskFeedback.js diff --git a/nladmin-ui/src/views/acs/test/hailiang/index.vue b/nladmin-ui/src/views/acs/test/hailiang/index.vue index 47cd2a6..5f5bac7 100644 --- a/nladmin-ui/src/views/acs/test/hailiang/index.vue +++ b/nladmin-ui/src/views/acs/test/hailiang/index.vue @@ -32,7 +32,7 @@ </template> <script> -import crudTest from '@/api/acs/test/test' +import crudTest from '@/views/acs/test/test' import CRUD, { crud } from '@crud/crud' import { getLodop } from '@/assets/js/lodop/LodopFuncs' diff --git a/nladmin-ui/src/api/acs/test/test.js b/nladmin-ui/src/views/acs/test/test.js similarity index 100% rename from nladmin-ui/src/api/acs/test/test.js rename to nladmin-ui/src/views/acs/test/test.js