diff --git a/.env b/.env index 475dd196..30327b79 100644 --- a/.env +++ b/.env @@ -19,6 +19,8 @@ VUE_APP_ELEMENT_COLOR=#409EFF # 后台接口地址(代理目标) VUE_APP_BASE_URL=http://127.0.0.1:22666/background/ +# Workerman 接口地址和端口 +VUE_APP_WORKERMAN_URL=http://127.0.0.1:34351 + # 部署路径 VUE_APP_PUBLIC_PATH=/dist/ - diff --git a/.env.development b/.env.development index 0674e47e..f4975fa3 100644 --- a/.env.development +++ b/.env.development @@ -5,3 +5,6 @@ VUE_APP_TITLE=D2Admin Dev # 后台接口地址(代理目标) VUE_APP_BASE_URL=http://127.0.0.1:8787/background/ + +# Workerman 接口地址和端口 +VUE_APP_WORKERMAN_URL=http://127.0.0.1:34351 diff --git a/.env.preview b/.env.preview index 3fb19836..e9a3d15f 100644 --- a/.env.preview +++ b/.env.preview @@ -11,3 +11,6 @@ VUE_APP_SCOURCE_LINK=TRUE # 部署路径 VUE_APP_PUBLIC_PATH=/ + +# Workerman 接口地址和端口 +VUE_APP_WORKERMAN_URL=http://127.0.0.1:34351 diff --git a/src/api/production-master-data/workerman/index.js b/src/api/production-master-data/workerman/index.js index 0d6c6720..408e8cda 100644 --- a/src/api/production-master-data/workerman/index.js +++ b/src/api/production-master-data/workerman/index.js @@ -1,15 +1 @@ -import { request } from '@/api/_service' - -const BASE = 'production_configuration/workerman/' - -export function sendWorkerman (data) { - return request({ - url: BASE + 'send', - method: 'get', - params: { - method: 'planning_production_produce_traymanage_send_workerman', - module: 'api', - ...data - } - }) -} +export * from '@/api/workerman' diff --git a/src/api/workerman/index.js b/src/api/workerman/index.js new file mode 100644 index 00000000..6852c9fe --- /dev/null +++ b/src/api/workerman/index.js @@ -0,0 +1,45 @@ +import axios from 'axios' + +const workerman = axios.create({ + baseURL: process.env.VUE_APP_WORKERMAN_URL, + timeout: 10000, + headers: { + 'Content-Type': 'application/json' + } +}) + +function normalizePayload (data = {}) { + return data.sendData || data +} + +export function sendWorkerman (data) { + return workerman.post('', normalizePayload(data)).then(response => response.data) +} + +export function trayLogin (param) { + return sendWorkerman({ + action: 'set_tray_login', + param + }) +} + +export function trayUnbinding (tray) { + return sendWorkerman({ + action: 'set_tray_unbinding', + param: { tray } + }) +} + +export function trayInactivity (data) { + return sendWorkerman({ + action: 'set_tray_inactivity', + param: { data } + }) +} + +export function batteryInactivity (data) { + return sendWorkerman({ + action: 'set_battery_inactivity', + param: { data } + }) +} diff --git a/src/views/planning-production/production-monitoring/tray-registration/index.vue b/src/views/planning-production/production-monitoring/tray-registration/index.vue index ecdd504d..52eaa536 100644 --- a/src/views/planning-production/production-monitoring/tray-registration/index.vue +++ b/src/views/planning-production/production-monitoring/tray-registration/index.vue @@ -219,7 +219,7 @@ import { useTableColumns } from '@/composables/useTableColumns' import { i18nMixin } from '@/composables/useI18n' import PageTable from '@/components/page-table' -import { sendWorkerman } from '@/api/production-master-data/workerman' +import { sendWorkerman } from '@/api/workerman' import { getBatchAll, getBatchTrayFormatAll,