From f265214459c53f8dd1489e4bbd8f20f7e824f1cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BB=96=E5=BE=B7=E4=BA=91?= 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 --- package.json | 2 +- src/api/ngtools/NGCalcTools.js | 13 +- src/components/NGTools/NGCom.vue | 346 ++++++---- src/components/NGTools/meterPar - 副本.vue | 485 -------------- src/components/NGTools/meterPar.vue | 404 ++++------- src/components/NGTools/meterResult.vue | 248 ++++--- src/components/NGTools/ngComponents.vue | 229 ------- src/components/inputValueUnit/index.vue | 743 +++++++++++---------- src/views/ngtools/FlowCal/index.vue | 287 ++++---- src/views/ngtools/meterresult/index.vue | 564 ++++++---------- vue.config.js | 2 +- 11 files changed, 1265 insertions(+), 2058 deletions(-) delete mode 100644 src/components/NGTools/meterPar - 副本.vue delete mode 100644 src/components/NGTools/ngComponents.vue diff --git a/package.json b/package.json index 42f1f40..a45b0c9 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@riophae/vue-treeselect": "0.4.0", "axios": "0.28.1", "clipboard": "2.0.8", - "core-js": "3.37.1", + "core-js": "^3.40.0", "echarts": "5.4.0", "element-ui": "2.15.14", "file-saver": "2.0.5", 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/NGCom.vue b/src/components/NGTools/NGCom.vue index dc4ff5e..58efe03 100644 --- a/src/components/NGTools/NGCom.vue +++ b/src/components/NGTools/NGCom.vue @@ -1,164 +1,242 @@ diff --git a/src/components/NGTools/meterPar - 副本.vue b/src/components/NGTools/meterPar - 副本.vue deleted file mode 100644 index 0179a22..0000000 --- a/src/components/NGTools/meterPar - 副本.vue +++ /dev/null @@ -1,485 +0,0 @@ - - - - - diff --git a/src/components/NGTools/meterPar.vue b/src/components/NGTools/meterPar.vue index b7846fb..7ba1f67 100644 --- a/src/components/NGTools/meterPar.vue +++ b/src/components/NGTools/meterPar.vue @@ -3,12 +3,14 @@ - + - + @@ -18,25 +20,20 @@ - + - + - + @@ -50,15 +47,8 @@ - + @@ -66,15 +56,8 @@ - + @@ -83,15 +66,8 @@ - + @@ -100,26 +76,12 @@ - + - + - - - + - + {{ textUnitName }} {{ textUnitName }} - -
+
{{ showEnglishOnly ? unit.unitName.split('(')[0] : unit.unitName }}
@@ -22,393 +22,414 @@ diff --git a/src/views/ngtools/FlowCal/index.vue b/src/views/ngtools/FlowCal/index.vue index a7e9ae1..6a982e9 100644 --- a/src/views/ngtools/FlowCal/index.vue +++ b/src/views/ngtools/FlowCal/index.vue @@ -1,16 +1,17 @@ diff --git a/src/views/ngtools/meterresult/index.vue b/src/views/ngtools/meterresult/index.vue index 10a2693..279bc8d 100644 --- a/src/views/ngtools/meterresult/index.vue +++ b/src/views/ngtools/meterresult/index.vue @@ -1,189 +1,75 @@ diff --git a/vue.config.js b/vue.config.js index 3a30fbc..e90ef87 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://localhost:9090`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''