From 0595bae5f10bda80776b45c6db8c041ee389c0a8 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=E5=B7=AE?=
 =?UTF-8?q?=E5=8E=8B=E5=BC=8F=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     | 40 +++++++++++++++++++++----
 vue.config.js                           |  2 +-
 4 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/src/api/ngtools/NGCalcTools.js b/src/api/ngtools/NGCalcTools.js
index ce0d567..5871368 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: '/flowCalcTools/flowCalc',
     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..bd4c129 100644
--- a/src/views/ngtools/FlowCal/index.vue
+++ b/src/views/ngtools/FlowCal/index.vue
@@ -1,7 +1,8 @@
 <template>
   <div>
     <div>
-      <button @click="calc">计算组分参数</button>
+      <button @click="calc" type="primary" class="animated-button">计算组分参数</button>
+      <button @click="calcFlow" type="primary" class="animated-button">计算流量</button>
     </div>
 
     <el-tabs v-model="activeTab">
@@ -10,7 +11,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 +25,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 +47,7 @@ export default {
         dtbE: 0,
         dPatm: 0.101325,
         dPatmUnit: 2,
-        dngComponents: this.componentString,
+        dngComponents: '',
         dMeterType: '0',
         dCoreType: '0',
         dPtmode: '0',
@@ -129,11 +130,40 @@ export default {
         .catch((error) => {
           console.error('Request error:', error);
         });
+    },
+    calcFlow() {
+      console.log(this.parentMeterPar);
+      calcFlow(this.parentMeterPar)
+        .then((res) => {
+          console.log('Response:', res);
+        })
+        .catch((error) => {
+          console.error('Request error:', error);
+        });
     }
   }
 };
 </script>
 
 <style scoped>
-/* 可按需添加样式 */
+.animated-button {
+  background-color: #007bff;
+  color: white;
+  padding: 10px 20px;
+  border: none;
+  border-radius: 5px;
+  cursor: pointer;
+  margin-right: 10px;
+  transition: background-color 0.3s ease;
+}
+.animated-button:last-child {
+  margin-right: 0;
+}
+.animated-button:hover {
+  background-color: #0056b3;
+  transform: scale(1.05);
+}
+.animated-button:active {
+  transform: scale(0.95);
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index 3a30fbc..7deac63 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -36,7 +36,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.3.246:9090`,
+        target: `http://192.168.3.19:9090`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''