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 @@ - + @@ -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',