From 29da4629bf3474018ab41ae6f0c63ea50f65a60f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=96=E5=BE=B7=E4=BA=91?= <ldeyun@163.com>
Date: Mon, 24 Feb 2025 23:58:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E7=AB=AFAPI?=
 =?UTF-8?q?=EF=BC=8C=E5=AE=8C=E6=88=90=E5=A4=A9=E7=84=B6=E6=B0=94=E7=89=A9?=
 =?UTF-8?q?=E6=80=A7=E5=8F=82=E6=95=B0=E8=AE=A1=E7=AE=97=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ngtools/NGCalcTools.js          | 13 ++++++++++++-
 src/components/NGTools/ngComponents.vue |  1 +
 src/views/ngtools/FlowCal/index.vue     |  6 +++---
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/api/ngtools/NGCalcTools.js b/src/api/ngtools/NGCalcTools.js
index ce0d567..32fea25 100644
--- a/src/api/ngtools/NGCalcTools.js
+++ b/src/api/ngtools/NGCalcTools.js
@@ -3,7 +3,18 @@ import request from '@/utils/request'
 // 天然气物性参数计算
 export function calcNGPar(data) {
   return request({
-    url: '/NGCalcTools/calculate',
+    url: '/NGCalcTools/ngCalc',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+// 天然气物性参数计算
+export function calcFlow(data) {
+  return request({
+    url: '/NGCalcTools/ngCalc',
     method: 'post',
     data: data,
     headers: {
diff --git a/src/components/NGTools/ngComponents.vue b/src/components/NGTools/ngComponents.vue
index 0f07d3c..757bc9e 100644
--- a/src/components/NGTools/ngComponents.vue
+++ b/src/components/NGTools/ngComponents.vue
@@ -111,6 +111,7 @@ export default {
         const result = this.calculateSum(newVal);
         this.sumzf = result.sum;
         const valuesStr = result.valuesStr;
+        console.log(this.sumzf, valuesStr);
         const diff = Math.abs(this.sumzf - 100);
         if (diff < 0.0001) {
           this.$emit('update:strZf', valuesStr);
diff --git a/src/views/ngtools/FlowCal/index.vue b/src/views/ngtools/FlowCal/index.vue
index a7e9ae1..6563005 100644
--- a/src/views/ngtools/FlowCal/index.vue
+++ b/src/views/ngtools/FlowCal/index.vue
@@ -10,7 +10,7 @@
       </el-tab-pane>
 
       <el-tab-pane label="天然气组分" name="ngComponents">
-        <ngComponents v-model="componentString" />
+        <ngComponents v-model="parentMeterPar.dngComponents" />
       </el-tab-pane>
       <el-tab-pane label="流量计算结果" name="meterresult">
         <meterResult v-model:meterResult="parentMeterResult" />
@@ -24,7 +24,7 @@ import meterPar from '@/components/NGTools/meterPar';
 import ngComponents from '@/components/NGTools/NGCom';
 import meterResult from '@/components/NGTools/meterResult';
 
-import { calcNGPar } from '@/api/ngtools/NGCalcTools.js';
+import { calcNGPar, calcFlow } from '@/api/ngtools/NGCalcTools.js';
 
 export default {
   name: 'TabbedComponentWrapper',
@@ -46,7 +46,7 @@ export default {
         dtbE: 0,
         dPatm: 0.101325,
         dPatmUnit: 2,
-        dngComponents: this.componentString,
+        dngComponents: '',
         dMeterType: '0',
         dCoreType: '0',
         dPtmode: '0',