diff --git a/.env.development b/.env.development index 10db161..da134de 100644 --- a/.env.development +++ b/.env.development @@ -7,8 +7,8 @@ VITE_APP_ENV = 'development' # 招商车研物联网平台/开发环境 VITE_APP_BASE_API = '/dev-api' -VITE_API_URL = http://192.168.0.222:13080 -VITE_WS_URL = ws://192.168.0.222:13080/ws -VITE_PORT = 80 +VITE_API_URL = http://localhost:14080 +VITE_WS_URL = ws://localhost:14080/ws +VITE_PORT = 5174 VITE_INSPECTION_TYPE = "inspection" VITE_MINIO_URL = "http://192.168.28.10:9000/cmvr-iot/" diff --git a/src/api/device/profile.js b/src/api/device/profile.js deleted file mode 100644 index 8b88dc8..0000000 --- a/src/api/device/profile.js +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/utils/request' - -// 查询设备配置信息列表 -export function listProfile(query) { - return request({ - url: '/device/profile/list', - method: 'get', - params: query - }) -} - -// 查询设备配置信息详细 -export function getProfile(query) { - return request({ - url: '/device/profile/parameterInfo/', - method: 'get', - params: query - }) -} - -// 新增设备配置信息 -export function addProfile(data) { - return request({ - url: '/device/profile', - method: 'post', - data: data - }) -} - -// 修改设备配置信息 -export function updateProfile(data) { - return request({ - url: '/device/profile', - method: 'put', - data: data - }) -} - -// 删除设备配置信息 -export function delProfile(id) { - return request({ - url: '/device/profile/' + id, - method: 'delete' - }) -} diff --git a/src/api/device/register.js b/src/api/device/register.js deleted file mode 100644 index 2234a78..0000000 --- a/src/api/device/register.js +++ /dev/null @@ -1,146 +0,0 @@ -import request from '@/utils/request' - -// 查询设备注册列表 -export function listRegister(query) { - return request({ - url: '/device/register/list', - method: 'get', - params: query - }) -} - -// 查询设备注册详细 -export function getRegister(id) { - return request({ - url: '/device/register/' + id, - method: 'get' - }) -} - -// 新增设备注册 -export function addRegister(data) { - return request({ - url: '/device/register', - method: 'post', - data: data - }) -} - -// 修改设备注册 -export function updateRegister(data) { - return request({ - url: '/device/register', - method: 'put', - data: data - }) -} - -// 删除设备注册 -export function delRegister(id) { - return request({ - url: '/device/register/' + id, - method: 'delete' - }) -} - -// 设备示教 -export function deviceTeach(id) { - return request({ - url: '/device/profile/' + id, - method: 'get', - }) -} - -// 设备示教参数修改 -export function deviceUpdateProfile(data) { - return request({ - url: '/device/profile/updateProfile', - method: 'put', - data: data, - }) -} - -// 新增音色 -export function createTimbre(data) { - return request({ - url: '/show/tts/create', - method: 'post', - headers: { - 'Content-Type': 'multipart/form-data', - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - data: data, - }) -} - -// 获取音色 -export function getTts() { - return request({ - url: '/show/tts/query', - headers: { - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - method: 'get', - }) -} - -// 生产语料 -export function createCorpus(data) { - return request({ - url: '/show/tts/corpus', - headers: { - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - method: 'post', - data: data - }) -} - -export function getSynthesize(data, config = {}) { - return request({ - url: '/show/tts/synthesize', - headers: { - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - responseType: 'blob', - method: 'post', - data: data - }, { - ...config - }) -} - -export function createAdvancedCorpus(data) { - return request({ - url: '/show/tts/corpus/advanced', - headers: { - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - method: 'post', - data: data - }) -} - -export function getAdvancedSynthesize(data, config = {}) { - return request({ - url: '/show/tts/synthesize/advanced', - headers: { - Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', - isToken: false - }, - responseType: 'blob', - method: 'post', - data: data - }, { - ...config - }) -} - -export const getFlowById = (id) => { - return request.get(import.meta.env.VITE_NODE_RED_URL + '/flow/' + id, {}) -} \ No newline at end of file diff --git a/src/api/device/robot.js b/src/api/device/robot.js deleted file mode 100644 index b725429..0000000 --- a/src/api/device/robot.js +++ /dev/null @@ -1,44 +0,0 @@ -import request from '@/utils/request' - -// 查询机器人配置列表 -export function listRobot(query) { - return request({ - url: '/device/robot/list', - method: 'get', - params: query - }) -} - -// 查询机器人配置详细 -export function getRobot(id) { - return request({ - url: '/device/robot/' + id, - method: 'get' - }) -} - -// 新增机器人配置 -export function addRobot(data) { - return request({ - url: '/device/robot', - method: 'post', - data: data - }) -} - -// 修改机器人配置 -export function updateRobot(data) { - return request({ - url: '/device/robot', - method: 'put', - data: data - }) -} - -// 删除机器人配置 -export function delRobot(id) { - return request({ - url: '/device/robot/' + id, - method: 'delete' - }) -} diff --git a/src/api/device/terminal.js b/src/api/device/terminal.js deleted file mode 100644 index f1d85a4..0000000 --- a/src/api/device/terminal.js +++ /dev/null @@ -1,86 +0,0 @@ -import request from '@/utils/request' - -// 查询设备终端配置列表 -export function listTerminal(query) { - return request({ - url: '/device/terminal/list', - method: 'get', - params: query - }) -} - -// 查询设备终端配置详细 -export function getTerminal(id) { - return request({ - url: '/device/terminal/' + id, - method: 'get' - }) -} - -// 新增设备终端配置 -export function addTerminal(data) { - return request({ - url: '/device/terminal', - method: 'post', - data: data - }) -} - -// 修改设备终端配置 -export function updateTerminal(data) { - return request({ - url: '/device/terminal', - method: 'put', - data: data - }) -} - -// 删除设备终端配置 -export function delTerminal(id) { - return request({ - url: '/device/terminal/' + id, - method: 'delete' - }) -} - -// 获取实例信息 -export function getInstInfo(id) { - return request({ - url: '/test/inst/context/' + id, - method: 'get' - }) -} - -// 暂停任务 -export function pauseInst(id) { - return request({ - url: `/test/inst/pause/${id}`, - method: 'post' - }) -} - -// 恢复任务 -export function resumeInst(id) { - return request({ - url: `/test/inst/resume/${id}`, - method: 'post' - }) -} - -// 恢复任务 -export function stopInst(id) { - return request({ - url: `/test/inst/stop/${id}`, - method: 'post' - }) -} - -export function getFlowParamsApi(taskId) { - return request({ - url: '/test/orchestration', - method: 'get', - params: { - taskId - } - }) -} \ No newline at end of file diff --git a/src/api/flow/nodeRed.js b/src/api/flow/nodeRed.js new file mode 100644 index 0000000..4ce5ca8 --- /dev/null +++ b/src/api/flow/nodeRed.js @@ -0,0 +1,5 @@ +import request from '@/utils/request' + +export function getNodeRedFlowById(id) { + return request.get(`${import.meta.env.VITE_NODE_RED_URL}/flow/${id}`, {}) +} diff --git a/src/api/inspection/map.js b/src/api/inspection/map.js deleted file mode 100644 index ec8c562..0000000 --- a/src/api/inspection/map.js +++ /dev/null @@ -1,33 +0,0 @@ -import request from '@/utils/request' - - -export function getMapList(params) { - return request({ - url: '/inspection/map/list', - method: 'get', - params: params - }) -} - -export function addMap(data) { - return request({ - url: '/inspection/map', - method: 'post', - data: data - }) -} - -export function updateMap(data) { - return request({ - url: '/inspection/map', - method: 'put', - data: data - }) -} - -export function deleteMap(id) { - return request({ - url: `/inspection/map/${id}`, - method: 'delete' - }) -} \ No newline at end of file diff --git a/src/api/inspection/robot.js b/src/api/inspection/robot.js deleted file mode 100644 index fa91960..0000000 --- a/src/api/inspection/robot.js +++ /dev/null @@ -1,126 +0,0 @@ -import request from '@/utils/request' - -export function getRobotList(params) { - return request({ - url: '/inspection/robot/list', - method: 'get', - params: params - }) -} - -export function addRobot(data) { - return request({ - url: '/inspection/robot', - method: 'post', - data: data - }) -} - -export function updateRobot(data) { - return request({ - url: '/inspection/robot', - method: 'put', - data: data - }) -} - -export function deleteRobot(id) { - return request({ - url: `/inspection/robot/${id}`, - method: 'delete' - }) -} - -export function getRobotDevices(id) { - return request({ - url: `/inspection/robot/${id}/devices`, - method: 'get' - }) -} - -export function getRobotDevicesByRobotId(robotId, params = {}) { - return request({ - url: '/inspection/robot/devices', - method: 'get', - params: { - robotId, - onlineOnly: true, - ...params - } - }) -} - -/** - * 获取机器人地图 - * @param {*} robotId - * @returns - */ -export function getMapByRobot(robotId) { - return request({ - url: `/inspection/robot/${robotId}/maps`, - method: 'get' - }) -} - -/** - * 获取地图JSON数据 - * @param {*} params - * @returns - */ -export function getMapJson(params) { - return request({ - url: `/inspection/robot/${params.robotId}/download-map`, - method: 'get', - params - }) -} - -/** - * 获取机器人位置 - * @param {*} robotId - * @returns - */ -export function getRobotLocation(robotId) { - return request({ - url: `/inspection/robot/${robotId}/location`, - method: 'get' - }) -} - -/** - * 获取机器人状态 - * @param {*} robotId - * @returns - */ -export function getRobotStatus(id) { - return request({ - url: `/inspection/robot/${id}/sync-status`, - method: 'post' - }) -} - -/** - * 机器人运动控制 - * @param {*} data - * @returns - */ -export function moveRobot(data) { - return request({ - url: '/api/agv/setVelocity', - method: 'post', - data: data - }) -} - -/** - * 机器人停止运动 - * @param {*} data - * @returns - */ -export function stopRobot(data) { - return request({ - url: '/api/agv/stopVelocityControl', - method: 'post', - data: data - }) -} diff --git a/src/api/resource/device.js b/src/api/resource/device.js new file mode 100644 index 0000000..378cd10 --- /dev/null +++ b/src/api/resource/device.js @@ -0,0 +1,13 @@ +import request from '@/utils/request' + +export function listResourceDevices(params) { + return request({ url: '/resource/devices', method: 'get', params }) +} + +export function getResourceDevice(id) { + return request({ url: `/resource/devices/${encodeURIComponent(id)}`, method: 'get' }) +} + +export function updateResourceDevice(id, data) { + return request({ url: `/resource/devices/${encodeURIComponent(id)}`, method: 'put', data }) +} diff --git a/src/api/resource/map.js b/src/api/resource/map.js new file mode 100644 index 0000000..05cf8b0 --- /dev/null +++ b/src/api/resource/map.js @@ -0,0 +1,24 @@ +import request from '@/utils/request' + +export function listResourceMaps(params) { + return request({ url: '/resource/maps', method: 'get', params }) +} + +export function listRobotMaps(robotId) { + return request({ + url: `/resource/maps/robot/${encodeURIComponent(robotId)}`, + method: 'get', + }) +} + +export function addResourceMap(data) { + return request({ url: '/resource/maps', method: 'post', data }) +} + +export function updateResourceMap(data) { + return request({ url: '/resource/maps', method: 'put', data }) +} + +export function deleteResourceMap(ids) { + return request({ url: `/resource/maps/${ids}`, method: 'delete' }) +} diff --git a/src/api/resource/robot.js b/src/api/resource/robot.js new file mode 100644 index 0000000..1096b5c --- /dev/null +++ b/src/api/resource/robot.js @@ -0,0 +1,77 @@ +import request from '@/utils/request' + +export function listResourceRobots(params) { + return request({ url: '/resource/robots', method: 'get', params }) +} + +export function getResourceRobot(robotId) { + return request({ url: `/resource/robots/${encodeURIComponent(robotId)}`, method: 'get' }) +} + +export function listRobotDevices(robotId, params = {}) { + return request({ + url: `/resource/robots/${encodeURIComponent(robotId)}/devices`, + method: 'get', + params, + }) +} + +export const getRobotList = listResourceRobots + +export function addRobot(data) { + return request({ url: '/resource/robots', method: 'post', data }) +} + +export function updateRobot(data) { + return request({ url: '/resource/robots', method: 'put', data }) +} + +export function deleteRobot(id) { + return request({ url: `/resource/robots/${id}`, method: 'delete' }) +} + +export function getRobotDevices(id) { + return request({ url: `/resource/robots/id/${id}/devices`, method: 'get' }) +} + +export function getRobotDevicesByRobotId(robotId, params = {}) { + return request({ + url: `/resource/robots/${encodeURIComponent(robotId)}/devices`, + method: 'get', + params: { onlineOnly: true, ...params }, + }) +} + +export function getMapByRobot(robotRef) { + return request({ + url: `/resource/robots/${encodeURIComponent(robotRef)}/remote-maps`, + method: 'get', + }) +} + +export function getMapJson(params) { + return request({ + url: `/resource/robots/${encodeURIComponent(params.robotId)}/download-map`, + method: 'get', + params, + }) +} + +export function getRobotLocation(robotRef) { + return request({ + url: `/resource/robots/${encodeURIComponent(robotRef)}/location`, + method: 'get', + }) +} + +export function getRobotStatus(id) { + return request({ url: `/resource/robots/id/${id}`, method: 'get' }) +} + +export function moveRobot(data) { + return request({ url: '/api/agv/setVelocity', method: 'post', data }) +} + +export function stopRobot(data) { + return request({ url: '/api/agv/stopVelocityControl', method: 'post', data }) +} diff --git a/src/api/resource/terminal.js b/src/api/resource/terminal.js new file mode 100644 index 0000000..8a4ae8b --- /dev/null +++ b/src/api/resource/terminal.js @@ -0,0 +1,29 @@ +import request from '@/utils/request' + +export function listResourceTerminals(params) { + return request({ url: '/resource/terminals', method: 'get', params }) +} + +export function addResourceTerminal(data) { + return request({ url: '/resource/terminals', method: 'post', data }) +} + +export function updateResourceTerminal(data) { + return request({ url: '/resource/terminals', method: 'put', data }) +} + +export function getResourceTerminal(id) { + return request({ url: `/resource/terminals/${encodeURIComponent(id)}`, method: 'get' }) +} + +export function deleteResourceTerminals(ids) { + return request({ url: `/resource/terminals/${ids}`, method: 'delete' }) +} + +export function listTerminalRobots(id) { + return request({ url: `/resource/terminals/${encodeURIComponent(id)}/robots`, method: 'get' }) +} + +export function updateTerminalRobots(id, robotIds) { + return request({ url: `/resource/terminals/${encodeURIComponent(id)}/robots`, method: 'put', data: robotIds }) +} diff --git a/src/api/test/log.js b/src/api/test/log.js index d84e12b..742a961 100644 --- a/src/api/test/log.js +++ b/src/api/test/log.js @@ -78,3 +78,15 @@ export function getFlowRuntimeLog(query) { }) } +export function pauseInst(id) { + return request({ url: `/test/inst/pause/${id}`, method: 'post' }) +} + +export function resumeInst(id) { + return request({ url: `/test/inst/resume/${id}`, method: 'post' }) +} + +export function stopInst(id) { + return request({ url: `/test/inst/stop/${id}`, method: 'post' }) +} + diff --git a/src/api/tts.js b/src/api/tts.js new file mode 100644 index 0000000..0a77f2a --- /dev/null +++ b/src/api/tts.js @@ -0,0 +1,30 @@ +import request from '@/utils/request' + +const serviceHeaders = { + Authorization: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6ImFiNmEyY2Y0LWM3MjQtNDgyMy1hM2NiLTk4N2NhZWNmMzZiNCJ9.oq-JVRbQuq_ujQ2V0h2jXC3woHPdMQKhnYJ8ixRm-C6Ez4GqJWyHYgmnkw5dbDyhWGdIUH02uv6XT8UiboHD4g', + isToken: false, +} + +export function createTimbre(data) { + return request({ url: '/show/tts/create', method: 'post', headers: { ...serviceHeaders, 'Content-Type': 'multipart/form-data' }, data }) +} + +export function getTts() { + return request({ url: '/show/tts/query', method: 'get', headers: serviceHeaders }) +} + +export function createCorpus(data) { + return request({ url: '/show/tts/corpus', method: 'post', headers: serviceHeaders, data }) +} + +export function getSynthesize(data, config = {}) { + return request({ url: '/show/tts/synthesize', method: 'post', headers: serviceHeaders, responseType: 'blob', data }, config) +} + +export function createAdvancedCorpus(data) { + return request({ url: '/show/tts/corpus/advanced', method: 'post', headers: serviceHeaders, data }) +} + +export function getAdvancedSynthesize(data, config = {}) { + return request({ url: '/show/tts/synthesize/advanced', method: 'post', headers: serviceHeaders, responseType: 'blob', data }, config) +} diff --git a/src/layout/components/AppMain.vue b/src/layout/components/AppMain.vue index e3fef8c..ceba25a 100644 --- a/src/layout/components/AppMain.vue +++ b/src/layout/components/AppMain.vue @@ -1,11 +1,9 @@ - + + diff --git a/src/views/test/configs/Run.vue b/src/views/test/configs/Run.vue index 932c7f4..7320dd3 100644 --- a/src/views/test/configs/Run.vue +++ b/src/views/test/configs/Run.vue @@ -66,7 +66,7 @@ import { ref, watch, onUnmounted } from "vue"; import { addValueProperty, formatTableData } from "@/utils/flow"; import { emitter } from "@/utils/eventBus"; import { ElMessage } from "element-plus"; -import { getFlowParamsApi } from "@/api/device/terminal.js"; +import { getTaskConfig } from "@/api/test/config.js"; import { taskExecute } from "@/api/test/config" import RuntimeAssignmentsEditor from '@/views/flow/components/RuntimeAssignmentsEditor.vue' import { @@ -99,7 +99,7 @@ const handleClose = () => { }; const getFlowParams = async () => { - const res = await getFlowParamsApi(props.currentRow.id); + const res = await getTaskConfig({ taskId: props.currentRow.id }); if (res.code === 200) { const data = parseConfig(res.rows) formData.value.tableData = data