diff --git a/.env.development b/.env.development
index 302ecd1..a34eb47 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 天然气工具系统
 
 # 开发环境配置
 ENV = 'development'
 
-# 若依管理系统/开发环境
+# 天然气工具系统/开发环境
 VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
diff --git a/.env.production b/.env.production
index b4893b0..14733a8 100644
--- a/.env.production
+++ b/.env.production
@@ -1,8 +1,8 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 天然气工具系统
 
 # 生产环境配置
 ENV = 'production'
 
-# 若依管理系统/生产环境
+# 天然气工具系统/生产环境
 VUE_APP_BASE_API = '/prod-api'
diff --git a/.env.staging b/.env.staging
index 209b64e..2d1dea4 100644
--- a/.env.staging
+++ b/.env.staging
@@ -1,5 +1,5 @@
 # 页面标题
-VUE_APP_TITLE = 若依管理系统
+VUE_APP_TITLE = 天然气工具系统
 
 BABEL_ENV = production
 
@@ -8,5 +8,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 若依管理系统/测试环境
+# 天然气工具系统/测试环境
 VUE_APP_BASE_API = '/stage-api'
diff --git a/package.json b/package.json
index a45b0c9..efd3a83 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "ruoyi",
   "version": "3.8.9",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "天然气工具集",
+  "author": "妍杰丽云",
   "license": "MIT",
   "scripts": {
     "dev": "vue-cli-service serve",
diff --git a/src/assets/images/logo (2)(1).png b/src/assets/images/logo (2)(1).png
new file mode 100644
index 0000000..7602825
Binary files /dev/null and b/src/assets/images/logo (2)(1).png differ
diff --git a/src/assets/images/logo (2).png b/src/assets/images/logo (2).png
new file mode 100644
index 0000000..48275d5
Binary files /dev/null and b/src/assets/images/logo (2).png differ
diff --git a/src/assets/images/logo.png b/src/assets/images/logo.png
new file mode 100644
index 0000000..674d093
Binary files /dev/null and b/src/assets/images/logo.png differ
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e263760..7602825 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/assets/logo/logo11.png b/src/assets/logo/logo11.png
new file mode 100644
index 0000000..c0a8a51
Binary files /dev/null and b/src/assets/logo/logo11.png differ
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 080595a..70160d9 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,12 +1,14 @@
 <template>
-  <el-breadcrumb class="app-breadcrumb" separator="/">
-    <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
-      </el-breadcrumb-item>
-    </transition-group>
-  </el-breadcrumb>
+  <div>
+    <el-breadcrumb class="app-breadcrumb" separator="/">
+      <transition-group name="breadcrumb">
+        <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+          <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
+          <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        </el-breadcrumb-item>
+      </transition-group>
+    </el-breadcrumb>
+  </div>
 </template>
 
 <script>
@@ -14,79 +16,79 @@ export default {
   data() {
     return {
       levelList: null
-    }
+    };
   },
   watch: {
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
       if (route.path.startsWith('/redirect/')) {
-        return
+        return;
       }
-      this.getBreadcrumb()
+      this.getBreadcrumb();
     }
   },
   created() {
-    this.getBreadcrumb()
+    this.getBreadcrumb();
   },
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = []
-      const router = this.$route
-      const pathNum = this.findPathNum(router.path)
+      let matched = [];
+      const router = this.$route;
+      const pathNum = this.findPathNum(router.path);
       // multi-level menu
       if (pathNum > 2) {
-        const reg = /\/\w+/gi
+        const reg = /\/\w+/gi;
         const pathList = router.path.match(reg).map((item, index) => {
-          if (index !== 0) item = item.slice(1)
-          return item
-        })
-        this.getMatched(pathList, this.$store.getters.defaultRoutes, matched)
+          if (index !== 0) item = item.slice(1);
+          return item;
+        });
+        this.getMatched(pathList, this.$store.getters.defaultRoutes, matched);
       } else {
-        matched = router.matched.filter(item => item.meta && item.meta.title)
+        matched = router.matched.filter((item) => item.meta && item.meta.title);
       }
       // 判断是否为首页
       if (!this.isDashboard(matched[0])) {
-        matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
+        matched = [{ path: '/index', meta: { title: '首页' } }].concat(matched);
       }
-      this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
+      this.levelList = matched.filter((item) => item.meta && item.meta.title && item.meta.breadcrumb !== false);
     },
-    findPathNum(str, char = "/") {
-      let index = str.indexOf(char)
-      let num = 0
+    findPathNum(str, char = '/') {
+      let index = str.indexOf(char);
+      let num = 0;
       while (index !== -1) {
-        num++
-        index = str.indexOf(char, index + 1)
+        num++;
+        index = str.indexOf(char, index + 1);
       }
-      return num
+      return num;
     },
     getMatched(pathList, routeList, matched) {
-      let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0])
+      let data = routeList.find((item) => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0]);
       if (data) {
-        matched.push(data)
+        matched.push(data);
         if (data.children && pathList.length) {
-          pathList.shift()
-          this.getMatched(pathList, data.children, matched)
+          pathList.shift();
+          this.getMatched(pathList, data.children, matched);
         }
       }
     },
     isDashboard(route) {
-      const name = route && route.name
+      const name = route && route.name;
       if (!name) {
-        return false
+        return false;
       }
-      return name.trim() === 'Index'
+      return name.trim() === 'Index';
     },
     handleLink(item) {
-      const { redirect, path } = item
+      const { redirect, path } = item;
       if (redirect) {
-        this.$router.push(redirect)
-        return
+        this.$router.push(redirect);
+        return;
       }
-      this.$router.push(path)
+      this.$router.push(path);
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/NGTools/NGResult.vue b/src/components/NGTools/NGResult.vue
index fb194b9..14ae3c1 100644
--- a/src/components/NGTools/NGResult.vue
+++ b/src/components/NGTools/NGResult.vue
@@ -1,259 +1,311 @@
 <template>
   <div class="app-container">
-    <el-form :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px"
-      class="result-form">
-
-      <el-form-item label="分子量" prop="dMrx">
-        <el-input v-model="NGResult.dMrx" placeholder="请输入分子量" />
+    <h3>GB/T 17747</h3>
+    <el-form :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="result-form">
+      <el-form-item label="分子量" prop="dMrx" ref="selectRef">
+        <el-input readonly v-model="NGResult.dMrx" placeholder="请输入分子量" />
       </el-form-item>
       <el-form-item label="标况压缩因子" prop="dZb">
-        <el-input v-model="NGResult.dZb" placeholder="请输入标况压缩因子" />
+        <el-input readonly v-model="NGResult.dZb" placeholder="请输入标况压缩因子" />
       </el-form-item>
       <el-form-item label="工况压缩因子" prop="dZf">
-        <el-input v-model="NGResult.dZf" placeholder="请输入工况压缩因子" />
+        <el-input readonly v-model="NGResult.dZf" placeholder="请输入工况压缩因子" />
       </el-form-item>
       <el-form-item label="超压缩系数" prop="dFpv">
-        <el-input v-model="NGResult.dFpv" placeholder="请输入超压缩系数" />
+        <el-input readonly v-model="NGResult.dFpv" placeholder="请输入超压缩系数" />
       </el-form-item>
       <el-form-item label="标况摩尔密度" prop="dDb">
-        <el-input v-model="NGResult.dDb" placeholder="请输入标况摩尔密度" />
+        <el-input readonly v-model="NGResult.dDb" placeholder="请输入标况摩尔密度" />
       </el-form-item>
       <el-form-item label="工况摩尔密度" prop="dDf">
-        <el-input v-model="NGResult.dDf" placeholder="请输入工况摩尔密度" />
+        <el-input readonly v-model="NGResult.dDf" placeholder="请输入工况摩尔密度" />
       </el-form-item>
       <el-form-item label="标况质量密度" prop="dRhob">
-        <el-input v-model="NGResult.dRhob" placeholder="请输入标况质量密度" />
+        <el-input readonly v-model="NGResult.dRhob" placeholder="请输入标况质量密度" />
       </el-form-item>
       <el-form-item label="工况质量密度" prop="dRhof">
-        <el-input v-model="NGResult.dRhof" placeholder="请输入工况质量密度" />
+        <el-input readonly v-model="NGResult.dRhof" placeholder="请输入工况质量密度" />
       </el-form-item>
-      <el-form-item label="理想气体的相对密度" prop="drdIdeal">
-        <el-input v-model="NGResult.drdIdeal" placeholder="请输入理想气体的相对密度" />
+      <el-form-item label="理想气体的相对密度" prop="dRD_Ideal">
+        <el-input readonly v-model="NGResult.dRD_Ideal" placeholder="请输入理想气体的相对密度" />
       </el-form-item>
-      <el-form-item label="真实气体的相对密度" prop="drdReal">
-        <el-input v-model="NGResult.drdReal" placeholder="请输入真实气体的相对密度" />
+      <el-form-item label="真实气体的相对密度" prop="dRD_Real">
+        <el-input readonly v-model="NGResult.dRD_Real" placeholder="请输入真实气体的相对密度" />
       </el-form-item>
+    </el-form>
+    <h3>AGA No10</h3>
+    <el-form :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="result-form">
       <el-form-item label="理想气体的比焓" prop="dHo">
-        <el-input v-model="NGResult.dHo" placeholder="请输入理想气体的比焓" />
+        <el-input readonly v-model="NGResult.dHo" placeholder="请输入理想气体的比焓" />
       </el-form-item>
       <el-form-item label="真实气体的焓" prop="dH">
-        <el-input v-model="NGResult.dH" placeholder="请输入真实气体的焓" />
+        <el-input readonly v-model="NGResult.dH" placeholder="请输入真实气体的焓" />
       </el-form-item>
       <el-form-item label="真实气体的熵" prop="dS">
-        <el-input v-model="NGResult.dS" placeholder="请输入真实气体的熵" />
+        <el-input readonly v-model="NGResult.dS" placeholder="请输入真实气体的熵" />
       </el-form-item>
       <el-form-item label="理想气体定压热容" prop="dCpi">
-        <el-input v-model="NGResult.dCpi" placeholder="请输入理想气体定压热容" />
+        <el-input readonly v-model="NGResult.dCpi" placeholder="请输入理想气体定压热容" />
       </el-form-item>
       <el-form-item label="定压热容" prop="dCp">
-        <el-input v-model="NGResult.dCp" placeholder="请输入定压热容" />
+        <el-input readonly v-model="NGResult.dCp" placeholder="请输入定压热容" />
       </el-form-item>
       <el-form-item label="定容积热容" prop="dCv">
-        <el-input v-model="NGResult.dCv" placeholder="请输入定容积热容" />
+        <el-input readonly v-model="NGResult.dCv" placeholder="请输入定容积热容" />
       </el-form-item>
       <el-form-item label="比热比" prop="dk">
-        <el-input v-model="NGResult.dk" placeholder="请输入比热比" />
+        <el-input readonly v-model="NGResult.dk" placeholder="请输入比热比" />
       </el-form-item>
       <el-form-item label="等熵指数" prop="dKappa">
-        <el-input v-model="NGResult.dKappa" placeholder="请输入等熵指数" />
+        <el-input readonly v-model="NGResult.dKappa" placeholder="请输入等熵指数" />
       </el-form-item>
       <el-form-item label="声速" prop="dSOS">
-        <el-input v-model="NGResult.dSOS" placeholder="请输入声速" />
+        <el-input readonly v-model="NGResult.dSOS" placeholder="请输入声速" />
       </el-form-item>
       <el-form-item label="临界流函数" prop="dCstar">
-        <el-input v-model="NGResult.dCstar" placeholder="请输入临界流函数" />
+        <el-input readonly v-model="NGResult.dCstar" placeholder="请输入临界流函数" />
       </el-form-item>
+    </el-form>
+    <h3>GB/T 11063</h3>
+    <el-form :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="result-form">
       <el-form-item label="摩尔高位发热量" prop="dHhvMol">
-        <el-input v-model="NGResult.dHhvMol" placeholder="请输入摩尔高位发热量" />
+        <el-input readonly v-model="NGResult.dHhvMol" placeholder="请输入摩尔高位发热量" />
       </el-form-item>
       <el-form-item label="摩尔低位发热量" prop="dLhvMol">
-        <el-input v-model="NGResult.dLhvMol" placeholder="请输入摩尔低位发热量" />
+        <el-input readonly v-model="NGResult.dLhvMol" placeholder="请输入摩尔低位发热量" />
       </el-form-item>
       <el-form-item label="体积高位发热量" prop="dHhvv">
-        <el-input v-model="NGResult.dHhvv" placeholder="请输入体积高位发热量" />
+        <el-input readonly v-model="NGResult.dHhvv" placeholder="请输入体积高位发热量" />
       </el-form-item>
       <el-form-item label="体积低位发热量" prop="dLhvv">
-        <el-input v-model="NGResult.dLhvv" placeholder="请输入体积低位发热量" />
+        <el-input readonly v-model="NGResult.dLhvv" placeholder="请输入体积低位发热量" />
       </el-form-item>
       <el-form-item label="质量高位发热量" prop="dHhvm">
-        <el-input v-model="NGResult.dHhvm" placeholder="请输入质量高位发热量" />
+        <el-input readonly v-model="NGResult.dHhvm" placeholder="请输入质量高位发热量" />
       </el-form-item>
       <el-form-item label="质量地位发热量" prop="dLhvm">
-        <el-input v-model="NGResult.dLhvm" placeholder="请输入质量地位发热量" />
+        <el-input readonly v-model="NGResult.dLhvm" placeholder="请输入质量地位发热量" />
       </el-form-item>
       <el-form-item label="标况压缩因子" prop="dZb11062">
-        <el-input v-model="NGResult.dZb11062" placeholder="请输入标况压缩因子" />
+        <el-input readonly v-model="NGResult.dZb11062" placeholder="请输入标况压缩因子" />
       </el-form-item>
       <el-form-item label="标况质量密度" prop="dRhob11062">
-        <el-input v-model="NGResult.dRhob11062" placeholder="请输入标况质量密度" />
+        <el-input readonly v-model="NGResult.dRhob11062" placeholder="请输入标况质量密度" />
       </el-form-item>
       <el-form-item label="工况质量密度" prop="dRhof11062">
-        <el-input v-model="NGResult.dRhof11062" placeholder="请输入工况质量密度" />
+        <el-input readonly v-model="NGResult.dRhof11062" placeholder="请输入工况质量密度" />
       </el-form-item>
-      <el-form-item label="理想气体的相对密度" prop="drdIdeal11062">
-        <el-input v-model="NGResult.drdIdeal11062" placeholder="请输入理想气体的相对密度" />
+      <el-form-item label="理想气体的相对密度" prop="dRD_Ideal11062">
+        <el-input readonly v-model="NGResult.dRD_Ideal11062" placeholder="请输入理想气体的相对密度" />
       </el-form-item>
-      <el-form-item label="真实气体的相对密度" prop="drdReal11062">
-        <el-input v-model="NGResult.drdReal11062" placeholder="请输入真实气体的相对密度" />
+      <el-form-item label="真实气体的相对密度" prop="dRD_Real11062">
+        <el-input readonly v-model="NGResult.dRD_Real11062" placeholder="请输入真实气体的相对密度" />
       </el-form-item>
       <el-form-item label="真实气体的沃泊指数" prop="dWobbeIndex">
-        <el-input v-model="NGResult.dWobbeIndex" placeholder="请输入真实气体的沃泊指数" />
+        <el-input readonly v-model="NGResult.dWobbeIndex" placeholder="请输入真实气体的沃泊指数" />
       </el-form-item>
+    </el-form>
+    <h3>其他</h3>
+    <el-form :model="NGResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="result-form">
       <el-form-item label="临界压力" prop="dPc">
-        <el-input v-model="NGResult.dPc" placeholder="请输入临界压力" />
+        <el-input readonly v-model="NGResult.dPc" placeholder="请输入临界压力" />
       </el-form-item>
       <el-form-item label="临界温度" prop="dTC">
-        <el-input v-model="NGResult.dTC" placeholder="请输入临界温度" />
+        <el-input readonly v-model="NGResult.dTC" placeholder="请输入临界温度" />
       </el-form-item>
       <el-form-item label="爆炸上限" prop="dBzsx">
-        <el-input v-model="NGResult.dBzsx" placeholder="请输入爆炸上限" />
+        <el-input readonly v-model="NGResult.dBzsx" placeholder="请输入爆炸上限" />
       </el-form-item>
       <el-form-item label="爆炸下限" prop="dBzxx">
-        <el-input v-model="NGResult.dBzxx" placeholder="请输入爆炸下限" />
+        <el-input readonly v-model="NGResult.dBzxx" placeholder="请输入爆炸下限" />
       </el-form-item>
       <el-form-item label="总炭含量(kg/m3)" prop="dTotalC">
-        <el-input v-model="NGResult.dTotalC" placeholder="请输入总炭含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dTotalC" placeholder="请输入总炭含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C2组分含量(kg/m3)" prop="dC2">
-        <el-input v-model="NGResult.dC2" placeholder="请输入C2组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC2" placeholder="请输入C2组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C2以上组分含量(kg/m3)" prop="dC2j">
-        <el-input v-model="NGResult.dC2j" placeholder="请输入C2以上组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC2j" placeholder="请输入C2以上组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C3以上组分含量(kg/m3)" prop="dC3j">
-        <el-input v-model="NGResult.dC3j" placeholder="请输入C3以上组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC3j" placeholder="请输入C3以上组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C4以上组分含量(kg/m3)" prop="dC4j">
-        <el-input v-model="NGResult.dC4j" placeholder="请输入C4以上组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC4j" placeholder="请输入C4以上组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C5以上组分含量(kg/m3)" prop="dC5j">
-        <el-input v-model="NGResult.dC5j" placeholder="请输入C5以上组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC5j" placeholder="请输入C5以上组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C6以上组分含量(kg/m3)" prop="dC6j">
-        <el-input v-model="NGResult.dC6j" placeholder="请输入C6以上组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC6j" placeholder="请输入C6以上组分含量(kg/m3)" />
       </el-form-item>
       <el-form-item label="C3C4组分含量(kg/m3)" prop="dC3C4">
-        <el-input v-model="NGResult.dC3C4" placeholder="请输入C3C4组分含量(kg/m3)" />
+        <el-input readonly v-model="NGResult.dC3C4" placeholder="请输入C3C4组分含量(kg/m3)" />
       </el-form-item>
-
     </el-form>
-
   </div>
 </template>
 
 <script>
-  import unitConverter from '@/components/inputValueUnit/index';
-  export default {
-    name: 'MeterresultComponent',
-    components: {
-      unitConverter
-    },
+import unitConverter from '@/components/inputValueUnit/index';
+export default {
+  name: 'MeterresultComponent',
+  components: {
+    unitConverter
+  },
 
-    props: {
-      value: {
-        type: Object,
-        default: () => ({
-          dMrx: null,
-          dZb: null,
-          dZf: null,
-          dFpv: null,
-          dDb: null,
-          dDf: null,
-          dRhob: null,
-          dRhof: null,
-          drdIdeal: null,
-          drdReal: null,
-          dHo: null,
-          dH: null,
-          dS: null,
-          dCpi: null,
-          dCp: null,
-          dCv: null,
-          dk: null,
-          dKappa: null,
-          dSOS: null,
-          dCstar: null,
-          dHhvMol: null,
-          dLhvMol: null,
-          dHhvv: null,
-          dLhvv: null,
-          dHhvm: null,
-          dLhvm: null,
-          dZb11062: null,
-          dRhob11062: null,
-          dRhof11062: null,
-          drdIdeal11062: null,
-          drdReal11062: null,
-          dWobbeIndex: null,
-          dPc: null,
-          dTC: null,
-          dBzsx: null,
-          dBzxx: null,
-          dTotalC: null,
-          dC2: null,
-          dC2j: null,
-          dC3j: null,
-          dC4j: null,
-          dC5j: null,
-          dC6j: null,
-          dC3C4: null,
-        })
-      }
-    },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({
+        dMrx: 0,
+        dZb: 0,
+        dZf: 0,
+        dFpv: 0,
+        dDb: 0,
+        dDf: 0,
+        dRhob: 0,
+        dRhof: 0,
+        dRD_Ideal: 0,
+        dRD_Real: 0,
+        dHo: 0,
+        dH: 0,
+        dS: 0,
+        dCpi: 0,
+        dCp: 0,
+        dCv: 0,
+        dk: 0,
+        dKappa: 0,
+        dSOS: 0,
+        dCstar: 0,
+        dHhvMol: 0,
+        dLhvMol: 0,
+        dHhvv: 0,
+        dLhvv: 0,
+        dHhvm: 0,
+        dLhvm: 0,
+        dZb11062: 0,
+        dRhob11062: 0,
+        dRhof11062: 0,
+        dRD_Ideal11062: 0,
+        dRD_Real11062: 0,
+        dWobbeIndex: 0,
+        dPc: 0,
+        dTC: 0,
+        dBzsx: 0,
+        dBzxx: 0,
+        dTotalC: 0,
+        dC2: 0,
+        dC2j: 0,
+        dC3j: 0,
+        dC4j: 0,
+        dC5j: 0,
+        dC6j: 0,
+        dC3C4: 0
+      })
+    }
+  },
 
-    data() {
-      return {
-        NGResult: [],
-        selectWidth: 180
-      };
-    },
+  data() {
+    return {
+      NGResult: {
+        dMrx: 0,
+        dZb: 0,
+        dZf: 0,
+        dFpv: 0,
+        dDb: 0,
+        dDf: 0,
+        dRhob: 0,
+        dRhof: 0,
+        dRD_Ideal: 0,
+        dRD_Real: 0,
+        dHo: 0,
+        dH: 0,
+        dS: 0,
+        dCpi: 0,
+        dCp: 0,
+        dCv: 0,
+        dk: 0,
+        dKappa: 0,
+        dSOS: 0,
+        dCstar: 0,
+        dHhvMol: 0,
+        dLhvMol: 0,
+        dHhvv: 0,
+        dLhvv: 0,
+        dHhvm: 0,
+        dLhvm: 0,
+        dZb11062: 0,
+        dRhob11062: 0,
+        dRhof11062: 0,
+        dRD_Ideal11062: 0,
+        dRD_Real11062: 0,
+        dWobbeIndex: 0,
+        dPc: 0,
+        dTC: 0,
+        dBzsx: 0,
+        dBzxx: 0,
+        dTotalC: 0,
+        dC2: 0,
+        dC2j: 0,
+        dC3j: 0,
+        dC4j: 0,
+        dC5j: 0,
+        dC6j: 0,
+        dC3C4: 0
+      },
+      selectWidth: 180
+    };
+  },
 
-    watch: {
-      value: {
-        deep: true,
-        handler(newVal) {
-          console.log(newVal)
-          for (const key in newVal) {
-            if (newVal.hasOwnProperty(key)) {
-              const value = newVal[key];
-              // 判断是否为有效的数值
-              if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
-                // 使用 toFixed 方法设置小数点位数
-                newVal[key] = parseFloat(value.toFixed(6));
-              }
+  watch: {
+    value: {
+      deep: true,
+      handler(newVal) {
+        // console.log(newVal);
+        for (const key in newVal) {
+          if (newVal.hasOwnProperty(key)) {
+            const value = newVal[key];
+            // 判断是否为有效的数值
+            if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
+              // 使用 toFixed 方法设置小数点位数
+              newVal[key] = parseFloat(value.toFixed(6));
             }
           }
-          this.NGResult = JSON.parse(JSON.stringify(newVal));
-
         }
+        this.NGResult = JSON.parse(JSON.stringify(newVal));
       }
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
-        if (this.selectWidth === 0) this.selectWidth = 180
-        console.log("wwww", this.selectWidth)
-      })
-
-    },
-    methods: {}
-  };
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
+      if (this.selectWidth === 0) this.selectWidth = 180;
+      // console.log('wwww', this.selectWidth);
+    });
+  },
+  methods: {}
+};
 </script>
 
 <style scoped>
-  /* 可按需添加样式 */
-  .app-container {
-    height: 100%;
-  }
+/* 可按需添加样式 */
+.app-container {
+  height: 100%;
+}
+.el-input .el-input__inner {
+  color: #0000ff; /* 你想要的字体颜色 */
+}
+.result-form {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 10px;
+  color: red;
+}
 
-  .result-form {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-    gap: 10px;
-  }
-
-  .total-input>>>.el-input__inner {
-    font-weight: bold;
-    color: #409eff;
-  }
+.total-input >>> .el-input readonly__inner {
+  font-weight: bold;
+  color: #409eff;
+}
 </style>
diff --git a/src/components/NGTools/meterPar.vue b/src/components/NGTools/meterPar.vue
index 7ba1f67..267a215 100644
--- a/src/components/NGTools/meterPar.vue
+++ b/src/components/NGTools/meterPar.vue
@@ -3,14 +3,12 @@
     <el-form :model="meterPar" ref="dataForm" label-position="top" size="small" :inline="true" label-width="160px">
       <el-form-item label="流量计算标准" prop="dFlowCalbz" ref="selectRef">
         <el-select v-model="meterPar.dFlowCalbz" placeholder="请选择流量计算标准 " clearable>
-          <el-option v-for="dict in dict.type.ngtools_lljsbz" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option v-for="dict in dict.type.ngtools_lljsbz" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="压缩因子计算标准" prop="dZcalbz">
         <el-select v-model="meterPar.dZcalbz" placeholder="请选择压缩因子计算标准 " clearable>
-          <el-option v-for="dict in dict.type.ngtools_ysyzjsbz" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option v-for="dict in dict.type.ngtools_ysyzjsbz" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="计量参比条件压力" prop="dCbtj">
@@ -20,20 +18,25 @@
       </el-form-item>
 
       <el-form-item label="当地大气压" prop="dPatm">
-        <unit-converter v-model="meterPar.dPatm" :unit-type="'pressure'" :unit-order.sync="meterPar.dPatmUnit"
-          :show-english-only="false" :decimal-places="6" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPatm"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dPatmUnit"
+          :show-english-only="false"
+          :decimal-places="6"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="流量计类别" prop="dMeterType">
-        <el-select v-model="meterPar.dMeterType" placeholder="请选择流量计类别 " clearable>
-          <el-option v-for="dict in dict.type.ngtools_lljlx" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+        <el-select :key="meterPar.dMeterType" v-model="meterPar.dMeterType" placeholder="请选择流量计类别 " clearable>
+          <el-option v-for="dict in dict.type.ngtools_lljlx" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="节流装置类型" prop="dCoreType">
         <el-select v-model="meterPar.dCoreType" placeholder="请选择节流装置类型 " clearable>
-          <el-option v-for="dict in dict.type.ngtools_jlzzlx" :key="dict.value" :label="dict.label"
-            :value="dict.value" />
+          <el-option v-for="dict in dict.type.ngtools_jlzzlx" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item label="取压方式" prop="dPtmode">
@@ -47,8 +50,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="管道内径" prop="dPipeD">
-        <unit-converter v-model="meterPar.dPipeD" :unit-type="'length'" :unit-order.sync="meterPar.dLenUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPipeD"
+          :unit-type="'length'"
+          :unit-order.sync="meterPar.dLenUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="管道材料" prop="dPipeMaterial">
         <el-select v-model="meterPar.dPipeMaterial" placeholder="请选择管道材料 " clearable>
@@ -56,8 +66,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="孔板孔径" prop="dOrificeD">
-        <unit-converter v-model="meterPar.dOrificeD" :unit-type="'length'" :unit-order.sync="meterPar.dOrificeUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dOrificeD"
+          :unit-type="'length'"
+          :unit-order.sync="meterPar.dOrificeUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="孔板材料" prop="dOrificeMaterial">
@@ -66,8 +83,15 @@
         </el-select>
       </el-form-item>
       <el-form-item label="输入压力" prop="dPf">
-        <unit-converter v-model="meterPar.dPf" :unit-type="'pressure'" :unit-order.sync="meterPar.dPfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPf"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dPfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="压力类型" prop="dPfType">
@@ -76,12 +100,26 @@
         </el-select>
       </el-form-item>
       <el-form-item label="输入温度" prop="dTf">
-        <unit-converter v-model="meterPar.dTf" :unit-type="'temperature'" :unit-order.sync="meterPar.dTfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dTf"
+          :unit-type="'temperature'"
+          :unit-order.sync="meterPar.dTfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="输入差压" prop="dDp">
-        <unit-converter v-model="meterPar.dDp" :unit-type="'pressure'" :unit-order.sync="meterPar.dDpUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dDp"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dDpUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <!--  <el-form-item label="体积流量单位" prop="dVFlowUnit">
@@ -106,163 +144,243 @@
         <el-input v-model="meterPar.dMeterFactor" placeholder="请输入仪表系数 " clearable />
       </el-form-item>
       <el-form-item label="脉冲数" prop="dPulseNum">
-        <unit-converter v-model="meterPar.dPulseNum" :unit-type="'user'" :unit-order.sync="meterPar.dVGscUnit"
-          :show-english-only="false" :decimal-places="5" :user-defined="true" :user-definedunit-name="'个'"
-          :enable-convert="false" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPulseNum"
+          :unit-type="'user'"
+          :unit-order.sync="meterPar.dVGscUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :user-defined="true"
+          :user-definedunit-name="'个'"
+          :enable-convert="false"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="管束车容积" prop="dVGsc">
-        <unit-converter v-model="meterPar.dVGsc" :unit-type="'volume'" :unit-order.sync="meterPar.dVGscUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dVGsc"
+          :unit-type="'volume'"
+          :unit-order.sync="meterPar.dVGscUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="最大体积流量" prop="dVFlowMax">
-        <unit-converter v-model="meterPar.dVFlowMax" :unit-type="'volumeflow'" :unit-order.sync="meterPar.dVFlowUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dVFlowMax"
+          :unit-type="'volumeflow'"
+          :unit-order.sync="meterPar.dVFlowUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="最小体积流量" prop="dVFlowMin">
-        <unit-converter v-model="meterPar.dVFlowMin" :unit-type="'volumeflow'" :unit-order.sync="meterPar.dVFlowUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dVFlowMin"
+          :unit-type="'volumeflow'"
+          :unit-order.sync="meterPar.dVFlowUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="常用流量" prop="dVFlowCon">
-        <unit-converter v-model="meterPar.dVFlowCon" :unit-type="'volumeflow'" :unit-order.sync="meterPar.dVFlowUnit"
-          :show-english-only="false" :decimal-places="5" :enable-convert="true" :width="selectWidth"
-          :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dVFlowCon"
+          :unit-type="'volumeflow'"
+          :unit-order.sync="meterPar.dVFlowUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :enable-convert="true"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
 
       <el-form-item label="压力量程下限" prop="dPfRangeMin">
-        <unit-converter v-model="meterPar.dPfRangeMin" :unit-type="'pressure'" :unit-order.sync="meterPar.dPfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPfRangeMin"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dPfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="压力量程上限" prop="dPfRangeMax">
-        <unit-converter v-model="meterPar.dPfRangeMax" :unit-type="'pressure'" :unit-order.sync="meterPar.dPfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dPfRangeMax"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dPfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="差压量程下限" prop="dDpRangeMin">
-        <unit-converter v-model="meterPar.dDpRangeMin" :unit-type="'pressure'" :unit-order.sync="meterPar.dDpUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dDpRangeMin"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dDpUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="差压量程上限" prop="dDpRangeMax">
-        <unit-converter v-model="meterPar.dDpRangeMax" :unit-type="'pressure'" :unit-order.sync="meterPar.dDpUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dDpRangeMax"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterPar.dDpUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="温度计量程下限" prop="dTfRangeMin">
-        <unit-converter v-model="meterPar.dTfRangeMin" :unit-type="'temperature'" :unit-order.sync="meterPar.dTfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dTfRangeMin"
+          :unit-type="'temperature'"
+          :unit-order.sync="meterPar.dTfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="温度计量程上限" prop="dTfRangeMax">
-        <unit-converter v-model="meterPar.dTfRangeMax" :unit-type="'temperature'" :unit-order.sync="meterPar.dTfUnit"
-          :show-english-only="false" :decimal-places="5" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterPar.dTfRangeMax"
+          :unit-type="'temperature'"
+          :unit-order.sync="meterPar.dTfUnit"
+          :show-english-only="false"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
     </el-form>
   </div>
 </template>
 
 <script>
-  import unitConverter from '@/components/inputValueUnit/index';
-  export default {
-    name: 'meterParComponents',
-    components: {
-      unitConverter
-    },
-    dicts: [
-      'ngtools_cbtj',
-      'ngtools_jlzzlx',
-      'ngtools_lljlx',
-      'ngtools_qyfs',
-      'ngtools_gdcz',
-      'ngtools_lcxsjsff',
-      'ngtools_gdlx',
-      'ngtools_yllx',
-      'ngtools_lljsbz',
-      'ngtools_ysyzjsbz'
-    ],
-    mounted() {
-      this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
-    },
-    props: {
-      value: {
-        type: Object,
-        default: () => ({
-          dFlowCalbz: null,
-          dZcalbz: null,
-          dCbtj: null,
-          dpbM: null,
-          dtbM: null,
-          dpbE: null,
-          dtbE: null,
-          dPatm: null,
-          dPatmUnit: null,
-          dngCompents: null,
-          dMeterType: null,
-          dCoreType: null,
-          dPtmode: null,
-          dPipeType: null,
-          dPipeD: null,
-          dLenUnit: null,
-          dPipeDtemp: null,
-          dPileDtempU: null,
-          dPipeMaterial: null,
-          dOrificeD: null,
-          dOrificeUnit: null,
-          dOrificeDtemp: null,
-          dOrificeDtempUnit: null,
-          dOrificeMaterial: null,
-          dOrificeSharpness: null,
-          dOrificeRk: null,
-          dOrificeRkLenU: null,
-          dPf: null,
-          dPfUnit: null,
-          dPfType: null,
-          dTf: null,
-          dTfUnit: null,
-          dDp: null,
-          dDpUnit: null,
-          dVFlowUnit: 0,
-          dVFlowWorkUnit: 0,
-          dMFlowUnit: 0,
-          dEFlowUnit: 6,
-          dCd: null,
-          dCdCalMethod: null,
-          dMeterFactor: null,
-          dPulseNum: null,
-          dVFlowMax: null,
-          dVFlowMin: null,
-          dVFlowCon: null,
-          dPfRangeMin: null,
-          dPfRangeMax: null,
-          dDpRangeMin: null,
-          dDpRangeMax: null,
-          dTfRangeMin: null,
-          dTfRangeMax: null,
-          dVGsc: null
-        })
+import unitConverter from '@/components/inputValueUnit/index';
+export default {
+  name: 'meterParComponents',
+  components: {
+    unitConverter
+  },
+  dicts: [
+    'ngtools_cbtj',
+    'ngtools_jlzzlx',
+    'ngtools_lljlx',
+    'ngtools_qyfs',
+    'ngtools_gdcz',
+    'ngtools_lcxsjsff',
+    'ngtools_gdlx',
+    'ngtools_yllx',
+    'ngtools_lljsbz',
+    'ngtools_ysyzjsbz'
+  ],
+  mounted() {
+    this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
+  },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({
+        dFlowCalbz: null,
+        dZcalbz: null,
+        dCbtj: null,
+        dpbM: null,
+        dtbM: null,
+        dpbE: null,
+        dtbE: null,
+        dPatm: null,
+        dPatmUnit: null,
+        dngCompents: null,
+        dMeterType: null,
+        dCoreType: null,
+        dPtmode: null,
+        dPipeType: null,
+        dPipeD: null,
+        dLenUnit: null,
+        dPipeDtemp: null,
+        dPileDtempU: null,
+        dPipeMaterial: null,
+        dOrificeD: null,
+        dOrificeUnit: null,
+        dOrificeDtemp: null,
+        dOrificeDtempUnit: null,
+        dOrificeMaterial: null,
+        dOrificeSharpness: null,
+        dOrificeRk: null,
+        dOrificeRkLenU: null,
+        dPf: null,
+        dPfUnit: null,
+        dPfType: null,
+        dTf: null,
+        dTfUnit: null,
+        dDp: null,
+        dDpUnit: null,
+        dVFlowUnit: 0,
+        dVFlowWorkUnit: 0,
+        dMFlowUnit: 0,
+        dEFlowUnit: 6,
+        dCd: null,
+        dCdCalMethod: null,
+        dMeterFactor: null,
+        dPulseNum: null,
+        dVFlowMax: null,
+        dVFlowMin: null,
+        dVFlowCon: null,
+        dPfRangeMin: null,
+        dPfRangeMax: null,
+        dDpRangeMin: null,
+        dDpRangeMax: null,
+        dTfRangeMin: null,
+        dTfRangeMax: null,
+        dVGsc: null
+      })
+    }
+  },
+  data() {
+    return {
+      selectWidth: 0, //下拉选择组件的宽度
+      meterPar: _.cloneDeep(this.value)
+    };
+  },
+  watch: {
+    value: {
+      deep: true,
+      handler(newVal) {
+        console.log('-------------------', newVal, newVal.dMeterType);
+        this.formData = _.cloneDeep(newVal);
       }
     },
-    data() {
-      return {
-        selectWidth: 0, //下拉选择组件的宽度
-        meterPar: _.cloneDeep(this.value)
-      };
-    },
-    watch: {
-      value: {
-        deep: true,
-        handler(newVal) {
-          this.formData = _.cloneDeep(newVal);
-        }
-      },
-      meterPar: {
-        deep: true,
-        handler(newVal) {
-          this.$emit('input', newVal);
-        }
+    meterPar: {
+      deep: true,
+      handler(newVal) {
+        this.$emit('input', newVal);
       }
-    },
-    methods: {}
-  };
+    }
+  },
+  methods: {}
+};
 </script>
 
 <style scoped>
-  /* 在这里可以添加一些样式 */
+/* 在这里可以添加一些样式 */
 </style>
diff --git a/src/components/NGTools/meterResult.vue b/src/components/NGTools/meterResult.vue
index 13caf44..d0a99e9 100644
--- a/src/components/NGTools/meterResult.vue
+++ b/src/components/NGTools/meterResult.vue
@@ -1,170 +1,232 @@
 <template>
   <div class="app-container">
-    <el-form :model="meterResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px"
-      class="result-form">
+    <el-form :model="meterResult" label-position="top" ref="queryRef" size="small" :inline="false" label-width="160px" class="result-form">
       <el-form-item label="求渐近速度系数 E" prop="dE" ref="selectRef">
-        <el-input disabled v-model="meterResult.dE" placeholder=" " />
+        <el-input readonly v-model="meterResult.dE" placeholder=" " />
       </el-form-item>
       <el-form-item label="求相对密度系数 FG" prop="dFG">
-        <el-input disabled v-model="meterResult.dFG" placeholder=" " />
+        <el-input readonly v-model="meterResult.dFG" placeholder=" " />
       </el-form-item>
       <el-form-item label="求流动温度系数 FT" prop="dFT">
-        <el-input disabled v-model="meterResult.dFT" placeholder="" />
+        <el-input readonly v-model="meterResult.dFT" placeholder="" />
       </el-form-item>
       <el-form-item label="求动力粘度dlnd" prop="dDViscosity">
-        <el-input disabled v-model="meterResult.dDViscosity" placeholder="" />
+        <el-input readonly v-model="meterResult.dDViscosity" placeholder="" />
       </el-form-item>
       <el-form-item label="求可膨胀系数" prop="dDExpCoefficient">
-        <el-input disabled v-model="meterResult.dDExpCoefficient" placeholder="" />
+        <el-input readonly v-model="meterResult.dDExpCoefficient" placeholder="" />
       </el-form-item>
       <el-form-item label="管道雷诺数" prop="dRnPipe">
-        <el-input disabled v-model="meterResult.dRnPipe" placeholder="" />
+        <el-input readonly v-model="meterResult.dRnPipe" placeholder="" />
       </el-form-item>
       <el-form-item label="孔板锐利度系数Bk" prop="dBk">
-        <el-input disabled v-model="meterResult.dBk" placeholder="" />
+        <el-input readonly v-model="meterResult.dBk" placeholder="" />
       </el-form-item>
       <el-form-item label="管道粗糙度系数 Gme" prop="dRoughNessPipe">
-        <el-input disabled v-model="meterResult.dRoughNessPipe" placeholder="" />
+        <el-input readonly v-model="meterResult.dRoughNessPipe" placeholder="" />
       </el-form-item>
       <el-form-item label="修正后的流出系数" prop="dCdCorrect">
-        <el-input disabled v-model="meterResult.dCdCorrect" placeholder="" />
+        <el-input readonly v-model="meterResult.dCdCorrect" placeholder="" />
       </el-form-item>
       <el-form-item label="喷嘴的流出系数" prop="dCdNozell">
-        <el-input disabled v-model="meterResult.dCdNozell" placeholder="" />
+        <el-input readonly v-model="meterResult.dCdNozell" placeholder="" />
       </el-form-item>
       <el-form-item label="标况体积流量m³/s" prop="dVFlowb">
-        <unit-converter v-model="meterResult.dVFlowb" :unit-type="'volumeflow'"
-          :unit-order.sync="meterResult.dVFlowUnit" :show-english-only="true" :decimal-places="5" :width="selectWidth"
-          :input-disable="true" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dVFlowb"
+          :unit-type="'volumeflow'"
+          :unit-order.sync="meterResult.dVFlowUnit"
+          :show-english-only="true"
+          :decimal-places="5"
+          :width="selectWidth"
+          :input-disable="true"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="工况体积流量" prop="dVFlowf">
-        <unit-converter v-model="meterResult.dVFlowf" :unit-type="'volumeflow'"
-          :unit-order.sync="meterResult.dVFlowWorkUnit" :show-english-only="true" :decimal-places="5"
-          :input-disable="true" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dVFlowf"
+          :unit-type="'volumeflow'"
+          :unit-order.sync="meterResult.dVFlowWorkUnit"
+          :show-english-only="true"
+          :decimal-places="5"
+          :input-disable="true"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="标况质量流量" prop="dMFlowb">
-        <unit-converter v-model="meterResult.dMFlowb" :unit-type="'massflow'" :unit-order.sync="meterResult.dMFlowUnit"
-          :input-disable="true" :show-english-only="true" :decimal-places="5" :width="selectWidth"
-          :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dMFlowb"
+          :unit-type="'massflow'"
+          :unit-order.sync="meterResult.dMFlowUnit"
+          :input-disable="true"
+          :show-english-only="true"
+          :decimal-places="5"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="标况能量流量" prop="dEFlowb">
-        <unit-converter v-model="meterResult.dEFlowb" :unit-type="'energyflow'"
-          :unit-order.sync="meterResult.dEFlowUnit" :show-english-only="true" :decimal-places="5" :width="selectWidth"
-          :input-disable="true" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dEFlowb"
+          :unit-type="'energyflow'"
+          :unit-order.sync="meterResult.dEFlowUnit"
+          :show-english-only="true"
+          :decimal-places="5"
+          :width="selectWidth"
+          :input-disable="true"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="管道内天然气流速" prop="dVelocityFlow">
-        <unit-converter v-model="meterResult.dVelocityFlow" :unit-type="'speed'"
-          :unit-order.sync="meterResult.dVelocityUnit" :show-english-only="true" :decimal-places="5"
-          :input-disable="true" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dVelocityFlow"
+          :unit-type="'speed'"
+          :unit-order.sync="meterResult.dVelocityUnit"
+          :show-english-only="true"
+          :decimal-places="5"
+          :input-disable="true"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="压力损失" prop="dPressLost">
-        <unit-converter v-model="meterResult.dPressLost" :unit-type="'pressure'"
-          :unit-order.sync="meterResult.dPressLostUnit" :show-english-only="true" :decimal-places="5"
-          :input-disable="true" :width="selectWidth" :style="{ width: selectWidth + 'px' }" />
+        <unit-converter
+          v-model="meterResult.dPressLost"
+          :unit-type="'pressure'"
+          :unit-order.sync="meterResult.dPressLostUnit"
+          :show-english-only="true"
+          :decimal-places="5"
+          :input-disable="true"
+          :width="selectWidth"
+          :style="{ width: selectWidth + 'px' }"
+        />
       </el-form-item>
       <el-form-item label="直径比" prop="dBeta">
-        <el-input disabled v-model="meterResult.dBeta" placeholder="" />
+        <el-input readonly v-model="meterResult.dBeta" placeholder="" />
       </el-form-item>
       <el-form-item label="等熵指数" prop="dKappa">
-        <el-input disabled v-model="meterResult.dKappa" placeholder="" />
+        <el-input readonly v-model="meterResult.dKappa" placeholder="" />
       </el-form-item>
     </el-form>
-
   </div>
 </template>
 
 <script>
-  import unitConverter from '@/components/inputValueUnit/index';
-  export default {
-    name: 'MeterresultComponent',
-    components: {
-      unitConverter
-    },
+import unitConverter from '@/components/inputValueUnit/index';
+export default {
+  name: 'MeterresultComponent',
+  components: {
+    unitConverter
+  },
 
-    props: {
-      value: {
-        type: Object,
-        default: () => ({
-          dE: 0,
-          dFG: 0,
-          dFT: 0,
-          dDViscosity: 0,
-          dDExpCoefficient: 0,
-          dRnPipe: 0,
-          dBk: 0,
-          dRoughNessPipe: 0,
-          dCdCorrect: 0,
-          dCdNozell: 0,
-          dVFlowb: 0,
-          dVFlowf: 0,
-          dVFlowUnit: 0,
-          dMFlowb: 0,
-          dMFlowUnit: 0,
-          dEFlowb: 0,
-          dEFlowUnit: 0,
-          dVelocityFlow: 0,
-          dVelocityUnit: 0,
-          dPressLost: 0,
-          dPressLostUnit: 0,
-          dBeta: 0,
-          dKappa: 0
-        })
-      }
-    },
+  props: {
+    value: {
+      type: Object,
+      default: () => ({
+        dE: 0,
+        dFG: 0,
+        dFT: 0,
+        dDViscosity: 0,
+        dDExpCoefficient: 0,
+        dRnPipe: 0,
+        dBk: 0,
+        dRoughNessPipe: 0,
+        dCdCorrect: 0,
+        dCdNozell: 0,
+        dVFlowb: 0,
+        dVFlowf: 0,
+        dVFlowUnit: 0,
+        dMFlowb: 0,
+        dMFlowUnit: 0,
+        dEFlowb: 0,
+        dEFlowUnit: 0,
+        dVelocityFlow: 0,
+        dVelocityUnit: 0,
+        dPressLost: 0,
+        dPressLostUnit: 0,
+        dBeta: 0,
+        dKappa: 0
+      })
+    }
+  },
 
-    data() {
-      return {
-        meterResult: [],
-        selectWidth: 180
-      };
-    },
+  data() {
+    return {
+      meterResult: {
+        dE: 0,
+        dFG: 0,
+        dFT: 0,
+        dDViscosity: 0,
+        dDExpCoefficient: 0,
+        dRnPipe: 0,
+        dBk: 0,
+        dRoughNessPipe: 0,
+        dCdCorrect: 0,
+        dCdNozell: 0,
+        dVFlowb: 0,
+        dVFlowf: 0,
+        dVFlowUnit: 0,
+        dMFlowb: 0,
+        dMFlowUnit: 0,
+        dEFlowb: 0,
+        dEFlowUnit: 0,
+        dVelocityFlow: 0,
+        dVelocityUnit: 0,
+        dPressLost: 0,
+        dPressLostUnit: 0,
+        dBeta: 0,
+        dKappa: 0
+      },
+      selectWidth: 180
+    };
+  },
 
-    watch: {
-      value: {
-        deep: true,
-        handler(newVal) {
-          console.log(newVal)
-          for (const key in newVal) {
-            if (newVal.hasOwnProperty(key)) {
-              const value = newVal[key];
-              // 判断是否为有效的数值
-              if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
-                // 使用 toFixed 方法设置小数点位数
-                newVal[key] = parseFloat(value.toFixed(6));
-              }
+  watch: {
+    value: {
+      deep: true,
+      handler(newVal) {
+        console.log(newVal);
+        for (const key in newVal) {
+          if (newVal.hasOwnProperty(key)) {
+            const value = newVal[key];
+            // 判断是否为有效的数值
+            if (typeof value === 'number' && !isNaN(value) && isFinite(value)) {
+              // 使用 toFixed 方法设置小数点位数
+              newVal[key] = parseFloat(value.toFixed(6));
             }
           }
-          this.meterResult = JSON.parse(JSON.stringify(newVal));
-
         }
+        this.meterResult = JSON.parse(JSON.stringify(newVal));
       }
-    },
-    mounted() {
-      this.$nextTick(() => {
-        this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
-        if (this.selectWidth === 0) this.selectWidth = 180
-        console.log("wwww", this.selectWidth)
-      })
-
-    },
-    methods: {}
-  };
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.selectWidth = this.$refs.selectRef.$el.offsetWidth;
+      if (this.selectWidth === 0) this.selectWidth = 180;
+      console.log('wwww', this.selectWidth);
+    });
+  },
+  methods: {}
+};
 </script>
 
 <style scoped>
-  /* 可按需添加样式 */
-  .app-container {
-    height: 100%;
-  }
+/* 可按需添加样式 */
+.app-container {
+  height: 100%;
+}
 
-  .result-form {
-    display: grid;
-    grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
-    gap: 10px;
-  }
+.result-form {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+  gap: 10px;
+}
 
-  .total-input>>>.el-input__inner {
-    font-weight: bold;
-    color: #409eff;
-  }
+.total-input >>> .el-input__inner {
+  font-weight: bold;
+  color: #409eff;
+}
 </style>
diff --git a/src/components/inputValueUnit/index -db.vue b/src/components/inputValueUnit/index -db.vue
deleted file mode 100644
index a685dc0..0000000
--- a/src/components/inputValueUnit/index -db.vue	
+++ /dev/null
@@ -1,250 +0,0 @@
-<template>
-  <div class="unit-conversion">
-    <!-- 数值输入框，实现双向绑定 -->
-    <input type="number" v-model="localValue" placeholder="请输入数值" @input="handleInputChange" class="input-field" />
-    <!-- 单位名称显示标签，蓝色字体，绑定点击和双击事件 -->
-    <span style="color: blue; cursor: pointer" @click="changeUnit" @dblclick="openUnitSelector" class="unit-label">
-      {{ getDisplayUnitName(currentUnitName) }}
-    </span>
-    <!-- 单位选择弹出窗口 -->
-    <div v-if="isUnitSelectorVisible" class="unit-selector" :style="{ top: selectorTop + 'px', left: selectorLeft + 'px' }">
-      <ul>
-        <!-- 遍历可用单位，绑定点击事件 -->
-        <li v-for="unit in availableUnits" :key="unit.id" @click="selectUnit(unit)" class="unit-option">
-          {{ getDisplayUnitName(unit.unitName) }}
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<script>
-// 引入后台单位换算查询的 API
-import { listSysUnitConvert } from '@/api/system/sysUnitConvert.js';
-
-export default {
-  props: {
-    // 单位类型
-    unitType: {
-      type: String,
-      required: true
-    },
-    // 单位名称，支持双向绑定
-    unitName: {
-      type: String,
-      required: true
-    },
-    // 数值，支持双向绑定
-    value: {
-      type: [Number, String],
-      default: ''
-    },
-    // 是否只显示英文部分
-    showEnglishOnly: {
-      type: Boolean,
-      default: false
-    },
-    // 换算结果小数点的位数
-    decimalPlaces: {
-      type: Number,
-      default: 2
-    }
-  },
-  data() {
-    return {
-      // 本地存储的数值，用于双向绑定
-      localValue: this.value,
-      // 当前选择的单位名称
-      currentUnitName: this.unitName,
-      // 单位选择弹出窗口是否可见
-      isUnitSelectorVisible: false,
-      // 弹出窗口的顶部位置
-      selectorTop: 0,
-      // 弹出窗口的左侧位置
-      selectorLeft: 0,
-      // 当前单位类型下的所有可用单位
-      availableUnits: [],
-      // 按照单位类型分组的单位换算数据
-      unitConversionData: {}
-    };
-  },
-  watch: {
-    // 监听父组件传入的单位类型变化，更新可用单位
-    unitType: {
-      handler(newVal) {
-        this.fetchUnitConversionData();
-      },
-      immediate: true
-    },
-    // 监听父组件传入的单位名称变化，更新当前单位名称
-    unitName(newVal) {
-      this.currentUnitName = newVal;
-      console.log(this.currentUnitName);
-      this.convertValue();
-    },
-    // 监听父组件传入的数值变化，更新本地数值
-    value(newVal) {
-      this.localValue = newVal;
-      this.convertValue();
-    }
-  },
-  mounted() {
-    // 组件挂载时获取单位换算数据
-    this.fetchUnitConversionData();
-  },
-  methods: {
-    // 获取单位换算数据
-    async fetchUnitConversionData() {
-      try {
-        const response = await listConversion({ pageSize: 300, unitType: this.unitType });
-        console.log(response);
-        // 平铺数据转换成按照 unitType 分组的格式
-        this.unitConversionData = this.groupByUnitType(response.rows);
-        console.log(this.unitConversionData);
-        // 获取当前单位类型下的所有可用单位
-        this.availableUnits = this.unitConversionData[this.unitType] || [];
-      } catch (error) {
-        console.error('获取单位换算数据失败:', error);
-      }
-    },
-    // 按照单位类型分组数据
-    groupByUnitType(data) {
-      const groupedData = {};
-      data.forEach((item) => {
-        if (!groupedData[item.unitType]) {
-          groupedData[item.unitType] = [];
-        }
-        groupedData[item.unitType].push(item);
-      });
-      return groupedData;
-    },
-    // 处理输入框输入变化事件
-    handleInputChange() {
-      this.convertValue();
-      // 通知父组件数值变化
-      this.$emit('update:value', parseFloat(this.localValue));
-    },
-    // 改变单位
-    changeUnit() {
-      const currentIndex = this.availableUnits.findIndex((unit) => unit.unitName === this.currentUnitName);
-      console.log(currentIndex);
-      const nextIndex = (currentIndex + 1) % this.availableUnits.length;
-      const nextUnit = this.availableUnits[nextIndex];
-      this.selectUnit(nextUnit);
-    },
-    // 打开单位选择弹出窗口
-    openUnitSelector(event) {
-      this.isUnitSelectorVisible = true;
-      // 获取单位标签的位置
-      const rect = event.target.getBoundingClientRect();
-      this.selectorTop = rect.bottom;
-      this.selectorLeft = rect.left;
-    },
-    // 选择单位
-    selectUnit(unit) {
-      const oldUnit = this.getUnitByName(this.currentUnitName);
-      const newUnit = unit;
-      this.currentUnitName = newUnit.unitName;
-      this.convertValue(oldUnit, newUnit);
-      this.isUnitSelectorVisible = false;
-      // 通知父组件单位名称变化
-      this.$emit('update:unitName', newUnit.unitName);
-    },
-    // 根据单位名称获取单位信息
-    getUnitByName(unitName) {
-      return this.availableUnits.find((unit) => unit.unitName === unitName);
-    },
-    // 换算值
-    convertValue(oldUnit, newUnit) {
-      oldUnit = oldUnit || this.getUnitByName(this.currentUnitName);
-      newUnit = newUnit || oldUnit;
-      const input = parseFloat(this.localValue);
-      if (isNaN(input)) return;
-      let result;
-      if (this.unitType === 'temperature') {
-        // 温度换算的特殊处理
-        result = this.convertTemperature(input, oldUnit, newUnit);
-      } else {
-        // 普通单位换算，以基准单位为中间件计算
-        const baseUnit = this.availableUnits.find((unit) => unit.baseUnit === 1);
-        const valueInBaseUnit = input * oldUnit.conversionFactor;
-        result = valueInBaseUnit / newUnit.conversionFactor;
-      }
-      // 按照四舍六入五留双处理结果
-      const roundedResult = this.roundToDecimalPlaces(result, this.decimalPlaces);
-      this.localValue = roundedResult;
-      // 提交换算结果给父组件
-      this.$emit('conversionResult', input, roundedResult, oldUnit.unitName, newUnit.unitName);
-    },
-    // 温度换算
-    convertTemperature(input, oldUnit, newUnit) {
-      if (oldUnit.unitName === 'C(摄氏度)' && newUnit.unitName === 'F(华氏度)') {
-        return (input * 9) / 5 + 32;
-      } else if (oldUnit.unitName === 'F(华氏度)' && newUnit.unitName === 'C(摄氏度)') {
-        return ((input - 32) * 5) / 9;
-      }
-      return input;
-    },
-    // 按照四舍六入五留双处理结果 conversionFactor
-    roundToDecimalPlaces(value, decimalPlaces) {
-      const multiplier = Math.pow(10, decimalPlaces);
-      const val = value * multiplier;
-      const intVal = Math.trunc(val);
-      const decimalPart = val - intVal;
-      if (decimalPart < 0.5) {
-        return intVal / multiplier;
-      } else if (decimalPart > 0.5) {
-        return (intVal + 1) / multiplier;
-      } else {
-        return intVal % 2 === 0 ? intVal / multiplier : (intVal + 1) / multiplier;
-      }
-    },
-    // 获取显示的单位名称
-    getDisplayUnitName(unitName) {
-      return this.showEnglishOnly ? unitName.split('(')[0] : unitName;
-    }
-  }
-};
-</script>
-
-<style scoped>
-.unit-conversion {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-}
-
-.input-field {
-  padding: 5px 8px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  font-size: 14px;
-}
-
-.unit-label {
-  font-size: 14px;
-}
-
-.unit-selector {
-  position: absolute;
-  z-index: 1000;
-  background-color: white;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  padding: 5px 0;
-  min-width: 100px;
-  list-style-type: none;
-  margin: 0;
-}
-
-.unit-option {
-  padding: 5px 10px;
-  cursor: pointer;
-  font-size: 14px;
-}
-
-.unit-option:hover {
-  background-color: #f0f0f0;
-}
-</style>
diff --git a/src/components/inputValueUnit/index.vue b/src/components/inputValueUnit/index.vue
index 7a4dba4..921d4a7 100644
--- a/src/components/inputValueUnit/index.vue
+++ b/src/components/inputValueUnit/index.vue
@@ -1,19 +1,25 @@
 <template>
   <div class="unit-converter" :style="{ width: width + 'px' }">
     <!-- 数值输入框 -->
-    <input v-model.number="inputValue" :disabled="inputDisable" class="input-field" type="number" ref="inputRef"
-      :style="{ width: inputWidth + 'px', height: height + 'px' }" @change="handleInputChange" @focus="selectAllText" />
+    <input
+      v-model.number="inputValue"
+      :disabled="inputDisable"
+      class="input-field"
+      type="number"
+      ref="inputRef"
+      :style="{ width: inputWidth + 'px', height: height + 'px' }"
+      @change="handleInputChange"
+      @focus="selectAllText"
+    />
     <!-- 单位标签 -->
-    <span v-if="enableConvert" ref="unitLabel" @click="cycleUnit" @dblclick="toggleUnitSelector" class="unit-label"
-      :style="{ color: 'blue', height: height + 'px' }">
+    <span v-if="enableConvert" ref="unitLabel" @click="cycleUnit" @dblclick="toggleUnitSelector" class="unit-label" :style="{ color: 'blue', height: height + 'px' }">
       {{ textUnitName }}
     </span>
     <span v-else ref="unitLabel" class="unit-label" :style="{ color: 'blue', height: height + 'px' }">
       {{ textUnitName }}
     </span>
     <!-- 单位选择弹出窗口 -->
-    <div v-if="showUnitSelector" class="unit-selector" ref="unitSelector"
-      :style="{ left: unitSelectorLeft + 'px', top: unitSelectorTop + 'px' }">
+    <div v-if="showUnitSelector" class="unit-selector" ref="unitSelector" :style="{ left: unitSelectorLeft + 'px', top: unitSelectorTop + 'px' }">
       <div v-for="unit in sortedUnits" :key="unit.id" @click="selectUnit(unit)" class="unit-option">
         {{ showEnglishOnly ? unit.unitName.split('(')[0] : unit.unitName }}
       </div>
@@ -22,414 +28,406 @@
 </template>
 
 <script>
-  import {
-    listSysUnitConvert
-  } from '@/api/system/sysUnitConvert.js';
+import { listSysUnitConvert } from '@/api/system/sysUnitConvert.js';
 
-  export default {
-    name: 'UnitConverter',
-    props: {
-      unitType: {
-        // 当前单位类型 (required)
-        type: String,
-        required: true
-      },
-      unitOrder: {
-        // 当前单位序号 (sync)
-        type: Number,
-        default: 0
-      },
-      value: {
-        // 输入数值 (sync)
-        type: Number,
-        required: true
-      },
-      showEnglishOnly: {
-        // 是否只显示英文
-        type: Boolean,
-        default: false
-      },
-      decimalPlaces: {
-        // 小数位数
-        type: Number,
-        default: 5,
-        validator: (v) => v >= 0 && v <= 10
-      },
-      width: {
-        type: Number,
-        required: false,
-        default: 180
-      },
-      height: {
-        type: Number,
-        required: false,
-        default: 32
-      },
-      enableConvert: {
-        //是否能够进行单位换算
-        type: Boolean,
-        default: true
-      },
-      userDefined: {
-        //自定义输入单位显示
-        type: Boolean,
-        default: false
-      },
-      userDefinedunitName: {
-        //自定义输入单位显示
-        type: String,
-        default: ''
-      },
-      inputDisable: {
-        type: Boolean,
-        required: false,
-        default: false
-      }
+export default {
+  name: 'UnitConverter',
+  props: {
+    unitType: {
+      // 当前单位类型 (required)
+      type: String,
+      required: true
+    },
+    unitOrder: {
+      // 当前单位序号 (sync)
+      type: Number,
+      default: 0
+    },
+    value: {
+      // 输入数值 (sync)
+      type: Number,
+      required: true
+    },
+    showEnglishOnly: {
+      // 是否只显示英文
+      type: Boolean,
+      default: false
+    },
+    decimalPlaces: {
+      // 小数位数
+      type: Number,
+      default: 5,
+      validator: (v) => v >= 0 && v <= 10
+    },
+    width: {
+      type: Number,
+      required: false,
+      default: 180
+    },
+    height: {
+      type: Number,
+      required: false,
+      default: 32
+    },
+    enableConvert: {
+      //是否能够进行单位换算
+      type: Boolean,
+      default: true
+    },
+    userDefined: {
+      //自定义输入单位显示
+      type: Boolean,
+      default: false
+    },
+    userDefinedunitName: {
+      //自定义输入单位显示
+      type: String,
+      default: ''
+    },
+    inputDisable: {
+      type: Boolean,
+      required: false,
+      default: false
+    }
+  },
+  mounted() {
+    this.$nextTick(() => {
+      this.updateInputWidth();
+    });
+    // 在挂载时添加全局点击事件监听器
+    document.addEventListener('click', this.handleClickOutside);
+  },
+  beforeUnmount() {
+    // 在组件销毁前移除全局点击事件监听器
+    document.removeEventListener('click', this.handleClickOutside);
+  },
+  data() {
+    return {
+      inputValue: this.value,
+      unitData: [], // 原始单位数据
+      showUnitSelector: false, // 显示选择器
+      currentUnit: null, // 当前选中单位
+      baseUnit: null, // 基准单位
+      inputWidth: 120, //输入框的宽度
+      textUnitName: '',
+      unitSelectorLeft: 0,
+      unitSelectorTop: 0,
+      // 新增三个数据项
+      originalValue: this.value, // 原始输入值
+      originalUnit: null, // 原始输入单位
+      isInternalUpdate: false // 更新锁定标志
+    };
+  },
+  computed: {
+    // 显示的单位文本
+    displayUnitText() {
+      if (!this.currentUnit) return '';
+      return this.showEnglishOnly ? this.currentUnit.unitName.split('(')[0].trim() : this.currentUnit.unitName;
     },
-    mounted() {
-      this.$nextTick(() => {
-        this.updateInputWidth();
-      });
-      // 在挂载时添加全局点击事件监听器
-      document.addEventListener('click', this.handleClickOutside);
 
+    // 当前类型的单位列表（按unitOrder排序）
+    sortedUnits() {
+      return this.unitData.filter((u) => u.unitType === this.unitType).sort((a, b) => a.unitOrder - b.unitOrder);
     },
-    beforeUnmount() {
-      // 在组件销毁前移除全局点击事件监听器
-      document.removeEventListener('click', this.handleClickOutside);
-    },
-    data() {
+
+    // 弹窗定位样式
+    popupPosition() {
+      if (!this.$refs.unitLabel) return {};
+      const rect = this.$refs.unitLabel.getBoundingClientRect();
       return {
-        inputValue: this.value,
-        unitData: [], // 原始单位数据
-        showUnitSelector: false, // 显示选择器
-        currentUnit: null, // 当前选中单位
-        baseUnit: null, // 基准单位
-        inputWidth: 120, //输入框的宽度
-        textUnitName: '',
-        unitSelectorLeft: 0,
-        unitSelectorTop: 0,
-        // 新增三个数据项
-        originalValue: this.value, // 原始输入值
-        originalUnit: null, // 原始输入单位
-        isInternalUpdate: false // 更新锁定标志
+        top: `${rect.bottom + window.scrollY}px`,
+        left: `${rect.left + window.scrollX}px`
       };
-    },
-    computed: {
-      // 显示的单位文本
-      displayUnitText() {
-        if (!this.currentUnit) return '';
-        return this.showEnglishOnly ? this.currentUnit.unitName.split('(')[0].trim() : this.currentUnit.unitName;
-      },
-
-      // 当前类型的单位列表（按unitOrder排序）
-      sortedUnits() {
-        return this.unitData.filter((u) => u.unitType === this.unitType).sort((a, b) => a.unitOrder - b.unitOrder);
-      },
-
-      // 弹窗定位样式
-      popupPosition() {
-        if (!this.$refs.unitLabel) return {};
-        const rect = this.$refs.unitLabel.getBoundingClientRect();
-        return {
-          top: `${rect.bottom + window.scrollY}px`,
-          left: `${rect.left + window.scrollX}px`
-        };
-      }
-    },
-    watch: {
-      // 监听单位类型变化
-      unitType: {
-        immediate: true,
-        async handler(newType) {
-          if (this.userDefined) {
-            this.textUnitName = this.userDefinedunitName;
-            this.$nextTick(() => {
-              this.updateInputWidth();
-            });
-          } else {
-            await this.loadUnits(newType);
-            this.initCurrentUnit();
-          }
-        }
-      },
-
-      // 监听外部单位序号变化
-      unitOrder(newOrder) {
+    }
+  },
+  watch: {
+    // 监听单位类型变化
+    unitType: {
+      immediate: true,
+      async handler(newType) {
         if (this.userDefined) {
           this.textUnitName = this.userDefinedunitName;
           this.$nextTick(() => {
             this.updateInputWidth();
           });
         } else {
-          const target = this.sortedUnits.find((u) => u.unitOrder === newOrder);
-          if (target) this.currentUnit = target;
-          this.textUnitName = this.showEnglishOnly ? target.unitName.split('(')[0].trim() : target.unitName;
-          this.$nextTick(() => {
-            this.updateInputWidth();
-          });
+          await this.loadUnits(newType);
+          this.initCurrentUnit();
         }
-      },
-
-      // 监听输入值变化
-      value(newVal) {
-        if (!this.isInternalUpdate) {
-
-          // 外部更新时重置原始值
-          this.originalValue = (newVal === "NaN" ? 0 : newVal);
-          this.originalUnit = this.currentUnit;
-          this.inputValue = (newVal === "" ? 0 : newVal);
-        }
-        this.isInternalUpdate = false;
       }
     },
-    methods: {
 
-      selectAllText(event) {
-        // 通过 event.target 获取触发事件的 input 元素
-        const input = event.target;
-        // 调用 select() 方法全选文本
-        input.select();
-      },
-      handleMouseMove(event) {
-        if (this.showUnitSelector) {
-          // 鼠标右下方偏移量
-          const offsetX = 10;
-          const offsetY = 10;
-          this.unitSelectorLeft = event.clientX + offsetX;
-          this.unitSelectorTop = event.clientY + offsetY;
-          // 获取弹窗元素
-          const unitSelector = this.$refs.unitSelector;
-          if (unitSelector) {
-            // 检查是否超出屏幕右边界
-            if (this.unitSelectorLeft + unitSelector.offsetWidth > window.innerWidth) {
-              this.unitSelectorLeft = window.innerWidth - unitSelector.offsetWidth;
-            }
-            // 检查是否超出屏幕下边界
-            if (this.unitSelectorTop + unitSelector.offsetHeight > window.innerHeight) {
-              this.unitSelectorTop = window.innerHeight - unitSelector.offsetHeight;
-            }
-          }
-        }
-      },
-
-      updateInputWidth() {
-
-        const spanWidth = this.$refs.unitLabel.offsetWidth + 5;
-        console.log("widht", this.width, "spanWidth", spanWidth)
-        this.inputWidth = this.width - spanWidth;
-      },
-      // 处理全局点击事件
-      handleClickOutside(event) {
-        if (this.$refs.unitSelector && !this.$refs.unitSelector.contains(event.target)) {
-          this.showUnitSelector = false;
-        }
-      },
-      // 切换单位选择器的显示状态
-      toggleUnitSelector() {
-        this.showUnitSelector = !this.showUnitSelector;
-
-      },
-      // 加载单位数据
-      async loadUnits(unitType) {
-        try {
-          const res = await listSysUnitConvert({
-            unitType: unitType,
-            status: 'Y'
-          });
-          // console.log(res);
-          this.unitData = res.rows;
-          this.baseUnit = this.unitData.find((u) => u.baseUnit === 'Y');
-          // console.log(this.baseUnit.unitName);
-        } catch (e) {
-          console.error('单位数据加载失败:', e);
-        }
-      },
-
-      // 初始化当前单位
-      initCurrentUnit() {
-        const target = this.sortedUnits.find((u) => u.unitOrder === this.unitOrder);
-        this.currentUnit = target || this.baseUnit || this.sortedUnits[0];
-        // 初始化时设置原始单位（关键修复）
-        this.originalUnit = this.currentUnit;
+    // 监听外部单位序号变化
+    unitOrder(newOrder) {
+      if (this.userDefined) {
+        this.textUnitName = this.userDefinedunitName;
+        this.$nextTick(() => {
+          this.updateInputWidth();
+        });
+      } else {
+        const target = this.sortedUnits.find((u) => u.unitOrder === newOrder);
+        if (target) this.currentUnit = target;
         this.textUnitName = this.showEnglishOnly ? target.unitName.split('(')[0].trim() : target.unitName;
         this.$nextTick(() => {
           this.updateInputWidth();
         });
-      },
+      }
+    },
 
-      // 输入变化处理
-      handleInputChange() {
-        // 记录原始值和单位
-        this.originalValue = this.inputValue;
+    // 监听输入值变化
+    value(newVal) {
+      if (!this.isInternalUpdate) {
+        // 外部更新时重置原始值
+        this.originalValue = newVal === 'NaN' ? 0 : newVal;
         this.originalUnit = this.currentUnit;
-        // console.log(this.originalValue);
-        this.$emit('input', this.inputValue);
-        // this.convertAndEmit();
-      },
-
-      // 循环切换单位
-      // 修改单位切换方法
-      cycleUnit() {
-        const index = this.sortedUnits.findIndex((u) => u === this.currentUnit);
-        const newUnit = this.sortedUnits[(index + 1) % this.sortedUnits.length];
-        this.currentUnit = newUnit;
-        this.textUnitName = this.showEnglishOnly ? newUnit.unitName.split('(')[0].trim() : newUnit.unitName;
-        this.$nextTick(() => {
-          this.updateInputWidth();
-          this.convertAndEmit(); // 触发转换
-        });
-      },
-
-
-      // 选择单位
-      selectUnit(unit) {
-        this.currentUnit = unit;
-        this.showUnitSelector = false;
-        this.$nextTick(() => {
-          this.updateInputWidth();
-          this.convertAndEmit(); // 触发转换
-        });
-      },
-
-      // 执行换算并提交事件
-      convertAndEmit() {
-        // 移除参数
-        if (!this.currentUnit || !this.baseUnit || !this.originalUnit) return;
-
-        let newValue = 0;
-        if (this.unitType === 'temperature') {
-          newValue = this.handleTemperatureConversion(this.originalUnit, this.currentUnit);
-        } else {
-          // 通过基准单位进行两次精确转换
-          const baseValue = this.originalValue / this.originalUnit.conversionFactor;
-          newValue = baseValue * this.currentUnit.conversionFactor;
-        }
-
-        const roundedValue = this.roundValue(newValue);
-        this.isInternalUpdate = true; // 锁定更新
-        this.inputValue = roundedValue;
-        this.$emit('input', roundedValue);
-        this.$emit('update:unitOrder', this.currentUnit.unitOrder);
-
-        this.$emit('conversion', {
-          initialValue: this.originalValue,
-          newValue: roundedValue,
-          oldUnit: this.originalUnit.unitName,
-          newUnit: this.currentUnit.unitName,
-          oldOrder: this.originalUnit.unitOrder,
-          newOrder: this.currentUnit.unitOrder
-        });
-      },
-
-      // 温度单位换算
-      // 温度转换调整（使用原始值）
-      handleTemperatureConversion(oldUnit, newUnit) {
-        const oldOrder = oldUnit.unitOrder;
-        const newOrder = newUnit.unitOrder;
-        // console.log(1111, this.originalValue);
-        // 使用原始值计算
-        let celsius;
-        switch (oldOrder) {
-          case 0:
-            celsius = this.originalValue;
-            break;
-          case 1:
-            celsius = ((this.originalValue - 32) * 5) / 9;
-            break;
-          case 2:
-            celsius = this.originalValue - 273.15;
-            break;
-          default:
-            throw new Error('无效温度单位');
-        }
-
-        switch (newOrder) {
-          case 0:
-            return celsius;
-          case 1:
-            return (celsius * 9) / 5 + 32;
-          case 2:
-            return celsius + 273.15;
-          default:
-            throw new Error('无效温度单位');
-        }
-      },
-
-      // 四舍六入五成双
-      roundValue(value) {
-        const multiplier = Math.pow(10, this.decimalPlaces);
-        const val = value * multiplier;
-        const intVal = Math.trunc(val);
-        const decimalPart = val - intVal;
-        if (decimalPart < 0.5) {
-          return intVal / multiplier;
-        } else if (decimalPart > 0.5) {
-          return (intVal + 1) / multiplier;
-        } else {
-          return intVal % 2 === 0 ? intVal / multiplier : (intVal + 1) / multiplier;
+        this.inputValue = newVal === '' ? 0 : newVal;
+      }
+      this.isInternalUpdate = false;
+    }
+  },
+  methods: {
+    selectAllText(event) {
+      // 通过 event.target 获取触发事件的 input 元素
+      const input = event.target;
+      // 调用 select() 方法全选文本
+      input.select();
+    },
+    handleMouseMove(event) {
+      if (this.showUnitSelector) {
+        // 鼠标右下方偏移量
+        const offsetX = 10;
+        const offsetY = 10;
+        this.unitSelectorLeft = event.clientX + offsetX;
+        this.unitSelectorTop = event.clientY + offsetY;
+        // 获取弹窗元素
+        const unitSelector = this.$refs.unitSelector;
+        if (unitSelector) {
+          // 检查是否超出屏幕右边界
+          if (this.unitSelectorLeft + unitSelector.offsetWidth > window.innerWidth) {
+            this.unitSelectorLeft = window.innerWidth - unitSelector.offsetWidth;
+          }
+          // 检查是否超出屏幕下边界
+          if (this.unitSelectorTop + unitSelector.offsetHeight > window.innerHeight) {
+            this.unitSelectorTop = window.innerHeight - unitSelector.offsetHeight;
+          }
         }
       }
+    },
+
+    updateInputWidth() {
+      const spanWidth = this.$refs.unitLabel.offsetWidth + 5;
+      // console.log("widht", this.width, "spanWidth", spanWidth)
+      this.inputWidth = this.width - spanWidth;
+    },
+    // 处理全局点击事件
+    handleClickOutside(event) {
+      if (this.$refs.unitSelector && !this.$refs.unitSelector.contains(event.target)) {
+        this.showUnitSelector = false;
+      }
+    },
+    // 切换单位选择器的显示状态
+    toggleUnitSelector() {
+      this.showUnitSelector = !this.showUnitSelector;
+    },
+    // 加载单位数据
+    async loadUnits(unitType) {
+      try {
+        const res = await listSysUnitConvert({
+          unitType: unitType,
+          status: 'Y'
+        });
+        // console.log(res);
+        this.unitData = res.rows;
+        this.baseUnit = this.unitData.find((u) => u.baseUnit === 'Y');
+        // console.log(this.baseUnit.unitName);
+      } catch (e) {
+        console.error('单位数据加载失败:', e);
+      }
+    },
+
+    // 初始化当前单位
+    initCurrentUnit() {
+      const target = this.sortedUnits.find((u) => u.unitOrder === this.unitOrder);
+      this.currentUnit = target || this.baseUnit || this.sortedUnits[0];
+      // 初始化时设置原始单位（关键修复）
+      this.originalUnit = this.currentUnit;
+      this.textUnitName = this.showEnglishOnly ? target.unitName.split('(')[0].trim() : target.unitName;
+      this.$nextTick(() => {
+        this.updateInputWidth();
+      });
+    },
+
+    // 输入变化处理
+    handleInputChange() {
+      // 记录原始值和单位
+      this.originalValue = this.inputValue;
+      this.originalUnit = this.currentUnit;
+      // console.log(this.originalValue);
+      this.$emit('input', this.inputValue);
+      // this.convertAndEmit();
+    },
+
+    // 循环切换单位
+    // 修改单位切换方法
+    cycleUnit() {
+      const index = this.sortedUnits.findIndex((u) => u === this.currentUnit);
+      const newUnit = this.sortedUnits[(index + 1) % this.sortedUnits.length];
+      this.currentUnit = newUnit;
+      this.textUnitName = this.showEnglishOnly ? newUnit.unitName.split('(')[0].trim() : newUnit.unitName;
+      this.$nextTick(() => {
+        this.updateInputWidth();
+        this.convertAndEmit(); // 触发转换
+      });
+    },
+
+    // 选择单位
+    selectUnit(unit) {
+      this.currentUnit = unit;
+      this.showUnitSelector = false;
+      this.$nextTick(() => {
+        this.updateInputWidth();
+        this.convertAndEmit(); // 触发转换
+      });
+    },
+
+    // 执行换算并提交事件
+    convertAndEmit() {
+      // 移除参数
+      if (!this.currentUnit || !this.baseUnit || !this.originalUnit) return;
+
+      let newValue = 0;
+      if (this.unitType === 'temperature') {
+        newValue = this.handleTemperatureConversion(this.originalUnit, this.currentUnit);
+      } else {
+        // 通过基准单位进行两次精确转换
+        const baseValue = this.originalValue / this.originalUnit.conversionFactor;
+        newValue = baseValue * this.currentUnit.conversionFactor;
+      }
+
+      const roundedValue = this.roundValue(newValue);
+      this.isInternalUpdate = true; // 锁定更新
+      this.inputValue = roundedValue;
+      this.$emit('input', roundedValue);
+      this.$emit('update:unitOrder', this.currentUnit.unitOrder);
+
+      this.$emit('conversion', {
+        initialValue: this.originalValue,
+        newValue: roundedValue,
+        oldUnit: this.originalUnit.unitName,
+        newUnit: this.currentUnit.unitName,
+        oldOrder: this.originalUnit.unitOrder,
+        newOrder: this.currentUnit.unitOrder
+      });
+    },
+
+    // 温度单位换算
+    // 温度转换调整（使用原始值）
+    handleTemperatureConversion(oldUnit, newUnit) {
+      const oldOrder = oldUnit.unitOrder;
+      const newOrder = newUnit.unitOrder;
+      // console.log(1111, this.originalValue);
+      // 使用原始值计算
+      let celsius;
+      switch (oldOrder) {
+        case 0:
+          celsius = this.originalValue;
+          break;
+        case 1:
+          celsius = ((this.originalValue - 32) * 5) / 9;
+          break;
+        case 2:
+          celsius = this.originalValue - 273.15;
+          break;
+        default:
+          throw new Error('无效温度单位');
+      }
+
+      switch (newOrder) {
+        case 0:
+          return celsius;
+        case 1:
+          return (celsius * 9) / 5 + 32;
+        case 2:
+          return celsius + 273.15;
+        default:
+          throw new Error('无效温度单位');
+      }
+    },
+
+    // 四舍六入五成双
+    roundValue(value) {
+      const multiplier = Math.pow(10, this.decimalPlaces);
+      const val = value * multiplier;
+      const intVal = Math.trunc(val);
+      const decimalPart = val - intVal;
+      if (decimalPart < 0.5) {
+        return intVal / multiplier;
+      } else if (decimalPart > 0.5) {
+        return (intVal + 1) / multiplier;
+      } else {
+        return intVal % 2 === 0 ? intVal / multiplier : (intVal + 1) / multiplier;
+      }
     }
-  };
+  }
+};
 </script>
 
 <style scoped>
-  .unit-converter {
-    display: flex;
-    align-items: center;
-    gap: 2px;
-    position: relative;
-  }
+.unit-converter {
+  display: flex;
+  align-items: center;
+  gap: 2px;
+  position: relative;
+}
 
-  .input-field {
-    border: 1px solid #d6d5d5;
-    border-radius: 4px;
-    font-size: 14px;
-  }
+.input-field {
+  border: 1px solid #d6d5d5;
+  border-radius: 4px;
+  font-size: 14px;
+}
 
-  .unit-label {
-    cursor: pointer;
-    font-weight: bold;
-    border: 1px solid #d6d5d5;
-    border-radius: 4px;
-    font-size: 12px;
-    padding-left: 10px;
-    padding-right: 5px;
-    white-space: nowrap;
-  }
+.unit-label {
+  cursor: pointer;
+  font-weight: bold;
+  border: 1px solid #d6d5d5;
+  border-radius: 4px;
+  font-size: 12px;
+  padding-left: 10px;
+  padding-right: 5px;
+  white-space: nowrap;
+}
 
-  .unit-label:hover {
-    background: #f0f8ff;
-  }
+.unit-label:hover {
+  background: #f0f8ff;
+}
 
-  .unit-selector {
-    /* 设置容器的最大高度，当内容超出这个高度时会出现滚动条 */
-    max-height: 100px;
-    /* 超出内容时显示纵向滚动条 */
-    overflow-y: auto;
-    /* 横向内容不溢出，隐藏多余部分 */
-    overflow-x: hidden;
-    /* 其他样式保持不变 */
-    position: absolute;
-    z-index: 9999;
-    background-color: white;
-    border: 1px solid #ccc;
-    border-radius: 4px;
-    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-    padding: 2px 0;
-    min-width: 200px;
-    list-style-type: none;
-    margin-left: 100px;
-  }
+.unit-selector {
+  /* 设置容器的最大高度，当内容超出这个高度时会出现滚动条 */
+  max-height: 100px;
+  /* 超出内容时显示纵向滚动条 */
+  overflow-y: auto;
+  /* 横向内容不溢出，隐藏多余部分 */
+  overflow-x: hidden;
+  /* 其他样式保持不变 */
+  position: absolute;
+  z-index: 9999;
+  background-color: white;
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  padding: 2px 0;
+  min-width: 200px;
+  list-style-type: none;
+  margin-left: 100px;
+}
 
-  .unit-option {
-    padding: 2px 10px;
-    cursor: pointer;
-    font-size: 14px;
-  }
+.unit-option {
+  padding: 2px 10px;
+  cursor: pointer;
+  font-size: 14px;
+}
 
-  .unit-option:hover {
-    background-color: #f0f0f0;
-  }
+.unit-option:hover {
+  background-color: #f0f0f0;
+}
 </style>
diff --git a/src/components/inputValueUnit/index_old.vue b/src/components/inputValueUnit/index_old.vue
deleted file mode 100644
index e08fca1..0000000
--- a/src/components/inputValueUnit/index_old.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-  <div class="unit-converter">
-    <!-- 数值输入框 -->
-    <input v-model="inputValue" type="number" @input="handleInputChange" class="input-field" :style="{ width: width + 'px' }" />
-    <!-- 单位标签 -->
-    <span @click="toggleUnit" @dblclick="toggleUnitSelector" class="unit-label" :style="{ color: 'blue' }">
-      {{ displayUnitName }}
-    </span>
-    <!-- 单位选择弹出窗口 -->
-    <div v-if="showUnitSelector" class="unit-selector" ref="unitSelector">
-      <div v-for="unit in filteredUnitList" :key="unit.id" @click="selectUnit(unit)" class="unit-option">
-        {{ showEnglishOnly ? unit.unitName.split('(')[0] : unit.unitName }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import { number } from 'echarts';
-import { listSysUnitConvert } from '@/api/system/sysUnitConvert.js';
-
-export default {
-  props: {
-    // 单位类型
-    unitType: {
-      type: String,
-      required: true
-    },
-    // 是否只显示英文部分
-    showEnglishOnly: {
-      type: Boolean,
-      default: false
-    },
-    // 当前单位名称
-    unitOrder: {
-      type: number,
-      required: false,
-      default: 0
-    },
-    // 当前数值
-    value: {
-      type: Number,
-      required: true
-    },
-    // 小数点位数
-    decimalPlaces: {
-      type: Number,
-      default: 2
-    },
-    width: {
-      type: Number,
-      required: false,
-      default: 80
-    }
-  },
-  mounted() {
-    // 在挂载时添加全局点击事件监听器
-    document.addEventListener('click', this.handleClickOutside);
-  },
-  beforeUnmount() {
-    // 在组件销毁前移除全局点击事件监听器
-    document.removeEventListener('click', this.handleClickOutside);
-  },
-  data() {
-    return {
-      inputValue: this.value, // 输入的数值
-      currentUnit: null, // 当前单位
-      unitList: [], // 单位列表
-      showUnitSelector: false // 是否显示单位选择窗口
-    };
-  },
-  computed: {
-    // 显示的单位名称  instanceof
-    displayUnitName() {
-      console.log('-----------------------------' + this.currentUnit.unitName);
-      if (!this.currentUnit) return '';
-      return this.showEnglishOnly ? this.currentUnit.unitName.split('(')[0] : this.currentUnit.unitName;
-    },
-    // 过滤后的单位列表（排除当前单位）
-    filteredUnitList() {
-      return this.unitList.filter((unit) => unit.unitOrder !== this.currentUnit?.unitOrder);
-    }
-  },
-  watch: {
-    // 监听 unitType 变化，重新加载单位列表
-    unitType: {
-      immediate: true,
-      handler(newVal) {
-        this.loadUnitList(newVal);
-      }
-    },
-    // 监听 unitName 变化，更新当前单位
-    unitOrder: {
-      immediate: true,
-      handler(newVal) {
-        console.log(newVal);
-        this.currentUnit = this.unitList.find((unit) => unit.unitOrder == newVal);
-      }
-    },
-    // 监听 value 变化，更新输入框的值
-    value: {
-      immediate: true,
-      handler(newVal) {
-        this.inputValue = newVal;
-      }
-    }
-  },
-  methods: {
-    // 处理全局点击事件
-    handleClickOutside(event) {
-      if (this.$refs.unitSelector && !this.$refs.unitSelector.contains(event.target)) {
-        this.showUnitSelector = false;
-      }
-    },
-    // 切换单位选择器的显示状态
-    toggleUnitSelector() {
-      this.showUnitSelector = !this.showUnitSelector;
-    },
-    // 加载单位列表
-    async loadUnitList(unitType) {
-      try {
-        const response = await listConversion({ pageSize: 100, unitType: unitType });
-        this.unitList = response.rows;
-        // if (this.unitOrder == ) {
-        //   //处理默认基准单位
-
-        //   this.currentUnit = this.unitList.find((unit) => unit.baseUnit == 1);
-        //   console.log(this.currentUnit);
-        // } else {
-        this.currentUnit = this.unitList.find((unit) => unit.unitOrder == this.unitOrder);
-        // console.log(this.currentUnit);
-        // if (this.currentUnit === undefined) {
-        //   this.currentUnit = this.unitList.find((unit) => unit.baseUnit === 1);
-        // }
-        // }
-      } catch (error) {
-        console.error('Failed to load unit list:', error);
-      }
-    },
-    // 处理输入框变化
-    handleInputChange() {
-      this.$emit('input', this.inputValue); // 将输入值同步到父组件
-      this.convertAndEmit();
-    },
-    // 切换单位
-    toggleUnit() {
-      const currentIndex = this.unitList.indexOf(this.currentUnit);
-      const nextIndex = (currentIndex + 1) % this.unitList.length;
-      let oldUnit = this.currentUnit;
-      let newUnit = this.unitList[nextIndex];
-      this.currentUnit = newUnit;
-      console.log('切换单位', currentIndex, nextIndex, this.currentUnit);
-      this.convertAndEmit(oldUnit, newUnit);
-    },
-    // 打开单位选择窗口
-    openUnitSelector() {
-      this.showUnitSelector = true;
-    },
-    // 选择单位
-    selectUnit(unit) {
-      console.log('所选择的单位', unit);
-      let oldUnit = this.currentUnit;
-      let newUnit = unit;
-      this.currentUnit = unit;
-      this.showUnitSelector = false;
-      this.convertAndEmit(oldUnit, newUnit);
-    },
-    // 换算并提交结果
-    convertAndEmit(oldUnit, newUnit) {
-      if (!newUnit) return;
-      // 获取基准单位
-      const baseUnit = this.unitList.find((unit) => unit.baseUnit === 1);
-      if (!baseUnit) return;
-      // 将输入值转换为基准单位的值
-      const baseValue = this.inputValue / oldUnit.conversionFactor;
-      // 将基准单位的值转换为新单位的值
-      const newValue = baseValue * newUnit.conversionFactor;
-
-      console.log('转换值', this.inputValue, baseValue, newValue);
-
-      let roundedValue = 0;
-      if (newUnit.unitName != 'ly(光年)') {
-        roundedValue = this.roundToDecimalPlaces(newValue);
-      } else {
-        roundedValue = newValue;
-      }
-
-      // 提交结果给父组件
-      this.$emit('conversion', {
-        initialValue: this.inputValue,
-        newValue: roundedValue,
-        oldUnit: oldUnit.unitOrder,
-        newUnit: newUnit.unitOrder
-      });
-      this.inputValue = roundedValue;
-
-      // 更新父组件的 unitName
-      this.$emit('update:unitOrder', this.newUnit.unitOrder);
-      this.$emit('input', roundedValue);
-    },
-    // 四舍六入五留双
-    // 按照四舍六入五留双处理结果 conversionFactor
-    roundToDecimalPlaces(value) {
-      const multiplier = Math.pow(10, this.decimalPlaces);
-      const val = value * multiplier;
-      const intVal = Math.trunc(val);
-      const decimalPart = val - intVal;
-      if (decimalPart < 0.5) {
-        return intVal / multiplier;
-      } else if (decimalPart > 0.5) {
-        return (intVal + 1) / multiplier;
-      } else {
-        return intVal % 2 === 0 ? intVal / multiplier : (intVal + 1) / multiplier;
-      }
-    }
-  }
-};
-</script>
-
-<style scoped>
-.unit-converter {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  position: relative;
-}
-
-.input-field {
-  padding: 2px;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  font-size: 14px;
-  height: 50px;
-}
-
-.unit-label {
-  cursor: pointer;
-  font-weight: bold;
-  font-size: 12px;
-}
-
-.unit-selector {
-  /* 设置容器的最大高度，当内容超出这个高度时会出现滚动条 */
-  max-height: 200px;
-  /* 超出内容时显示纵向滚动条 */
-  overflow-y: auto;
-  /* 横向内容不溢出，隐藏多余部分 */
-  overflow-x: hidden;
-  /* 其他样式保持不变 */
-  position: absolute;
-  z-index: 1000;
-  background-color: white;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-  padding: 2px 0;
-  min-width: 100px;
-  list-style-type: none;
-  margin: 0;
-}
-
-.unit-option {
-  padding: 2px 10px;
-  cursor: pointer;
-  font-size: 14px;
-}
-
-.unit-option:hover {
-  background-color: #f0f0f0;
-}
-</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 466cd98..eb5815b 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -2,11 +2,14 @@
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
 
-    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
-    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+    <!-- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/> -->
 
+    <div class="left-menu" v-if="topNav">
+      <p style="color: white">欢迎进入天然气工具系统平台</p>
+    </div>
     <div class="right-menu">
-      <template v-if="device!=='mobile'">
+      <template v-if="device !== 'mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <el-tooltip content="源码地址" effect="dark" placement="bottom">
@@ -22,12 +25,11 @@
         <el-tooltip content="布局大小" effect="dark" placement="bottom">
           <size-select id="size-select" class="right-menu-item hover-effect" />
         </el-tooltip>
-
       </template>
 
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
-          <img :src="avatar" class="user-avatar">
+          <img :src="avatar" class="user-avatar" />
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown">
@@ -47,15 +49,15 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Breadcrumb from '@/components/Breadcrumb'
-import TopNav from '@/components/TopNav'
-import Hamburger from '@/components/Hamburger'
-import Screenfull from '@/components/Screenfull'
-import SizeSelect from '@/components/SizeSelect'
-import Search from '@/components/HeaderSearch'
-import RuoYiGit from '@/components/RuoYi/Git'
-import RuoYiDoc from '@/components/RuoYi/Doc'
+import { mapGetters } from 'vuex';
+import Breadcrumb from '@/components/Breadcrumb';
+import TopNav from '@/components/TopNav';
+import Hamburger from '@/components/Hamburger';
+import Screenfull from '@/components/Screenfull';
+import SizeSelect from '@/components/SizeSelect';
+import Search from '@/components/HeaderSearch';
+import RuoYiGit from '@/components/RuoYi/Git';
+import RuoYiDoc from '@/components/RuoYi/Doc';
 
 export default {
   components: {
@@ -69,45 +71,43 @@ export default {
     RuoYiDoc
   },
   computed: {
-    ...mapGetters([
-      'sidebar',
-      'avatar',
-      'device'
-    ]),
+    ...mapGetters(['sidebar', 'avatar', 'device']),
     setting: {
       get() {
-        return this.$store.state.settings.showSettings
+        return this.$store.state.settings.showSettings;
       },
       set(val) {
         this.$store.dispatch('settings/changeSetting', {
           key: 'showSettings',
           value: val
-        })
+        });
       }
     },
     topNav: {
       get() {
-        return this.$store.state.settings.topNav
+        return this.$store.state.settings.topNav;
       }
     }
   },
   methods: {
     toggleSideBar() {
-      this.$store.dispatch('app/toggleSideBar')
+      this.$store.dispatch('app/toggleSideBar');
     },
     async logout() {
       this.$confirm('确定注销并退出系统吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
-      }).then(() => {
-        this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+      })
+        .then(() => {
+          this.$store.dispatch('LogOut').then(() => {
+            location.href = '/index';
+          });
         })
-      }).catch(() => {});
+        .catch(() => {});
     }
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -115,19 +115,19 @@ export default {
   height: 50px;
   overflow: hidden;
   position: relative;
-  background: #fff;
-  box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  background: #19b6ff;
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   .hamburger-container {
     line-height: 46px;
     height: 100%;
     float: left;
     cursor: pointer;
-    transition: background .3s;
-    -webkit-tap-highlight-color:transparent;
+    transition: background 0.3s;
+    -webkit-tap-highlight-color: transparent;
 
     &:hover {
-      background: rgba(0, 0, 0, .025)
+      background: rgba(0, 0, 0, 0.025);
     }
   }
 
@@ -159,15 +159,15 @@ export default {
       padding: 0 8px;
       height: 100%;
       font-size: 18px;
-      color: #5a5e66;
+      color: #ffffff;
       vertical-align: text-bottom;
 
       &.hover-effect {
         cursor: pointer;
-        transition: background .3s;
+        transition: background 0.3s;
 
         &:hover {
-          background: rgba(0, 0, 0, .025)
+          background: rgba(0, 0, 0, 0.025);
         }
       }
     }
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 2774cc8..e56a762 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -1,21 +1,25 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }"
+  >
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }}</h1>
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/logo/logo.png'
-import variables from '@/assets/styles/variables.scss'
+import logoImg from '@/assets/logo/logo.png';
+import variables from '@/assets/styles/variables.scss';
 
 export default {
   name: 'SidebarLogo',
@@ -30,16 +34,16 @@ export default {
       return variables;
     },
     sideTheme() {
-      return this.$store.state.settings.sideTheme
+      return this.$store.state.settings.sideTheme;
     }
   },
   data() {
     return {
       title: process.env.VUE_APP_TITLE,
       logo: logoImg
-    }
+    };
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 51d0839..0cf7e67 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,57 +1,52 @@
 <template>
-    <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
-        <logo v-if="showLogo" :collapse="isCollapse" />
-        <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
-            <el-menu
-                :default-active="activeMenu"
-                :collapse="isCollapse"
-                :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
-                :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
-                :unique-opened="true"
-                :active-text-color="settings.theme"
-                :collapse-transition="false"
-                mode="vertical"
-            >
-                <sidebar-item
-                    v-for="(route, index) in sidebarRouters"
-                    :key="route.path  + index"
-                    :item="route"
-                    :base-path="route.path"
-                />
-            </el-menu>
-        </el-scrollbar>
-    </div>
+  <div :class="{ 'has-logo': showLogo }" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+    <logo v-if="showLogo" :collapse="isCollapse" />
+    <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
+      <el-menu
+        :default-active="activeMenu"
+        :collapse="isCollapse"
+        :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
+        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor"
+        :unique-opened="true"
+        :active-text-color="settings.theme"
+        :collapse-transition="false"
+        mode="vertical"
+      >
+        <sidebar-item v-for="(route, index) in sidebarRouters" :key="route.path + index" :item="route" :base-path="route.path" />
+      </el-menu>
+    </el-scrollbar>
+  </div>
 </template>
 
 <script>
-import { mapGetters, mapState } from "vuex";
-import Logo from "./Logo";
-import SidebarItem from "./SidebarItem";
-import variables from "@/assets/styles/variables.scss";
+import { mapGetters, mapState } from 'vuex';
+import Logo from './Logo';
+import SidebarItem from './SidebarItem';
+import variables from '@/assets/styles/variables.scss';
 
 export default {
-    components: { SidebarItem, Logo },
-    computed: {
-        ...mapState(["settings"]),
-        ...mapGetters(["sidebarRouters", "sidebar"]),
-        activeMenu() {
-            const route = this.$route;
-            const { meta, path } = route;
-            // if set path, the sidebar will highlight the path you set
-            if (meta.activeMenu) {
-                return meta.activeMenu;
-            }
-            return path;
-        },
-        showLogo() {
-            return this.$store.state.settings.sidebarLogo;
-        },
-        variables() {
-            return variables;
-        },
-        isCollapse() {
-            return !this.sidebar.opened;
-        }
+  components: { SidebarItem, Logo },
+  computed: {
+    ...mapState(['settings']),
+    ...mapGetters(['sidebarRouters', 'sidebar']),
+    activeMenu() {
+      const route = this.$route;
+      const { meta, path } = route;
+      // if set path, the sidebar will highlight the path you set
+      if (meta.activeMenu) {
+        return meta.activeMenu;
+      }
+      return path;
+    },
+    showLogo() {
+      return this.$store.state.settings.sidebarLogo;
+    },
+    variables() {
+      return variables;
+    },
+    isCollapse() {
+      return !this.sidebar.opened;
     }
+  }
 };
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index 71907b6..191d280 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -29,17 +29,14 @@ import Layout from '@/layout'
  */
 
 // 公共路由
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
-    children: [
-      {
-        path: '/redirect/:path(.*)',
-        component: () => import('@/views/redirect')
-      }
-    ]
+    children: [{
+      path: '/redirect/:path(.*)',
+      component: () => import('@/views/redirect')
+    }]
   },
   {
     path: '/login',
@@ -65,102 +62,109 @@ export const constantRoutes = [
     path: '',
     component: Layout,
     redirect: 'index',
-    children: [
-      {
-        path: 'index',
-        component: () => import('@/views/index'),
-        name: 'Index',
-        meta: { title: '首页', icon: 'dashboard', affix: true }
+    children: [{
+      path: 'index',
+      component: () => import('@/views/index'),
+      name: 'Index',
+      meta: {
+        title: '首页',
+        icon: 'dashboard',
+        affix: true
       }
-    ]
+    }]
   },
   {
     path: '/user',
     component: Layout,
     hidden: true,
     redirect: 'noredirect',
-    children: [
-      {
-        path: 'profile',
-        component: () => import('@/views/system/user/profile/index'),
-        name: 'Profile',
-        meta: { title: '个人中心', icon: 'user' }
+    children: [{
+      path: 'profile',
+      component: () => import('@/views/system/user/profile/index'),
+      name: 'Profile',
+      meta: {
+        title: '个人中心',
+        icon: 'user'
       }
-    ]
+    }]
   }
 ]
 
 // 动态路由，基于用户权限动态去加载
-export const dynamicRoutes = [
-  {
+export const dynamicRoutes = [{
     path: '/system/user-auth',
     component: Layout,
     hidden: true,
     permissions: ['system:user:edit'],
-    children: [
-      {
-        path: 'role/:userId(\\d+)',
-        component: () => import('@/views/system/user/authRole'),
-        name: 'AuthRole',
-        meta: { title: '分配角色', activeMenu: '/system/user' }
+    children: [{
+      path: 'role/:userId(\\d+)',
+      component: () => import('@/views/system/user/authRole'),
+      name: 'AuthRole',
+      meta: {
+        title: '分配角色',
+        activeMenu: '/system/user'
       }
-    ]
+    }]
   },
   {
     path: '/system/role-auth',
     component: Layout,
     hidden: true,
     permissions: ['system:role:edit'],
-    children: [
-      {
-        path: 'user/:roleId(\\d+)',
-        component: () => import('@/views/system/role/authUser'),
-        name: 'AuthUser',
-        meta: { title: '分配用户', activeMenu: '/system/role' }
+    children: [{
+      path: 'user/:roleId(\\d+)',
+      component: () => import('@/views/system/role/authUser'),
+      name: 'AuthUser',
+      meta: {
+        title: '分配用户',
+        activeMenu: '/system/role'
       }
-    ]
+    }]
   },
   {
     path: '/system/dict-data',
     component: Layout,
     hidden: true,
     permissions: ['system:dict:list'],
-    children: [
-      {
-        path: 'index/:dictId(\\d+)',
-        component: () => import('@/views/system/dict/data'),
-        name: 'Data',
-        meta: { title: '字典数据', activeMenu: '/system/dict' }
+    children: [{
+      path: 'index/:dictId(\\d+)',
+      component: () => import('@/views/system/dict/data'),
+      name: 'Data',
+      meta: {
+        title: '字典数据',
+        activeMenu: '/system/dict'
       }
-    ]
+    }]
   },
   {
     path: '/monitor/job-log',
     component: Layout,
     hidden: true,
     permissions: ['monitor:job:list'],
-    children: [
-      {
-        path: 'index/:jobId(\\d+)',
-        component: () => import('@/views/monitor/job/log'),
-        name: 'JobLog',
-        meta: { title: '调度日志', activeMenu: '/monitor/job' }
+    children: [{
+      path: 'index/:jobId(\\d+)',
+      component: () => import('@/views/monitor/job/log'),
+      name: 'JobLog',
+      meta: {
+        title: '调度日志',
+        activeMenu: '/monitor/job'
       }
-    ]
+    }]
   },
   {
     path: '/tool/gen-edit',
     component: Layout,
     hidden: true,
     permissions: ['tool:gen:edit'],
-    children: [
-      {
-        path: 'index/:tableId(\\d+)',
-        component: () => import('@/views/tool/gen/editTable'),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置', activeMenu: '/tool/gen' }
+    children: [{
+      path: 'index/:tableId(\\d+)',
+      component: () => import('@/views/tool/gen/editTable'),
+      name: 'GenEdit',
+      meta: {
+        title: '修改生成配置',
+        activeMenu: '/tool/gen'
       }
-    ]
+    }]
   }
 ]
 
@@ -178,6 +182,8 @@ Router.prototype.replace = function push(location) {
 
 export default new Router({
   mode: 'history', // 去掉url中的#
-  scrollBehavior: () => ({ y: 0 }),
+  scrollBehavior: () => ({
+    y: 0
+  }),
   routes: constantRoutes
 })
diff --git a/src/views/index.vue b/src/views/index.vue
index 6f6168d..aa95d72 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,1034 +1,64 @@
 <template>
-  <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="24">
-        <blockquote class="text-warning" style="font-size: 14px">
-          阿里云服务器折扣区
-          <el-link href="http://aly.ruoyi.vip" type="primary" target="_blank">☛☛点我进入☚☚</el-link>
-          &nbsp;&nbsp;&nbsp; 腾讯云服务器秒杀区
-          <el-link href="http://txy.ruoyi.vip" type="primary" target="_blank">☛☛点我进入☚☚</el-link>
-        </blockquote>
-        <hr />
-      </el-col>
-    </el-row>
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>若依后台管理框架</h2>
-        <p>
-          一直想做一款后台管理系统，看了很多优秀的开源项目但是发现没有合适自己的。于是利用空闲休息时间开始自己写一套后台系统。如此有了若依管理系统，她可以用于所有的Web应用程序，如网站管理后台，网站会员中心，CMS，CRM，OA等等，当然，您也可以对她进行深度定制，以做出更强系统。所有前端后台代码封装过后十分精简易上手，出错概率低。同时支持移动客户端访问。系统会陆续更新一些实用功能。
-        </p>
-        <p>
-          <b>当前版本:</b>
-          <span>v{{ version }}</span>
-        </p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button type="primary" size="mini" icon="el-icon-cloudy" plain @click="goTarget('https://gitee.com/y_project/RuoYi-Vue')">访问码云</el-button>
-          <el-button size="mini" icon="el-icon-s-home" plain @click="goTarget('http://ruoyi.vip')">访问主页</el-button>
-        </p>
-      </el-col>
+  <div class="container">
+    <!-- 顶部区域 -->
+    <div class="top"><h2>天然气工具系统 简要说明</h2></div>
+    <hr style="border: 1px solid #ccc; margin: 20px 0" />
+    <!-- <el-divider></el-divider> -->
+    <div class="middle">
+      <!-- 左侧区域 -->
+      <div class="left"></div>
+      <!-- 右侧区域 -->
+      <div class="right">
+        <div class="content" style="overflow-y: auto; height: calc(100vh - 230px)">
+          <p>
+            天然气工具系统 是一款采用 vue
+            2和springboot前后端分离技术开发的网页版天然气计量计算和专业信息的专业软件。借助先进的前端框架，提供更流畅、便捷的操作体验，无需安装，通过网页即可直接使用。
+          </p>
 
-      <el-col :sm="24" :lg="12" style="padding-left: 50px">
-        <el-row>
-          <el-col :span="12">
-            <h2>技术选型</h2>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="6">
-            <h4>后端技术</h4>
-            <ul>
-              <li>SpringBoot</li>
-              <li>Spring Security</li>
-              <li>JWT</li>
-              <li>MyBatis</li>
-              <li>Druid</li>
-              <li>Fastjson</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-          <el-col :span="6">
-            <h4>前端技术</h4>
-            <ul>
-              <li>Vue</li>
-              <li>Vuex</li>
-              <li>Element-ui</li>
-              <li>Axios</li>
-              <li>Sass</li>
-              <li>Quill</li>
-              <li>...</li>
-            </ul>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-    <el-divider />
-    <el-row :gutter="20">
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>联系信息</span>
-          </div>
-          <div class="body">
-            <p>
-              <i class="el-icon-s-promotion"></i>
-              官网：
-              <el-link href="http://www.ruoyi.vip" target="_blank">http://www.ruoyi.vip</el-link>
-            </p>
-            <p>
-              <i class="el-icon-user-solid"></i>
-              QQ群：
-              <s>满937441</s>
-              <s>满887144332</s>
-              <s>满180251782</s>
-              <s>满104180207</s>
-              <s>满186866453</s>
-              <s>满201396349</s>
-              <s>满101456076</s>
-              <s>满101539465</s>
-              <s>满264312783</s>
-              <s>满167385320</s>
-              <s>满104748341</s>
-              <s>满160110482</s>
-              <s>满170801498</s>
-              <s>满108482800</s>
-              <s>满101046199</s>
-              <s>满136919097</s>
-              <s>满143961921</s>
-              <s>满174951577</s>
-              <s>满161281055</s>
-              <s>满138988063</s>
-              <s>满151450850</s>
-              <s>满224622315</s>
-              <s>满287842588</s>
-              <a
-                href="http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=HKz42pk2zQ1WUMbbRo50-N7tY4IDKKrj&authKey=ukBg3edmUbnmoo40xZCo6R1tYdTglYJ1nBFRW9gTHuZwLI1r8wgFT6cWUrAldwcr&noverify=0&group_code=187944233"
-                target="_blank"
-              >
-                187944233
-              </a>
-            </p>
-            <p>
-              <i class="el-icon-chat-dot-round"></i>
-              微信：
-              <a href="javascript:;">/ *若依</a>
-            </p>
-            <p>
-              <i class="el-icon-money"></i>
-              支付宝：
-              <a href="javascript:;" class="支付宝信息">/ *若依</a>
-            </p>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>更新日志</span>
-          </div>
-          <el-collapse accordion>
-            <el-collapse-item title="v3.8.9 - 2024-12-30">
-              <ol>
-                <li>用户管理支持分栏拖动</li>
-                <li>修改主题样式本地读取</li>
-                <li>用户头像http(s)链接支持</li>
-                <li>用户管理过滤掉已禁用部门</li>
-                <li>支持自定义显示Excel属性列</li>
-                <li>操作日志记录DELETE请求参数</li>
-                <li>白名单支持对通配符路径匹配</li>
-                <li>校检文件名是否包含特殊字符</li>
-                <li>代码生成创建表屏蔽违规的字符</li>
-                <li>菜单面包屑导航支持多层级显示</li>
-                <li>Excel注解支持wrapText是否允许内容换行</li>
-                <li>代码生成新增配置是否允许文件覆盖到本地</li>
-                <li>修复角色禁用权限不失效问题</li>
-                <li>修复代码生成上级菜单显示问题</li>
-                <li>修复导出子列表对象只能在最后的问题</li>
-                <li>修复TopNav无法正确获取active的问题</li>
-                <li>修复默认关闭Tags-Views内链页面打不开</li>
-                <li>升级oshi到最新版本6.6.5</li>
-                <li>升级tomcat到最新版本9.0.96</li>
-                <li>升级fastjson到最新版2.0.53</li>
-                <li>升级logback到最新版本1.2.13</li>
-                <li>升级spring-framework到最新版本5.3.39</li>
-                <li>升级quill到最新版本2.0.2</li>
-                <li>升级axios到最新版本0.28.1</li>
-                <li>优化身份证脱敏正则</li>
-                <li>优化权限更新后同步缓存</li>
-                <li>优化查询时间范围日期格式</li>
-                <li>优化参数键值更换为多行文本</li>
-                <li>优化导入带标题文件关闭清理</li>
-                <li>优化上传图片带域名不增加前缀</li>
-                <li>优化特殊字符密码修改失败问题</li>
-                <li>优化无用户编号不校验数据权限</li>
-                <li>优化TopNav内链菜单点击没有高亮</li>
-                <li>优化菜单管理切换Mini布局错乱问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.8 - 2024-06-30">
-              <ol>
-                <li>菜单管理新增路由名称</li>
-                <li>新增数据脱敏过滤注解</li>
-                <li>用户密码新增非法字符验证</li>
-                <li>限制用户操作数据权限范围</li>
-                <li>代码生成新增创建表结构功能</li>
-                <li>定时任务白名单配置范围缩小</li>
-                <li>优化代码生成主子表关联查询方式</li>
-                <li>Excel注解新增属性comboReadDict</li>
-                <li>Excel注解ColumnType类型新增文本</li>
-                <li>新增国际化资源文件配置</li>
-                <li>升级oshi到最新版本6.6.1</li>
-                <li>升级druid到最新版本1.2.23</li>
-                <li>升级core-js到最新版本3.37.1</li>
-                <li>更新HttpUtils中的User-Agent</li>
-                <li>更新compressionPlugin到6.1.2以兼容node18+</li>
-                <li>升级spring-security到安全版本，防止漏洞风险</li>
-                <li>升级spring-framework到安全版本，防止漏洞风险</li>
-                <li>优化自定义XSS注解匹配方式</li>
-                <li>优化缓存监控键名列表排序显示</li>
-                <li>优化定时任务日志默认按时间排序</li>
-                <li>优化默认文件大小超过2G无效的问题</li>
-                <li>优化查表特殊字符使用反斜杠进行转义</li>
-                <li>优化定时任务cron表达式小时配置显示错误问题</li>
-                <li>优化多个自定数据权限使用in查询,避免多次拼接</li>
-                <li>优化导入Excel时设置dictType属性重复查缓存问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.7 - 2023-12-08">
-              <ol>
-                <li>操作日志记录部门名称</li>
-                <li>全局数据存储用户编号</li>
-                <li>新增编程式判断资源访问权限</li>
-                <li>操作日志列表新增IP地址查询</li>
-                <li>定时任务新增页去除状态选项</li>
-                <li>代码生成支持选择前端模板类型</li>
-                <li>显隐列组件支持复选框弹出类型</li>
-                <li>通用排序属性orderBy参数限制长度</li>
-                <li>Excel自定义数据处理器增加单元格/工作簿对象</li>
-                <li>升级oshi到最新版本6.4.8</li>
-                <li>升级druid到最新版本1.2.20</li>
-                <li>升级fastjson到最新版2.0.43</li>
-                <li>升级pagehelper到最新版1.4.7</li>
-                <li>升级commons.io到最新版本2.13.0</li>
-                <li>升级element-ui到最新版本2.15.14</li>
-                <li>修复五级路由缓存无效问题</li>
-                <li>修复外链带端口出现的异常</li>
-                <li>修复树模板父级编码变量错误</li>
-                <li>修复字典表详情页面搜索问题</li>
-                <li>修复内链iframe没有传递参数问题</li>
-                <li>修复自定义字典样式不生效的问题</li>
-                <li>修复字典缓存删除方法参数错误问题</li>
-                <li>修复Excel导入数据临时文件无法删除问题</li>
-                <li>修复未登录带参数访问成功后参数丢失问题</li>
-                <li>修复HeaderSearch组件跳转query参数丢失问题</li>
-                <li>修复代码生成导入后必填项与数据库不匹配问题</li>
-                <li>修复Excels导入时无法获取到dictType字典值问题</li>
-                <li>优化下载zip方法新增遮罩层</li>
-                <li>优化头像上传参数新增文件名称</li>
-                <li>优化字典标签支持自定义分隔符</li>
-                <li>优化菜单管理类型为按钮状态可选</li>
-                <li>优化前端防重复提交数据大小限制</li>
-                <li>优化TopNav菜单没有图标svg不显示</li>
-                <li>优化数字金额大写转换精度丢失问题</li>
-                <li>优化富文本Editor组件检验图片格式</li>
-                <li>优化页签在Firefox浏览器被遮挡的问题</li>
-                <li>优化个人中心/基本资料修改时数据显示问题</li>
-                <li>优化缓存监控图表支持跟随屏幕大小自适应调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.6 - 2023-06-30">
-              <ol>
-                <li>支持登录IP黑名单限制</li>
-                <li>新增监控页面图标显示</li>
-                <li>操作日志新增消耗时间属性</li>
-                <li>屏蔽定时任务bean违规的字符</li>
-                <li>日志管理使用索引提升查询性能</li>
-                <li>日志注解支持排除指定的请求参数</li>
-                <li>支持自定义隐藏属性列过滤子对象</li>
-                <li>升级oshi到最新版本6.4.3</li>
-                <li>升级druid到最新版本1.2.16</li>
-                <li>升级fastjson到最新版2.0.34</li>
-                <li>升级spring-boot到最新版本2.5.15</li>
-                <li>升级element-ui到最新版本2.15.13</li>
-                <li>移除apache/commons-fileupload依赖</li>
-                <li>修复页面切换时布局错乱的问题</li>
-                <li>修复匿名注解Anonymous空指针问题</li>
-                <li>修复路由跳转被阻止时内部产生报错信息问题</li>
-                <li>修复isMatchedIp的参数判断产生空指针的问题</li>
-                <li>修复用户多角色数据权限可能出现权限抬升的情况</li>
-                <li>修复开启TopNav后一级菜单路由参数设置无效问题</li>
-                <li>修复DictTag组件value没有匹配的值时则展示value</li>
-                <li>优化文件下载出现的异常</li>
-                <li>优化选择图标组件高亮回显</li>
-                <li>优化弹窗后导航栏偏移的问题</li>
-                <li>优化修改密码日志存储明文问题</li>
-                <li>优化页签栏关闭其他出现的异常问题</li>
-                <li>优化页签关闭左侧选项排除首页选项</li>
-                <li>优化关闭当前tab页跳转最右侧tab页</li>
-                <li>优化缓存列表清除操作提示不变的问题</li>
-                <li>优化字符未使用下划线不进行驼峰式处理</li>
-                <li>优化用户导入更新时需获取用户编号问题</li>
-                <li>优化侧边栏的平台标题与VUE_APP_TITLE保持同步</li>
-                <li>优化导出Excel时设置dictType属性重复查缓存问题</li>
-                <li>连接池Druid支持新的配置connectTimeout和socketTimeout</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.5 - 2023-01-01">
-              <ol>
-                <li>定时任务违规的字符</li>
-                <li>重置时取消部门选中</li>
-                <li>新增返回警告消息提示</li>
-                <li>忽略不必要的属性数据返回</li>
-                <li>修改参数键名时移除前缓存配置</li>
-                <li>导入更新用户数据前校验数据权限</li>
-                <li>兼容Excel下拉框内容过多无法显示的问题</li>
-                <li>升级echarts到最新版本5.4.0</li>
-                <li>升级core-js到最新版本3.25.3</li>
-                <li>升级oshi到最新版本6.4.0</li>
-                <li>升级kaptcha到最新版2.3.3</li>
-                <li>升级druid到最新版本1.2.15</li>
-                <li>升级fastjson到最新版2.0.20</li>
-                <li>升级pagehelper到最新版1.4.6</li>
-                <li>优化弹窗内容过多展示不全问题</li>
-                <li>优化swagger-ui静态资源使用缓存</li>
-                <li>开启TopNav没有子菜单隐藏侧边栏</li>
-                <li>删除fuse无效选项maxPatternLength</li>
-                <li>优化导出对象的子列表为空会出现[]问题</li>
-                <li>优化编辑头像时透明部分会变成黑色问题</li>
-                <li>优化小屏幕上修改头像界面布局错位的问题</li>
-                <li>修复代码生成勾选属性无效问题</li>
-                <li>修复文件上传组件格式验证问题</li>
-                <li>修复回显数据字典数组异常问题</li>
-                <li>修复sheet超出最大行数异常问题</li>
-                <li>修复Log注解GET请求记录不到参数问题</li>
-                <li>修复调度日志点击多次数据不变化的问题</li>
-                <li>修复主题颜色在Drawer组件不会加载问题</li>
-                <li>修复文件名包含特殊字符的文件无法下载问题</li>
-                <li>修复table中更多按钮切换主题色未生效修复问题</li>
-                <li>修复某些特性的环境生成代码变乱码TXT文件问题</li>
-                <li>修复代码生成图片/文件/单选时选择必填无法校验问题</li>
-                <li>修复某些特性的情况用户编辑对话框中角色和部门无法修改问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.4 - 2022-09-26">
-              <ol>
-                <li>数据逻辑删除不进行唯一验证</li>
-                <li>Excel注解支持导出对象的子列表方法</li>
-                <li>Excel注解支持自定义隐藏属性列</li>
-                <li>Excel注解支持backgroundColor属性设置背景色</li>
-                <li>支持配置密码最大错误次数/锁定时间</li>
-                <li>登录日志新增解锁账户功能</li>
-                <li>通用下载方法新增config配置选项</li>
-                <li>支持多权限字符匹配角色数据权限</li>
-                <li>页面内嵌iframe切换tab不刷新数据</li>
-                <li>操作日志记录支持排除敏感属性字段</li>
-                <li>修复多文件上传报错出现的异常问题</li>
-                <li>修复图片预览组件src属性为null值控制台报错问题</li>
-                <li>升级oshi到最新版本6.2.2</li>
-                <li>升级fastjson到最新版2.0.14</li>
-                <li>升级pagehelper到最新版1.4.3</li>
-                <li>升级core-js到最新版本3.25.2</li>
-                <li>升级element-ui到最新版本2.15.10</li>
-                <li>优化任务过期不执行调度</li>
-                <li>优化字典数据使用store存取</li>
-                <li>优化修改资料头像被覆盖的问题</li>
-                <li>优化修改用户登录账号重复验证</li>
-                <li>优化代码生成同步后值NULL问题</li>
-                <li>优化定时任务支持执行父类方法</li>
-                <li>优化用户个人信息接口防止修改部门</li>
-                <li>优化布局设置使用el-drawer抽屉显示</li>
-                <li>优化没有权限的用户编辑部门缺少数据</li>
-                <li>优化日志注解记录限制请求地址的长度</li>
-                <li>优化excel/scale属性导出单元格数值类型</li>
-                <li>优化日志操作中重置按钮时重复查询的问题</li>
-                <li>优化多个相同角色数据导致权限SQL重复问题</li>
-                <li>优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出）</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.3 - 2022-06-27">
-              <ol>
-                <li>新增缓存列表菜单功能</li>
-                <li>代码生成树表新增(展开/折叠)</li>
-                <li>Excel注解支持color字体颜色</li>
-                <li>新增Anonymous匿名访问不鉴权注解</li>
-                <li>用户头像上传限制只能为图片格式</li>
-                <li>接口使用泛型使其看到响应属性字段</li>
-                <li>检查定时任务bean所在包名是否为白名单配置</li>
-                <li>添加页签openPage支持传递参数</li>
-                <li>用户缓存信息添加部门ancestors祖级列表</li>
-                <li>升级element-ui到最新版本2.15.8</li>
-                <li>升级oshi到最新版本6.1.6</li>
-                <li>升级druid到最新版本1.2.11</li>
-                <li>升级fastjson到最新版2.0.8</li>
-                <li>升级spring-boot到最新版本2.5.14</li>
-                <li>降级jsencrypt版本兼容IE浏览器</li>
-                <li>删除多余的salt字段</li>
-                <li>新增获取不带后缀文件名称方法</li>
-                <li>新增获取配置文件中的属性值方法</li>
-                <li>新增内容编码/解码方便插件集成使用</li>
-                <li>字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）</li>
-                <li>优化设置分页参数默认值</li>
-                <li>优化对空字符串参数处理的过滤</li>
-                <li>优化显示顺序orderNum类型为整型</li>
-                <li>优化表单构建按钮不显示正则校验</li>
-                <li>优化字典数据回显样式下拉框显示值</li>
-                <li>优化R响应成功状态码与全局保持一致</li>
-                <li>优化druid开启wall过滤器出现的异常问题</li>
-                <li>优化用户管理左侧树型组件增加选中高亮保持</li>
-                <li>优化新增用户与角色信息&用户与岗位信息逻辑</li>
-                <li>优化默认不启用压缩文件缓存防止node_modules过大</li>
-                <li>修复字典数据显示不全问题</li>
-                <li>修复操作日志查询类型条件为0时会查到所有数据</li>
-                <li>修复Excel注解prompt/combo同时使用不生效问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.2 - 2022-04-01">
-              <ol>
-                <li>前端支持设置是否需要防止数据重复提交</li>
-                <li>开启TopNav没有子菜单情况隐藏侧边栏</li>
-                <li>侧边栏菜单名称过长悬停显示标题</li>
-                <li>用户访问控制时校验数据权限，防止越权</li>
-                <li>导出Excel时屏蔽公式，防止CSV注入风险</li>
-                <li>组件ImagePreview支持多图预览显示</li>
-                <li>组件ImageUpload支持多图同时选择上传</li>
-                <li>组件FileUpload支持多文件同时选择上传</li>
-                <li>服务监控新增运行参数信息显示</li>
-                <li>定时任务目标字符串过滤特殊字符</li>
-                <li>定时任务目标字符串验证包名白名单</li>
-                <li>代码生成列表图片支持预览</li>
-                <li>代码生成编辑修改打开新页签</li>
-                <li>代码生成新增Java类型Boolean</li>
-                <li>代码生成子表支持日期/字典配置</li>
-                <li>代码生成同步保留必填/类型选项</li>
-                <li>升级oshi到最新版本6.1.2</li>
-                <li>升级fastjson到最新版1.2.80</li>
-                <li>升级pagehelper到最新版1.4.1</li>
-                <li>升级spring-boot到最新版本2.5.11</li>
-                <li>升级spring-boot-mybatis到最新版2.2.2</li>
-                <li>添加遗漏的分页参数合理化属性</li>
-                <li>修改npm即将过期的注册源地址</li>
-                <li>修复分页组件请求两次问题</li>
-                <li>修复通用文件下载接口跨域问题</li>
-                <li>修复Xss注解字段值为空时的异常问题</li>
-                <li>修复选项卡点击右键刷新丢失参数问题</li>
-                <li>修复表单清除元素位置未垂直居中问题</li>
-                <li>修复服务监控中运行参数显示条件错误</li>
-                <li>修复导入Excel时字典字段类型为Long转义为空问题</li>
-                <li>修复登录超时刷新页面跳转登录页面还提示重新登录问题</li>
-                <li>优化加载字典缓存数据</li>
-                <li>优化IP地址获取到多个的问题</li>
-                <li>优化任务队列满时任务拒绝策略</li>
-                <li>优化文件上传兼容Weblogic环境</li>
-                <li>优化定时任务默认保存到内存中执行</li>
-                <li>优化部门修改缩放后出现的错位问题</li>
-                <li>优化Excel格式化不同类型的日期对象</li>
-                <li>优化菜单表关键字导致的插件报错问题</li>
-                <li>优化Oracle用户头像列为空时不显示问题</li>
-                <li>优化页面若未匹配到字典标签则返回原字典值</li>
-                <li>优化修复登录失效后多次请求提示多次弹窗问题</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.1 - 2022-01-01">
-              <ol>
-                <li>新增Vue3前端代码生成模板</li>
-                <li>新增图片预览组件</li>
-                <li>新增压缩插件实现打包Gzip</li>
-                <li>自定义xss校验注解实现</li>
-                <li>自定义文字复制剪贴指令</li>
-                <li>代码生成预览支持复制内容</li>
-                <li>路由支持单独配置菜单或角色权限</li>
-                <li>用户管理部门查询选择节点后分页参数初始</li>
-                <li>修复用户分配角色属性错误</li>
-                <li>修复打包后字体图标偶现的乱码问题</li>
-                <li>修复菜单管理重置表单出现的错误</li>
-                <li>修复版本差异导致的懒加载报错问题</li>
-                <li>修复Cron组件中周回显问题</li>
-                <li>修复定时任务多参数逗号分隔的问题</li>
-                <li>修复根据ID查询列表可能出现的主键溢出问题</li>
-                <li>修复tomcat配置参数已过期问题</li>
-                <li>升级clipboard到最新版本2.0.8</li>
-                <li>升级oshi到最新版本v5.8.6</li>
-                <li>升级fastjson到最新版1.2.79</li>
-                <li>升级spring-boot到最新版本2.5.8</li>
-                <li>升级log4j2到2.17.1，防止漏洞风险</li>
-                <li>优化下载解析blob异常提示</li>
-                <li>优化代码生成字典组重复问题</li>
-                <li>优化查询用户的角色组&岗位组代码</li>
-                <li>优化定时任务cron表达式小时设置24</li>
-                <li>优化用户导入提示溢出则显示滚动条</li>
-                <li>优化防重复提交标识组合为(key+url+header)</li>
-                <li>优化分页方法设置成通用方便灵活调用</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.8.0 - 2021-12-01">
-              <ol>
-                <li>新增配套并同步的Vue3前端版本</li>
-                <li>新增通用方法简化模态/缓存/下载/权限/页签使用</li>
-                <li>优化导出数据/使用通用下载方法</li>
-                <li>Excel注解支持自定义数据处理器</li>
-                <li>Excel注解支持导入导出标题信息</li>
-                <li>Excel导入支持@Excels注解</li>
-                <li>新增组件data-dict，简化数据字典使用</li>
-                <li>新增Jaxb依赖，防止jdk8以上出现的兼容错误</li>
-                <li>生产环境使用路由懒加载提升页面响应速度</li>
-                <li>修复五级以上菜单出现的404问题</li>
-                <li>防重提交注解支持配置间隔时间/提示消息</li>
-                <li>日志注解新增是否保存响应参数</li>
-                <li>任务屏蔽违规字符&参数忽略双引号中的逗号</li>
-                <li>升级SpringBoot到最新版本2.5.6</li>
-                <li>升级pagehelper到最新版1.4.0</li>
-                <li>升级spring-boot-mybatis到最新版2.2.0</li>
-                <li>升级oshi到最新版本v5.8.2</li>
-                <li>升级druid到最新版1.2.8</li>
-                <li>升级velocity到最新版本2.3</li>
-                <li>升级fastjson到最新版1.2.78</li>
-                <li>升级axios到最新版本0.24.0</li>
-                <li>升级dart-sass到版本1.32.13</li>
-                <li>升级core-js到最新版本3.19.1</li>
-                <li>升级jsencrypt到最新版本3.2.1</li>
-                <li>升级js-cookie到最新版本3.0.1</li>
-                <li>升级file-saver到最新版本2.0.5</li>
-                <li>升级sass-loader到最新版本10.1.1</li>
-                <li>升级element-ui到最新版本2.15.6</li>
-                <li>新增sendGet无参请求方法</li>
-                <li>禁用el-tag组件的渐变动画</li>
-                <li>代码生成点击预览重置激活tab</li>
-                <li>AjaxResult重写put方法，以方便链式调用</li>
-                <li>优化登录/验证码请求headers不设置token</li>
-                <li>优化用户个人信息接口防止修改用户名</li>
-                <li>优化Cron表达式生成器关闭时销毁避免缓存</li>
-                <li>优化注册成功提示消息类型success</li>
-                <li>优化aop语法，使用spring自动注入注解</li>
-                <li>优化记录登录信息，移除不必要的修改</li>
-                <li>优化mybatis全局默认的执行器</li>
-                <li>优化Excel导入图片可能出现的异常</li>
-                <li>修复代码生成模板主子表删除缺少事务</li>
-                <li>修复日志记录可能出现的转换异常</li>
-                <li>修复代码生成复选框字典遗漏问题</li>
-                <li>修复关闭xss功能导致可重复读RepeatableFilter失效</li>
-                <li>修复字符串无法被反转义问题</li>
-                <li>修复后端主子表代码模板方法名生成错误问题</li>
-                <li>修复xss过滤后格式出现的异常</li>
-                <li>修复swagger没有指定dataTypeClass导致启动出现warn日志</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.7.0 - 2021-09-13">
-              <ol>
-                <li>参数管理支持配置验证码开关</li>
-                <li>新增是否开启用户注册功能</li>
-                <li>定时任务支持在线生成cron表达式</li>
-                <li>菜单管理支持配置路由参数</li>
-                <li>支持自定义注解实现接口限流</li>
-                <li>Excel注解支持Image图片导入</li>
-                <li>自定义弹层溢出滚动样式</li>
-                <li>自定义可拖动弹窗宽度指令</li>
-                <li>自定义可拖动弹窗高度指令</li>
-                <li>修复任意账户越权问题</li>
-                <li>修改时检查用户数据权限范围</li>
-                <li>修复保存配置主题颜色失效问题</li>
-                <li>新增暗色菜单风格主题</li>
-                <li>菜单&部门新增展开/折叠功能</li>
-                <li>页签新增关闭左侧&添加图标</li>
-                <li>顶部菜单排除隐藏的默认路由</li>
-                <li>顶部菜单同步系统主题样式</li>
-                <li>跳转路由高亮相对应的菜单栏</li>
-                <li>代码生成主子表多选行数据</li>
-                <li>日期范围支持添加多组</li>
-                <li>升级element-ui到最新版本2.15.5</li>
-                <li>升级oshi到最新版本v5.8.0</li>
-                <li>升级commons.io到最新版本v2.11.0</li>
-                <li>定时任务屏蔽ldap远程调用</li>
-                <li>定时任务屏蔽http(s)远程调用</li>
-                <li>补充定时任务表字段注释</li>
-                <li>定时任务对检查异常进行事务回滚</li>
-                <li>启用父部门状态排除顶级节点</li>
-                <li>富文本新增上传文件大小限制</li>
-                <li>默认首页使用keep-alive缓存</li>
-                <li>修改代码生成字典回显样式</li>
-                <li>自定义分页合理化传入参数</li>
-                <li>修复字典组件值为整形不显示问题</li>
-                <li>修复定时任务日志执行状态显示</li>
-                <li>角色&菜单新增字段属性提示信息</li>
-                <li>修复角色分配用户页面参数类型错误提醒</li>
-                <li>优化布局设置动画特效</li>
-                <li>优化异常处理信息</li>
-                <li>优化错误token导致的解析异常</li>
-                <li>密码框新增显示切换密码图标</li>
-                <li>定时任务新增更多操作</li>
-                <li>更多操作按钮添加权限控制</li>
-                <li>导入用户样式优化</li>
-                <li>提取通用方法到基类控制器</li>
-                <li>优化使用权限工具获取用户信息</li>
-                <li>优化用户不能删除自己</li>
-                <li>优化XSS跨站脚本过滤</li>
-                <li>优化代码生成模板</li>
-                <li>验证码默认20s超时</li>
-                <li>BLOB下载时清除URL对象引用</li>
-                <li>代码生成导入表按创建时间排序</li>
-                <li>修复代码生成页面数据编辑保存之后总是跳转第一页的问题</li>
-                <li>修复带safari浏览器无法格式化utc日期格式yyyy-MM-dd'T'HH:mm:ss.SSS问题</li>
-                <li>多图上传组件移除多余的api地址&验证失败导致图片删除问题&无法删除相应图片修复</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.6.0 - 2021-07-12">
-              <ol>
-                <li>角色管理新增分配用户功能</li>
-                <li>用户管理新增分配角色功能</li>
-                <li>日志列表支持排序操作</li>
-                <li>优化参数&字典缓存操作</li>
-                <li>系统布局配置支持动态标题开关</li>
-                <li>菜单路由配置支持内链访问</li>
-                <li>默认访问后端首页新增提示语</li>
-                <li>富文本默认上传返回url类型</li>
-                <li>新增自定义弹窗拖拽指令</li>
-                <li>全局注册常用通用组件</li>
-                <li>全局挂载字典标签组件</li>
-                <li>ImageUpload组件支持多图片上传</li>
-                <li>FileUpload组件支持多文件上传</li>
-                <li>文件上传组件添加数量限制属性</li>
-                <li>富文本编辑组件添加类型属性</li>
-                <li>富文本组件工具栏配置视频</li>
-                <li>封装通用iframe组件</li>
-                <li>限制超级管理员不允许操作</li>
-                <li>用户信息长度校验限制</li>
-                <li>分页组件新增pagerCount属性</li>
-                <li>添加bat脚本执行应用</li>
-                <li>升级oshi到最新版本v5.7.4</li>
-                <li>升级element-ui到最新版本2.15.2</li>
-                <li>升级pagehelper到最新版1.3.1</li>
-                <li>升级commons.io到最新版本v2.10.0</li>
-                <li>升级commons.fileupload到最新版本v1.4</li>
-                <li>升级swagger到最新版本v3.0.0</li>
-                <li>修复关闭confirm提示框控制台报错问题</li>
-                <li>修复存在的SQL注入漏洞问题</li>
-                <li>定时任务屏蔽rmi远程调用</li>
-                <li>修复用户搜索分页变量错误</li>
-                <li>修复导出角色数据范围翻译缺少仅本人</li>
-                <li>修复表单构建选择下拉选择控制台报错问题</li>
-                <li>优化图片工具类读取文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.5.0 - 2021-05-25">
-              <ol>
-                <li>新增菜单导航显示风格TopNav（false为左侧导航菜单，true为顶部导航菜单）</li>
-                <li>布局设置支持保存&重置配置</li>
-                <li>修复树表数据显示不全&加载慢问题</li>
-                <li>新增IE浏览器版本过低提示页面</li>
-                <li>用户登录后记录最后登录IP&时间</li>
-                <li>页面导出按钮点击之后添加遮罩</li>
-                <li>富文本编辑器支持自定义上传地址</li>
-                <li>富文本编辑组件新增readOnly属性</li>
-                <li>页签TagsView新增关闭右侧功能</li>
-                <li>显隐列组件加载初始默认隐藏列</li>
-                <li>关闭头像上传窗口还原默认图片</li>
-                <li>个人信息添加手机&邮箱重复验证</li>
-                <li>代码生成模板导出按钮点击后添加遮罩</li>
-                <li>代码生成模板树表操作列添加新增按钮</li>
-                <li>代码生成模板修复主子表字段重名问题</li>
-                <li>升级fastjson到最新版1.2.76</li>
-                <li>升级druid到最新版本v1.2.6</li>
-                <li>升级mybatis到最新版3.5.6 阻止远程代码执行漏洞</li>
-                <li>升级oshi到最新版本v5.6.0</li>
-                <li>velocity剔除commons-collections版本，防止3.2.1版本的反序列化漏洞</li>
-                <li>数据监控页默认账户密码防止越权访问</li>
-                <li>修复firefox下表单构建拖拽会新打卡一个选项卡</li>
-                <li>修正后端导入表权限标识</li>
-                <li>修正前端操作日志&登录日志权限标识</li>
-                <li>设置Redis配置HashKey序列化</li>
-                <li>删除操作日志记录信息</li>
-                <li>上传媒体类型添加视频格式</li>
-                <li>修复请求形参未传值记录日志异常问题</li>
-                <li>优化xss校验json请求条件</li>
-                <li>树级结构更新子节点使用replaceFirst</li>
-                <li>优化ExcelUtil空值处理</li>
-                <li>日志记录过滤BindingResult对象，防止异常</li>
-                <li>修改主题后mini类型按钮无效问题</li>
-                <li>优化通用下载完成后删除节点</li>
-                <li>通用Controller添加响应返回消息</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.4.0 - 2021-02-22">
-              <ol>
-                <li>代码生成模板支持主子表</li>
-                <li>表格右侧工具栏组件支持显隐列</li>
-                <li>图片组件添加预览&移除功能</li>
-                <li>Excel注解支持Image图片导出</li>
-                <li>操作按钮组调整为朴素按钮样式</li>
-                <li>代码生成支持文件上传组件</li>
-                <li>代码生成日期控件区分范围</li>
-                <li>代码生成数据库文本类型生成表单文本域</li>
-                <li>用户手机邮箱&菜单组件修改允许空字符串</li>
-                <li>升级SpringBoot到最新版本2.2.13 提升启动速度</li>
-                <li>升级druid到最新版本v1.2.4</li>
-                <li>升级fastjson到最新版1.2.75</li>
-                <li>升级element-ui到最新版本2.15.0</li>
-                <li>修复IE11浏览器报错问题</li>
-                <li>优化多级菜单之间切换无法缓存的问题</li>
-                <li>修复四级菜单无法显示问题</li>
-                <li>修正侧边栏静态路由丢失问题</li>
-                <li>修复角色管理-编辑角色-功能权限显示异常</li>
-                <li>配置文件新增redis数据库索引属性</li>
-                <li>权限工具类增加admin判断</li>
-                <li>角色非自定义权限范围清空选择值</li>
-                <li>修复导入数据为负浮点数时丢失精度问题</li>
-                <li>移除path-to-regexp正则匹配插件</li>
-                <li>修复生成树表代码异常</li>
-                <li>修改ip字段长度防止ipv6地址长度不够</li>
-                <li>防止get请求参数值为false或0等特殊值会导致无法正确的传参</li>
-                <li>登录后push添加catch防止出现检查错误</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.3.0 - 2020-12-14">
-              <ol>
-                <li>新增缓存监控功能</li>
-                <li>支持主题风格配置</li>
-                <li>修复多级菜单之间切换无法缓存的问题</li>
-                <li>多级菜单自动配置组件</li>
-                <li>代码生成预览支持高亮显示</li>
-                <li>支持Get请求映射Params参数</li>
-                <li>删除用户和角色解绑关联</li>
-                <li>去除用户手机邮箱部门必填验证</li>
-                <li>Excel支持注解align对齐方式</li>
-                <li>Excel支持导入Boolean型数据</li>
-                <li>优化头像样式，鼠标移入悬停遮罩</li>
-                <li>代码生成预览提供滚动机制</li>
-                <li>代码生成删除多余的数字float类型</li>
-                <li>修正转换字符串的目标字符集属性</li>
-                <li>回显数据字典防止空值报错</li>
-                <li>日志记录增加过滤多文件场景</li>
-                <li>修改缓存Set方法可能导致嵌套的问题</li>
-                <li>移除前端一些多余的依赖</li>
-                <li>防止安全扫描YUI出现的风险提示</li>
-                <li>修改node-sass为dart-sass</li>
-                <li>升级SpringBoot到最新版本2.1.18</li>
-                <li>升级poi到最新版本4.1.2</li>
-                <li>升级oshi到最新版本v5.3.6</li>
-                <li>升级bitwalker到最新版本1.21</li>
-                <li>升级axios到最新版本0.21.0</li>
-                <li>升级element-ui到最新版本2.14.1</li>
-                <li>升级vue到最新版本2.6.12</li>
-                <li>升级vuex到最新版本3.6.0</li>
-                <li>升级vue-cli到版本4.5.9</li>
-                <li>升级vue-router到最新版本3.4.9</li>
-                <li>升级vue-cli到最新版本4.4.6</li>
-                <li>升级vue-cropper到最新版本0.5.5</li>
-                <li>升级clipboard到最新版本2.0.6</li>
-                <li>升级core-js到最新版本3.8.1</li>
-                <li>升级echarts到最新版本4.9.0</li>
-                <li>升级file-saver到最新版本2.0.4</li>
-                <li>升级fuse.js到最新版本6.4.3</li>
-                <li>升级js-beautify到最新版本1.13.0</li>
-                <li>升级js-cookie到最新版本2.2.1</li>
-                <li>升级path-to-regexp到最新版本6.2.0</li>
-                <li>升级quill到最新版本1.3.7</li>
-                <li>升级screenfull到最新版本5.0.2</li>
-                <li>升级sortablejs到最新版本1.10.2</li>
-                <li>升级vuedraggable到最新版本2.24.3</li>
-                <li>升级chalk到最新版本4.1.0</li>
-                <li>升级eslint到最新版本7.15.0</li>
-                <li>升级eslint-plugin-vue到最新版本7.2.0</li>
-                <li>升级lint-staged到最新版本10.5.3</li>
-                <li>升级runjs到最新版本4.4.2</li>
-                <li>升级sass-loader到最新版本10.1.0</li>
-                <li>升级script-ext-html-webpack-plugin到最新版本2.1.5</li>
-                <li>升级svg-sprite-loader到最新版本5.1.1</li>
-                <li>升级vue-template-compiler到最新版本2.6.12</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.1 - 2020-11-18">
-              <ol>
-                <li>阻止任意文件下载漏洞</li>
-                <li>代码生成支持上传控件</li>
-                <li>新增图片上传组件</li>
-                <li>调整默认首页</li>
-                <li>升级druid到最新版本v1.2.2</li>
-                <li>mapperLocations配置支持分隔符</li>
-                <li>权限信息调整</li>
-                <li>调整sql默认时间</li>
-                <li>解决代码生成没有bit类型的问题</li>
-                <li>升级pagehelper到最新版1.3.0</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v3.2.0 - 2020-10-10">
-              <ol>
-                <li>升级springboot版本到2.1.17 提升安全性</li>
-                <li>升级oshi到最新版本v5.2.5</li>
-                <li>升级druid到最新版本v1.2.1</li>
-                <li>升级jjwt到版本0.9.1</li>
-                <li>升级fastjson到最新版1.2.74</li>
-                <li>修改sass为node-sass，避免el-icon图标乱码</li>
-                <li>代码生成支持同步数据库</li>
-                <li>代码生成支持富文本控件</li>
-                <li>代码生成页面时不忽略remark属性</li>
-                <li>代码生成添加select必填选项</li>
-                <li>Excel导出类型NUMERIC支持精度浮点类型</li>
-                <li>Excel导出targetAttr优化获取值，防止get方法不规范</li>
-                <li>Excel注解支持自动统计数据总和</li>
-                <li>Excel注解支持设置BigDecimal精度&舍入规则</li>
-                <li>菜单&数据权限新增（展开/折叠 全选/全不选 父子联动）</li>
-                <li>允许用户分配到部门父节点</li>
-                <li>菜单新增是否缓存keep-alive</li>
-                <li>表格操作列间距调整</li>
-                <li>限制系统内置参数不允许删除</li>
-                <li>富文本组件优化，支持自定义高度&图片冲突问题</li>
-                <li>富文本工具栏样式对齐</li>
-                <li>导入excel整形值校验优化</li>
-                <li>修复页签关闭所有时固定标签路由不刷新问题</li>
-                <li>表单构建布局型组件新增按钮</li>
-                <li>左侧菜单文字过长显示省略号</li>
-                <li>修正根节点为子部门时，树状结构显示问题</li>
-                <li>修正调用目标字符串最大长度</li>
-                <li>修正菜单提示信息错误</li>
-                <li>修正定时任务执行一次权限标识</li>
-                <li>修正数据库字符串类型nvarchar</li>
-                <li>优化递归子节点</li>
-                <li>优化数据权限判断</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
+          <h2>主要功能</h2>
+          <ol>
+            <li>多类型流量计流量计算：支持标准孔板、速度式、容积式和临界流文丘利喷嘴流量计的流量计算，严格依据相关标准和规程，确保计算结果的准确性和可靠性。</li>
+            <li>
+              系数修正方法多样：在流量计算过程中，可灵活使用校准提供的流量计系数、仪表系数（适用于速度式和容积式流量计）、流出系数（针对标准孔板和临界流文丘利喷嘴）进行修正。对于标准孔板，还支持多种流出系数标准公式，满足不同场景的计算需求。
+            </li>
+            <li>流量单位换算：提供标准参比条件下体积流量、工作条件下体积流量、质量流量和标准参比条件下能量流量的换算功能，方便用户在不同流量单位之间进行快速转换。</li>
+            <li>物性参数计算丰富：具备多种计算标准参比条件下物性参数、工作条件下压缩因子和密度、等熵指数和临界流函数等物性参数的方法，为天然气流量计算提供全面的数据支持。</li>
+          </ol>
 
-            <el-collapse-item title="v3.1.0 - 2020-08-13">
-              <ol>
-                <li>表格工具栏右侧添加刷新&显隐查询组件</li>
-                <li>后端支持CORS跨域请求</li>
-                <li>代码生成支持选择上级菜单</li>
-                <li>代码生成支持自定义路径</li>
-                <li>代码生成支持复选框</li>
-                <li>Excel导出导入支持dictType字典类型</li>
-                <li>Excel支持分割字符串组内容</li>
-                <li>验证码类型支持（数组计算、字符验证）</li>
-                <li>升级vue-cli版本到4.4.4</li>
-                <li>修改 node-sass 为 dart-sass</li>
-                <li>表单类型为Integer/Long设置整形默认值</li>
-                <li>代码生成器默认mapper路径与默认mapperScan路径不一致</li>
-                <li>优化防重复提交拦截器</li>
-                <li>优化上级菜单不能选择自己</li>
-                <li>修复角色的权限分配后，未实时生效问题</li>
-                <li>修复在线用户日志记录类型</li>
-                <li>修复富文本空格和缩进保存后不生效问题</li>
-                <li>修复在线用户判断逻辑</li>
-                <li>唯一限制条件只返回单条数据</li>
-                <li>添加获取当前的环境配置方法</li>
-                <li>超时登录后页面跳转到首页</li>
-                <li>全局异常状态汉化拦截处理</li>
-                <li>HTML过滤器改为将html转义</li>
-                <li>检查字符支持小数点&降级改成异常提醒</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
+          <h3>计算选择</h3>
+          <ul>
+            <li>物性参数计算：在系统设置框中，可从参比条件下拉式选择框中选择合适的标准参比条件，从压缩因子和等熵指数下拉式选择框中选择相应的计算方法，以满足不同的计算需求。</li>
+            <li>
+              流量计算：选择流量计算单选按钮后，根据所选的流量计类型，按要求输入天然气和流量计数据，选择合适的流出系数计算方法，输入温度、压力等相关数据，然后按计算按钮或从系统文件菜单中选择开始计算项目，即可完成流量计算。
+            </li>
+            <li>
+              流量换算：选择流量换算单选按钮，按上述方法选择标准参比条件和压缩因子计算方法，输入天然气数据和温度、压力、大气压、流量等数据，点击计算按钮或从菜单选择开始计算项目，即可进行流量换算。
+            </li>
+          </ul>
+          <h3>结果输出</h3>
+          <p>
+            计算结果支持显示、打印和保存三种方式。显示结果会在指定的文本框中呈现，用户可清晰查看计算结果；通过系统文件菜单中的打印计算结果子菜单，可选择需要打印的内容进行打印；选择保存计算结果子菜单，可选择保存内容、文件格式和文件名，将计算结果保存到指定位置。
+          </p>
 
-            <el-collapse-item title="v3.0.0 - 2020-07-20">
-              <ol>
-                <li>单应用调整为多模块项目</li>
-                <li>升级element-ui版本到2.13.2</li>
-                <li>删除babel，提高编译速度。</li>
-                <li>新增菜单默认主类目</li>
-                <li>编码文件名修改为uuid方式</li>
-                <li>定时任务cron表达式验证</li>
-                <li>角色权限修改时已有权限未自动勾选异常修复</li>
-                <li>防止切换权限用户后登录出现404</li>
-                <li>Excel支持sort导出排序</li>
-                <li>创建用户不允许选择超级管理员角色</li>
-                <li>修复代码生成导入表结构出现异常页面不提醒问题</li>
-                <li>修复代码生成点击多次表修改数据不变化的问题</li>
-                <li>修复头像上传成功二次打开无法改变裁剪框大小和位置问题</li>
-                <li>修复布局为small者mini用户表单显示错位问题</li>
-                <li>修复热部署导致的强换异常问题</li>
-                <li>修改用户管理复选框宽度，防止部分浏览器出现省略号</li>
-                <li>IpUtils工具，清除Xss特殊字符，防止Xff注入攻击</li>
-                <li>生成domain 如果是浮点型 统一用BigDecimal</li>
-                <li>定时任务调整label-width，防止部署出现错位</li>
-                <li>调整表头固定列默认样式</li>
-                <li>代码生成模板调整，字段为String并且必填则加空串条件</li>
-                <li>代码生成字典Integer/Long使用parseInt</li>
-                <li>修复dict_sort不可update为0的问题&查询返回增加dict_sort升序排序</li>
-                <li>修正岗位导出权限注解</li>
-                <li>禁止加密密文返回前端</li>
-                <li>修复代码生成页面中的查询条件创建时间未生效的问题</li>
-                <li>修复首页搜索菜单外链无法点击跳转问题</li>
-                <li>修复菜单管理选择图标，backspace删除时不过滤数据</li>
-                <li>用户管理部门分支节点不可检查&显示计数</li>
-                <li>数据范围过滤属性调整</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.3.0 - 2020-06-01">
-              <ol>
-                <li>升级fastjson到最新版1.2.70 修复高危安全漏洞</li>
-                <li>dev启动默认打开浏览器</li>
-                <li>vue-cli使用默认source-map</li>
-                <li>slidebar eslint报错优化</li>
-                <li>当tags-view滚动关闭右键菜单</li>
-                <li>字典管理添加缓存读取</li>
-                <li>参数管理支持缓存操作</li>
-                <li>支持一级菜单（和主页同级）在main区域显示</li>
-                <li>限制外链地址必须以http(s)开头</li>
-                <li>tagview & sidebar 主题颜色与element ui(全局)同步</li>
-                <li>修改数据源类型优先级，先根据方法，再根据类</li>
-                <li>支持是否需要设置token属性，自定义返回码消息。</li>
-                <li>swagger请求前缀加入配置。</li>
-                <li>登录地点设置内容过长则隐藏显示</li>
-                <li>修复定时任务执行一次按钮后不提示消息问题</li>
-                <li>修改上级部门（选择项排除本身和下级）</li>
-                <li>通用http发送方法增加参数 contentType 编码类型</li>
-                <li>更换IP地址查询接口</li>
-                <li>修复页签变量undefined</li>
-                <li>添加校验部门包含未停用的子部门</li>
-                <li>修改定时任务详情下次执行时间日期显示错误</li>
-                <li>角色管理查询设置默认排序字段</li>
-                <li>swagger添加enable参数控制是否启用</li>
-                <li>只对json类型请求构建可重复读取inputStream的request</li>
-                <li>修改代码生成字典字段int类型没有自动选中问题</li>
-                <li>vuex用户名取值修正</li>
-                <li>表格树模板去掉多余的)</li>
-                <li>代码生成序号修正</li>
-                <li>全屏情况下不调整上外边距</li>
-                <li>代码生成Date字段添加默认格式</li>
-                <li>用户管理角色选择权限控制</li>
-                <li>修复路由懒加载报错问题</li>
-                <li>模板sql.vm添加菜单状态</li>
-                <li>设置用户名称不能修改</li>
-                <li>dialog添加append-to-body属性，防止ie遮罩</li>
-                <li>菜单区分状态和显示隐藏功能</li>
-                <li>升级fastjson到最新版1.2.68 修复安全加固</li>
-                <li>修复代码生成如果选择字典类型缺失逗号问题</li>
-                <li>登录请求params更换为data，防止暴露url</li>
-                <li>日志返回时间格式处理</li>
-                <li>添加handle控制允许拖动的元素</li>
-                <li>布局设置点击扩大范围</li>
-                <li>代码生成列属性排序查询</li>
-                <li>代码生成列支持拖动排序</li>
-                <li>修复时间格式不支持ios问题</li>
-                <li>表单构建添加父级class，防止冲突</li>
-                <li>定时任务并发属性修正</li>
-                <li>角色禁用&菜单隐藏不查询权限</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.2.0 - 2020-03-18">
-              <ol>
-                <li>系统监控新增定时任务功能</li>
-                <li>添加一个打包Web工程bat</li>
-                <li>修复页签鼠标滚轮按下的时候，可以关闭不可关闭的tag</li>
-                <li>修复点击退出登录有时会无提示问题</li>
-                <li>修复防重复提交注解无效问题</li>
-                <li>修复通知公告批量删除异常问题</li>
-                <li>添加菜单时路由地址必填限制</li>
-                <li>代码生成字段描述可编辑</li>
-                <li>修复用户修改个人信息导致缓存不过期问题</li>
-                <li>个人信息创建时间获取正确属性值</li>
-                <li>操作日志详细显示正确类型</li>
-                <li>导入表单击行数据时选中对应的复选框</li>
-                <li>批量替换表前缀逻辑调整</li>
-                <li>固定重定向路径表达式</li>
-                <li>升级element-ui版本到2.13.0</li>
-                <li>操作日志排序调整</li>
-                <li>修复charts切换侧边栏或者缩放窗口显示bug</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.1.0 - 2020-02-24">
-              <ol>
-                <li>新增表单构建</li>
-                <li>代码生成支持树表结构</li>
-                <li>新增用户导入</li>
-                <li>修复动态加载路由页面刷新问题</li>
-                <li>修复地址开关无效问题</li>
-                <li>汉化错误提示页面</li>
-                <li>代码生成已知问题修改</li>
-                <li>修复多数据源下配置关闭出现异常处理</li>
-                <li>添加HTML过滤器，用于去除XSS漏洞隐患</li>
-                <li>修复上传头像控制台出现异常</li>
-                <li>修改用户管理分页不正确的问题</li>
-                <li>修复验证码记录提示错误</li>
-                <li>修复request.js缺少Message引用</li>
-                <li>修复表格时间为空出现的异常</li>
-                <li>添加Jackson日期反序列化时区配置</li>
-                <li>调整根据用户权限加载菜单数据树形结构</li>
-                <li>调整成功登录不恢复按钮，防止多次点击</li>
-                <li>修改用户个人资料同步缓存信息</li>
-                <li>修复页面同时出现el-upload和Editor不显示处理</li>
-                <li>修复在角色管理页修改菜单权限偶尔未选中问题</li>
-                <li>配置文件新增redis密码属性</li>
-                <li>设置mybatis全局的配置文件</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-
-            <el-collapse-item title="v2.0.0 - 2019-12-02">
-              <ol>
-                <li>新增代码生成</li>
-                <li>新增@RepeatSubmit注解，防止重复提交</li>
-                <li>新增菜单主目录添加/删除操作</li>
-                <li>日志记录过滤特殊对象，防止转换异常</li>
-                <li>修改代码生成路由脚本错误</li>
-                <li>用户上传头像实时同步缓存，无需重新登录</li>
-                <li>调整切换页签后不重新加载数据</li>
-                <li>添加jsencrypt实现参数的前端加密</li>
-                <li>系统退出删除用户缓存记录</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.1.0 - 2019-11-11">
-              <ol>
-                <li>新增在线用户管理</li>
-                <li>新增按钮组功能实现（批量删除、导出、清空）</li>
-                <li>新增查询条件重置按钮</li>
-                <li>新增Swagger全局Token配置</li>
-                <li>新增后端参数校验</li>
-                <li>修复字典管理页面的日期查询异常</li>
-                <li>修改时间函数命名防止冲突</li>
-                <li>去除菜单上级校验，默认为顶级</li>
-                <li>修复用户密码无法修改问题</li>
-                <li>修复菜单类型为按钮时不显示权限标识</li>
-                <li>其他细节优化</li>
-              </ol>
-            </el-collapse-item>
-            <el-collapse-item title="v1.0.0 - 2019-10-08">
-              <ol>
-                <li>若依前后端分离系统正式发布</li>
-              </ol>
-            </el-collapse-item>
-          </el-collapse>
-        </el-card>
-      </el-col>
-      <el-col :xs="24" :sm="24" :md="12" :lg="8">
-        <el-card class="update-log">
-          <div slot="header" class="clearfix">
-            <span>捐赠支持</span>
-          </div>
-          <div class="body">
-            <img src="@/assets/images/pay.png" alt="donate" width="100%" />
-            <span style="display: inline-block; height: 30px; line-height: 30px">你可以请作者喝杯咖啡表示鼓励</span>
-          </div>
-        </el-card>
-      </el-col>
-    </el-row>
+          <h2>注意事项</h2>
+          <ul>
+            <li>
+              本软件计算方法严格遵循相关国家和行业标准，计算结果与标准中的计算示例结果的偏差均在标准允许的范围内，但开发者不承担因直接或间接使用本软件所引起的经济和安全责任。
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+    <!-- 底部区域 -->
+    <div class="bottom">
+      <p style="color: blue; font-size: 14px">妍杰丽云工作室版权所有 &copy; ----- 基于若依管理框架系统 V3.8.9</p>
+    </div>
   </div>
 </template>
 
 <script>
 import { calcNGPar } from '@/api/ngtools/NGCalcTools';
+import { listSysUnitConvert } from '@/api/system/sysUnitConvert.js';
 export default {
   name: 'Index',
   data() {
@@ -1037,74 +67,106 @@ export default {
       version: '3.8.9'
     };
   },
+  onload() {
+    this.loadUnits();
+  },
   methods: {
+    loadUnits() {
+      console.log(0);
+      listSysUnitConvert({
+        // unitType: unitType,
+        status: 'Y'
+      })
+        .then((res) => {
+          // 检查 res 是否为有效对象且包含 rows 属性
+          if (res && res.rows) {
+            console.log('未找到 baseUnit 为 Y 的单位数据');
+            this.unitData = res.rows;
+            // 检查 unitData 是否为有效数组
+            if (Array.isArray(this.unitData)) {
+              this.baseUnit = this.unitData.find((u) => u.baseUnit === 'Y');
+              // 检查 baseUnit 是否找到
+              if (this.baseUnit) {
+                // console.log(this.baseUnit.unitName);
+              } else {
+                console.log('未找到 baseUnit 为 Y 的单位数据');
+              }
+            } else {
+              console.log('unitData 不是有效的数组');
+            }
+          } else {
+            console.log('响应数据格式不正确，缺少 rows 属性');
+          }
+        })
+        .catch((e) => {
+          console.error('单位数据加载失败:', e);
+        });
+    },
     goTarget(href) {
       window.open(href, '_blank');
     }
   }
 };
 </script>
+<style scoped>
+.container {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 100px);
+}
 
-<style scoped lang="scss">
-.home {
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
-    margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
-  }
-  .col-item {
-    margin-bottom: 20px;
-  }
+.top {
+  height: 30px;
+  text-align: center;
+  /* background-color: #f0f0f0; */
+}
 
-  ul {
-    padding: 0;
-    margin: 0;
-  }
+.bottom {
+  height: 30px;
+  text-align: center;
+  vertical-align: top;
+  /* background-color: #f0f0f0; */
+}
 
-  font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
+.middle {
+  display: flex;
+  flex: 1; /* 中间区域占满剩余空间 */
+}
 
-  ul {
-    list-style-type: none;
-  }
+.left {
+  width: 75%;
+  /* background-color: #e0e0e0; */
+}
 
-  h4 {
-    margin-top: 0px;
-  }
+.right {
+  width: 25%;
+  /* background-color: #d0d0d0; */
+}
 
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
+/* 美化 .content 部分的样式 */
+.content {
+  font-size: 14px; /* 缩小字体 */
+  line-height: 1.6; /* 调整行高，增强可读性 */
+  padding: 20px; /* 添加内边距，使内容不紧贴边框 */
+}
 
-  p {
-    margin-top: 10px;
+.content p {
+  text-indent: 2em; /* 首行缩进2个字符 */
+  margin-bottom: 10px; /* 段落底部间距 */
+}
 
-    b {
-      font-weight: 700;
-    }
-  }
+.content h2,
+.content h3 {
+  margin-top: 20px; /* 标题顶部间距 */
+  margin-bottom: 10px; /* 标题底部间距 */
+}
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
-    }
-  }
+.content ol,
+.content ul {
+  padding-left: 20px; /* 列表左侧内边距 */
+}
+
+.content li {
+  margin-bottom: 8px; /* 列表项底部间距 */
 }
 </style>
diff --git a/src/views/login.vue b/src/views/login.vue
index 6e2d936..86f1161 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,55 +1,32 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">天然气工具集</h3>
       <el-form-item prop="username">
-        <el-input
-          v-model="loginForm.username"
-          type="text"
-          auto-complete="off"
-          placeholder="账号"
-        >
+        <el-input v-model="loginForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="loginForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleLogin"
-        >
+        <el-input v-model="loginForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="loginForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleLogin"
-        >
+        <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleLogin">
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="login-code">
-          <img :src="codeUrl" @click="getCode" class="login-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="login-code-img" />
         </div>
       </el-form-item>
-      <el-checkbox v-model="loginForm.rememberMe" style="margin:0px 0px 25px 0px;">记住密码</el-checkbox>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleLogin"
-        >
+      <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">记住密码</el-checkbox>
+      <el-form-item style="width: 100%">
+        <el-button :loading="loading" size="medium" type="primary" style="width: 100%" @click.native.prevent="handleLogin">
           <span v-if="!loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
-        <div style="float: right;" v-if="register">
+        <div style="float: right" v-if="register">
           <router-link class="link-type" :to="'/register'">立即注册</router-link>
         </div>
       </el-form-item>
@@ -62,30 +39,26 @@
 </template>
 
 <script>
-import { getCodeImg } from "@/api/login";
-import Cookies from "js-cookie";
-import { encrypt, decrypt } from '@/utils/jsencrypt'
+import { getCodeImg } from '@/api/login';
+import Cookies from 'js-cookie';
+import { encrypt, decrypt } from '@/utils/jsencrypt';
 
 export default {
-  name: "Login",
+  name: 'Login',
   data() {
     return {
-      codeUrl: "",
+      codeUrl: '',
       loginForm: {
-        username: "admin",
-        password: "admin123",
+        username: 'admin',
+        password: 'admin123',
         rememberMe: false,
-        code: "",
-        uuid: ""
+        code: '',
+        uuid: ''
       },
       loginRules: {
-        username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" }
-        ],
-        password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
-        ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
+        password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
       },
       loading: false,
       // 验证码开关
@@ -97,7 +70,7 @@ export default {
   },
   watch: {
     $route: {
-      handler: function(route) {
+      handler: function (route) {
         this.redirect = route.query && route.query.redirect;
       },
       immediate: true
@@ -109,18 +82,18 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
+      getCodeImg().then((res) => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.codeUrl = 'data:image/gif;base64,' + res.img;
           this.loginForm.uuid = res.uuid;
         }
       });
     },
     getCookie() {
-      const username = Cookies.get("username");
-      const password = Cookies.get("password");
-      const rememberMe = Cookies.get('rememberMe')
+      const username = Cookies.get('username');
+      const password = Cookies.get('password');
+      const rememberMe = Cookies.get('rememberMe');
       this.loginForm = {
         username: username === undefined ? this.loginForm.username : username,
         password: password === undefined ? this.loginForm.password : decrypt(password),
@@ -128,26 +101,29 @@ export default {
       };
     },
     handleLogin() {
-      this.$refs.loginForm.validate(valid => {
+      this.$refs.loginForm.validate((valid) => {
         if (valid) {
           this.loading = true;
           if (this.loginForm.rememberMe) {
-            Cookies.set("username", this.loginForm.username, { expires: 30 });
-            Cookies.set("password", encrypt(this.loginForm.password), { expires: 30 });
+            Cookies.set('username', this.loginForm.username, { expires: 30 });
+            Cookies.set('password', encrypt(this.loginForm.password), { expires: 30 });
             Cookies.set('rememberMe', this.loginForm.rememberMe, { expires: 30 });
           } else {
-            Cookies.remove("username");
-            Cookies.remove("password");
+            Cookies.remove('username');
+            Cookies.remove('password');
             Cookies.remove('rememberMe');
           }
-          this.$store.dispatch("Login", this.loginForm).then(() => {
-            this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          });
+          this.$store
+            .dispatch('Login', this.loginForm)
+            .then(() => {
+              this.$router.push({ path: this.redirect || '/' }).catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
     }
@@ -161,7 +137,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url('../assets/images/login-background.jpg');
   background-size: cover;
 }
 .title {
diff --git a/src/views/ngtools/FlowCal/index.vue b/src/views/ngtools/FlowCal/index.vue
index 044fa76..43d5bae 100644
--- a/src/views/ngtools/FlowCal/index.vue
+++ b/src/views/ngtools/FlowCal/index.vue
@@ -1,19 +1,19 @@
 <template>
   <div>
-    <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
+    <div style="text-align: center; margin-top: 10px; margin-bottom: 10px">
       <button @click="calc" type="primary" class="animated-button">计算组分参数</button>
       <button @click="calcFlow" type="primary" class="animated-button">计算流量</button>
     </div>
 
-    <el-tabs v-model="activeTab" style="width: 100%;">
-      <el-tab-pane label="流量计参数" name="meterpar">
+    <el-tabs v-model="activeTab" style="width: 100%">
+      <el-tab-pane label="工况参数" name="meterpar">
         <meterPar v-model="parentMeterPar" />
       </el-tab-pane>
 
-      <el-tab-pane label="天然气组分" name="ngComponents">
+      <el-tab-pane label="摩尔组分" name="ngComponents">
         <ngComponents v-model="parentMeterPar.dngComponents" />
       </el-tab-pane>
-      <el-tab-pane label="流量计算结果" name="meterresult">
+      <el-tab-pane label="计算结果" name="meterresult">
         <meterResult v-model:meterResult="parentMeterResult" />
         <n-g-result v-model:NGResult="parentNGResult"></n-g-result>
       </el-tab-pane>
@@ -21,261 +21,284 @@
 
     <div v-if="isShowMessage" class="message-box">{{ message }}</div>
   </div>
-
-
-
 </template>
 
 <script>
-  import meterPar from '@/components/NGTools/meterPar';
-  import ngComponents from '@/components/NGTools/NGCom';
-  import meterResult from '@/components/NGTools/meterResult';
-  import NGResult from '@/components/NGTools/NGResult';
+import meterPar from '@/components/NGTools/meterPar';
+import ngComponents from '@/components/NGTools/NGCom';
+import meterResult from '@/components/NGTools/meterResult';
+import NGResult from '@/components/NGTools/NGResult';
 
-  import {
-    calcNGPar,
-    calcFlow
-  } from '@/api/ngtools/NGCalcTools.js';
+import { calcNGPar, calcFlow } from '@/api/ngtools/NGCalcTools.js';
 
-  export default {
-    name: 'TabbedComponentWrapper',
-    components: {
-      meterPar,
-      ngComponents,
-      meterResult,
-      NGResult
-
-    },
-    data() {
-      return {
-        activeTab: 'meterpar',
-        isShowMessage: false,
-        message: '',
-        parentMeterPar: {
-          dFlowCalbz: '0',
-          dZcalbz: '0',
-          dCbtj: '0',
-          dpbM: 0,
-          dtbM: 0,
-          dpbE: 0,
-          dtbE: 0,
-          dPatm: 0.0981,
-          dPatmUnit: 2,
-          dngComponents: '',
-          dMeterType: '0',
-          dCoreType: '0',
-          dPtmode: '0',
-          dPipeType: '0',
-          dPipeD: 259.38,
-          dLenUnit: 3,
-          dPipeDtemp: 20,
-          dPileDtempU: 0,
-          dPipeMaterial: '11.16',
-          dOrificeD: 150.25,
-          dOrificeUnit: 3,
-          dOrificeDtemp: 0,
-          dOrificeDtempUnit: 0,
-          dOrificeMaterial: '16.6',
-          dOrificeSharpness: 0,
-          dOrificeRk: 0,
-          dOrificeRkLenU: 0,
-          dPf: 1.48,
-          dPfUnit: 2,
-          dPfType: '0',
-          dTf: 15,
-          dTfUnit: 0,
-          dDp: 12.5,
-          dDpUnit: 1,
-          dVFlowUnit: 0,
-          dVFlowWorkUnit: 0,
-          dMFlowUnit: 0,
-          dEFlowUnit: 6,
-          dCd: 0,
-          dCdCalMethod: 0,
-          dMeterFactor: 2354,
-          dPulseNum: 12000,
-          dVFlowMax: 6,
-          dVFlowMin: 3,
-          dVFlowCon: 5,
-          dPfRangeMin: 0,
-          dPfRangeMax: 0,
-          dDpRangeMin: 0,
-          dDpRangeMax: 0,
-          dTfRangeMin: 0,
-          dTfRangeMax: 0,
-          dVGsc: 300,
-          dVGscUnit: 0
-        },
-
-        parentMeterResult: {
-          dE: 10,
-          dFG: 0,
-          dFT: 0,
-          dDViscosity: 0,
-          dDExpCoefficient: 0,
-          dRnPipe: 0,
-          dBk: 0,
-          dRoughNessPipe: 0,
-          dCdCorrect: 0,
-          dCdNozell: 0,
-          dVFlowb: 100,
-          dVFlowf: 100,
-          dVFlowUnit: 2,
-          dMFlowb: 44,
-          dMFlowUnit: 0,
-          dEFlowb: 33,
-          dEFlowUnit: 0,
-          dVelocityFlow: 3,
-          dVelocityUnit: 1,
-          dPressLost: 300,
-          dPressLostUnit: 0,
-          dBeta: 0,
-          dKappa: 0
-        },
-        parentNGResult: {
-          dMrx: null,
-          dZb: null,
-          dZf: null,
-          dFpv: null,
-          dDb: null,
-          dDf: null,
-          dRhob: null,
-          dRhof: null,
-          drdIdeal: null,
-          drdReal: null,
-          dHo: null,
-          dH: null,
-          dS: null,
-          dCpi: null,
-          dCp: null,
-          dCv: null,
-          dk: null,
-          dKappa: null,
-          dSOS: null,
-          dCstar: null,
-          dHhvMol: null,
-          dLhvMol: null,
-          dHhvv: null,
-          dLhvv: null,
-          dHhvm: null,
-          dLhvm: null,
-          dZb11062: null,
-          dRhob11062: null,
-          dRhof11062: null,
-          drdIdeal11062: null,
-          drdReal11062: null,
-          dWobbeIndex: null,
-          dPc: null,
-          dTC: null,
-          dBzsx: null,
-          dBzxx: null,
-          dTotalC: null,
-          dC2: null,
-          dC2j: null,
-          dC3j: null,
-          dC4j: null,
-          dC5j: null,
-          dC6j: null,
-          dC3C4: null,
-        },
-        componentString: ''
-      };
-    },
-    methods: {
-      showMessage() {
-        this.isShowMessage = true;
-        setTimeout(() => {
-          this.isShowMessage = false;
-        }, 1000); // 3 秒后自动消失
+export default {
+  name: 'TabbedComponentWrapper',
+  components: {
+    meterPar,
+    ngComponents,
+    meterResult,
+    NGResult
+  },
+  data() {
+    return {
+      activeTab: 'meterpar',
+      isShowMessage: false,
+      message: '',
+      parentMeterPar: {
+        dFlowCalbz: '0',
+        dZcalbz: '0',
+        dCbtj: '0',
+        dpbM: 0,
+        dtbM: 0,
+        dpbE: 0,
+        dtbE: 0,
+        dPatm: 0.0981,
+        dPatmUnit: 2,
+        dngComponents: '',
+        dMeterType: '0',
+        dCoreType: '0',
+        dPtmode: '0',
+        dPipeType: '0',
+        dPipeD: 259.38,
+        dLenUnit: 3,
+        dPipeDtemp: 20,
+        dPileDtempU: 0,
+        dPipeMaterial: '11.16',
+        dOrificeD: 150.25,
+        dOrificeUnit: 3,
+        dOrificeDtemp: 0,
+        dOrificeDtempUnit: 0,
+        dOrificeMaterial: '16.6',
+        dOrificeSharpness: 0,
+        dOrificeRk: 0,
+        dOrificeRkLenU: 0,
+        dPf: 1.48,
+        dPfUnit: 2,
+        dPfType: '0',
+        dTf: 15,
+        dTfUnit: 0,
+        dDp: 12.5,
+        dDpUnit: 1,
+        dVFlowUnit: 0,
+        dVFlowWorkUnit: 0,
+        dMFlowUnit: 0,
+        dEFlowUnit: 6,
+        dCd: 0.9957,
+        dCdCalMethod: 0,
+        dMeterFactor: 2354,
+        dPulseNum: 12000,
+        dVFlowMax: 6,
+        dVFlowMin: 3,
+        dVFlowCon: 5,
+        dPfRangeMin: 0,
+        dPfRangeMax: 0,
+        dDpRangeMin: 0,
+        dDpRangeMax: 0,
+        dTfRangeMin: 0,
+        dTfRangeMax: 0,
+        dVGsc: 300,
+        dVGscUnit: 0
       },
-      calc() {
-        console.log(this.parentMeterPar);
-        calcNGPar(this.parentMeterPar)
-          .then((res) => {
-            this.parentNGResult = res.data
-            this.activeTab = "meterresult"
-            console.log('Response:', res);
-          })
-          .catch((error) => {
-            console.error('Request error:', error);
-          });
+
+      parentMeterResult: {
+        dE: 0,
+        dFG: 0,
+        dFT: 0,
+        dDViscosity: 0,
+        dDExpCoefficient: 0,
+        dRnPipe: 0,
+        dBk: 0,
+        dRoughNessPipe: 0,
+        dCdCorrect: 0,
+        dCdNozell: 0,
+        dVFlowb: 0,
+        dVFlowf: 0,
+        dVFlowUnit: 2,
+        dMFlowb: 0,
+        dMFlowUnit: 0,
+        dEFlowb: 0,
+        dEFlowUnit: 0,
+        dVelocityFlow: 0,
+        dVelocityUnit: 0,
+        dPressLost: 0,
+        dPressLostUnit: 0,
+        dBeta: 0,
+        dKappa: 0
       },
-      calcFlow() {
-        console.log(this.parentMeterPar);
-        if (this.parentMeterPar.dngComponents === "") {
-          this.message = "组分为空，请输入天然气组分!"
-          this.showMessage()
-          this.activeTab = "ngComponents"
-          return;
-        }
-        // 遍历对象并将每个属性的值设置为零
-        for (const key in this.parentMeterResult) {
-          if (this.parentMeterResult.hasOwnProperty(key)) {
-            this.parentMeterResult[key] = 0;
-          }
-        }
-        calcFlow(this.parentMeterPar)
-          .then((res) => {
-            this.parentMeterResult = res.data[0];
-            console.log('Response:', this.parentMeterResult);
-            this.activeTab = "meterresult"
-          })
-          .catch((error) => {
-            console.error('Request error:', error);
-          });
-      }
+      parentNGResult: {
+        dMrx: 0,
+        dZb: 0,
+        dZf: 0,
+        dFpv: 0,
+        dDb: 0,
+        dDf: 0,
+        dRhob: 0,
+        dRhof: 0,
+        dRD_Ideal: 0,
+        dRD_Real: 0,
+        dHo: 0,
+        dH: 0,
+        dS: 0,
+        dCpi: 0,
+        dCp: 0,
+        dCv: 0,
+        dk: 0,
+        dKappa: 0,
+        dSOS: 0,
+        dCstar: 0,
+        dHhvMol: 0,
+        dLhvMol: 0,
+        dHhvv: 0,
+        dLhvv: 0,
+        dHhvm: 0,
+        dLhvm: 0,
+        dZb11062: 0,
+        dRhob11062: 0,
+        dRhof11062: 0,
+        dRD_Ideal11062: 0,
+        dRD_Real11062: 0,
+        dWobbeIndex: 0,
+        dPc: 0,
+        dTC: 0,
+        dBzsx: 0,
+        dBzxx: 0,
+        dTotalC: 0,
+        dC2: 0,
+        dC2j: 0,
+        dC3j: 0,
+        dC4j: 0,
+        dC5j: 0,
+        dC6j: 0,
+        dC3C4: 0
+      },
+      componentString: '',
+      dMeterType: 0
+    };
+  },
+  mounted() {
+    console.log('179行', this.dMeterType);
+    this.parentMeterPar.dMeterType = this.dMeterType;
+    console.log('180行', this.parentMeterPar);
+  },
+  created() {
+    // 获取路由的查询参数
+    let params = this.$route.query;
+    console.log('186行', params);
+    this.dMeterType = params.dMeterType;
+  },
+  watch: {
+    dMeterType(newValue) {
+      this.parentMeterPar.dMeterType = newValue;
+      console.log('dMeterType 变化后，parentMeterPar:', this.parentMeterPar);
     }
-  };
+  },
+  methods: {
+    showMessage() {
+      this.isShowMessage = true;
+      setTimeout(() => {
+        this.isShowMessage = false;
+      }, 1000); // 3 秒后自动消失
+    },
+    calc() {
+      console.log(this.parentMeterPar);
+      if (this.parentMeterPar.dngComponents === '') {
+        this.message = '组分为空，请输入天然气组分!';
+        this.showMessage();
+        this.activeTab = 'ngComponents';
+        return;
+      }
+      // 遍历对象并将每个属性的值设置为零
+      for (const key in this.parentNGResult) {
+        if (this.parentNGResult.hasOwnProperty(key)) {
+          this.parentNGResult[key] = 0;
+        }
+      }
+      calcNGPar(this.parentMeterPar)
+        .then((res) => {
+          this.parentNGResult = res.data;
+          this.activeTab = 'meterresult';
+          console.log('Response:', res);
+        })
+        .catch((error) => {
+          console.error('Request error:', error);
+        });
+    },
+    calcFlow() {
+      console.log(this.parentMeterPar);
+      if (this.parentMeterPar.dngComponents === '') {
+        this.message = '组分为空，请输入天然气组分!';
+        this.showMessage();
+        this.activeTab = 'ngComponents';
+        return;
+      }
+      // 遍历对象并将每个属性的值设置为零
+      for (const key in this.parentMeterResult) {
+        if (this.parentMeterResult.hasOwnProperty(key)) {
+          this.parentMeterResult[key] = 0;
+        }
+      }
+      calcFlow(this.parentMeterPar)
+        .then((res) => {
+          this.parentMeterResult = res.data[0];
+          console.log('Response:', this.parentMeterResult);
+          this.activeTab = 'meterresult';
+        })
+        .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 {
+  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:last-child {
+  margin-right: 0;
+}
 
-  .animated-button:hover {
-    background-color: #0056b3;
-    transform: scale(1.05);
-  }
+.animated-button:hover {
+  background-color: #0056b3;
+  transform: scale(1.05);
+}
 
-  .animated-button:active {
-    transform: scale(0.95);
-  }
+.animated-button:active {
+  transform: scale(0.95);
+}
 
-  /* 使用深度选择器 */
-  /deep/ .el-tabs__nav {
-    padding: 0;
-    margin: 0;
-    display: flex;
-    width: 100%;
-  }
+/* 使用深度选择器 */
+/deep/ .el-tabs__nav {
+  padding: 0;
+  margin: 0;
+  display: flex;
+  width: 100%;
+}
 
-  /deep/ .el-tabs__item {
-    flex: 1;
-    text-align: center;
-    padding: 10px;
-  }
+/deep/ .el-tabs__item {
+  flex: 1;
+  text-align: center;
+  padding: 10px;
+}
 
-  .message-box {
-    position: fixed;
-    top: 20px;
-    left: 50%;
-    transform: translateX(-50%);
-    background-color: #333;
-    color: white;
-    padding: 10px 20px;
-    border-radius: 5px;
-    z-index: 9999;
-  }
+.message-box {
+  position: fixed;
+  top: 20px;
+  left: 50%;
+  transform: translateX(-50%);
+  background-color: #333;
+  color: white;
+  padding: 10px 20px;
+  border-radius: 5px;
+  z-index: 9999;
+}
 </style>
diff --git a/src/views/register.vue b/src/views/register.vue
index 60d8bca..a59ca3a 100644
--- a/src/views/register.vue
+++ b/src/views/register.vue
@@ -1,60 +1,36 @@
 <template>
   <div class="register">
     <el-form ref="registerForm" :model="registerForm" :rules="registerRules" class="register-form">
-      <h3 class="title">若依后台管理系统</h3>
+      <h3 class="title">天然气工具系统</h3>
       <el-form-item prop="username">
         <el-input v-model="registerForm.username" type="text" auto-complete="off" placeholder="账号">
           <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input
-          v-model="registerForm.password"
-          type="password"
-          auto-complete="off"
-          placeholder="密码"
-          @keyup.enter.native="handleRegister"
-        >
+        <el-input v-model="registerForm.password" type="password" auto-complete="off" placeholder="密码" @keyup.enter.native="handleRegister">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="confirmPassword">
-        <el-input
-          v-model="registerForm.confirmPassword"
-          type="password"
-          auto-complete="off"
-          placeholder="确认密码"
-          @keyup.enter.native="handleRegister"
-        >
+        <el-input v-model="registerForm.confirmPassword" type="password" auto-complete="off" placeholder="确认密码" @keyup.enter.native="handleRegister">
           <svg-icon slot="prefix" icon-class="password" class="el-input__icon input-icon" />
         </el-input>
       </el-form-item>
       <el-form-item prop="code" v-if="captchaEnabled">
-        <el-input
-          v-model="registerForm.code"
-          auto-complete="off"
-          placeholder="验证码"
-          style="width: 63%"
-          @keyup.enter.native="handleRegister"
-        >
+        <el-input v-model="registerForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter.native="handleRegister">
           <svg-icon slot="prefix" icon-class="validCode" class="el-input__icon input-icon" />
         </el-input>
         <div class="register-code">
-          <img :src="codeUrl" @click="getCode" class="register-code-img"/>
+          <img :src="codeUrl" @click="getCode" class="register-code-img" />
         </div>
       </el-form-item>
-      <el-form-item style="width:100%;">
-        <el-button
-          :loading="loading"
-          size="medium"
-          type="primary"
-          style="width:100%;"
-          @click.native.prevent="handleRegister"
-        >
+      <el-form-item style="width: 100%">
+        <el-button :loading="loading" size="medium" type="primary" style="width: 100%" @click.native.prevent="handleRegister">
           <span v-if="!loading">注 册</span>
           <span v-else>注 册 中...</span>
         </el-button>
-        <div style="float: right;">
+        <div style="float: right">
           <router-link class="link-type" :to="'/login'">使用已有账户登录</router-link>
         </div>
       </el-form-item>
@@ -67,42 +43,42 @@
 </template>
 
 <script>
-import { getCodeImg, register } from "@/api/login";
+import { getCodeImg, register } from '@/api/login';
 
 export default {
-  name: "Register",
+  name: 'Register',
   data() {
     const equalToPassword = (rule, value, callback) => {
       if (this.registerForm.password !== value) {
-        callback(new Error("两次输入的密码不一致"));
+        callback(new Error('两次输入的密码不一致'));
       } else {
         callback();
       }
     };
     return {
-      codeUrl: "",
+      codeUrl: '',
       registerForm: {
-        username: "",
-        password: "",
-        confirmPassword: "",
-        code: "",
-        uuid: ""
+        username: '',
+        password: '',
+        confirmPassword: '',
+        code: '',
+        uuid: ''
       },
       registerRules: {
         username: [
-          { required: true, trigger: "blur", message: "请输入您的账号" },
+          { required: true, trigger: 'blur', message: '请输入您的账号' },
           { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         password: [
-          { required: true, trigger: "blur", message: "请输入您的密码" },
-          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
-          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+          { required: true, trigger: 'blur', message: '请输入您的密码' },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          { pattern: /^[^<>"'|\\]+$/, message: '不能包含非法字符：< > " \' \\\ |', trigger: 'blur' }
         ],
         confirmPassword: [
-          { required: true, trigger: "blur", message: "请再次输入您的密码" },
-          { required: true, validator: equalToPassword, trigger: "blur" }
+          { required: true, trigger: 'blur', message: '请再次输入您的密码' },
+          { required: true, validator: equalToPassword, trigger: 'blur' }
         ],
-        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
+        code: [{ required: true, trigger: 'change', message: '请输入验证码' }]
       },
       loading: false,
       captchaEnabled: true
@@ -113,32 +89,36 @@ export default {
   },
   methods: {
     getCode() {
-      getCodeImg().then(res => {
+      getCodeImg().then((res) => {
         this.captchaEnabled = res.captchaEnabled === undefined ? true : res.captchaEnabled;
         if (this.captchaEnabled) {
-          this.codeUrl = "data:image/gif;base64," + res.img;
+          this.codeUrl = 'data:image/gif;base64,' + res.img;
           this.registerForm.uuid = res.uuid;
         }
       });
     },
     handleRegister() {
-      this.$refs.registerForm.validate(valid => {
+      this.$refs.registerForm.validate((valid) => {
         if (valid) {
           this.loading = true;
-          register(this.registerForm).then(res => {
-            const username = this.registerForm.username;
-            this.$alert("<font color='red'>恭喜你，您的账号 " + username + " 注册成功！</font>", '系统提示', {
-              dangerouslyUseHTMLString: true,
-              type: 'success'
-            }).then(() => {
-              this.$router.push("/login");
-            }).catch(() => {});
-          }).catch(() => {
-            this.loading = false;
-            if (this.captchaEnabled) {
-              this.getCode();
-            }
-          })
+          register(this.registerForm)
+            .then((res) => {
+              const username = this.registerForm.username;
+              this.$alert("<font color='red'>恭喜你，您的账号 " + username + ' 注册成功！</font>', '系统提示', {
+                dangerouslyUseHTMLString: true,
+                type: 'success'
+              })
+                .then(() => {
+                  this.$router.push('/login');
+                })
+                .catch(() => {});
+            })
+            .catch(() => {
+              this.loading = false;
+              if (this.captchaEnabled) {
+                this.getCode();
+              }
+            });
         }
       });
     }
@@ -152,7 +132,7 @@ export default {
   justify-content: center;
   align-items: center;
   height: 100%;
-  background-image: url("../assets/images/login-background.jpg");
+  background-image: url('../assets/images/login-background.jpg');
   background-size: cover;
 }
 .title {
diff --git a/vue.config.js b/vue.config.js
index e90ef87..8e51d11 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -7,7 +7,7 @@ function resolve(dir) {
 
 const CompressionPlugin = require('compression-webpack-plugin')
 
-const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
+const name = process.env.VUE_APP_TITLE || '天然气工具' // 网页标题
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 
@@ -26,7 +26,8 @@ module.exports = {
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
   lintOnSave: process.env.NODE_ENV === 'development',
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
+  // productionSourceMap: true,
+  productionSourceMap: true,
   transpileDependencies: ['quill'],
   // webpack-dev-server 相关配置
   devServer: {