From b2c2ae3c4c2a9d1d61c9b012da64b5eb69188611 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Thu, 9 Apr 2026 15:57:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20[=E6=95=B0=E6=8D=AE=E5=AF=B9=E6=8E=A5]?= =?UTF-8?q?=20=E5=A4=A9=E5=B9=B3=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tpph.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/utils/tpph.js b/src/utils/tpph.js index c505042..89c7922 100644 --- a/src/utils/tpph.js +++ b/src/utils/tpph.js @@ -4,24 +4,22 @@ import axios from 'axios' import { Message } from 'element-ui' -export async function getBalance( - cmd, - format, - comPort, - baudRate, - byteSize, - parity -) { +export async function getBalance(obj) { return { success: true, originalValue: '1000', originalUnit: 'g', + + value: '1000', + unit: obj.dw || 'g', message: '' } + let yq = obj.yq + let dw = obj.dw let val = {} let url = `/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` - // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` + // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/balance/value?cmd=${yq.cmd}&format=${yq.format}&comPort=${yq.comPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}` await axios .get( url, @@ -49,16 +47,17 @@ export async function getBalance( return await val } -export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) { +export async function getPh(obj) { return { success: true, value: '900', message: '' } + let yq = obj.yq let val = {} let url = `/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N` - // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${cmd}&format=${format}&comPort=${comPort}&baudRate=${baudRate}&byteSize=${byteSize}&parity=${parity}` + // let url = `http://127.0.0.1:${localStorage.getItem('sb_port')}/api/v1/ph/value?cmd=${yq.cmd}&format=${yq.format}&comPort=${yq.comPort}&baudRate=${yq.baudRate}&byteSize=${yq.byteSize}&parity=${yq.parity}` await axios .get( url,