From 0a8796fc97ff1b4ff0c9aac652f44684f3ff0f84 Mon Sep 17 00:00:00 2001 From: "USER-20220102CG\\noblelift" <546428999@qq.com> Date: Wed, 28 Sep 2022 17:14:06 +0800 Subject: [PATCH] init --- qd/src/api/acs/device/device.js | 2 +- qd/src/api/acs/instruction/instruction.js | 1 - qd/src/api/acs/route/routeLine.js | 4 +- qd/src/api/acs/stage/stage.js | 2 +- qd/src/api/acs/task/task.js | 2 +- qd/src/components/Echarts/BarChart2.vue | 1 - qd/src/layout/components/Navbar.vue | 16 ++- qd/src/main.js | 6 +- qd/src/router/index.js | 2 +- .../views/acs/device/driver/oumulong_plc.vue | 4 +- .../views/acs/device/driver/traffic_light.vue | 4 +- qd/src/views/acs/device/opc/index.vue | 58 ++++---- qd/src/views/acs/route/routeLine/index.vue | 4 +- qd/src/views/acs/route/routeLoc/index.vue | 77 ++++++----- qd/src/views/acs/route/routePlan/index.vue | 55 +++++--- qd/src/views/acs/stage/actor/index.vue | 2 +- qd/src/views/acs/stage/index.vue | 49 ++++--- qd/src/views/acs/task/taskFeedback/index.vue | 2 +- qd/src/views/bigscreen/task.vue | 34 ++--- qd/src/views/monitor/log/logQuery.vue | 16 +-- qd/src/views/monitor/lucene/index.vue | 14 +- qd/src/views/monitor/lucene/search.vue | 2 +- qd/src/views/system/devicedriver/index.vue | 127 +++++++++--------- qd/src/views/system/param/index.vue | 44 +++--- 24 files changed, 283 insertions(+), 245 deletions(-) diff --git a/qd/src/api/acs/device/device.js b/qd/src/api/acs/device/device.js index e65c9df..d7e7bf7 100644 --- a/qd/src/api/acs/device/device.js +++ b/qd/src/api/acs/device/device.js @@ -159,4 +159,4 @@ export function reload() { export default { add, edit, del, selectDeviceList, selectDeviceListByRegion, callAgv, responseAgv, selectDeviceDevicerInfo, autoCreateTask, changeDeviceStatus, cleanTask, queryStorageExtra, selectConDeviceList, saveBarcode, selectDeviceListOne, selectDeviceListTwo, selectDeviceListThree, - addMaterial, cleanMaterial, changeFenceStatus,reload } + addMaterial, cleanMaterial, changeFenceStatus, reload } diff --git a/qd/src/api/acs/instruction/instruction.js b/qd/src/api/acs/instruction/instruction.js index 436c53c..4d2f34d 100644 --- a/qd/src/api/acs/instruction/instruction.js +++ b/qd/src/api/acs/instruction/instruction.js @@ -1,6 +1,5 @@ import request from '@/utils/request' - export function add(data) { return request({ url: 'api/instruction', diff --git a/qd/src/api/acs/route/routeLine.js b/qd/src/api/acs/route/routeLine.js index afa39c0..78fe275 100644 --- a/qd/src/api/acs/route/routeLine.js +++ b/qd/src/api/acs/route/routeLine.js @@ -22,7 +22,7 @@ export function edit(data) { method: 'put', data }) -}export function enabled(data) { +} export function enabled(data) { return request({ url: 'api/routeLine/enabled', method: 'put', @@ -37,4 +37,4 @@ export function reload() { }) } -export default { add, edit, del,enabled,reload } +export default { add, edit, del, enabled, reload } diff --git a/qd/src/api/acs/stage/stage.js b/qd/src/api/acs/stage/stage.js index 2cb059e..c3e19ff 100644 --- a/qd/src/api/acs/stage/stage.js +++ b/qd/src/api/acs/stage/stage.js @@ -31,4 +31,4 @@ export function selectStageList() { }) } -export default { add, edit, del,selectStageList } +export default { add, edit, del, selectStageList } diff --git a/qd/src/api/acs/task/task.js b/qd/src/api/acs/task/task.js index c0680dd..015c05f 100644 --- a/qd/src/api/acs/task/task.js +++ b/qd/src/api/acs/task/task.js @@ -95,5 +95,5 @@ export function specialTaskCreate(data) { }) } -export default { add, edit, del, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst,reload } +export default { add, edit, del, finish, cancel, createTaskByClick, deviceAskTask, ordinaryTaskCreate, specialTaskCreate, createInst, reload } diff --git a/qd/src/components/Echarts/BarChart2.vue b/qd/src/components/Echarts/BarChart2.vue index 4c2580c..3007a8f 100644 --- a/qd/src/components/Echarts/BarChart2.vue +++ b/qd/src/components/Echarts/BarChart2.vue @@ -7,7 +7,6 @@ import echarts from 'echarts' require('echarts/theme/macarons') // echarts theme import { debounce } from '@/utils' - export default { props: { className: { diff --git a/qd/src/layout/components/Navbar.vue b/qd/src/layout/components/Navbar.vue index ecd82e3..d938a40 100644 --- a/qd/src/layout/components/Navbar.vue +++ b/qd/src/layout/components/Navbar.vue @@ -1,20 +1,24 @@
diff --git a/qd/src/views/acs/stage/actor/index.vue b/qd/src/views/acs/stage/actor/index.vue index 8189e44..5a2cd72 100644 --- a/qd/src/views/acs/stage/actor/index.vue +++ b/qd/src/views/acs/stage/actor/index.vue @@ -137,7 +137,7 @@ export default { create_time: [ { required: true, message: '创建时间不能为空', trigger: 'blur' } ] - } } + }} }, methods: { // 钩子:在获取表格数据之前执行,false 则代表不获取数据 diff --git a/qd/src/views/acs/stage/index.vue b/qd/src/views/acs/stage/index.vue index 8a0137f..fbf6475 100644 --- a/qd/src/views/acs/stage/index.vue +++ b/qd/src/views/acs/stage/index.vue @@ -3,22 +3,27 @@