Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/utils/tpph.js

@@ -12,8 +12,15 @@ export async function getBalance(
   byteSize,
   parity
 ) {
+  return {
+    success: true,
+    originalValue: '1000',
+    originalUnit: 'g',
+    message: ''
+  }
+
   let val = {}
-  let url = `http://localhost/tpphurl/api/v1/balance/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  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}`
   await axios
     .get(
@@ -43,8 +50,14 @@ export async function getBalance(
 }
 
 export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) {
+  return {
+    success: true,
+    value: '900',
+    message: ''
+  }
+
   let val = {}
-  let url = `http://localhost/tpphurl/api/v1/ph/value?cmd=12&format=hex&comPort=COM1&baudRate=9600&byteSize=8&parity=N`
+  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}`
   await axios
     .get(
@@ -67,7 +80,7 @@ export async function getPh(cmd, format, comPort, baudRate, byteSize, parity) {
         Message.error(data.msg || '获取PH数据失败')
         return
       }
-      val = parseBalanceData(data.data)
+      val = extractPHValue(data.data)
       debugger
     })
   debugger